From 829d5327decb7ac53dc55fef99a2acd8ccccd834 Mon Sep 17 00:00:00 2001 From: mensonge Date: Tue, 6 Jan 2009 16:39:02 +0000 Subject: Interface fix: use DOJO hierarchy in linked tags box git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@216 b3834d28-1941-0410-a4f8-b48e95affb8f --- ajax/getlinkedtags.php | 2 + alltags.php | 1 + populartags.php | 1 + templates/sidebar.block.linked.php | 116 +++++++++++++++++++++---------------- templates/sidebar.block.menu2.php | 2 +- 5 files changed, 72 insertions(+), 50 deletions(-) diff --git a/ajax/getlinkedtags.php b/ajax/getlinkedtags.php index 24d00fc..c4110a2 100644 --- a/ajax/getlinkedtags.php +++ b/ajax/getlinkedtags.php @@ -34,6 +34,8 @@ isset($_GET['uId']) ? define('GET_UID', $_GET['uId']): define('GET_UID', ''); function displayTag($tag, $uId) { + $uId = ($uId==0)?NULL:$uId; // if user is nobody, NULL allows to look for every public tags + $tag2tagservice =& ServiceFactory::getServiceInstance('Tag2TagService'); $output = '{ id:'.rand().', name:\''.$tag.'\''; diff --git a/alltags.php b/alltags.php index c37922d..dc84cf3 100644 --- a/alltags.php +++ b/alltags.php @@ -78,6 +78,7 @@ if (isset($userid)) { $tplVars['sidebar_blocks'] = array('linked'); $tplVars['userid'] = $userid; +$tplVars['loadjs'] = true; $tplVars['subtitle'] = $pagetitle; $templateservice->loadTemplate('tags.tpl', $tplVars); diff --git a/populartags.php b/populartags.php index 3bdf139..c20cabc 100644 --- a/populartags.php +++ b/populartags.php @@ -77,6 +77,7 @@ if (isset($userid)) { $tplVars['sidebar_blocks'] = array('linked'); $tplVars['subtitle'] = $pagetitle; +$tplVars['loadjs'] = true; $templateservice->loadTemplate('tags.tpl', $tplVars); diff --git a/templates/sidebar.block.linked.php b/templates/sidebar.block.linked.php index 13a8319..c78b5e1 100644 --- a/templates/sidebar.block.linked.php +++ b/templates/sidebar.block.linked.php @@ -13,84 +13,102 @@ $summarizeLinkedTags = isset($summarizeLinkedTags)?$summarizeLinkedTags:false; $logged_on_userid = $userservice->getCurrentUserId(); if ($logged_on_userid === false) { - $logged_on_userid = NULL; + $logged_on_userid = NULL; } $explodedTags = array(); if (strlen($currenttag)>0) { - $explodedTags = explode('+', $currenttag); + $explodedTags = explode('+', $currenttag); } else { - if($summarizeLinkedTags == true) { - $orphewTags = $tag2tagservice->getOrphewTags('>', $userid, 4, "nb"); - } else { - $orphewTags = $tag2tagservice->getOrphewTags('>', $userid); - } - - foreach($orphewTags as $orphewTag) { - $explodedTags[] = $orphewTag['tag']; - } + if($summarizeLinkedTags == true) { + $orphewTags = $tag2tagservice->getOrphewTags('>', $userid, 4, "nb"); + } else { + $orphewTags = $tag2tagservice->getOrphewTags('>', $userid); + } + + foreach($orphewTags as $orphewTag) { + $explodedTags[] = $orphewTag['tag']; + } } ?> includeTemplate("dojo.inc"); ?> 0 || $editingMode):?> -
'; - echo ' ('.T_('Add new link').') '; - echo ' ('.T_('Delete link').')'; - echo ' | '; - } +