aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-23 12:12:05 +0000
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-04-23 12:12:05 +0000
commit8ddab046c44e6f8f95a8b82fc492d7b0407389d1 (patch)
treea57463d83a73ab2e81f4182d1a5f46959e04ca71 /views/default
parent37235af003b133fd84dded5cec886ce3d169521f (diff)
downloadelgg-8ddab046c44e6f8f95a8b82fc492d7b0407389d1.tar.gz
elgg-8ddab046c44e6f8f95a8b82fc492d7b0407389d1.tar.bz2
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
Diffstat (limited to 'views/default')
-rw-r--r--views/default/comments/forms/edit.php2
-rw-r--r--views/default/css.php4
-rw-r--r--views/default/upload/upload_form_content.php6
3 files changed, 7 insertions, 5 deletions
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