From abea818df6ae3d429a87a2d195ed0eb1b4ea65f4 Mon Sep 17 00:00:00 2001
From: pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 23 Mar 2010 18:28:47 +0000
Subject: Reordered the top toolbar items.

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

diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php
index 240cd0465..327326c99 100644
--- a/views/default/page_elements/elgg_topbar.php
+++ b/views/default/page_elements/elgg_topbar.php
@@ -26,34 +26,32 @@
 	<div class="log_out">
 		<?php echo elgg_view('output/url', array('href' => "{$vars['url']}action/logout", 'text' => elgg_echo('logout'), 'is_action' => TRUE)); ?>
 	</div>
+	
+	<a href="<?php echo $vars['url']; ?>pg/settings/" class="settings"><?php echo elgg_echo('settings'); ?></a>
 
 	<?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
-		}
+	// 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/settings/" class="settings"><?php echo elgg_echo('settings'); ?></a>
+		<a href="<?php echo $vars['url']; ?>pg/admin/" class="admin"><?php echo elgg_echo("admin"); ?></a>
+
 	<?php
-		if(is_plugin_enabled('help')){
+	}
+
+	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>
+	}
 
+	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
-		}
+	}
 	?>
 
 </div>
-
 </div>
 <?php
 	}
-- 
cgit v1.2.3