From 8ddab046c44e6f8f95a8b82fc492d7b0407389d1 Mon Sep 17 00:00:00 2001 From: pete 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/ecml/start.php | 2 +- mod/ecml/views/default/ecml/admin/css.php | 6 ++++++ mod/ecml/views/default/ecml/input_ext.php | 2 +- mod/embed/languages/en.php | 2 +- mod/embed/start.php | 2 +- mod/embed/views/default/embed/css.php | 11 ----------- mod/embed/views/default/embed/link.php | 2 +- mod/externalpages/views/default/expages/forms/edit.php | 5 +++-- mod/externalpages/views/default/expages/menu.php | 2 +- mod/file/views/default/file/upload.php | 5 ++--- mod/groups/views/default/forms/forums/addpost.php | 4 ++-- mod/groups/views/default/forms/forums/addtopic.php | 5 ++--- mod/groups/views/default/forms/forums/edittopic.php | 5 ++--- mod/groups/views/default/forum/topicposts.php | 5 ++++- mod/messages/views/default/messages/forms/send.php | 4 ++-- mod/messages/views/default/messages/messages.php | 5 ++--- mod/pages/views/default/forms/pages/editwelcome.php | 4 +--- .../views/default/reportedcontent/form.php | 5 ++--- mod/tinymce/languages/en.php | 3 ++- mod/tinymce/views/default/input/longtext.php | 16 +++++++++++----- mod/tinymce/views/default/tinymce/css.php | 9 +++++---- views/default/comments/forms/edit.php | 2 +- views/default/css.php | 4 ++++ views/default/upload/upload_form_content.php | 6 ++---- 24 files changed, 59 insertions(+), 57 deletions(-) diff --git a/mod/ecml/start.php b/mod/ecml/start.php index f1f282c84..f48aa2d25 100644 --- a/mod/ecml/start.php +++ b/mod/ecml/start.php @@ -39,7 +39,7 @@ function ecml_init() { register_action('ecml/save_permissions', FALSE, dirname(__FILE__) . '/actions/save_permissions.php', TRUE); // show ECML-enabled icon on free-text input areas - elgg_extend_view('input/longtext', 'ecml/input_ext'); + elgg_extend_view('input/longtext', 'ecml/input_ext', 0); elgg_extend_view('input/plaintext', 'ecml/input_ext'); //elgg_extend_view('input/text', 'ecml/input_ext'); diff --git a/mod/ecml/views/default/ecml/admin/css.php b/mod/ecml/views/default/ecml/admin/css.php index 1431074f0..e6cd7cfb2 100644 --- a/mod/ecml/views/default/ecml/admin/css.php +++ b/mod/ecml/views/default/ecml/admin/css.php @@ -1,3 +1,9 @@ + + .ecml_admin_table { width:100%; } diff --git a/mod/ecml/views/default/ecml/input_ext.php b/mod/ecml/views/default/ecml/input_ext.php index 03941fb08..5a68f2fa8 100644 --- a/mod/ecml/views/default/ecml/input_ext.php +++ b/mod/ecml/views/default/ecml/input_ext.php @@ -11,4 +11,4 @@ $docs_href = "{$vars['url']}pg/ecml"; ?> -ECML \ No newline at end of file +ECML \ No newline at end of file diff --git a/mod/embed/languages/en.php b/mod/embed/languages/en.php index ca57f4a9b..c92c5efad 100644 --- a/mod/embed/languages/en.php +++ b/mod/embed/languages/en.php @@ -2,7 +2,7 @@ $english = array( - 'media:insert' => 'Embed / upload media', + 'media:insert' => 'Embed media', 'embed:instructions' => 'Click on any file to embed it into your content.', diff --git a/mod/embed/start.php b/mod/embed/start.php index d6bdcc0c9..f98c21245 100644 --- a/mod/embed/start.php +++ b/mod/embed/start.php @@ -19,7 +19,7 @@ elgg_extend_view('css','embed/css'); elgg_extend_view('js/initialise_elgg','embed/js'); elgg_extend_view('metatags','embed/metatags'); - elgg_extend_view('input/longtext','embed/link',10); + elgg_extend_view('input/longtext','embed/link',1); // Page handler for the modal media embed register_page_handler('embed','embed_page_handler'); diff --git a/mod/embed/views/default/embed/css.php b/mod/embed/views/default/embed/css.php index 1b4f3ca80..d528ab1cc 100644 --- a/mod/embed/views/default/embed/css.php +++ b/mod/embed/views/default/embed/css.php @@ -91,17 +91,6 @@ #media_embed .embed_instructions { margin:10px 0 5px 0; } -a.embed_media { - margin:0; - float:right; - display:block; - text-align: right; - font-weight: normal; -} -label a.embed_media { - font-size:0.8em; -} - /* modal tabs */ #embed_media_tabs { diff --git a/mod/embed/views/default/embed/link.php b/mod/embed/views/default/embed/link.php index 0dd77ac99..14b33d4c2 100644 --- a/mod/embed/views/default/embed/link.php +++ b/mod/embed/views/default/embed/link.php @@ -1 +1 @@ -
\ No newline at end of file + \ No newline at end of file diff --git a/mod/externalpages/views/default/expages/forms/edit.php b/mod/externalpages/views/default/expages/forms/edit.php index 154b621fc..0bd4e6d69 100644 --- a/mod/externalpages/views/default/expages/forms/edit.php +++ b/mod/externalpages/views/default/expages/forms/edit.php @@ -55,8 +55,9 @@ //construct the form $form_body = <<$external_page_title -

$input_area

+

+ + $input_area

$hidden_value $hidden_guid
diff --git a/mod/externalpages/views/default/expages/menu.php b/mod/externalpages/views/default/expages/menu.php index 7e4f2c981..8070bcfcf 100644 --- a/mod/externalpages/views/default/expages/menu.php +++ b/mod/externalpages/views/default/expages/menu.php @@ -15,7 +15,7 @@ $type = $vars['type']; $url = $vars['url'] . "pg/expages/index.php?type="; ?> -
+
  • >
  • >
    • diff --git a/mod/file/views/default/file/upload.php b/mod/file/views/default/file/upload.php index 065b0eb3f..ae37f53ac 100644 --- a/mod/file/views/default/file/upload.php +++ b/mod/file/views/default/file/upload.php @@ -72,8 +72,8 @@ ?>

    -

    -

    + $description, )); ?> -

    - + diff --git a/mod/groups/views/default/forms/forums/addtopic.php b/mod/groups/views/default/forms/forums/addtopic.php index 9dd70d7a8..c60966b2a 100644 --- a/mod/groups/views/default/forms/forums/addtopic.php +++ b/mod/groups/views/default/forms/forums/addtopic.php @@ -66,8 +66,8 @@

    -

    -

    + $message, )); ?> -

    diff --git a/mod/groups/views/default/forms/forums/edittopic.php b/mod/groups/views/default/forms/forums/edittopic.php index b88dfd866..89c8c441b 100644 --- a/mod/groups/views/default/forms/forums/edittopic.php +++ b/mod/groups/views/default/forms/forums/edittopic.php @@ -66,8 +66,8 @@

    -

    -

    + $messsage_content, )); ?> -

    diff --git a/mod/groups/views/default/forum/topicposts.php b/mod/groups/views/default/forum/topicposts.php index a6a3f6bf0..9c0d33726 100644 --- a/mod/groups/views/default/forum/topicposts.php +++ b/mod/groups/views/default/forum/topicposts.php @@ -58,10 +58,13 @@ $field = elgg_view('input/hidden', array('internalname' => 'field_num', 'value' => $vars['entity']->id)); $topic = elgg_view('input/hidden', array('internalname' => 'topic', 'value' => get_input('topic'))); $group = elgg_view('input/hidden', array('internalname' => 'group', 'value' => get_input('group_guid'))); + $edittopic_title = elgg_echo('groups:edittopic'); $form_body = <<$text_textarea

    +

    + + $text_textarea

    $post $topic $group diff --git a/mod/messages/views/default/messages/forms/send.php b/mod/messages/views/default/messages/forms/send.php index 93abe2e64..ed2cb0e49 100644 --- a/mod/messages/views/default/messages/forms/send.php +++ b/mod/messages/views/default/messages/forms/send.php @@ -62,13 +62,13 @@ unset($_SESSION['msg_contents']); ?>

    -

    "message", "value" => $msg_content, )); ?> -

    +

    " />

    diff --git a/mod/messages/views/default/messages/messages.php b/mod/messages/views/default/messages/messages.php index 29178bf6d..46747faa3 100644 --- a/mod/messages/views/default/messages/messages.php +++ b/mod/messages/views/default/messages/messages.php @@ -99,13 +99,12 @@ if (isloggedin())

    -

    -
    +

    "message", "value" => '', )); - ?>

    + ?>

    guid; ?> -
    -

    +

    diff --git a/mod/reportedcontent/views/default/reportedcontent/form.php b/mod/reportedcontent/views/default/reportedcontent/form.php index 00ceeb074..40561a784 100644 --- a/mod/reportedcontent/views/default/reportedcontent/form.php +++ b/mod/reportedcontent/views/default/reportedcontent/form.php @@ -51,10 +51,10 @@ $owner = $vars['user']; ?>

    -

    +

    -

    diff --git a/mod/tinymce/languages/en.php b/mod/tinymce/languages/en.php index 9d1396da4..d8e444dd3 100644 --- a/mod/tinymce/languages/en.php +++ b/mod/tinymce/languages/en.php @@ -6,7 +6,8 @@ * Menu items and titles */ - 'tinymce:remove' => "Add/Remove editor", + 'tinymce:remove' => "Remove editor", + 'tinymce:add' => "Add editor", ); 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); + + $("a.toggle_editor").html(''); + } + else { + tinyMCE.execCommand('mceRemoveControl', false, id); + + $("a.toggle_editor").html(''); + } } + -