Reordered the top toolbar items.

git-svn-id: http://code.elgg.org/elgg/trunk@5482 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php
index 240cd0465383f7c2ab175a66b138ef402cd0674d..327326c996e3b06430fdf6d2eea278c25bc6032b 100644 (file)
--- 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
        }