"MDL-20592, improve advimage plugin in editor"

diff --git a/lib/editor/tinymce/extra/patches/tinymce_plugin_advimage.patch b/lib/editor/tinymce/extra/patches/tinymce_plugin_advimage.patch
new file mode 100644 (file)
index 0000000..0c6bb6c
--- /dev/null
+++ b/lib/editor/tinymce/extra/patches/tinymce_plugin_advimage.patch
@@ -0,0 +1,83 @@
+Index: lib/editor/tinymce/plugins/advimage/image.htm
+===================================================================
+RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/plugins/advimage/image.htm,v
+retrieving revision 1.1
+diff -u -r1.1 image.htm
+--- lib/editor/tinymce/plugins/advimage/image.htm      16 May 2009 20:53:41 -0000      1.1
++++ lib/editor/tinymce/plugins/advimage/image.htm      11 Nov 2009 05:18:39 -0000
+@@ -26,14 +26,15 @@
+                                               <legend>{#advimage_dlg.general}</legend>\r
+ \r
+                                               <table class="properties">\r
++                            <tr>\r
++                                                              <td class="column1">&nbsp;</td>\r
++                                <td align="left" id="srcbrowsercontainer">&nbsp;</td>\r
++                            </tr>\r
+                                                       <tr>\r
+                                                               <td class="column1"><label id="srclabel" for="src">{#advimage_dlg.src}</label></td>\r
+-                                                              <td colspan="2"><table border="0" cellspacing="0" cellpadding="0">\r
+-                                                                      <tr> \r
+-                                                                        <td><input name="src" type="text" id="src" value="" class="mceFocus" onchange="ImageDialog.showPreviewImage(this.value);" /></td> \r
+-                                                                        <td id="srcbrowsercontainer">&nbsp;</td>\r
+-                                                                      </tr>\r
+-                                                                </table></td>\r
++                                                              <td>\r
++                                <input name="src" type="text" id="src" value="" class="mceFocus" onchange="ImageDialog.showPreviewImage(this.value);" /> \r
++                                                              </td>\r
+                                                       </tr>\r
+                                                       <tr>\r
+                                                               <td><label for="src_list">{#advimage_dlg.image_list}</label></td>\r
+@@ -41,12 +42,8 @@
+                                                       </tr>\r
+                                                       <tr> \r
+                                                               <td class="column1"><label id="altlabel" for="alt">{#advimage_dlg.alt}</label></td> \r
+-                                                              <td colspan="2"><input id="alt" name="alt" type="text" value="" /></td> \r
++                                                              <td><input id="alt" name="alt" type="text" value="" /></td> \r
+                                                       </tr> \r
+-                                                      <tr> \r
+-                                                              <td class="column1"><label id="titlelabel" for="title">{#advimage_dlg.title}</label></td> \r
+-                                                              <td colspan="2"><input id="title" name="title" type="text" value="" /></td> \r
+-                                                      </tr>\r
+                                               </table>\r
+                               </fieldset>\r
+ \r
+@@ -180,10 +177,13 @@
+ \r
+                                       <table border="0" cellpadding="4" cellspacing="0">\r
+                                               <tr>\r
++                                                      <td class="column1"><label id="titlelabel" for="title">{#advimage_dlg.title}</label></td> \r
++                                                      <td><input id="title" name="title" type="text" value="" /></td> \r
++                                              </tr>\r
++                                              <tr>\r
+                                                       <td class="column1"><label id="idlabel" for="id">{#advimage_dlg.id}</label></td> \r
+                                                       <td><input id="id" name="id" type="text" value="" /></td> \r
+                                               </tr>\r
+-\r
+                                               <tr>\r
+                                                       <td class="column1"><label id="dirlabel" for="dir">{#advimage_dlg.langdir}</label></td> \r
+                                                       <td>\r
+Index: lib/editor/tinymce/plugins/advimage/css/advimage.css
+===================================================================
+RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/plugins/advimage/css/advimage.css,v
+retrieving revision 1.1
+diff -u -r1.1 advimage.css
+--- lib/editor/tinymce/plugins/advimage/css/advimage.css       16 May 2009 20:54:52 -0000      1.1
++++ lib/editor/tinymce/plugins/advimage/css/advimage.css       11 Nov 2009 05:18:39 -0000
+@@ -1,13 +1,15 @@
+ #src_list, #over_list, #out_list {width:280px;}\r
+ .mceActionPanel {margin-top:7px;}\r
++.moodlebutton {font-size: 1.5em;font-weight:bold;padding: 3px;border:1px solid #ccc;text-decoration:none}\r
++.moodlebutton:hover {background: #ccc}\r
+ .alignPreview {border:1px solid #000; width:140px; height:140px; overflow:hidden; padding:5px;}\r
+ .checkbox {border:0;}\r
+ .panel_wrapper div.current {height:305px;}\r
+-#prev {margin:0; border:1px solid #000; width:428px; height:150px; overflow:auto;}\r
++#prev {margin:0; border:1px solid #000; width:428px; height:180px; overflow:auto;}\r
+ #align, #classlist {width:150px;}\r
+ #width, #height {vertical-align:middle; width:50px; text-align:center;}\r
+ #vspace, #hspace, #border {vertical-align:middle; width:30px; text-align:center;}\r
+ #class_list {width:180px;}\r
+ input {width: 280px;}\r
+ #constrain, #onmousemovecheck {width:auto;}\r
+-#id, #dir, #lang, #usemap, #longdesc {width:200px;}\r
++#id, #title, #dir, #lang, #usemap, #longdesc {width:200px;}\r

diff --git a/lib/editor/tinymce/plugins/advimage/css/advimage.css b/lib/editor/tinymce/plugins/advimage/css/advimage.css
index 0a6251a6965637d3002613cb09384922e2f2b51b..89b58cb4a9745381b1885ae1b849401b30e0daba 100644 (file)
--- a/lib/editor/tinymce/plugins/advimage/css/advimage.css
+++ b/lib/editor/tinymce/plugins/advimage/css/advimage.css
@@ -1,13 +1,15 @@
 #src_list, #over_list, #out_list {width:280px;}\r
 .mceActionPanel {margin-top:7px;}\r
+.moodlebutton {font-size: 1.5em;font-weight:bold;padding: 3px;border:1px solid #ccc;text-decoration:none}\r
+.moodlebutton:hover {background: #ccc}\r
 .alignPreview {border:1px solid #000; width:140px; height:140px; overflow:hidden; padding:5px;}\r
 .checkbox {border:0;}\r
 .panel_wrapper div.current {height:305px;}\r
-#prev {margin:0; border:1px solid #000; width:428px; height:150px; overflow:auto;}\r
+#prev {margin:0; border:1px solid #000; width:428px; height:180px; overflow:auto;}\r
 #align, #classlist {width:150px;}\r
 #width, #height {vertical-align:middle; width:50px; text-align:center;}\r
 #vspace, #hspace, #border {vertical-align:middle; width:30px; text-align:center;}\r
 #class_list {width:180px;}\r
 input {width: 280px;}\r
 #constrain, #onmousemovecheck {width:auto;}\r
-#id, #dir, #lang, #usemap, #longdesc {width:200px;}\r
+#id, #title, #dir, #lang, #usemap, #longdesc {width:200px;}\r

diff --git a/lib/editor/tinymce/plugins/advimage/image.htm b/lib/editor/tinymce/plugins/advimage/image.htm
index 5d261504674aab55a22c2d3a4c735592f638903f..08b3b790ad758da3acdebbf0890e7c8aad092089 100644 (file)
--- a/lib/editor/tinymce/plugins/advimage/image.htm
+++ b/lib/editor/tinymce/plugins/advimage/image.htm
@@ -26,14 +26,15 @@
                                                <legend>{#advimage_dlg.general}</legend>\r
 \r
                                                <table class="properties">\r
+                            <tr>\r
+                                                               <td class="column1">&nbsp;</td>\r
+                                <td align="left" id="srcbrowsercontainer">&nbsp;</td>\r
+                            </tr>\r
                                                        <tr>\r
                                                                <td class="column1"><label id="srclabel" for="src">{#advimage_dlg.src}</label></td>\r
-                                                               <td colspan="2"><table border="0" cellspacing="0" cellpadding="0">\r
-                                                                       <tr> \r
-                                                                         <td><input name="src" type="text" id="src" value="" class="mceFocus" onchange="ImageDialog.showPreviewImage(this.value);" /></td> \r
-                                                                         <td id="srcbrowsercontainer">&nbsp;</td>\r
-                                                                       </tr>\r
-                                                                 </table></td>\r
+                                                               <td>\r
+                                <input name="src" type="text" id="src" value="" class="mceFocus" onchange="ImageDialog.showPreviewImage(this.value);" /> \r
+                                                               </td>\r
                                                        </tr>\r
                                                        <tr>\r
                                                                <td><label for="src_list">{#advimage_dlg.image_list}</label></td>\r
@@ -41,12 +42,8 @@
                                                        </tr>\r
                                                        <tr> \r
                                                                <td class="column1"><label id="altlabel" for="alt">{#advimage_dlg.alt}</label></td> \r
-                                                               <td colspan="2"><input id="alt" name="alt" type="text" value="" /></td> \r
+                                                               <td><input id="alt" name="alt" type="text" value="" /></td> \r
                                                        </tr> \r
-                                                       <tr> \r
-                                                               <td class="column1"><label id="titlelabel" for="title">{#advimage_dlg.title}</label></td> \r
-                                                               <td colspan="2"><input id="title" name="title" type="text" value="" /></td> \r
-                                                       </tr>\r
                                                </table>\r
                                </fieldset>\r
 \r
@@ -179,11 +176,14 @@
                                        <legend>{#advimage_dlg.misc}</legend>\r
 \r
                                        <table border="0" cellpadding="4" cellspacing="0">\r
+                                               <tr>\r
+                                                       <td class="column1"><label id="titlelabel" for="title">{#advimage_dlg.title}</label></td> \r
+                                                       <td><input id="title" name="title" type="text" value="" /></td> \r
+                                               </tr>\r
                                                <tr>\r
                                                        <td class="column1"><label id="idlabel" for="id">{#advimage_dlg.id}</label></td> \r
                                                        <td><input id="id" name="id" type="text" value="" /></td> \r
                                                </tr>\r
-\r
                                                <tr>\r
                                                        <td class="column1"><label id="dirlabel" for="dir">{#advimage_dlg.langdir}</label></td> \r
                                                        <td>\r

diff --git a/lib/editor/tinymce/readme_moodle.txt b/lib/editor/tinymce/readme_moodle.txt
index d7a8c57c085b917ce1c9f545b163166f2b7a3129..6f5c5433d5bfc84264f692fc638f9711356b969b 100644 (file)
--- a/lib/editor/tinymce/readme_moodle.txt
+++ b/lib/editor/tinymce/readme_moodle.txt
@@ -12,7 +12,7 @@ Upgrade procedure:
  2/ replace tiny_mce*.* files, themes/*, utils/* and plugins/*
     (keep dragmath, moodlenolink, spellchecker)
  3/ copy tinymce/jscripts/tiny_mce/classes/Popup.js to Popup.js
- 4/ apply strings & form_utils.js patch
+ 4/ apply strings & form_utils.js & tinymce_plugin_advimage patches
  5/ copy yuicompressor.jar from dev package into extra/tools/, use shell
     script extra/tools/compress.sh to compress modified files
  6/ download all TinyMCE lang files (extra/tools/download_langs.sh)