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

[Phung Hai Nam]

Author: namphunghai
Date: 2006-05-30 03:51:26 +0200 (Tue, 30 May 2006)
New Revision: 1076

Modified:
   xwiki/trunk/src/main/web/templates/macrowysiwyg.vm
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/image.htm
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/macro.htm
Log:
Fixed bugs ' the image insertion does not take into account the size chosen for the
image and the separator between variables in the {} macro to | '

Modified: xwiki/trunk/src/main/web/templates/macrowysiwyg.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/macrowysiwyg.vm	2006-05-29 10:07:36 UTC (rev 1075)
+++ xwiki/trunk/src/main/web/templates/macrowysiwyg.vm	2006-05-30 01:51:26 UTC (rev 1076)
@@ -62,7 +62,7 @@
                                     #if($counter == 3)
                                         #if (!$infoMacro.equals(""))
                                             <tr>
-                                                <td nowrap='nowrap'>Content :</td>
+                                                <td nowrap='nowrap'>infoMacro :</td>
                                                 <td>
                                                     <textarea id="content" name="content" rows='' cols='' style='width:240px;'></textarea>
                                                 </td>

Modified: xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/image.htm
===================================================================
--- xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/image.htm	2006-05-29 10:07:36 UTC (rev 1075)
+++ xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/image.htm	2006-05-30 01:51:26 UTC (rev 1076)
@@ -12,7 +12,7 @@
 			var width = document.forms[0].width.value;
 			var height = document.forms[0].height.value;
 
-			window.opener.wikiEditor.insertImage(src, "", "", "", "", width, height, "");
+			window.opener.wikiEditor.insertImage(src, width, height);
 			top.close();
 		}
 	}

Modified: xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/macro.htm
===================================================================
--- xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/macro.htm	2006-05-29 10:07:36 UTC (rev 1075)
+++ xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/macro.htm	2006-05-30 01:51:26 UTC (rev 1076)
@@ -108,7 +108,7 @@
             macroparams = macroparamstr.split(",");
             for(var i=0; i < macroparams.length; i++) {
                 macro += macroparams[i] + "=" + document.getElementById(macroparams[i]).value;
-                if (i != macroparams.length-1 )  macro += ",";
+                if (i != macroparams.length-1 )  macro += "|";
             }
             macro += "}";
             if ((macrocontent !=null && macrocontent !="")) {