diff options
| -rw-r--r-- | views/default/css/elements/page_layout.php | 64 | ||||
| -rw-r--r-- | views/default/css/screen.php | 28 | ||||
| -rw-r--r-- | views/default/page/elements/topbar.php | 17 | ||||
| -rw-r--r-- | views/default/page/elements/topbar_logout.php | 14 |
4 files changed, 45 insertions, 78 deletions
diff --git a/views/default/css/elements/page_layout.php b/views/default/css/elements/page_layout.php index fb0ddf8fe..6250f79ba 100644 --- a/views/default/css/elements/page_layout.php +++ b/views/default/css/elements/page_layout.php @@ -12,7 +12,6 @@ .elgg-page-topbar { background: #333333 url(<?php echo elgg_get_site_url(); ?>_graphics/toptoolbar_background.gif) repeat-x top left; - color: #eeeeee; border-bottom: 1px solid #000000; min-width: 998px; position: relative; @@ -181,74 +180,25 @@ } .elgg-page-topbar a { color: #eeeeee; -} -.elgg-page-topbar a.main { float: left; - margin-right: 30px; + margin: 2px 30px 0 0; + line-height: 1.1em; } .elgg-page-topbar a.alt { float: right; - margin-left: 30px; + margin: 2px 0 0 30px; } .elgg-page-topbar a:hover { color: #71cbff; text-decoration: none; } -.elgg-icon { - background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat left; - width: 16px; - height: 16px; - display: block; - float: left; -} -.elgg-icon-settings { - background-position: -302px -44px; -} -.elgg-icon-friends { - background-position: 0 -300px; - width: 36px; +/* elgg logo and user avatar need to be adjusted slightly */ +.elgg-page-topbar img { + margin-top: -1px; } -.elgg-page-topbar a img.user-mini-avatar { - border:1px solid #eeeeee; - margin:1px 0 0 10px; - display: block; -} -.elgg-page-topbar a img.site-logo { - display: block; - margin-top: -1px; -} -.elgg-page-topbar .log-out { - float:right; -} -.elgg-page-topbar .log-out a { - display: inline; - text-align: right; - margin-right:10px; - color:#999999; -} -.elgg-page-topbar .log-out a:hover { - color:#71cbff; -} -.elgg-page-topbar a.myfriends { - background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat left -297px; - text-indent: -900em; - width:36px; -} -.elgg-page-topbar a.myfriends:hover { - background-position: left -337px; -} -.elgg-page-topbar a.admin { - background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -300px -41px; - padding-left:20px !important; -} -.elgg-page-topbar a.help { - background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -300px -133px; - padding-left:18px !important; - float:right; - margin-right:30px; -} + /* *************************************** diff --git a/views/default/css/screen.php b/views/default/css/screen.php index 8941977bd..adf56d525 100644 --- a/views/default/css/screen.php +++ b/views/default/css/screen.php @@ -65,6 +65,34 @@ echo elgg_view('css/elements/forms', $vars); #e4ecf5 - elgg v light blue */ + +.elgg-icon { + background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat left; + width: 16px; + height: 16px; + display: block; + float: left; +} +.elgg-icon-settings { + background-position: -302px -44px; +} +.elgg-icon-friends { + background-position: 0 -300px; + width: 36px; +} +.elgg-icon-friends:hover { + background-position: 0 -340px; +} +.elgg-icon-help { + background-position: -302px -136px; +} + + + +.elgg-border-plain { + border: 1px solid #eeeeee; +} + /* *************************************** SYSTEM MESSAGES *************************************** */ diff --git a/views/default/page/elements/topbar.php b/views/default/page/elements/topbar.php index 7d57ed684..a79df2efb 100644 --- a/views/default/page/elements/topbar.php +++ b/views/default/page/elements/topbar.php @@ -14,22 +14,25 @@ echo '<div class="elgg-page-topbar">'; echo '<div class="elgg-inner clearfix">'; // Elgg logo -echo '<a href="http://www.elgg.org" class="main">'; -echo "<img class=\"site-logo\" src=\"".elgg_get_site_url()."_graphics/elgg_toolbar_logo.gif\" alt=\"Elgg logo\" />"; -echo '</a>'; +$image = '<img src="' . elgg_get_site_url() . '_graphics/elgg_toolbar_logo.gif" alt="Elgg logo" />'; +echo elgg_view('output/url', array( + 'href' => 'http://www.elgg.org/', + 'text' => $image, +)); // avatar $user_link = $user->getURL(); $user_image = $user->getIcon('topbar'); -echo "<a href=\"$user_link\" class=\"main\"><img class=\"user-mini-avatar\" src=\"$user_image\" alt=\"User avatar\" /></a>"; +$image = "<img src=\"$user_image\" alt=\"$user->name\" class=\"elgg-border-plain\" />"; +echo elgg_view('output/url', array( + 'href' => $user_link, + 'text' => $image, +)); // friends -//$friends = elgg_echo('friends'); -//echo "<a class='myfriends main' href=\"".elgg_get_site_url()."pg/friends/{$user->username}\" title=\"$friends\"> </a>"; echo elgg_view('output/url', array( 'href' => elgg_get_site_url() . "pg/settings/{$user->username}/", 'text' => '<span class="elgg-icon elgg-icon-friends"></span>', - 'class' => 'main', 'title' => elgg_echo('friends'), )); diff --git a/views/default/page/elements/topbar_logout.php b/views/default/page/elements/topbar_logout.php deleted file mode 100644 index a4bc55e6e..000000000 --- a/views/default/page/elements/topbar_logout.php +++ /dev/null @@ -1,14 +0,0 @@ -<?php -/** - * A standard logout link - * - * Called within the Elgg topbar view. - */ - - -echo elgg_view('output/url', array( - 'href' => "action/logout", - 'text' => elgg_echo('logout'), - 'is_action' => TRUE, - 'class' => 'alt', -)); |