diff options
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 @@ +<?php +/** +* ECML CSS +*/ +?> + .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"; ?> -<a href="<?php echo $docs_href; ?>" target="_new"><img src="<?php echo $vars['url']; ?>mod/ecml/graphics/ecml.png" width="50" height="15" alt="ECML" /></a>
\ No newline at end of file +<a href="<?php echo $docs_href; ?>" class="longtext_control" title="<?php echo elgg_echo('ecml:help'); ?>" target="_new"><img src="<?php echo $vars['url']; ?>mod/ecml/graphics/ecml.png" width="50" height="15" alt="ECML" /></a>
\ 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 @@ -<a class="embed_media small link" href="<?php echo $vars['url'] . 'pg/embed/media'; ?>?internalname=<?php echo $vars['internalname']; ?>" rel="facebox"><?php echo elgg_echo('media:insert'); ?></a><br />
\ No newline at end of file +<a class="longtext_control small link" href="<?php echo $vars['url'] . 'pg/embed/media'; ?>?internalname=<?php echo $vars['internalname']; ?>" rel="facebox"><?php echo elgg_echo('media:insert'); ?></a>
\ 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 = <<<EOT - <h3 class='settings'>$external_page_title</h3> - <p class='longtext_editarea'>$input_area</p> + <p class='longtext_inputarea'> + <label>$external_page_title</label> + $input_area</p> $hidden_value $hidden_guid <br /> 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="; ?> -<div class="elgg_horizontal_tabbed_nav"> +<div class="elgg_horizontal_tabbed_nav margin_top"> <ul> <li <?php if($type == 'about') echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>about"><?php echo elgg_echo('expages:about'); ?></a></li> <li <?php if($type == 'terms') echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>terms"><?php echo elgg_echo('expages:terms'); ?></a></li> 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 @@ ?> </label> </p> -<p class="longtext_editarea"> - <label><?php echo elgg_echo("description"); ?><br /> +<p class="longtext_inputarea"> + <label><?php echo elgg_echo("description"); ?></label> <?php echo elgg_view("input/longtext",array( @@ -81,7 +81,6 @@ "value" => $description, )); ?> - </label> </p> <p> <label><?php echo elgg_echo("tags"); ?><br /> diff --git a/mod/groups/views/default/forms/forums/addpost.php b/mod/groups/views/default/forms/forums/addpost.php index 3ad3de0ff..c5236c532 100644 --- a/mod/groups/views/default/forms/forums/addpost.php +++ b/mod/groups/views/default/forms/forums/addpost.php @@ -14,7 +14,7 @@ ?> <form action="<?php echo $vars['url']; ?>action/groups/addpost" method="post" class="margin_top"> - <label><?php echo elgg_echo("groups:reply"); ?><br /> + <label><?php echo elgg_echo("groups:reply"); ?></label> <?php echo elgg_view("input/longtext",array( @@ -22,7 +22,7 @@ "value" => $body, )); ?> - </label> + <!-- pass across the topic guid --> <input type="hidden" name="topic_guid" value="<?php echo $vars['entity']->guid; ?>" /> 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 @@ </p> <!-- topic message input --> - <p class="longtext_editarea"> - <label><?php echo elgg_echo("groups:topicmessage"); ?><br /> + <p class="longtext_inputarea"> + <label><?php echo elgg_echo("groups:topicmessage"); ?></label> <?php echo elgg_view("input/longtext",array( @@ -75,7 +75,6 @@ "value" => $message, )); ?> - </label> </p> <!-- set the topic status --> 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 @@ </p> <!-- topic message input --> - <p class="longtext_editarea"> - <label><?php echo elgg_echo("groups:topicmessage"); ?><br /> + <p class="longtext_inputarea"> + <label><?php echo elgg_echo("groups:topicmessage"); ?></label> <?php echo elgg_view("input/longtext",array( @@ -75,7 +75,6 @@ "value" => $messsage_content, )); ?> - </label> </p> <!-- set the topic status --> 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 = <<<EOT - <p class='longtext_editarea'>$text_textarea</p> + <p class='longtext_inputarea'> + <label>$edittopic_title</label> + $text_textarea</p> $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']); ?> <p class="margin_top"><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' value='<?php echo $msg_title; ?>' class="input_text" /></label></p> - <p class="longtext_editarea"><label><?php echo elgg_echo("messages:message"); ?>: <br /> + <p class="longtext_inputarea"><label><?php echo elgg_echo("messages:message"); ?>:</label> <?php echo elgg_view("input/longtext", array( "internalname" => "message", "value" => $msg_content, )); ?> - </label></p> + </p> <p><input type="submit" class="submit_button" value="<?php echo elgg_echo("messages:fly"); ?>" /></p> </form> 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()) <form action="<?php echo $vars['url']; ?>action/messages/send" method="post" name="messageForm" class="margin_top" id="messages_send_form"> <?php echo elgg_view('input/securitytoken'); ?> <p><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' class="input_text" value='<?php echo $reply_title; ?>' /></label></p> - <p class="longtext_editarea"><label><?php echo elgg_echo("messages:message"); ?>:</label></p> - <div id="message_reply_editor"> + <p class="longtext_inputarea"><label><?php echo elgg_echo("messages:message"); ?>:</label> <?php echo elgg_view("input/longtext", array( "internalname" => "message", "value" => '', )); - ?></div> + ?></p> <?php //pass across the guid of the message being replied to diff --git a/mod/pages/views/default/forms/pages/editwelcome.php b/mod/pages/views/default/forms/pages/editwelcome.php index 996c3a58a..39d8d05ca 100644 --- a/mod/pages/views/default/forms/pages/editwelcome.php +++ b/mod/pages/views/default/forms/pages/editwelcome.php @@ -25,10 +25,9 @@ $page_owner = $vars['owner']->guid; ?> -<div class="contentWrapper"> <form action="<?php echo $vars['url']; ?>action/pages/editwelcome" method="post"> - <p class="longtext_editarea"> + <p class="longtext_inputarea"> <label> <?php echo elgg_view("input/longtext",array( 'internalname' => "pages_welcome", @@ -58,4 +57,3 @@ <input type="submit" class="submit_button" value="<?php echo elgg_echo("save"); ?>" /> </form> -</div> 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']; ?> </label> </p> - <p class="longtext_editarea"> + <p class="longtext_inputarea"> <label> <?php echo elgg_echo('reportedcontent:description'); ?> - <br /> + </label> <?php echo elgg_view('input/longtext',array( @@ -63,7 +63,6 @@ $owner = $vars['user']; )); ?> - </label> </p> <p> <input type="submit" value="<?php echo elgg_echo('reportedcontent:report'); ?>" /> 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); + <?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 diff --git a/views/default/comments/forms/edit.php b/views/default/comments/forms/edit.php index 1a8e19c5c..06480b9a9 100644 --- a/views/default/comments/forms/edit.php +++ b/views/default/comments/forms/edit.php @@ -11,7 +11,7 @@ if (isset($vars['entity']) && isloggedin()) { - $form_body = "<div class='comment margin_top'><p class='longtext_editarea'><label>".elgg_echo("generic_comments:text")."<br />" . elgg_view('input/longtext',array('internalname' => 'generic_comment')) . "</label></p>"; + $form_body = "<div class='comment margin_top'><p class='longtext_inputarea'><label>".elgg_echo("generic_comments:text")."</label>" . elgg_view('input/longtext',array('internalname' => 'generic_comment')) . "</p>"; $form_body .= elgg_view('input/hidden', array('internalname' => 'entity_guid', 'value' => $vars['entity']->getGUID())); $form_body .= elgg_view('input/submit', array('value' => elgg_echo("generic_comments:post"))) . "</div>"; diff --git a/views/default/css.php b/views/default/css.php index 0cd6f2533..f05ad518e 100644 --- a/views/default/css.php +++ b/views/default/css.php @@ -1122,6 +1122,10 @@ input[type="text"]:focus { background: #e4ecf5; color:#333333; } +a.longtext_control { + float:right; + margin-left:14px; +} .submit_button { font-size: 14px; font-weight: bold; diff --git a/views/default/upload/upload_form_content.php b/views/default/upload/upload_form_content.php index 225560a3f..32ab0a0ee 100644 --- a/views/default/upload/upload_form_content.php +++ b/views/default/upload/upload_form_content.php @@ -72,8 +72,8 @@ if (!$vars['entity']) { <?php } ?> - <p class="longtext_editarea"> - <label><?php echo elgg_echo("description"); ?><br /> + <p class="longtext_inputarea"> + <label><?php echo elgg_echo("description"); ?></label> <?php echo elgg_view("input/longtext",array( @@ -81,9 +81,7 @@ if (!$vars['entity']) { "value" => $description, )); ?> - </label> </p> - <br /> <p> <label><?php echo elgg_echo("tags"); ?><br /> <?php |