From 4766f36a4d74924f21ff329c4318ce4e069ffa04 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 3 Mar 2010 17:53:05 +0000
Subject: Pulled in the interface changes.

git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/page_elements/elgg_topbar.php | 96 ++++++++++++-----------------
 1 file changed, 38 insertions(+), 58 deletions(-)

(limited to 'views/default/page_elements/elgg_topbar.php')

diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php
index 7734e61de..c57020e79 100644
--- a/views/default/page_elements/elgg_topbar.php
+++ b/views/default/page_elements/elgg_topbar.php
@@ -2,12 +2,6 @@
 /**
  * Elgg top toolbar
  * The standard elgg top toolbar
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
  */
 ?>
 
@@ -15,65 +9,51 @@
 	if (isloggedin()) {
 ?>
 
-<div id="elgg_topbar">
+<div id="elgg_topbar" class="clearfloat">
+<div id="elgg_topbar_contents">
+	<a href="http://www.elgg.org" target="_blank"><img class="site_logo" src="<?php echo $vars['url']; ?>_graphics/elgg_toolbar_logo.gif" alt="Elgg logo" /></a>
+	<a href="<?php echo $_SESSION['user']->getURL(); ?>"><img class="user_mini_avatar" src="<?php echo $_SESSION['user']->getIcon('topbar'); ?>" alt="User avatar" /></a>
 
-<div id="elgg_topbar_container_left">
-	<div class="toolbarimages">
-		<a href="http://www.elgg.org" target="_blank"><img src="<?php echo $vars['url']; ?>_graphics/elgg_toolbar_logo.gif" alt="toolbar_logo graphic" /></a>
+    <?php
+	    // elgg tools menu
+        echo elgg_view("navigation/topbar_tools");
 
-		<a href="<?php echo $_SESSION['user']->getURL(); ?>"><img class="user_mini_avatar" src="<?php echo $_SESSION['user']->getIcon('topbar'); ?>" alt="User avatar" /></a>
-
-	</div>
-	<div class="toolbarlinks">
-		<a href="<?php echo $vars['url']; ?>pg/dashboard/" class="pagelinks"><?php echo elgg_echo('dashboard'); ?></a>
-	</div>
-		<?php
-
-			echo elgg_view("navigation/topbar_tools");
-
-		?>
-
-		<div class="toolbarlinks2">
-		<?php
-		//allow people to extend this top menu
+		// enable elgg topbar extending
 		echo elgg_view('elgg_topbar/extend', $vars);
-		?>
-
-		<a href="<?php echo $vars['url']; ?>pg/settings/" class="usersettings"><?php echo elgg_echo('settings'); ?></a>
-
-		<?php
-
-			// The administration link is for admin or site admin users only
-			if ($vars['user']->admin || $vars['user']->siteadmin) {
-
-		?>
-
-			<a href="<?php echo $vars['url']; ?>pg/admin/" class="usersettings"><?php echo elgg_echo("admin"); ?></a>
-
-		<?php
-
-				}
-
-		?>
+	?>
+	
+	<div class="log_out">
+		<?php echo elgg_view('output/url', array('href' => "{$vars['url']}action/logout", 'text' => elgg_echo('logout'), 'is_action' => TRUE)); ?>
 	</div>
 
+	<?php
+		if(is_plugin_enabled('shared_access')){
+	?>
+	<a href="<?php echo $vars['url']; ?>pg/shared_access/home" class="shared_access"><?php echo elgg_echo('shared_access:shared_access'); ?></a>
+	<?php
+		}
+	?>
+	<a href="<?php echo $vars['url']; ?>pg/settings/" class="settings"><?php echo elgg_echo('settings'); ?></a>
+	<?php
+		if(is_plugin_enabled('help')){
+	?>
+		<a href="<?php echo $vars['url']; ?>mod/help/index.php" class="help">Help</a>
+	<?php
+		}
+	?>
+	<?php
+		// The administration link is for admin or site admin users only
+		if ($vars['user']->admin || $vars['user']->siteadmin) { 
+	?>
+		<a href="<?php echo $vars['url']; ?>pg/admin/" class="admin"><?php echo elgg_echo("admin"); ?></a>
+	
+	<?php
+		}
+	?>
 
 </div>
 
-
-<div id="elgg_topbar_container_right">
-		<small>
-			<?php echo elgg_view('output/url', array('href' => "{$vars['url']}action/logout", 'text' => elgg_echo('logout'), 'is_action' => TRUE)); ?>
-		</small>
-</div>
-
-<div id="elgg_topbar_container_search">
-<?php echo elgg_view('page_elements/searchbox'); ?>
 </div>
-
-</div><!-- /#elgg_topbar -->
-
-<div class="clearfloat"></div>
-
 <?php
-	}
+    }
+?>
\ No newline at end of file
-- 
cgit v1.2.3