Item1918: add "rendering" parameter to TAGSEARCH as a shortcut to TAG…

…CLOUD, apply click behaviour to custom tagclouds git-svn-id: http://svn.foswiki.org/trunk/TagsPlugin@7548 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · May 26, 2010 · a7ab231 · a7ab231
1 parent 5b3c1ba
commit a7ab231
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 16 deletions.
diff --git a/data/System/VarTAGSEARCH.txt b/data/System/VarTAGSEARCH.txt
@@ -19,6 +19,7 @@
      | =order="tag"= <br /> =order="topic"= <br /> =order="user"= | This affects the sorting. | =none= |
      | =limit="..."= | Numerical value. Limits the number of hits. | =not set= |
      | =offset="..."= | Numerical value. May only be used in conjunction with =limit=. Number of hits to be skipped. | =not set= |
+     | =rendering="cloud"= | This is a shortcut which nests the output of =%<nop>TAGSEARCH%= into a =<nop>TAGCLOUD%= call. (This will override the =format=, =query= and =sep= parameter.) | =not set= |
    * If two hits only differ in (tag|topic|user) and the =format= does not contain a (tag|topic|user) variable, the (two) hits clash into a single hit.
    * Supported variables in custom formatting:
      | *Name:* | *Expands To:* |

diff --git a/lib/Foswiki/Plugins/TagsPlugin/TAGSEARCH.pm b/lib/Foswiki/Plugins/TagsPlugin/TAGSEARCH.pm
@@ -35,20 +35,21 @@ Return:
 sub do {
     my ( $session, $params, $topic, $web ) = @_;
 
-    my $theHeader = $params->{header}     || '';
-    my $theSep    = $params->{separator}  || $params->{sep} || ', ';
-    my $theFooter = $params->{footer}     || '';
-    my $theUser   = $params->{user}       || 'all';
-    my $theWeb    = $params->{web}        || 'all';
-    my $theTag    = $params->{tag}        || 'all';
-    my $theTopic  = $params->{topic}      || '';
-    my $theQuery  = $params->{query}      || 'tag';
-    my $theOrder  = $params->{order}      || '';
-    my $thePublic = $params->{visibility} || 'all';
-    my $theAlt    = $params->{alt}        || '';
-    my $theLimit  = $params->{limit}      || 0;
-    my $theOffset = $params->{offset}     || 0;
-    my $theFormat = $params->{format};
+    my $theHeader    = $params->{header}     || '';
+    my $theSep       = $params->{separator}  || $params->{sep} || ', ';
+    my $theFooter    = $params->{footer}     || '';
+    my $theUser      = $params->{user}       || 'all';
+    my $theWeb       = $params->{web}        || 'all';
+    my $theTag       = $params->{tag}        || 'all';
+    my $theTopic     = $params->{topic}      || '';
+    my $theQuery     = $params->{query}      || 'tag';
+    my $theOrder     = $params->{order}      || '';
+    my $thePublic    = $params->{visibility} || 'all';
+    my $theAlt       = $params->{alt}        || '';
+    my $theLimit     = $params->{limit}      || 0;
+    my $theOffset    = $params->{offset}     || 0;
+    my $theFormat    = $params->{format};
+    my $theRendering = $params->{rendering}  || '';
 
     use Foswiki::Plugins::TagsPlugin::Func;
     $theTag = Foswiki::Plugins::TagsPlugin::Func::normalizeTagname($theTag);
@@ -66,6 +67,12 @@ sub do {
         }
     }
 
+    if ( $theRendering =~ /^cloud$/i ) {
+        $theFormat = '$tag:1:$web:$topic:$user';
+        $theQuery  = "tag";
+        $theSep    = ",";
+    }
+
     my $isTagAdmin =
       Foswiki::Func::isGroupMember( $Foswiki::cfg{TagsPlugin}{TagAdminGroup}
           || "AdminGroup" ) ? 1 : 0;
@@ -322,6 +329,13 @@ $limit";
     $output =~ s/\$quot/"/g;
     $output =~ s/\$dollar/\$/g;
 
+    # handle special renderings (ie. cloud)
+    if ( $theRendering =~ /^cloud$/i ) {
+        my $tml = "%TAGCLOUD{ terms=\"$output\" format=\"<a style='font-size:\$weightpx;' class='tagsplugin_tagcloud_tag' href='%SCRIPTURL{view}%/%SYSTEMWEB%/TagsPluginTagDetails?tag=\$term' item='\$3.\$4' topic='\$4' web='\$3' tag='\$term' user='\$5'>\$term</a>\" warn=\"off\" split=\"[,]+\" }%";
+        $output = Foswiki::Func::expandCommonVariables( $tml, $topic, $web );
+    }
+
+
     return $output;
 }
 

diff --git a/pub/System/TagsPlugin/tagsplugin-base.js b/pub/System/TagsPlugin/tagsplugin-base.js
@@ -218,8 +218,8 @@
         }
 
         jQuery.tagsplugin.redirect_tagdetails = function() {
-          $("div#tagsplugin .tagsplugin_tag")
-          .add("div#tagsplugin .tagsplugin_tagcloud_tag")
+          $(".tagsplugin_tag")
+          .add(".tagsplugin_tagcloud_tag")
           .bind(
             'click',
             function(event) {