From 754f98d1859398928160b4a7a589e439589fab82 Mon Sep 17 00:00:00 2001
From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 25 Feb 2011 22:11:38 +0000
Subject: Refs #2895: Converted topbar to one menu (felt dirty using two). 
 Fixed styles.

git-svn-id: http://code.elgg.org/elgg/trunk@8476 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/admin.php   | 3 ++-
 engine/lib/elgglib.php | 8 ++++++++
 engine/lib/users.php   | 8 +++++---
 3 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'engine/lib')

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 81403a6be..4e9f202c0 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -210,11 +210,12 @@ function admin_init() {
 		'weight' => 10,
 	));
 
-	elgg_register_menu_item('topbar_alt', array(
+	elgg_register_menu_item('topbar', array(
 		'name' => 'administration',
 		'href' => 'pg/admin',
 		'text' => elgg_view_icon('settings') . elgg_echo('admin'),
 		'weight' => 100,
+		'section' => 'alt',
 	));
 			
 	// widgets
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 8b8cc16df..12e9bdcf9 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -1813,6 +1813,14 @@ function elgg_init() {
 	// Trigger the shutdown:system event upon PHP shutdown.
 	register_shutdown_function('_elgg_shutdown_hook');
 
+	$logo_url = elgg_get_site_url() . "_graphics/elgg_toolbar_logo.gif";
+	elgg_register_menu_item('topbar', array(
+		'name' => 'elgg_logo',
+		'href' => 'http://www.elgg.org/',
+		'text' => "<img src=\"$logo_url\" alt=\"Elgg logo\" />",
+		'weight' => 1,
+	));
+	
 	// Sets a blacklist of words in the current language.
 	// This is a comma separated list in word:blacklist.
 	// @todo possibly deprecate
diff --git a/engine/lib/users.php b/engine/lib/users.php
index c12f8d00d..fd68ef276 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1537,19 +1537,21 @@ function users_init() {
 			'weight' => 300,
 		));
 		
-		elgg_register_menu_item('topbar_alt', array(
+		elgg_register_menu_item('topbar', array(
 			'name' => 'usersettings',
 			'href' => "pg/settings/user/{$user->username}",
 			'text' => elgg_view_icon('settings') . elgg_echo('settings'),
-			'weight' => 500
+			'weight' => 500,
+			'section' => 'alt',
 		));
 		
-		elgg_register_menu_item('topbar_alt', array(
+		elgg_register_menu_item('topbar', array(
 			'name' => 'logout',
 			'href' => "action/logout",
 			'text' => elgg_echo('logout'),
 			'is_action' => TRUE,
 			'weight' => 1000,
+			'section' => 'alt',
 		));
 		
 	}
-- 
cgit v1.2.3