r1126 - in xwiki/trunk/src/main/web: templates tiny_mce/themes/wikieditor/langs

[Phung Hai Nam]

Author: namphunghai
Date: 2006-08-09 09:55:42 +0200 (Wed, 09 Aug 2006)
New Revision: 1126

Modified:
   xwiki/trunk/src/main/web/templates/attachwysiwyg.vm
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/en.js
Log:
Fix bug XWIKI-317 , Write label of default style as  "Normal" , not "--Titles--"

Modified: xwiki/trunk/src/main/web/templates/attachwysiwyg.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/attachwysiwyg.vm	2006-08-09 00:19:03 UTC (rev 1125)
+++ xwiki/trunk/src/main/web/templates/attachwysiwyg.vm	2006-08-09 07:55:42 UTC (rev 1126)
@@ -1,5 +1,19 @@
 #set($attachments = $doc.attachmentList)
 <div id="xwikiattachmentscontent" class="xwikidatacontent">
+<br />
+<form id="attach" action="$doc.getURL("upload")" enctype="multipart/form-data" method="post"
+      onsubmit="return updateAttachName(this)" >
+<input type="hidden" name="xredirect" value="" />
+<p>
+$msg.get("choosetargetfilename"):
+<input type="text" name="filename" value="" size="20" />
+<br /><br />
+$msg.get("choosefiletoupload"):
+<input type="file" name="filepath" value="" size="40"  />
+<br /><br />
+<input type="submit" value="$msg.get("attachthisfile")" />
+</p>
+</form>
 #set($counter=0)
 #foreach ($attach in $attachments)
 #if((!$request.images)||$attach.isImage())
@@ -22,20 +36,6 @@
 #set( $counter = $counter + 1)
 #end
 </table>
-<br />
-<form id="attach" action="$doc.getURL("upload")" enctype="multipart/form-data" method="post"
-      onsubmit="return updateAttachName(this)" >
-<input type="hidden" name="xredirect" value="" />
-<p>
-$msg.get("choosetargetfilename"):
-<input type="text" name="filename" value="" size="20" />
-<br /><br />
-$msg.get("choosefiletoupload"):
-<input type="file" name="filepath" value="" size="40"  />
-<br /><br />
-<input type="submit" value="$msg.get("attachthisfile")" />
-</p>
-</form>
 </div>
 <div class="xwikidatafooter2">
 <div class="xwikidatafooter1">&nbsp;</div>

Modified: xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/en.js
===================================================================
--- xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/en.js	2006-08-09 00:19:03 UTC (rev 1125)
+++ xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/en.js	2006-08-09 07:55:42 UTC (rev 1126)
@@ -61,12 +61,12 @@
 tinyMCELang['lang_class'] = 'Class';
 tinyMCELang['lang_newdocument'] = 'Are you sure you want clear all contents?';
 <!-- new additions for wikieditor -->
-tinyMCELang['lang_wiki_title_menu'] = '-- Titles --';
-tinyMCELang['lang_wiki_title_1'] = 'Title 1';
-tinyMCELang['lang_wiki_title_2'] = 'Title 2';
-tinyMCELang['lang_wiki_title_3'] = 'Title 3';
-tinyMCELang['lang_wiki_title_4'] = 'Title 4';
-tinyMCELang['lang_wiki_title_5'] = 'Title 5';
+tinyMCELang['lang_wiki_title_menu'] = ' Normal ';
+tinyMCELang['lang_wiki_title_1'] = ' Title 1 ';
+tinyMCELang['lang_wiki_title_2'] = ' Title 2 ';
+tinyMCELang['lang_wiki_title_3'] = ' Title 3 ';
+tinyMCELang['lang_wiki_title_4'] = ' Title 4 ';
+tinyMCELang['lang_wiki_title_5'] = ' Title 5 ';
 tinyMCELang['lang_attachment_desc'] = 'Insert an Attachment Link';
 tinyMCELang['lang_macro_desc'] = 'Insert a Macro';
 tinyMCELang['lang_insert_image_name'] = 'Image(attachment) name';