r1488 - in xwiki/trunk: core/src/main/resources src/main/web/templates

[Phung Hai Nam]

Author: namphunghai
Date: 2006-11-02 10:08:40 +0100 (Thu, 02 Nov 2006)
New Revision: 1488

Modified:
   xwiki/trunk/core/src/main/resources/ApplicationResources.properties
   xwiki/trunk/src/main/web/templates/attachwysiwyg.vm
   xwiki/trunk/src/main/web/templates/macrowysiwyg.vm
Log:
Modified something for  wysiwyg editor (ui for macro and attachwysiwyg) to compatible with editor 2 (no effect to editor 1)

Modified: xwiki/trunk/core/src/main/resources/ApplicationResources.properties
===================================================================
--- xwiki/trunk/core/src/main/resources/ApplicationResources.properties	2006-11-02 00:27:05 UTC (rev 1487)
+++ xwiki/trunk/core/src/main/resources/ApplicationResources.properties	2006-11-02 09:08:40 UTC (rev 1488)
@@ -489,4 +489,10 @@
 comment_registered=Registered
 comment=Comment
 confirmcommentnotcorrect=Confirm to avoid spam robots. Please try again !!
-validationerror=Field $propName is incorrect.
\ No newline at end of file
+validationerror=Field $propName is incorrect.
+
+attachedby=attached by
+listofallexistspages=List of all exists pages
+listofallattachments=List of all attachments
+listofrecentlyviewedpages=List of recently viewed pages
+listofresultspages= List of result 
\ No newline at end of file

Modified: xwiki/trunk/src/main/web/templates/attachwysiwyg.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/attachwysiwyg.vm	2006-11-02 00:27:05 UTC (rev 1487)
+++ xwiki/trunk/src/main/web/templates/attachwysiwyg.vm	2006-11-02 09:08:40 UTC (rev 1488)
@@ -9,14 +9,14 @@
       <br /><br />
       $msg.get("choosefiletoupload"):
       <input type="file" name="filepath" value="" size="40"  /> <br /><br />
-      <input type="submit" value="$msg.get("attachthisfile")" />
+      <input type="submit" id="attachment" name="attachment" value="$msg.get("attachthisfile")" />
     </p>
   </form>
   #set($counter=0)
   #foreach ($attach in $attachments)
     #if((!$request.images)||$attach.isImage())
       #if($counter==0)
-        <table>
+        <table width="95%">
           <tr class="title"><th></th><th>$msg.get("filename")</th><th>$msg.get("version")</th><th>$msg.get("author")</th></tr>
       #end
       <tr>

Modified: xwiki/trunk/src/main/web/templates/macrowysiwyg.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/macrowysiwyg.vm	2006-11-02 00:27:05 UTC (rev 1487)
+++ xwiki/trunk/src/main/web/templates/macrowysiwyg.vm	2006-11-02 09:08:40 UTC (rev 1488)
@@ -27,7 +27,7 @@
             </tr>
         </table>
     </div>
-    <hr />
+
     <div id="input">
     </div>
     #foreach ($macro in $macros)