r1077 - in xwiki/trunk/src/main/web: templates wiki_editor/plugins

[Phung Hai Nam]

Author: namphunghai
Date: 2006-05-30 06:21:55 +0200 (Tue, 30 May 2006)
New Revision: 1077

Modified:
   xwiki/trunk/src/main/web/templates/macrowysiwyg.vm
   xwiki/trunk/src/main/web/templates/wysiwyg.vm
   xwiki/trunk/src/main/web/wiki_editor/plugins/macros.js
Log:
fix bug 'The window is a little small of the macro has 3 or more parameters'

Modified: xwiki/trunk/src/main/web/templates/macrowysiwyg.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/macrowysiwyg.vm	2006-05-30 01:51:26 UTC (rev 1076)
+++ xwiki/trunk/src/main/web/templates/macrowysiwyg.vm	2006-05-30 04:21:55 UTC (rev 1077)
@@ -52,7 +52,7 @@
                                         #set($params = $infoMacro.split(","))
                                         #foreach ($param in $params)
                                             <tr>
-                                                <td nowrap="nowrap">$param :</td>
+                                                <td nowrap="nowrap" width="25%">$param :</td>
                                                 <td>
                                                      <input type="text" id="$param" name="$param" style="width:240px;"/>
                                                 </td>
@@ -62,9 +62,9 @@
                                     #if($counter == 3)
                                         #if (!$infoMacro.equals(""))
                                             <tr>
-                                                <td nowrap='nowrap'>infoMacro :</td>
+                                                <td nowrap='nowrap'>$infoMacro :</td>
                                                 <td>
-                                                    <textarea id="content" name="content" rows='' cols='' style='width:240px;'></textarea>
+                                                    <textarea id="content" name="content" rows='' cols='4' style='width:240px;'></textarea>
                                                 </td>
                                             </tr>
                                         #end

Modified: xwiki/trunk/src/main/web/templates/wysiwyg.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/wysiwyg.vm	2006-05-30 01:51:26 UTC (rev 1076)
+++ xwiki/trunk/src/main/web/templates/wysiwyg.vm	2006-05-30 04:21:55 UTC (rev 1077)
@@ -65,7 +65,7 @@
 #end
 $msg.get("titlefield"):&nbsp;<input type="text" name="title" value="$!tdoc.title" size="60" />
 <br /><br />
-   Switch to &nbsp; <span style="color: blue; cursor:pointer;" onclick="document.forms.edit.action='$doc.getURL("edit")'; document.forms.edit.onsubmit();if (checkDocumentContent()) document.forms.edit.submit(); return false;"><u>$msg.get("wikieditor")</u></span>
+   Switch to &nbsp; <span style="color: blue; cursor:pointer;" onclick="document.forms.edit.action='$doc.getURL("edit")';if (document.forms.edit.onsubmit) document.forms.edit.onsubmit(); document.forms.edit.submit(); return false;"><u>$msg.get("wikieditor")</u></span>
 <br />
 $xwiki.getTextArea($tdoc.content)
 <br/>

Modified: xwiki/trunk/src/main/web/wiki_editor/plugins/macros.js
===================================================================
--- xwiki/trunk/src/main/web/wiki_editor/plugins/macros.js	2006-05-30 01:51:26 UTC (rev 1076)
+++ xwiki/trunk/src/main/web/wiki_editor/plugins/macros.js	2006-05-30 04:21:55 UTC (rev 1077)
@@ -27,8 +27,8 @@
 	var template = new Array();
 
     template['file'] = 'macro.htm';
-	template['width'] = 390;
-	template['height'] = 230;
+	template['width'] = 420;
+	template['height'] = 290;
 
     tinyMCE.openWindow(template, {editor_id : editor_id, scrollbars : 'yes',  resizable : 'no', mce_windowresize: false});