aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-11 16:08:04 +0000
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-11 16:08:04 +0000
commita454889d81ed753de06ac6b014ff92ca3c57e039 (patch)
tree19fcaf6fee7a54af8e30e778aab85e06dc554f94
parentf157509b3cd60f227c9f5aca0b3d4c9cdd13dfe3 (diff)
downloadelgg-a454889d81ed753de06ac6b014ff92ca3c57e039.tar.gz
elgg-a454889d81ed753de06ac6b014ff92ca3c57e039.tar.bz2
Updates: longtext editor default size added (and overridden in group/forums), more updates to lists of members, remaining/previously-missed generic input classes renamed to lowercase.
git-svn-id: http://code.elgg.org/elgg/trunk@5365 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--admin/user.php2
-rw-r--r--mod/blog/views/default/blog/css.php2
-rw-r--r--mod/blog/views/default/blog/forms/edit.php2
-rw-r--r--mod/embed/views/default/embed/upload.php2
-rw-r--r--mod/groups/views/default/groups/css.php5
-rw-r--r--mod/invitefriends/views/default/invitefriends/formitems.php4
-rw-r--r--mod/tinymce/views/default/input/longtext.php2
-rw-r--r--views/default/css.php1
-rw-r--r--views/default/user/search/finishblurb.php4
-rw-r--r--views/default/user/search/startblurb.php9
-rw-r--r--views/failsafe/input/access.php2
-rw-r--r--views/failsafe/input/longtext.php2
-rw-r--r--views/failsafe/input/text.php2
13 files changed, 19 insertions, 20 deletions
diff --git a/admin/user.php b/admin/user.php
index f47c18b4c..2eaeb3b87 100644
--- 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 738aa9ef6..361e1572c 100644
--- 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 09389a8fb..28a0980a4 100644
--- 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 a727501dd..fbdcbfd8c 100644
--- 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 2cffb3e2a..a0a03aad0 100644
--- 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 0db562d50..1e0d8e124 100644
--- 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 be6bceacd..2907e1322 100644
--- 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 d81ea3c89..e1b9e4902 100644
--- 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 8371ee4b5..e58b1252d 100644
--- 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 5ddb5ddc0..8a3377820 100644
--- 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 c0dabccaf..a57014840 100644
--- 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 9c89583de..9da3d8276 100644
--- 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 f94ee0135..7f69a2f93 100644
--- 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";
}
?>