diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 70280128c..b0fbc1d16 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -2,6 +2,7 @@ - fix: template variable isUncommitted is not documented in the help - fix: Event is no longer editable by anyone who can add events - fixed: Package search is slow for large websites + - fixed: rich editor image picker displays incorrectly in IE 7.5.10 - fix: Syntax error in GetCsMail diff --git a/www/extras/tinymce-webgui/plugins/wginsertimage/insertimage.htm b/www/extras/tinymce-webgui/plugins/wginsertimage/insertimage.htm index 09033b05b..66b0a0ec3 100644 --- a/www/extras/tinymce-webgui/plugins/wginsertimage/insertimage.htm +++ b/www/extras/tinymce-webgui/plugins/wginsertimage/insertimage.htm @@ -25,68 +25,62 @@
{#wginsertimage.selectedproperties} - +
- - + + - - - -
- - - - - -
-
- {#wginsertimage.imagelayout} - - - - - - - - - -
- -
-
-
-
- {#wginsertimage.imagespacing} - - - - - - - - - -
-
-
-
+ + + +
+
+ {#wginsertimage.imagelayout} + + + + + + + + + +
+ +
+
+
+
+ {#wginsertimage.imagespacing} + + + + + + + + + +
+
+
+
diff --git a/www/extras/tinymce-webgui/plugins/wginsertimage/langs/en.js b/www/extras/tinymce-webgui/plugins/wginsertimage/langs/en.js index 9be46e931..90d9be93e 100644 --- a/www/extras/tinymce-webgui/plugins/wginsertimage/langs/en.js +++ b/www/extras/tinymce-webgui/plugins/wginsertimage/langs/en.js @@ -1,3 +1,3 @@ tinyMCE.addI18n('en.wginsertimage',{ - desc : 'Insert WebGUI Image', + desc : 'Insert WebGUI Image' }); diff --git a/www/extras/tinymce-webgui/plugins/wginsertimage/langs/en_dlg.js b/www/extras/tinymce-webgui/plugins/wginsertimage/langs/en_dlg.js index 8d17d1525..db6d5b6b3 100644 --- a/www/extras/tinymce-webgui/plugins/wginsertimage/langs/en_dlg.js +++ b/www/extras/tinymce-webgui/plugins/wginsertimage/langs/en_dlg.js @@ -3,8 +3,8 @@ tinyMCE.addI18n('en.wginsertimage',{ manager : 'WebGUI Collateral Image Manager', newwindow : 'Open link in new window.', selectedproperties : 'Selected Image', - imageurl : 'Image URL:', - imagealt : 'Alt Text:', + imageurl : 'Image URL:', + imagealt : 'Alt Text:', imagelayout : 'Layout', imagealign : 'Alignment:', imageborder : 'Border:', diff --git a/www/extras/tinymce-webgui/plugins/wgmacro/editor_plugin.js b/www/extras/tinymce-webgui/plugins/wgmacro/editor_plugin.js index d05f8b256..6ae65447c 100644 --- a/www/extras/tinymce-webgui/plugins/wgmacro/editor_plugin.js +++ b/www/extras/tinymce-webgui/plugins/wgmacro/editor_plugin.js @@ -10,7 +10,7 @@ height : 125 + ed.getLang('wgmacro.delta_height', 0), inline : 1 }, { - plugin_url : url, + plugin_url : url }); }); diff --git a/www/extras/tinymce-webgui/plugins/wgpagetree/css/pagetree.css b/www/extras/tinymce-webgui/plugins/wgpagetree/css/pagetree.css index 4f6eb32b7..ab27b65a9 100644 --- a/www/extras/tinymce-webgui/plugins/wgpagetree/css/pagetree.css +++ b/www/extras/tinymce-webgui/plugins/wgpagetree/css/pagetree.css @@ -13,6 +13,10 @@ iframe.pages { height: 100%; } +td.label-column { + width: 4em; +} + .nav { font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, Arial, sans-serif; font-size: 12px; diff --git a/www/extras/tinymce-webgui/plugins/wgpagetree/langs/en.js b/www/extras/tinymce-webgui/plugins/wgpagetree/langs/en.js index bdb2c05f5..969547554 100644 --- a/www/extras/tinymce-webgui/plugins/wgpagetree/langs/en.js +++ b/www/extras/tinymce-webgui/plugins/wgpagetree/langs/en.js @@ -1,3 +1,3 @@ tinyMCE.addI18n('en.wgpagetree',{ - desc : 'Link to a page in the WebGUI asset tree', + desc : 'Link to a page in the WebGUI asset tree' }); diff --git a/www/extras/tinymce-webgui/plugins/wgpagetree/pagetree.htm b/www/extras/tinymce-webgui/plugins/wgpagetree/pagetree.htm index b3bbdd08e..dee7e4b58 100644 --- a/www/extras/tinymce-webgui/plugins/wgpagetree/pagetree.htm +++ b/www/extras/tinymce-webgui/plugins/wgpagetree/pagetree.htm @@ -21,7 +21,7 @@
- +