From 3cae6838170fc79f7d367bcb017b67e91620c54c Mon Sep 17 00:00:00 2001
From: mensonge
Date: Thu, 18 Dec 2008 22:11:03 +0000
Subject: Interface fix: allows to remove a tag from selection in subtitle bar
 thanks to a *

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@207 b3834d28-1941-0410-a4f8-b48e95affb8f
---
 bookmarks.php     | 23 ++++++++++++++++++-----
 functions.inc.php | 14 ++++++++++++++
 scuttle.css       |  3 +++
 tags.php          | 19 ++++++++++++++-----
 4 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/bookmarks.php b/bookmarks.php
index 3a948ef..f8d73de 100644
--- a/bookmarks.php
+++ b/bookmarks.php
@@ -100,7 +100,15 @@ if ($user) {
 }
 if ($cat) {
 	$catTitle = ': '. str_replace('+', ' + ', $cat);
-	$pagetitle .= $catTitle;
+	
+	$catTitleWithUrls = ': ';	
+	$titleTags = explode('+', filter($cat));	
+	for($i = 0; $i<count($titleTags);$i++) {
+		$catTitleWithUrls.= $titleTags[$i].'<a href="'.createUrl('bookmarks', $user.'/'.aggregateTags($titleTags, '+', $titleTags[$i])).'" title="'.T_('Remove the tag from the selection').'">*</a> + ';
+	}
+	$catTitleWithUrls = substr($catTitleWithUrls, 0, strlen($catTitleWithUrls) - strlen(' + '));
+
+	$pagetitle .= $catTitleWithUrls;
 }
 $pagetitle = substr($pagetitle, 2);
 
@@ -237,12 +245,17 @@ if ($templatename == 'editbookmark.tpl') {
 	$tplVars['cat_url'] = createURL('bookmarks', '%s/%s');
 	$tplVars['nav_url'] = createURL('bookmarks', '%s/%s%s');
 	if ($userservice->isLoggedOn() && $user == $currentUsername) {
-		$title = T_('My Bookmarks') . filter($catTitle);
+		//$title = T_('My Bookmarks') . $catTitleWithUrls;
+		$tplVars['pagetitle'] = T_('My Bookmarks') . $catTitle;
+		$tplVars['subtitle'] =  T_('My Bookmarks') . $catTitleWithUrls;
 	} else {
-		$title = filter($pagetitle);
+		//$title = $pagetitle;
+		//$tplVars['pagetitle'] = $pagetitle;
+		$tplVars['pagetitle'] = '';
+		$tplVars['subtitle'] = $pagetitle;
 	}
-	$tplVars['pagetitle'] = $title;
-	$tplVars['subtitle'] = $title;
+	//$tplVars['pagetitle'] = $title;
+	//$tplVars['subtitle'] = $title;
 }
 
 $tplVars['summarizeLinkedTags'] = true;
diff --git a/functions.inc.php b/functions.inc.php
index 4dd73f3..3ee0e9b 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -115,6 +115,20 @@ function checkUrl($url, $checkOnline = true) {
 	}
 }
 
+/* Returns a concatenated String
+ * including all the tags from the array $arrayTags (excepted of the $exceptedTag)
+ * separated by the $separator.
+ * */
+function aggregateTags($arrayTags, $separator = ' + ', $exceptedTag = '') {
+	$output = '';
+
+	for($i = 0; $i<count($arrayTags); $i++) {
+		if($arrayTags[$i] != $exceptedTag) {
+			$output.= $arrayTags[$i] . $separator;
+		}
+	}
+	return substr($output, 0, strlen($output) - strlen($separator) );
+}
 
 function message_die($msg_code, $msg_text = '', $msg_title = '', $err_line = '', $err_file = '', $sql = '', $db = NULL) {
 	if(defined('HAS_DIED'))
diff --git a/scuttle.css b/scuttle.css
index 271416a..9dfc0a4 100644
--- a/scuttle.css
+++ b/scuttle.css
@@ -152,6 +152,9 @@ h2 {
     padding: 0.5em 1em;
     text-transform: lowercase;
 }
+h2 a, h2 a:hover {
+	color: #DDD;
+}
 
 /* NAVIGATION */
 
diff --git a/tags.php b/tags.php
index bee3092..358501c 100644
--- a/tags.php
+++ b/tags.php
@@ -39,10 +39,17 @@ list($url, $cat) = explode('/', $_SERVER['PATH_INFO']);
 if (!$cat) {
 	header('Location: '. createURL('populartags'));
 	exit;
-} else {
-	$cattitle = str_replace('+', ' + ', $cat);
 }
-$pagetitle = T_('Tags') .': '. $cattitle;
+
+$titleTags = explode('+', filter($cat));
+$pagetitle = T_('Tags') .': ';
+for($i = 0; $i<count($titleTags);$i++) {
+	$pagetitle.= $titleTags[$i].'<a href="'.createUrl('tags', aggregateTags($titleTags, '+', $titleTags[$i])).'" title="'.T_('Remove the tag from the selection').'">*</a> + ';
+}
+$pagetitle = substr($pagetitle, 0, strlen($pagetitle) - strlen(' + ')); 
+
+
+//$cattitle = str_replace('+', ' + ', $cat);
 
 if ($usecache) {
 	// Generate hash for caching on
@@ -57,7 +64,8 @@ if ($usecache) {
 }
 
 // Header variables
-$tplVars['pagetitle'] = $pagetitle;
+//$tplVars['pagetitle'] = $pagetitle;
+$tplVars['pagetitle'] = '';
 $tplVars['loadjs'] = true;
 $tplVars['rsschannels'] = array(
 array(filter($sitename .': '. $pagetitle), createURL('rss', 'all/'. filter($cat, 'url')).'?sort='.getSortOrder())
@@ -78,7 +86,7 @@ $tplVars['start'] = $start;
 $tplVars['popCount'] = 25;
 $tplVars['currenttag'] = $cat;
 $tplVars['sidebar_blocks'] = array('linked', 'related', 'popular');
-$tplVars['subtitle'] = filter($pagetitle);
+$tplVars['subtitle'] = $pagetitle;
 $tplVars['bookmarkCount'] = $start + 1;
 $bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, NULL, $cat, NULL, getSortOrder());
 $tplVars['total'] = $bookmarks['total'];
@@ -92,4 +100,5 @@ if ($usecache) {
 	// Cache output if existing copy has expired
 	$cacheservice->End($hash);
 }
+
 ?>
-- 
cgit v1.2.3-54-g00ecf