1 files changed, 6 insertions, 58 deletions
diff --git a/views/default/page/elements/topbar.php b/views/default/page/elements/topbar.php
index 7d57ed684..e4c6c86bb 100644
--- a/views/default/page/elements/topbar.php
+++ b/views/default/page/elements/topbar.php
@@ -1,68 +1,16 @@
 <?php
 /**
- * Elgg top toolbar
+ * Elgg topbar
  * The standard elgg top toolbar
  */
 
-$user = get_loggedin_user();
-if (!elgg_instanceof($user, 'user')) {
-	// do not show tobpar to logged out users
-	return true;
-}
-
-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>';
-
-// 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>";
-
-// friends
-//$friends = elgg_echo('friends');
-//echo "<a class='myfriends main' href=\"".elgg_get_site_url()."pg/friends/{$user->username}\" title=\"$friends\">&nbsp;</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'),
-));
-
-// logout link
-echo elgg_view('output/url', array(
-	'href' => "action/logout",
-	'text' => elgg_echo('logout'),
-	'is_action' => TRUE,
-	'class' => 'alt',
-));
+echo elgg_view_menu('topbar', array('sort_by' => 'priority', array('elgg-menu-hz')));
 
 // elgg tools menu
 // need to echo this empty view for backward compatibility.
-echo elgg_view("navigation/topbar_tools");
-
-// enable elgg topbar extending
-echo elgg_view('elgg_topbar/extend', $vars);
-
-// user settings
-echo elgg_view('output/url', array(
-	'href' => elgg_get_site_url() . 'pg/settings/',
-	'text' => '<span class="elgg-icon elgg-icon-settings"></span>' . elgg_echo('settings'),
-	'class' => 'alt',
-));
-
-// The administration link is for admin or site admin users only
-if ($user->isAdmin()) {
-	echo elgg_view('output/url', array(
-		'href' => elgg_get_site_url() . 'pg/admin/',
-		'text' => '<span class="elgg-icon elgg-icon-settings"></span>' . elgg_echo('admin'),
-		'class' => 'alt',
-	));
+$content = elgg_view("navigation/topbar_tools");
+if ($content) {
+	elgg_deprecated_notice('navigation/topbar_tools was deprecated. Extend the topbar menus or the page/elements/topbar view directly', 1.8);
+	echo $content;
 }
-
-echo '</div>';
-echo '</div>';