From 8ddab046c44e6f8f95a8b82fc492d7b0407389d1 Mon Sep 17 00:00:00 2001
From: pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 23 Apr 2010 12:12:05 +0000
Subject: Updated longtext/tinymce area extra controls. Moved and updated ecml
 help link, 'edit/remove editor' link and 'add media' links both moved and
 improved. Redundant css removed.

git-svn-id: http://code.elgg.org/elgg/trunk@5860 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/tinymce/views/default/input/longtext.php | 16 +++++++++++-----
 mod/tinymce/views/default/tinymce/css.php    |  9 +++++----
 2 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'mod/tinymce/views/default')

diff --git a/mod/tinymce/views/default/input/longtext.php b/mod/tinymce/views/default/input/longtext.php
index 0c912d32e..4af26d7d6 100644
--- a/mod/tinymce/views/default/input/longtext.php
+++ b/mod/tinymce/views/default/input/longtext.php
@@ -73,10 +73,16 @@ tinyMCE.init({
 	}
 });
 function toggleEditor(id) {
-if (!tinyMCE.get(id))
-	tinyMCE.execCommand('mceAddControl', false, id);
-else
-	tinyMCE.execCommand('mceRemoveControl', false, id);
+	if (!tinyMCE.get(id)) {
+		tinyMCE.execCommand('mceAddControl', false, id);
+		<?php $toggleEditor_linktext = elgg_echo('tinymce:remove'); ?>
+		$("a.toggle_editor").html('<?php echo $toggleEditor_linktext ?>');
+	}
+	else {
+		tinyMCE.execCommand('mceRemoveControl', false, id);
+		<?php $toggleEditor_linktext = elgg_echo('tinymce:add'); ?>
+		$("a.toggle_editor").html('<?php echo $toggleEditor_linktext ?>');
+	}
 }
 </script>
 <?php
@@ -86,9 +92,9 @@ else
 
 ?>
 
+<a class="longtext_control toggle_editor small link" href="javascript:toggleEditor('<?php echo $vars['internalname']; ?>');"><?php echo elgg_echo('tinymce:remove'); ?></a>
 <!-- show the textarea -->
 <textarea class="input_textarea mceEditor" name="<?php echo $vars['internalname']; ?>" <?php echo $vars['js']; ?>><?php echo htmlentities($vars['value'], null, 'UTF-8'); ?></textarea>
-<div class="toggle_editor_container"><a class="toggle_editor small link" href="javascript:toggleEditor('<?php echo $vars['internalname']; ?>');"><?php echo elgg_echo('tinymce:remove'); ?></a></div>
 
 <script type="text/javascript">
 	$(document).ready(function() {
diff --git a/mod/tinymce/views/default/tinymce/css.php b/mod/tinymce/views/default/tinymce/css.php
index dd9aef4a3..3e8078d09 100644
--- a/mod/tinymce/views/default/tinymce/css.php
+++ b/mod/tinymce/views/default/tinymce/css.php
@@ -1,3 +1,8 @@
+<?php
+/**
+* TinyMCE CSS
+*/
+?>
 #elgg_page_contents .mceButton {
 background-color: #e9e8e8;
 	border-color: #B2B2B2;
@@ -44,8 +49,4 @@ border: 1px solid #CCC;
 #elgg_page_contents .mceIframeContainer{}
 .wp_themeSkin .mceButtonDisabled {
 	border-color: #ccc !important;
-}
-.toggle_editor {
-	float:right;
-	margin-top:-15px;
 }
\ No newline at end of file
-- 
cgit v1.2.3