aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--history.php5
-rw-r--r--index.php2
-rw-r--r--tags.php2
-rw-r--r--templates/bookmarks.tpl.php24
-rw-r--r--templates/sidebar.block.common.php7
-rw-r--r--templates/sidebar.block.linked.php4
-rw-r--r--templates/sidebar.block.popular.php7
-rw-r--r--templates/sidebar.block.recent.php7
-rw-r--r--templates/sidebar.tpl.php1
9 files changed, 51 insertions, 8 deletions
diff --git a/history.php b/history.php
index 568a8b6..f7ae927 100644
--- a/history.php
+++ b/history.php
@@ -73,7 +73,8 @@ if ($bookmark =& $bookmarkservice->getBookmarkByHash($hash)) {
$tplVars['hash'] = $hash;
$tplVars['popCount'] = 50;
$tplVars['sidebar_blocks'] = array('common');
- $tplVars['cat_url'] = createURL('tags', '%2$s');
+ //$tplVars['cat_url'] = createURL('tags', '%2$s');
+ $tplVars['cat_url'] = createURL('bookmarks', '%1$s/%2$s');
$tplVars['nav_url'] = createURL('history', $hash .'/%3$s');
$templateservice->loadTemplate('bookmarks.tpl', $tplVars);
} else {
@@ -87,4 +88,4 @@ if ($usecache) {
// Cache output if existing copy has expired
$cacheservice->End($cachehash);
}
-?> \ No newline at end of file
+?>
diff --git a/index.php b/index.php
index 7457254..f70f72b 100644
--- a/index.php
+++ b/index.php
@@ -75,7 +75,7 @@ $tplVars['bookmarkCount'] = $start + 1;
$bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, NULL, NULL, NULL, getSortOrder(), NULL, 0, $dtend);
$tplVars['total'] = $bookmarks['total'];
$tplVars['bookmarks'] =& $bookmarks['bookmarks'];
-$tplVars['cat_url'] = createURL('tags', '%2$s');
+$tplVars['cat_url'] = createURL('bookmarks', '%1$s/%2$s');
$tplVars['nav_url'] = createURL('index', '%3$s');
$tplVars['summarizeLinkedTags'] = true;
diff --git a/tags.php b/tags.php
index 81956fd..e44c592 100644
--- a/tags.php
+++ b/tags.php
@@ -76,7 +76,7 @@ $tplVars['bookmarkCount'] = $start + 1;
$bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, NULL, $cat, NULL, getSortOrder());
$tplVars['total'] = $bookmarks['total'];
$tplVars['bookmarks'] =& $bookmarks['bookmarks'];
-$tplVars['cat_url'] = createURL('tags', '%2$s');
+$tplVars['cat_url'] = createURL('bookmarks', '%1$s/%2$s');
$tplVars['nav_url'] = createURL('tags', '%2$s%3$s');
$templateservice->loadTemplate('bookmarks.tpl', $tplVars);
diff --git a/templates/bookmarks.tpl.php b/templates/bookmarks.tpl.php
index 7837e6c..e4cfe04 100644
--- a/templates/bookmarks.tpl.php
+++ b/templates/bookmarks.tpl.php
@@ -4,6 +4,9 @@ $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
$cdservice =& ServiceFactory::getServiceInstance('CommonDescriptionService');
$logged_on_userid = $userservice->getCurrentUserId();
+$currentUser = $userservice->getCurrentUser();
+$currentUsername = $currentUser[$userservice->getFieldName('username')];
+
$this->includeTemplate($GLOBALS['top_include']);
include('search.inc.php');
@@ -54,8 +57,26 @@ window.onload = playerLoad;
<?php
}
?>
+
+ <?php
+ if(isset($currenttag)) {
+ if(isset($user)) {
+ echo ' - ';
+ echo '<a href="'. createURL('tags', $currenttag) .'">';
+ echo T_('Bookmarks from other users for these tags').'</a>';
+ //echo T_(' for these tags');
+ } else if($logged_on_userid>0){
+ echo ' - ';
+ echo '<a href="'. createURL('bookmarks', $currentUsername.'/'.$currenttag) .'">';
+ echo T_('Only your bookmarks for these tags').'</a>';
+ //echo T_(' for these tags');
+ }
+ }
+ ?>
</p>
+
+
<ol<?php echo ($start > 0 ? ' start="'. ++$start .'"' : ''); ?> id="bookmarks">
<?php
@@ -76,8 +97,9 @@ window.onload = playerLoad;
$cats = '';
$tags = $row['tags'];
foreach(array_keys($tags) as $key) {
+
$tag =& $tags[$key];
- $cats .= '<a href="'. sprintf($cat_url, filter($user, 'url'), filter($tag, 'url')) .'" rel="tag">'. filter($tag) .'</a>, ';
+ $cats .= '<a href="'. sprintf($cat_url, filter($row['username'], 'url'), filter($tag, 'url')) .'" rel="tag">'. filter($tag) .'</a>, ';
}
$cats = substr($cats, 0, -2);
if ($cats != '') {
diff --git a/templates/sidebar.block.common.php b/templates/sidebar.block.common.php
index 205ca1e..e92efa7 100644
--- a/templates/sidebar.block.common.php
+++ b/templates/sidebar.block.common.php
@@ -11,6 +11,11 @@ if ($commonTags && count($commonTags) > 0) {
<p class="tags">
<?php
$contents = '';
+
+ if(strlen($user)==0) {
+ $cat_url = createURL('tags', '%2$s');
+ }
+
foreach ($commonTags as $row) {
$entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']);
$contents .= '<a href="'. sprintf($cat_url, $user, filter($row['tag'], 'url')) .'" title="'. $row['bCount'] .' '. $entries .'" rel="tag" style="font-size:'. $row['size'] .'">'. filter($row['tag']) .'</a> ';
@@ -22,4 +27,4 @@ if ($commonTags && count($commonTags) > 0) {
<?php
}
-?> \ No newline at end of file
+?>
diff --git a/templates/sidebar.block.linked.php b/templates/sidebar.block.linked.php
index 1643272..3856141 100644
--- a/templates/sidebar.block.linked.php
+++ b/templates/sidebar.block.linked.php
@@ -118,6 +118,10 @@ if ($currenttag) {
echo '</td></tr>';
}
+ if(strlen($user)==0) {
+ $cat_url = createURL('tags', '%2$s');
+ }
+
$stopList = array();
foreach($explodedTags as $explodedTag) {
if(!in_array($explodedTag, $stopList)) {
diff --git a/templates/sidebar.block.popular.php b/templates/sidebar.block.popular.php
index fc9703d..446e9b2 100644
--- a/templates/sidebar.block.popular.php
+++ b/templates/sidebar.block.popular.php
@@ -17,6 +17,11 @@ if ($popularTags && count($popularTags) > 0) {
<p class="tags">
<?php
$contents = '';
+
+ if(strlen($user)==0) {
+ $cat_url = createURL('tags', '%2$s');
+ }
+
foreach ($popularTags as $row) {
$entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']);
$contents .= '<a href="'. sprintf($cat_url, $user, filter($row['tag'], 'url')) .'" title="'. $row['bCount'] .' '. $entries .'" rel="tag" style="font-size:'. $row['size'] .'">'. filter($row['tag']) .'</a> ';
@@ -28,4 +33,4 @@ if ($popularTags && count($popularTags) > 0) {
<?php
}
-?> \ No newline at end of file
+?>
diff --git a/templates/sidebar.block.recent.php b/templates/sidebar.block.recent.php
index f489e49..58a9f84 100644
--- a/templates/sidebar.block.recent.php
+++ b/templates/sidebar.block.recent.php
@@ -16,6 +16,11 @@ if ($recentTags && count($recentTags) > 0) {
<div id="recent">
<?php
$contents = '<p class="tags">';
+
+ if(strlen($user)==0) {
+ $cat_url = createURL('tags', '%2$s');
+ }
+
foreach ($recentTags as $row) {
$entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']);
$contents .= '<a href="'. sprintf($cat_url, $user, filter($row['tag'], 'url')) .'" title="'. $row['bCount'] .' '. $entries .'" rel="tag" style="font-size:'. $row['size'] .'">'. filter($row['tag']) .'</a> ';
@@ -27,4 +32,4 @@ if ($recentTags && count($recentTags) > 0) {
<?php
}
-?> \ No newline at end of file
+?>
diff --git a/templates/sidebar.tpl.php b/templates/sidebar.tpl.php
index 5f399b5..a90b584 100644
--- a/templates/sidebar.tpl.php
+++ b/templates/sidebar.tpl.php
@@ -1,5 +1,6 @@
<div id="sidebar">
<?php
+
$size = count($sidebar_blocks);
for ($i = 0; $i < $size; $i++) {
$this->includeTemplate('sidebar.block.'. $sidebar_blocks[$i]);