aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ajax/getlinkedtags.php2
-rw-r--r--alltags.php1
-rw-r--r--populartags.php1
-rw-r--r--templates/sidebar.block.linked.php116
-rw-r--r--templates/sidebar.block.menu2.php2
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'];
+ }
}
?>
<?php
if(($logged_on_userid != null) && ($userid === $logged_on_userid)) {
- $editingMode = true;
+ $editingMode = true;
} else {
- $editingMode = false;
+ $editingMode = false;
}
+
+$this->includeTemplate("dojo.inc");
?>
<?php if(count($explodedTags)>0 || $editingMode):?>
-<h2>
-<?php
- echo T_('Linked Tags').' ';
- //if($userid != null) {
- $cUser = $userservice->getUser($userid);
- //echo '<small><a href="'.createURL('alltags', $cUser['username']).'">('.T_('all tags').')</a></small>';
- //}
-?>
-</h2>
+<h2><?php
+
+
+echo T_('Linked Tags').' ';
+//if($userid != null) {
+$cUser = $userservice->getUser($userid);
+//echo '<small><a href="'.createURL('alltags', $cUser['username']).'">('.T_('all tags').')</a></small>';
+//}
+?></h2>
<?php //endif?>
-<div id="linked">
- <table>
- <?php
- if($editingMode) {
- echo '<tr><td></td><td>';
- echo ' (<a href="'. createURL('tag2tagadd','') .'" rel="tag">'.T_('Add new link').'</a>) ';
- echo ' (<a href="'. createURL('tag2tagdelete','') .'" rel="tag">'.T_('Delete link').'</a>)';
- echo '</td></tr>';
- }
+<div id="related">
+
+<!-- table-->
+<?php
+if($editingMode) {
+ //echo '<tr><td></td><td>';
+ echo '<p style="margin-bottom: 13px;text-align:center;">';
+ echo ' (<a href="'. createURL('tag2tagadd','') .'" rel="tag">'.T_('Add new link').'</a>) ';
+ echo ' (<a href="'. createURL('tag2tagdelete','') .'" rel="tag">'.T_('Delete link').'</a>)';
+ echo '</p>';
+ //echo '</td></tr>';
+}
+
+if(strlen($user)==0) {
+ $cat_url = createURL('tags', '%2$s');
+}
+
+$stopList = array();
+foreach($explodedTags as $explodedTag) {
+ if(!in_array($explodedTag, $stopList)) {
+
- if(strlen($user)==0) {
- $cat_url = createURL('tags', '%2$s');
- }
- $stopList = array();
- foreach($explodedTags as $explodedTag) {
- if(!in_array($explodedTag, $stopList)) {
// fathers tag
- $fatherTags = $tag2tagservice->getLinkedTags($explodedTag, '>', $userid, true);
+ /*$fatherTags = $tag2tagservice->getLinkedTags($explodedTag, '>', $userid, true);
if(count($fatherTags)>0) {
- foreach($fatherTags as $fatherTag) {
- echo '<tr><td></td><td>';
- echo '<a href="'. sprintf($cat_url, filter($user, 'url'), filter($fatherTag, 'url')) .'" rel="tag">('. filter($fatherTag) .')</a>';
- echo '</td></tr>';
- }
+ foreach($fatherTags as $fatherTag) {
+ echo '<tr><td></td><td>';
+ echo '<a href="'. sprintf($cat_url, filter($user, 'url'), filter($fatherTag, 'url')) .'" rel="tag">('. filter($fatherTag) .')</a>';
+ echo '</td></tr>';
+ }
}
$displayLinkedTags = displayLinkedTags($explodedTag, '>', $userid, $cat_url, $user, $editingMode, null, 1);
echo $displayLinkedTags['output'];
if(is_array($displayLinkedTags['stopList'])) {
- $stopList = array_merge($stopList, $displayLinkedTags['stopList']);
- }
- }
-
+ $stopList = array_merge($stopList, $displayLinkedTags['stopList']);
+ }*/
+ echo '<div dojoType="dojo.data.ItemFileReadStore" url="'.ROOT.'ajax/getlinkedtags.php?tag='.$explodedTag.'&uId='.$userid.'" jsid="linkedTagStore" ></div>';
+ echo '<div dojoType="dijit.Tree" store="linkedTagStore" labelAttr="name" >';
+ echo '<script type="dojo/method" event="onClick" args="item">';
+ $returnUrl = sprintf($cat_url, filter($user, 'url'), filter('', 'url'));
+ echo 'window.location = "'.$returnUrl.'"+item.name';
+ echo '</script>';
+ echo '<script type="dojo/method" event="getLabelClass" args="item">';
+ echo 'return \'treeTag\';';
+ echo '</script>';
+ echo '</div>';
}
- ?>
- </table>
+
+}
+?>
+<!-- /table-->
</div>
<?php endif?>
diff --git a/templates/sidebar.block.menu2.php b/templates/sidebar.block.menu2.php
index 8759f1b..4062fc5 100644
--- a/templates/sidebar.block.menu2.php
+++ b/templates/sidebar.block.menu2.php
@@ -24,7 +24,7 @@ if (sizeOf($menu2Tags) > 0) {
$this->includeTemplate("dojo.inc");
?>
-<h2><?php echo '<span>'.T_('Menu Tags').'</span> ';?></h2>
+<h2><?php echo '<span>'.T_('Featured Menu Tags').'</span> ';?></h2>
<div id="related"><?php
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-25 11:37:00 +0000