From 8e56ebfaa05eb987e65bbff91aae268c479301de Mon Sep 17 00:00:00 2001 From: nickw Date: Tue, 4 May 2010 16:22:42 +0000 Subject: Removing hard-coded plugin extensions from core topbar. git-svn-id: http://code.elgg.org/elgg/trunk@5967 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/page_elements/elgg_topbar.php | 88 ++++++++++++----------------- 1 file changed, 37 insertions(+), 51 deletions(-) diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php index c59360a3a..6348099bc 100644 --- a/views/default/page_elements/elgg_topbar.php +++ b/views/default/page_elements/elgg_topbar.php @@ -3,62 +3,48 @@ * Elgg top toolbar * The standard elgg top toolbar */ -?> - - -
-
- - User avatar - - guid > 0)) { + echo '
'; + echo '
'; - // add Friends to top toolbar - if profile mod is running - if ( is_plugin_enabled('profile') ) { - $user = get_loggedin_user(); - echo "wwwroot . "pg/friends/" . $user->username."\" title=\"".elgg_echo('friends')."\">".elgg_echo('friends').""; - } - ?> + // Elgg logo + echo ''; + echo "\"Elgg"; + echo ''; -
- "{$vars['url']}action/logout", 'text' => elgg_echo('logout'), 'is_action' => TRUE)); ?> -
+ // avatar + $user_link = $user->getURL(); + $user_image = $user->getIcon('topbar'); + echo "\"User"; + + // logout link + echo '
'; + echo elgg_view('output/url', array( + 'href' => "{$vars['url']}action/logout", + 'text' => elgg_echo('logout'), + 'is_action' => TRUE + )); + echo '
'; - + // user settings + $settings = elgg_echo('settings'); + echo "$settings"; - isAdmin()) { - ?> - - - - Help - isAdmin()) { + $admin = elgg_echo("admin"); + echo "$admin"; } + + // 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); - if(is_plugin_enabled('shared_access')){ - ?> - - - -
-
- + echo '
'; + echo '
'; +} -- cgit v1.2.3