yohan/SemanticScuttle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Interface fix: allows to remove a tag from selection in subtitle bar thanks to a *

Browse Source 
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@207 b3834d28-1941-0410-a4f8-b48e95affb8f
This commit is contained in:
mensonge 2008-12-18 22:11:03 +00:00
parent e0a61f1fc5
commit 3cae683817
4 changed files with 49 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bookmarks.php
View File

@ -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;

14
functions.inc.php
View File

@ -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'))

3
scuttle.css
View File

@ -152,6 +152,9 @@ h2 {
padding: 0.5em 1em;
text-transform: lowercase;
}
h2 a, h2 a:hover {
color: #DDD;
}
/* NAVIGATION */

19
tags.php
View File

@ -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);
}
?>