Optimisation of the interface: moved toolbar, search menu, sort menu and right profile menu

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@6 b3834d28-1941-0410-a4f8-b48e95affb8f

1 files changed, 4 insertions, 1 deletions

diff --git a/templates/toolbar.inc.php b/templates/toolbar.inc.php
index 2eb56ac..916897c 100644
--- a/templates/toolbar.inc.php
+++ b/templates/toolbar.inc.php
@@ -2,14 +2,17 @@
 $userservice =& ServiceFactory::getServiceInstance('UserService');
 if ($userservice->isLoggedOn()) {
     $cUser = $userservice->getCurrentUser();
+    $cUserId = $userservice->getCurrentUserId();
     $cUsername = $cUser[$userservice->getFieldName('username')];
 ?>
 
     <ul id="navigation">
         <li><a href="<?php echo createURL('bookmarks', $cUsername); ?>"><?php echo T_('Bookmarks'); ?></a></li>
+	<li><a href="<?php echo createURL('alltags', $cUsername); ?>"><?php echo T_('Tags'); ?></a></li>
         <li><a href="<?php echo createURL('watchlist', $cUsername); ?>"><?php echo T_('Watchlist'); ?></a></li>
+	<li><a href="<?php echo $userservice->getProfileUrl($cUserId, $cUsername); ?>"><?php echo T_('Profile'); ?></a></li>
         <li><a href="<?php echo createURL('bookmarks', $cUsername . '?action=add'); ?>"><?php echo T_('Add a Bookmark'); ?></a></li>
-        <li class="access"><a href="<?php echo $GLOBALS['root']; ?>?action=logout"><?php echo T_('Log Out'); ?></a></li>
+        <li class="access"><?php echo $cUsername?><a href="<?php echo $GLOBALS['root']; ?>?action=logout">(<?php echo T_('Log Out'); ?>)</a></li>
     </ul>
 
 <?php