Item2412: FoswikiImage plugin. Fix unable to select/insert an image w…

…hen only one image attachment present; adjust image insert dialogue layout help text to be more compact; increase image insert dialogue window size, to avoid preview of image covering insert/cancel buttons git-svn-id: http://svn.foswiki.org/branches/Release01x00@5628 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Nov 25, 2009 · c041496 · c041496
1 parent 654b2dc
commit c041496
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/...mce/plugins/foswikiimage/css/advimage.css → ...plugins/foswikiimage/css/foswikiimage.css b/...mce/plugins/foswikiimage/css/advimage.css → ...plugins/foswikiimage/css/foswikiimage.css
diff --git a/...plugins/foswikiimage/css/advimage_src.css → ...ins/foswikiimage/css/foswikiimage_src.css b/...plugins/foswikiimage/css/advimage_src.css → ...ins/foswikiimage/css/foswikiimage_src.css
diff --git a/.../pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/editor_plugin.js b/.../pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/editor_plugin.js
diff --git a/.../System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/editor_plugin_src.js b/.../System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/editor_plugin_src.js
@@ -29,8 +29,8 @@
                     toolbar: false,
                     status: false,
                     url : url + '/image.htm',
-                    width : 480,
-                    height : 385,
+                    width : 550,
+                    height : 400,
                     movable : true,
                     inline : true
                 }, {

diff --git a/...EPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/image.htm b/...EPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/image.htm
@@ -35,7 +35,7 @@
          </tr>
         </table>
        </td>
-       <td colspan="2">
+       <td rowspan="0" valign="top" colspan="2">
 		{#foswikiimage_dlg.img_url_help}
        </td>
       </tr>

diff --git a/...lugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/js/image.js b/...lugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/js/image.js
@@ -309,7 +309,9 @@ var FoswikiImageDialog = {
                 var select = document.getElementById("attachments_select");
                 for (var i = 0; i < atts.length; i++) {
                     for (var j = 0; j < ids.length; j++) {
-                        lsts[j].options[i] =
+                        /* +1 so as not to overwrite existing null option
+                         * defined in the static HTML. Item2412 */
+                        lsts[j].options[i+1] =
                             new Option(atts[i].name, atts[i].name);
                     }
                 }