[svn r22391] FS#2867 - The online editorr: Fixing some language translations and javascript errors (IE).

17 years ago · da3d95847c
parent 32b934fe6d
commit da3d95847c
5 changed files with 34 additions and 16 deletions
--- 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 {
 /*]]>*/
 </style>

+<script type="text/javascript">
+/*<![CDATA[*/
+
+	function Init()
+	{
+		if ( !window.opener && window.parent )
+		{
+			var title = window.parent.document.getElementById( 'TitleArea' ).innerHTML ;
+			if ( title )
+			{
+				window.parent.document.getElementById( 'TitleArea' ).innerHTML = title.replace( 'Edit image', i18n( 'Edit image' ) ) ;
+			}
+		}
+	}
+
+/*]]>*/
+</script>
+
 </head>

-<body>
+<body onload="javascript: Init();">
 <div id="indicator">
 <img src="img/spacer.gif" id="indicator_image" height="20" width="20" alt="" />
 </div>
--- 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
--- 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 );
 		}
 	}

--- 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 = '' ;
-		}
-	}
-
 /*]]>*/
 </script>

@ -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 {

 </head>

-<body onload='javascript: Init();'>
+<body onload="javascript: Init();">
 <div id="dialog_title" class="PopupTitle" style="visibility: hidden;">Insert Image</div>
 <form action="images.php" id="uploadForm" method="post" enctype="multipart/form-data">
 <fieldset style="margin-left: 15px; margin-right: 15px;"><legend>Image Manager</legend>
@ -244,7 +244,7 @@ body {
 	<div class="PopupButtons" style="width: 100%;">
 	<div style="float: right; white-space: nowrap; margin-right: 25px;">
 		  <button type="button" class="refresh" onclick="javascript: return refresh();">Refresh</button>&nbsp;
-          <button type="button" class="save" onclick="javascript: return onOK();">Ok</button>&nbsp;
+          <button type="button" class="save" onclick="javascript: return onOK();">OK</button>&nbsp;
          <button type="button" class="cancel" onclick="javascript: return onCancel();">Cancel</button>
    </div>
    </div>
--- 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()
 		</script>
 	</head>
 	<body scroll="no" style="overflow: hidden;">
-		<div style="margin-top: 30px; margin-bottom: 30px; margin-right: auto; margin-left: auto; width: 90%;" align="center">
+		<div style="margin-top: 30px; margin-bottom: 30px; margin-right: auto; margin-left: auto; width: 100%;" align="center">
 			<span id="message"></span><br />
 			<input id="inputfield" type="text" style="width: 100%;"/>
 		</div>