Updates: longtext editor default size added (and overridden in group/forums), more...

git-svn-id: http://code.elgg.org/elgg/trunk@5365 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/admin/user.php b/admin/user.php
index f47c18b4c4b3f70d8adae71bcbfb74202356c998..2eaeb3b873b1e6c9756ff4e91af94f5effbd5784 100644 (file)
--- a/admin/user.php
+++ b/admin/user.php
@@ -25,7 +25,7 @@ $title = elgg_view_title(elgg_echo('admin:user'));
 
 set_context('search');
 
-$result = elgg_list_entities(array('type' => 'user', 'limit' => $limit, 'full_view' => FALSE));
+$result = "<div class='members_list'>".elgg_list_entities(array('type' => 'user', 'limit' => $limit, 'full_view' => FALSE))."</div>";
 
 set_context('admin');
 

diff --git a/mod/blog/views/default/blog/css.php b/mod/blog/views/default/blog/css.php
index 738aa9ef60d9e1c056288dae3dbd6ab7a315cd96..361e1572cd65589831aad16729e7ef1368996be7 100644 (file)
--- a/mod/blog/views/default/blog/css.php
+++ b/mod/blog/views/default/blog/css.php
@@ -232,7 +232,7 @@ ItemMetaData block only
        margin-top:15px;
        margin-bottom:15px;
 }
-#excerpt_editarea .input-textarea {
+#excerpt_editarea .input_textarea {
        height:80px;
 }
 #blogPostForm .current_access {

diff --git a/mod/blog/views/default/blog/forms/edit.php b/mod/blog/views/default/blog/forms/edit.php
index 09389a8fb69c2fa337184fd51cd0b82419e84eb6..28a0980a4ffc5569b7388150a1d064bf6205c88d 100644 (file)
--- a/mod/blog/views/default/blog/forms/edit.php
+++ b/mod/blog/views/default/blog/forms/edit.php
@@ -91,7 +91,7 @@ $text_label = elgg_echo('blog:text');
 $text_textarea = elgg_view('input/longtext', array('internalname' => 'blogbody', 'value' => $body));
 $excerpt_label = elgg_echo('blog:excerpt');
 $excerpt_counter = "<div class='thewire_characters_remaining'><span id='countervalue'></span></div>";
-$excerpt_textarea = elgg_view('input/text', array('internalname' => 'blogexcerpt', 'internalid' => 'excerpt', 'class' => 'excerpt input-textarea', 'value' => $excerpt));
+$excerpt_textarea = elgg_view('input/text', array('internalname' => 'blogexcerpt', 'internalid' => 'excerpt', 'class' => 'excerpt input_textarea', 'value' => $excerpt));
 $excerpt_desc = elgg_echo('blog:excerptdesc');
 $show_excerpt_field = elgg_view('input/hidden', array('internalname' => 'show_excerpt', 'value' => $show_excerpt));
 $tag_label = elgg_echo('tags');

diff --git a/mod/embed/views/default/embed/upload.php b/mod/embed/views/default/embed/upload.php
index a727501dd06f2dd5cfae4c416a3bc75625eaeea3..fbdcbfd8c335e0b5161b92073a02757067a68559 100644 (file)
--- a/mod/embed/views/default/embed/upload.php
+++ b/mod/embed/views/default/embed/upload.php
@@ -32,7 +32,7 @@
                </p>
                <p>
                <label for="filedescription"><?php echo elgg_echo("description"); ?><br />
-               <textarea class="input-textarea" name="description" id="filedescription"></textarea>
+               <textarea class="input_textarea" name="description" id="filedescription"></textarea>
                </label></p>
                
                <p>

diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php
index 2cffb3e2aa20d2f9345f336f63d2ce4d9fc177f1..a0a03aad041635bcd4013cdebe76392239c78ad2 100644 (file)
--- a/mod/groups/views/default/groups/css.php
+++ b/mod/groups/views/default/groups/css.php
@@ -122,5 +122,8 @@
 .topic .entity_metadata .delete_button {
        margin-top:3px;
 }
-
+/* all browsers - force tinyMCE on edit forum posts to be full-width */
+.edit_comment .defaultSkin table.mceLayout {
+       width: 694px !important;
+}
 

diff --git a/mod/invitefriends/views/default/invitefriends/formitems.php b/mod/invitefriends/views/default/invitefriends/formitems.php
index 0db562d50722e11e3c6b2882d7f67f36f4e311c8..1e0d8e1245de083a62471cb108f647e1670d8b57 100644 (file)
--- a/mod/invitefriends/views/default/invitefriends/formitems.php
+++ b/mod/invitefriends/views/default/invitefriends/formitems.php
@@ -16,11 +16,11 @@
 <p><label>
        <?php echo elgg_echo('invitefriends:introduction'); ?>
 </label>
-<textarea class="input-textarea" name="emails" ></textarea></p>
+<textarea class="input_textarea" name="emails" ></textarea></p>
 <p><label>
        <?php echo elgg_echo('invitefriends:message'); ?>
 </label>
