Interface fix: enable sorting bookmarks asc or desc; improve navigation links

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

3 files changed, 18 insertions, 4 deletions

diff --git a/templates/bookmarks.tpl.php b/templates/bookmarks.tpl.php
index 9277083..6a778bb 100644
--- a/templates/bookmarks.tpl.php
+++ b/templates/bookmarks.tpl.php
@@ -63,12 +63,17 @@ window.onload = playerLoad;
 <p id="sort">
     <?php echo $total.' '.T_("bookmark(s)"); ?> - 
     <?php echo T_("Sort by:"); ?>
-    <a href="?sort=date_desc"><?php echo T_("Date"); ?></a><span> / </span>
-    <a href="?sort=title_asc"><?php echo T_("Title"); ?></a><span> / </span>
+    <?php
+	$dateSort = (getSortOrder()=='date_desc')? 'date_asc':'date_desc';
+	$titleSort = (getSortOrder()=='title_asc')? 'title_desc':'title_asc';
+	$urlSort = (getSortOrder()=='url_asc')? 'url_desc':'url_asc';
+    ?>
+    <a href="?sort=<?php echo $dateSort ?>"><?php echo T_("Date"); ?></a><span> / </span>
+    <a href="?sort=<?php echo $titleSort ?>"><?php echo T_("Title"); ?></a><span> / </span>
     <?php
     if (!isset($hash)) {
     ?>
-    <a href="?sort=url_asc"><?php echo T_("URL"); ?></a>
+    <a href="?sort=<?php echo $urlSort ?>"><?php echo T_("URL"); ?></a>
     <?php
     }
     ?>
diff --git a/templates/sidebar.block.menu.php b/templates/sidebar.block.menu.php
index de4f0f7..0c7087a 100644
--- a/templates/sidebar.block.menu.php
+++ b/templates/sidebar.block.menu.php
@@ -57,8 +57,16 @@ if (sizeof($menuTags) > 0 || ($userid != 0 && $userid === $logged_on_userid)) {
 </table>
 
 <?php $cUser = $userservice->getUser($userid); ?>
+<?php if($userid>0): ?>
+<?php if($userid==$logged_on_userid): ?>
 <p style="text-align:right"><a href="<?php echo createURL('alltags', $cUser['username']); ?>" title="<?php echo T_('See all your tags')?>"><?php echo T_('all your tags'); ?></a> &rarr;</p>
+<?php else: ?>
+<p style="text-align:right"><a href="<?php echo createURL('alltags', $cUser['username']); ?>" title="<?php echo T_('See all tags from this user')?>"><?php echo T_('all tags from this user'); ?></a> &rarr;</p>
+<?php endif; ?>
 
+<?php else : ?>
+<p style="text-align:right"><a href="<?php echo createURL('populartags', $cUser['username']); ?>" title="<?php echo T_('See popular tags')?>"><?php echo T_('Popular Tags'); ?></a> &rarr;</p>
+<?php endif; ?>
 </div>
 
 <?php
diff --git a/templates/sidebar.block.users.php b/templates/sidebar.block.users.php
index 813c163..7c61acc 100644
--- a/templates/sidebar.block.users.php
+++ b/templates/sidebar.block.users.php
@@ -22,10 +22,11 @@ foreach ($lastUsers as $row) {
     echo ' (<a href="'.createURL('bookmarks', $row['username']).'">'.T_('bookmarks').'</a>)';
     echo '</td></tr>';
 }
-echo '<tr><td><a href="'.createURL('users').'">...</a></td></tr>';
+//echo '<tr><td><a href="'.createURL('users').'">...</a></td></tr>';
 ?>
 
 </table>
+<p style="text-align:right"><a href="<?php echo createURL('users'); ?>" title="<?php echo T_('See all users')?>"><?php echo T_('All users'); ?></a> &rarr;</p>
 </div>
 <?php
 }