From 8f484535ba505b12d2d4ccdaf30686c375035108 Mon Sep 17 00:00:00 2001 From: cash Date: Wed, 2 Mar 2011 12:16:33 +0000 Subject: Fixes #3006 restores previous dividers git-svn-id: http://code.elgg.org/elgg/trunk@8569 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/users.php | 3 ++- mod/blog/views/default/forms/blog/save.php | 2 +- mod/groups/views/default/forms/groups/edit.php | 2 +- .../notifications/subscriptions/forminternals.php | 2 +- views/default/css/elements/chrome.php | 19 +++++++++++++++++++ views/default/forms/admin/site/update_advanced.php | 2 +- views/default/forms/admin/site/update_basic.php | 2 +- views/default/forms/usersettings/save.php | 2 +- 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' => "getIconURL('topbar')}\" alt=\"$user->name\" />", + 'text' => "\"$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 -
+
$save_status $saved
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) { } } ?> -
+
-

+

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 @@ -92,6 +92,25 @@ h2 { margin-top: 15px; } +/* *************************************** + 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 *************************************** */ 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 .= "

"; $form_body .= elgg_view('input/hidden', array('name' => 'settings', 'value' => 'go')); -$form_body .= '
'; +$form_body .= '
'; $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save"))); $form_body .= '
'; 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, )) . "
"; -$form_body .= '
'; +$form_body .= '
'; $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save"))); $form_body .= '
'; 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 @@ '; +$form_body .= '
'; $form_body .= elgg_view('input/submit', array('value' => elgg_echo('save'))); $form_body .= '
'; -- cgit v1.2.3