From da3d95847c3c1fbda443fdcb4893fc6e6528eabc Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Mon, 27 Jul 2009 22:39:42 +0200 Subject: [PATCH] [svn r22391] FS#2867 - The online editorr: Fixing some language translations and javascript errors (IE). --- .../editor/plugins/ImageManager/editor.php | 20 ++++++++++++++++++- .../editor/plugins/ImageManager/fckplugin.js | 2 +- .../editor/plugins/ImageManager/images.php | 2 +- .../editor/plugins/ImageManager/manager.php | 20 +++++++++---------- .../editor/plugins/prompt/fck_prompt.html | 6 +++--- 5 files changed, 34 insertions(+), 16 deletions(-) diff --git a/main/inc/lib/fckeditor/editor/plugins/ImageManager/editor.php b/main/inc/lib/fckeditor/editor/plugins/ImageManager/editor.php index c3a34fda7c..074dc44ca6 100644 --- a/main/inc/lib/fckeditor/editor/plugins/ImageManager/editor.php +++ b/main/inc/lib/fckeditor/editor/plugins/ImageManager/editor.php @@ -101,9 +101,27 @@ body { /*]]>*/ + + - +
diff --git a/main/inc/lib/fckeditor/editor/plugins/ImageManager/fckplugin.js b/main/inc/lib/fckeditor/editor/plugins/ImageManager/fckplugin.js index 3fb5f164b6..bb6bf24c28 100644 --- a/main/inc/lib/fckeditor/editor/plugins/ImageManager/fckplugin.js +++ b/main/inc/lib/fckeditor/editor/plugins/ImageManager/fckplugin.js @@ -167,7 +167,7 @@ ImageManager.prototype.insert = function(outparam) imgFileName = sElm.src.substring(lastSlashPosition); var url = FCKConfig.PluginsPath + 'ImageManager/editor.php?img=' + "/" + imgFileName; //Dialog(url, null, outparam); - OpenDialog( url, null, outparam, 'FCKDialog_ImageEditor', 'Edit Image', 713, 596 ); + OpenDialog( url, null, outparam, 'FCKDialog_ImageEditor', 'Edit image', 713, 596 ); } // no image selected - stop else diff --git a/main/inc/lib/fckeditor/editor/plugins/ImageManager/images.php b/main/inc/lib/fckeditor/editor/plugins/ImageManager/images.php index 926ddf6ca6..8b95c62a34 100644 --- a/main/inc/lib/fckeditor/editor/plugins/ImageManager/images.php +++ b/main/inc/lib/fckeditor/editor/plugins/ImageManager/images.php @@ -199,7 +199,7 @@ function drawErrorBase(&$manager) } else if ( window.parent.oEditor ) { - window.parent.oEditor.OpenDialog( url, null, null, 'FCKDialog_ImageEditor', 'Edit Image', 713, 596 ); + window.parent.oEditor.OpenDialog( url, null, null, 'FCKDialog_ImageEditor', 'Edit image', 713, 596 ); } } diff --git a/main/inc/lib/fckeditor/editor/plugins/ImageManager/manager.php b/main/inc/lib/fckeditor/editor/plugins/ImageManager/manager.php index 9921f2e354..af6c77a5be 100644 --- a/main/inc/lib/fckeditor/editor/plugins/ImageManager/manager.php +++ b/main/inc/lib/fckeditor/editor/plugins/ImageManager/manager.php @@ -91,14 +91,6 @@ I18N = this.ImageManager.I18N; } - function Init() - { - if (window.opener) - { - document.getElementById('dialog_title').style.visibility = '' ; - } - } - /*]]>*/ @@ -124,6 +116,14 @@ body { { document.getElementById('dialog_title').style.visibility = '' ; } + else if ( window.parent ) + { + var title = window.parent.document.getElementById( 'TitleArea' ).innerHTML ; + if ( title ) + { + window.parent.document.getElementById( 'TitleArea' ).innerHTML = title.replace( 'Insert Image', i18n( 'Insert Image' ) ) ; + } + } } /*]]>*/ @@ -131,7 +131,7 @@ body { - +
Image Manager @@ -244,7 +244,7 @@ body {
  -   +  
diff --git a/main/inc/lib/fckeditor/editor/plugins/prompt/fck_prompt.html b/main/inc/lib/fckeditor/editor/plugins/prompt/fck_prompt.html index 2d258d91c6..a8c3d6c6c0 100644 --- a/main/inc/lib/fckeditor/editor/plugins/prompt/fck_prompt.html +++ b/main/inc/lib/fckeditor/editor/plugins/prompt/fck_prompt.html @@ -48,8 +48,8 @@ function Ok() window.onload = function() { - message = dialog.Args().CustomValue.message ; - default_value = dialog.Args().CustomValue.default_value ; + var message = dialog.Args().CustomValue.message ; + var default_value = dialog.Args().CustomValue.default_value ; document.getElementById( 'message' ).innerHTML = message ; document.getElementById( 'inputfield' ).value = default_value ; @@ -60,7 +60,7 @@ window.onload = function() -
+