aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-02 12:16:33 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-02 12:16:33 +0000
commit8f484535ba505b12d2d4ccdaf30686c375035108 (patch)
treefc8e38c03a0a4f1e800d1d16bd2300050f68da7b
parentf096b91267d0deaeec911939fbdd54177e9f1995 (diff)
downloadelgg-8f484535ba505b12d2d4ccdaf30686c375035108.tar.gz
elgg-8f484535ba505b12d2d4ccdaf30686c375035108.tar.bz2
Fixes #3006 restores previous dividers
git-svn-id: http://code.elgg.org/elgg/trunk@8569 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/users.php3
-rw-r--r--mod/blog/views/default/forms/blog/save.php2
-rw-r--r--mod/groups/views/default/forms/groups/edit.php2
-rw-r--r--mod/notifications/views/default/notifications/subscriptions/forminternals.php2
-rw-r--r--views/default/css/elements/chrome.php19
-rw-r--r--views/default/forms/admin/site/update_advanced.php2
-rw-r--r--views/default/forms/admin/site/update_basic.php2
-rw-r--r--views/default/forms/usersettings/save.php2
8 files changed, 27 insertions, 7 deletions
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 0b620e578..318cd71bd 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1502,10 +1502,11 @@ function users_pagesetup() {
'contexts' => array('profile_edit'),
));
+ $icon_url = $user->getIconURL('topbar');
elgg_register_menu_item('topbar', array(
'name' => 'profile',
'href' => $user->getURL(),
- 'text' => "<img src=\"{$user->getIconURL('topbar')}\" alt=\"$user->name\" />",
+ 'text' => "<img src=\"$icon_url\" alt=\"$user->name\" class=\"elgg-border-plain\" />",
'priority' => 100,
));
diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php
index c0c9ea7cd..c8c0fde55 100644
--- a/mod/blog/views/default/forms/blog/save.php
+++ b/mod/blog/views/default/forms/blog/save.php
@@ -142,7 +142,7 @@ $body_input
$categories_input
-<div class="elgg-subtext pvm mbn bta">
+<div class="elgg-subtext pvm mbn elgg-divide-top">
$save_status <span class="blog-save-status-time">$saved</span>
</div>
diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index f9ef86296..3993e750d 100644
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -128,7 +128,7 @@ if ($tools) {
}
}
?>
-<div class="bta">
+<div class="elgg-divide-top">
<?php
if (isset($vars['entity'])) {
diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
index ab608d7ce..936194842 100644
--- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php
+++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
@@ -325,7 +325,7 @@ if (!isset($vars['replacement'])) {
?>
- <p class="bta">
+ <p class="elgg-divide-top">
<?php
echo elgg_view('input/submit', array(
'value' => elgg_echo('save'),
diff --git a/views/default/css/elements/chrome.php b/views/default/css/elements/chrome.php
index ed4b4e08d..fd42f86ca 100644
--- a/views/default/css/elements/chrome.php
+++ b/views/default/css/elements/chrome.php
@@ -93,6 +93,25 @@ h2 {
}
/* ***************************************
+ BORDERS AND SEPARATORS
+*************************************** */
+.elgg-border-plain {
+ border: 1px solid #eeeeee;
+}
+elgg-divide-top {
+ border-top: 1px solid #CCCCCC;
+}
+elgg-divide-bottom {
+ border-bottom: 1px solid #CCCCCC;
+}
+elgg-divide-left {
+ border-left: 1px solid #CCCCCC;
+}
+elgg-divide-right {
+ border-right: 1px solid #CCCCCC;
+}
+
+/* ***************************************
USER INPUT DISPLAY RESET
*************************************** */
.elgg-output {
diff --git a/views/default/forms/admin/site/update_advanced.php b/views/default/forms/admin/site/update_advanced.php
index d3ae5e250..d3cce2ec3 100644
--- a/views/default/forms/admin/site/update_advanced.php
+++ b/views/default/forms/admin/site/update_advanced.php
@@ -91,7 +91,7 @@ $form_body .= "</div>";
$form_body .= elgg_view('input/hidden', array('name' => 'settings', 'value' => 'go'));
-$form_body .= '<div class="bta">';
+$form_body .= '<div class="elgg-divide-top">';
$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
$form_body .= '</div>';
diff --git a/views/default/forms/admin/site/update_basic.php b/views/default/forms/admin/site/update_basic.php
index eb4218810..66722aef2 100644
--- a/views/default/forms/admin/site/update_basic.php
+++ b/views/default/forms/admin/site/update_basic.php
@@ -24,7 +24,7 @@ $form_body .= elgg_view("input/dropdown", array(
'options_values' => $languages,
)) . "</div>";
-$form_body .= '<div class="bta">';
+$form_body .= '<div class="elgg-divide-top">';
$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
$form_body .= '</div>';
diff --git a/views/default/forms/usersettings/save.php b/views/default/forms/usersettings/save.php
index 2a240d036..62593e699 100644
--- a/views/default/forms/usersettings/save.php
+++ b/views/default/forms/usersettings/save.php
@@ -1,7 +1,7 @@
<?php
$form_body = elgg_view("forms/account/settings");
-$form_body .= '<div class="bta">';
+$form_body .= '<div class="elgg-divide-top">';
$form_body .= elgg_view('input/submit', array('value' => elgg_echo('save')));
$form_body .= '</div>';