-<textarea class="input-textarea" name="emailmessage" ><?php
+<textarea class="input_textarea" name="emailmessage" ><?php
 
        echo sprintf(elgg_echo('invitefriends:message:default'),$CONFIG->site->name);
 

diff --git a/mod/tinymce/views/default/input/longtext.php b/mod/tinymce/views/default/input/longtext.php
index be6bceacd9aaa3a1167bc481ba4e49abce8059ae..2907e1322e2d88830fb24da9dfcab0782dac6137 100644 (file)
--- a/mod/tinymce/views/default/input/longtext.php
+++ b/mod/tinymce/views/default/input/longtext.php
@@ -82,7 +82,7 @@ else
 ?>
 
 <!-- show the textarea -->
-<textarea class="input-textarea" name="<?php echo $vars['internalname']; ?>" <?php echo $vars['js']; ?>><?php echo htmlentities($vars['value'], null, 'UTF-8'); ?></textarea> 
+<textarea class="input_textarea" 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" href="javascript:toggleEditor('<?php echo $vars['internalname']; ?>');"><?php echo elgg_echo('tinymce:remove'); ?></a></div>
 
 <script type="text/javascript">

diff --git a/views/default/css.php b/views/default/css.php
index d81ea3c89b5f4f97fb1872f2afcafec922a6a3b9..e1b9e4902c1c7bfffa30cf86e81701f22b346d74 100644 (file)
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -1098,6 +1098,7 @@ select.styled .select_option {
 }
 .input_textarea {
        height: 200px;
+       width:718px;
 }
 input[type="checkbox"] {
        margin:0 3px 0 0;

diff --git a/views/default/user/search/finishblurb.php b/views/default/user/search/finishblurb.php
index 8371ee4b59dd5a3b538f2ac732bcf06b00d9fb94..e58b1252d2cc8577b949b78d13e14a39317b9860 100644 (file)
--- a/views/default/user/search/finishblurb.php
+++ b/views/default/user/search/finishblurb.php
@@ -12,9 +12,9 @@ elgg_deprecated_notice('view user/search/finishblurb was deprecated.', 1.7);
 if ($vars['count'] > $vars['threshold']) {
 
 ?>
-<div class="contentWrapper"><a href="<?php echo $vars['url']; ?>pg/search/users/?tag=<?php echo urlencode($vars['tag']); ?>"><?php
+<a href="<?php echo $vars['url']; ?>pg/search/users/?tag=<?php echo urlencode($vars['tag']); ?>"><?php
        echo elgg_echo("user:search:finishblurb");
-       ?></a></div>
+       ?></a>
 <?php
 
 }

diff --git a/views/default/user/search/startblurb.php b/views/default/user/search/startblurb.php
index 5ddb5ddc012b231a5db53cf7c1f431dffe525ce2..8a33778208a3c0bcf108e17c21126cc250da0e52 100644 (file)
--- a/views/default/user/search/startblurb.php
+++ b/views/default/user/search/startblurb.php
@@ -9,11 +9,6 @@
 
 elgg_deprecated_notice('view user/search/startblurb was deprecated.', 1.7);
 
-?>
-<div class="contentWrapper">
-       <?php
-
-               echo sprintf(elgg_echo("user:search:startblurb"),$vars['tag']);
+echo sprintf(elgg_echo("user:search:startblurb"),$vars['tag']);
 
-       ?>
-</div>
+?>

diff --git a/views/failsafe/input/access.php b/views/failsafe/input/access.php
index c0dabccaf23be1869ba48fa6cf681a2319422156..a57014840536205c0f5718f4911def565d37bbbf 100644 (file)
--- a/views/failsafe/input/access.php
+++ b/views/failsafe/input/access.php
@@ -18,7 +18,7 @@ if (isset($vars['class'])) {
        $class = $vars['class'];
 }
 if (!$class) {
-       $class = "input-access";
+       $class = "input_access";
 }
 
 if ((!isset($vars['options'])) || (!is_array($vars['options']))) {

diff --git a/views/failsafe/input/longtext.php b/views/failsafe/input/longtext.php
index 9c89583def9e7a36a9e1827e20915b5945651e91..9da3d8276c2fe3d1a74ae31c00254953e291f8a0 100644 (file)
--- a/views/failsafe/input/longtext.php
+++ b/views/failsafe/input/longtext.php
@@ -16,7 +16,7 @@
 
 $class = $vars['class'];
 if (!$class) {
-       $class = "input-textarea";
+       $class = "input_textarea";
 }
 
 ?>

diff --git a/views/failsafe/input/text.php b/views/failsafe/input/text.php
index f94ee0135a51017c2a1aaa9467122eb1861df0d7..7f69a2f93518629f1ff4777761e4703871f1bb4f 100644 (file)
--- a/views/failsafe/input/text.php
+++ b/views/failsafe/input/text.php
@@ -19,7 +19,7 @@
 
 $class = $vars['class'];
 if (!$class) {
-       $class = "input-text";
+       $class = "input_text";
 }
 
 ?>