Item12639: rewrite of category UI using JSTreeContrib

... and various improvements git-svn-id: http://svn.foswiki.org/trunk/ClassificationPlugin@17058 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Nov 6, 2013 · 38242a4 · 38242a4
1 parent 215413a
commit 38242a4
Show file tree

Hide file tree

Showing 53 changed files with 1,569 additions and 253 deletions.
diff --git a/data/Applications/ClassificationApp/CategorizedTopic.txt b/data/Applications/ClassificationApp/CategorizedTopic.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="micha" comment="reprev" date="1366625390" format="1.1" reprev="10" version="10"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1366625390" format="1.1" reprev="10" version="10"}%
 %META:TOPICPARENT{name="TopicType"}%
 %TOC{depth="2"}%
 

diff --git a/data/Applications/ClassificationApp/Category.txt b/data/Applications/ClassificationApp/Category.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="autosave" date="1357565279" format="1.1" version="15"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1382706529" format="1.1" reprev="17" version="18"}%
 %META:TOPICPARENT{name="TopicType"}%
 %TOC%
 %DBCALL{"Applications.RenderTopicInstaller" 
@@ -14,24 +14,13 @@ categories are a predefined hierarchy where content is situated in separate comp
 
 Categories themselves are CategorizedTopics thus implementing a hierarchy.
 
-See also: See CategorizedTopic, ClassifiedTopic, TaggedTopic, CategoryTemplate, CategoryViewTemplate, CategoryEditTemplate
+See also: See [[CategorizedTopic]], [[ClassifiedTopic]], [[TaggedTopic]], [[CategoryTemplate]], [[CategoryViewTemplate]], [[CategoryEditTemplate]]
 %ENDSECTION{name="documentation" type="section"}%
 
 %STARTINCLUDE%<!-- -->
-%TWISTY{
-  link="%BUTTON{
-    "%IF{"defined 'LABEL'" then="%LABEL%" else="%MAKETEXT{"New"}%"}%" 
-    icon="add"
-    style="margin-bottom:2px;"
-  }%%CLEAR%"
-}%
-%DBCALL{"Applications.ClassificationApp.RenderCategoryFactory"}%
-%ENDTWISTY%
 %DBCALL{"Applications.ClassificationApp.RenderCategoryBrowser" 
   THEWEB="%URLPARAM{"web" default="%BASEWEB%"}%"
-  BUTTONS="bottom"
-}%
-<!-- -->%STOPINCLUDE%
+}%<!-- -->%STOPINCLUDE%
 
 ---++ %TOPIC% form
 | *Name:*| *Type:* | *Size:* | *Values:* | *Description:* | *Attributes:* |

diff --git a/data/Applications/ClassificationApp/CategoryBrowser.txt b/data/Applications/ClassificationApp/CategoryBrowser.txt
@@ -1,15 +1,15 @@
-%META:TOPICINFO{author="ProjectContributor" comment="autosave" date="1357565279" format="1.1" version="8"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1381660056" format="1.1" reprev="4" version="4"}%
 %META:TOPICPARENT{name="ApplicationTopic"}%
 %DBCALL{"Applications.RenderTopicInstaller"}%
 
 %STARTINCLUDE%<!-- -->
 %DBCALL{"Applications.ClassificationApp.RenderCategoryBrowser" THEWEB="%URLPARAM{"web" default="%BASEWEB%"}%"}%
 <!-- -->%STOPINCLUDE%
 
-See: RenderCategoryBrowser
+See: [[RenderCategoryBrowser]]
 
 %META:FORM{name="Applications.ApplicationTopic"}%
 %META:FIELD{name="TopicType" title="TopicType" value="ApplicationTopic, WebTool"}%
-%META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="CategoryBrowser"}%
+%META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value=""}%
 %META:FIELD{name="Summary" attributes="c" title="Summary" value="Explore the categories in the current web"}%
 %META:FIELD{name="WikiApplication" attributes="" title="WikiApplication" value="ClassificationApp"}%
diff --git a/data/Applications/ClassificationApp/CategoryEditTemplate.txt b/data/Applications/ClassificationApp/CategoryEditTemplate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="micha" comment="reprev" date="1357824700" format="1.1" reprev="9" version="9"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1357824700" format="1.1" reprev="9" version="9"}%
 %META:TOPICPARENT{name="TopicView"}%
 %{<verbatim class="tml">}%
 %TMPL:INCLUDE{"Applications.ClassificationApp.ClassifiedTopicEdit"}%

diff --git a/data/Applications/ClassificationApp/CategoryRenderIndexItem.txt b/data/Applications/ClassificationApp/CategoryRenderIndexItem.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="micha" comment="reprev" date="1357646398" format="1.1" reprev="9" version="9"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1380280644" format="1.1" reprev="9" version="10"}%
 %META:TOPICPARENT{name="TopicFunction"}%
 %TOC{depth="2"}%
 
@@ -24,7 +24,7 @@ a summary for an object of type ClassifiedTopic.
      <a href='$url'>%IF{"defined TITLE" then="%TITLE%" else="$title"}%</a>$percntIF{
        \"'$count'>'0'\" then=\"&nbsp;($count)\"
      }$percnt<!-- -->
-     $percntIF{\"'$summary'!=''\" then=\"<div class='foswikiTopicInfo'>$summary</div>\"}$percnt<!-- -->
+     $percntIF{\"'$percntENCODE{\"$summary\" type=\"entity\"}$percnt'!=''\" then=\"<div class='foswikiTopicInfo'>$summary</div>\"}$percnt<!-- -->
      <div class='clsSubCategories'>$children $more</div>
    </div>"
 }%%CLEAR%</noautolink><!-- -->%STOPINCLUDE%

diff --git a/data/Applications/ClassificationApp/CategoryViewTemplate.txt b/data/Applications/ClassificationApp/CategoryViewTemplate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="autosave" date="1357565279" format="1.1" version="14"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1380204072" format="1.1" reprev="15" version="15"}%
 %META:TOPICPARENT{name="TopicView"}%
 %{<verbatim class="tml">}%
 %TMPL:INCLUDE{"Applications.WikiTopicView"}%
@@ -35,7 +35,7 @@
 %CATINFO{
    cat="%URLPARAM{"catname"}%"
    format="<h1>$link 
-     $percntIF{\"'$summary'!=''\"
+     $percntIF{\"'$percntENCODE{\"$summary\" type=\"entity\"}$percnt'!=''\"
        then=\"<br /><span class='foswikiTopicSummary'>$summary</span>\"
      }$percnt</h1>
      $percntMAKETEXT{\"Filed in [_1]\" 

diff --git a/data/Applications/ClassificationApp/ClassifiedTopic.txt b/data/Applications/ClassificationApp/ClassifiedTopic.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="micha" comment="reprev" date="1366625302" format="1.1" reprev="26" version="26"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1366625302" format="1.1" reprev="26" version="26"}%
 %META:TOPICPARENT{name="TopicType"}%
 %TOC{depth="2"}%
 %DBCALL{"Applications.RenderTopicInstaller" TEXT="Install '%TOPIC%' TopicType" TYPE="TopicType" PARENT="TopicType"}%

diff --git a/data/Applications/ClassificationApp/ClassifiedTopicRenderIndexItem.txt b/data/Applications/ClassificationApp/ClassifiedTopicRenderIndexItem.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="micha" comment="reprev" date="1366813631" format="1.1" reprev="19" version="19"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1383131311" format="1.1" reprev="21" version="21"}%
 %META:TOPICPARENT{name="TopicFunction"}%
 %TOC{depth="2"}%
 
@@ -17,7 +17,11 @@ a summary for an object of type ClassifiedTopic.
 %STARTINCLUDE%<!-- -->%CALC{"$SET(catinfo, 0)"}%
 %DBQUERY{topic="%OBJECT%"
   format="<div class='clsIndexItem clsTopicItem clsCassifiedTopicItem'>
-    $percntDBCALL{\"$web.$topic->Applications.RenderTopicThumbnail\" TYPE=\"plain\"}$percnt<!-- -->
+    $percntDBCALL{\"$web.$topic->Applications.RenderTopicThumbnail\" 
+      TYPE=\"plain\" 
+      ALIGN=\"right\"
+      DIS_SIZE=\"84x84>\"
+    }$percnt<!-- -->
     [[$web.$topic][$expand(topictitle)]]&nbsp;$percntREDDOT{\"$web.$topic\"}$percnt
     $expand('<div class=\"foswikiTopicSummary\">' and Summary and '</div>')<!-- -->
     <div class='foswikiTopicInfo'>

diff --git a/data/Applications/ClassificationApp/ClassifiedTopicViewTemplate.txt b/data/Applications/ClassificationApp/ClassifiedTopicViewTemplate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="autosave" date="1357565279" format="1.1" version="14"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1371559314" format="1.1" reprev="15" version="15"}%
 %META:TOPICPARENT{name="TopicView"}%
 %{<verbatim class="tml">}%
 %TMPL:INCLUDE{"Applications.WikiTopicView"}%
@@ -7,7 +7,7 @@
 %{<verbatim class="tml">}%
 %TMPL:DEF{"beforetext"}%<div class="foswikiTopicInfo">
 %DBCALL{"Applications.ClassificationApp.RenderClassifiedTopicView" TITLE_EXTRA="%TMPL:P{"titleextra"}%" }%
-</div>%TMPL:END%
+</div>%IF{"$'ENABLEQUALITYCHECK'='on'" then="$percntTMPL:P{\"qualitycheck\"}$percnt"}%%TMPL:END%
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
@@ -32,6 +32,18 @@
 }%%TMPL:END%
 %{</verbatim>}%
 
+%{<verbatim class="tml">}%
+%TMPL:DEF{"qualitycheck"}%%TMPL:PREV%%TMPL:P{"qualitycheck::notags"}%%TMPL:END%
+%{</verbatim>}%
+
+%{<verbatim class="tml">}%
+%TMPL:DEF{"qualitycheck::notags"}%%IF{
+  "'%BASEWEB%.%BASETOPIC%'/TopicType=~'ClassifiedTopic' and '%BASEWEB%.%BASETOPIC%'/Tag=''" 
+  then="<p class='foswikiWarningMessage'>This page needs tagging. Please add keywords describing what this page is about.</p>" 
+}%%TMPL:END%
+%{</verbatim>}%
+
+
 %META:FORM{name="Applications.ApplicationTopic"}%
 %META:FIELD{name="TopicType" title="TopicType" value="TopicView"}%
 %META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value=""}%

diff --git a/data/Applications/ClassificationApp/FinanceAndPlaningBudgetCategory.txt b/data/Applications/ClassificationApp/FinanceAndPlaningBudgetCategory.txt
diff --git a/...s/ClassificationApp/FinanceAndPlaning.txt → .../ClassificationApp/FinanceAndPlanning.txt b/...s/ClassificationApp/FinanceAndPlaning.txt → .../ClassificationApp/FinanceAndPlanning.txt
@@ -1,11 +1,12 @@
-%META:TOPICINFO{author="ProjectContributor" comment="autosave" date="1357565280" format="1.1" version="2"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1372239615" format="1.1" reprev="3" version="3"}%
 %META:TOPICPARENT{name="DepartmentsCategory"}%
 %DBCALL{"Applications.ClassificationApp.RenderCategory"}%
 
 %META:FORM{name="Applications.ClassificationApp.Category"}%
-%META:FIELD{name="TopicType" attributes="" title="TopicType" value="Category, CategorizedTopic"}%
-%META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="Finance  & Planing"}%
+%META:FIELD{name="TopicType" title="TopicType" value="Category, CategorizedTopic, WikiTopic"}%
+%META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="Finance  & Planning"}%
 %META:FIELD{name="Summary" attributes="" title="Summary" value=""}%
 %META:FIELD{name="Category" attributes="" title="Category" value="DepartmentsCategory"}%
 %META:FIELD{name="Icon" attributes="" title="Icon" value="coins.png"}%
 %META:FIELD{name="ImportedCategory" attributes="" title="<nop>ImportedCategory" value=""}%
+%META:TOPICMOVED{by="micha" date="1372239615" from="Applications/ClassificationApp.FinanceAndPlaning" to="Applications/ClassificationApp.FinanceAndPlanning"}%
diff --git a/data/Applications/ClassificationApp/FinanceAndPlanningBudgetCategory.txt b/data/Applications/ClassificationApp/FinanceAndPlanningBudgetCategory.txt
@@ -0,0 +1,14 @@
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1372239655" format="1.1" reprev="3" version="3"}%
+%META:TOPICPARENT{name="FinanceAndPlanning"}%
+%DBCALL{"Applications.ClassificationApp.RenderCategory"}%
+
+
+%META:FORM{name="Applications.ClassificationApp.Category"}%
+%META:FIELD{name="TopicType" title="TopicType" value="Category, CategorizedTopic, WikiTopic"}%
+%META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="Budget"}%
+%META:FIELD{name="Summary" attributes="" title="Summary" value=""}%
+%META:FIELD{name="Category" attributes="" title="Category" value="FinanceAndPlanning"}%
+%META:FIELD{name="Icon" attributes="" title="Icon" value="coins.png"}%
+%META:FIELD{name="ImportedCategory" attributes="" title="<nop>ImportedCategory" value=""}%
+%META:FIELD{name="Order" attributes="" title="Order" value=""}%
+%META:TOPICMOVED{by="micha" date="1372239641" from="Applications/ClassificationApp.FinanceAndPlaningBudgetCategory" to="Applications/ClassificationApp.FinanceAndPlanningBudgetCategory"}%
diff --git a/data/Applications/ClassificationApp/IntranetDirectory.txt b/data/Applications/ClassificationApp/IntranetDirectory.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="autosave" date="1357565280" format="1.1" version="5"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1380203236" format="1.1" reprev="8" version="8"}%
 %META:TOPICPARENT{name="WebHome"}%
 %DBCALL{"Applications.ClassificationApp.RenderCategory"}%
 

diff --git a/data/Applications/ClassificationApp/RenderCategory.txt b/data/Applications/ClassificationApp/RenderCategory.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="autosave" date="1357564984" format="1.1" version="14"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1380194836" format="1.1" reprev="15" version="15"}%
 %META:TOPICPARENT{name="TopicFunction"}%
 %TOC{depth="2"}%
 
@@ -24,11 +24,11 @@ See the CategoryTemplate.
      top="%IF{"defined CAT" then="%CAT%" else="%URLPARAM{"catname" default="%BASETOPIC%"}%"}%"
      exclude="%IF{"defined CAT" then="%CAT%" else="%URLPARAM{"catname" default="%BASETOPIC%"}%"}%"
      depth="2"
-     format="$trunctitle;$topic;$origweb$n"
+     format="($trunctitle);$topic;$origweb$n"
    }%"
   cols="%IF{"defined CLASSIFICATIONPLUGIN_NRCOLS" then="%CLASSIFICATIONPLUGIN_NRCOLS%" else="3"}%"
   split="\n"
-  pattern="(.*);(.*);(.*)"
+  pattern="\((.*)\);(.*);(.*)"
   sort="off"
   format="$percntDBCALL{\"$3.$2->RenderIndexItem\" TITLE=\"$1\"}$percnt"
 }%

diff --git a/data/Applications/ClassificationApp/RenderCategoryBrowser.txt b/data/Applications/ClassificationApp/RenderCategoryBrowser.txt
@@ -1,13 +1,14 @@
-%META:TOPICINFO{author="ProjectContributor" comment="autosave" date="1357565281" format="1.1" version="10"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1381661507" format="1.1" reprev="12" version="12"}%
 %META:TOPICPARENT{name="TopicFunction"}%
-%TOC{depth="2"}%
+ %TOC{depth="2"}%
 
 ---++ Documentation
 %STARTSECTION{name="documentation" type="section"}%
 
 ---+++++ Parameters
-   * TOP: node from where to start the category, defaults to 'TopCategory'
-   * THEWEB: where to search for categories, defaults to BASEWEB
+   * TOP: node from where to start the category, defaults to "TopCategory"
+   * THEWEB: where to search for categories, defaults to "%<nop>BASEWEB%"
+   * MODE: could be "edit", "select" or "browse", defaults to "browse"
 
 See also RenderCategoryEditor.
 
@@ -16,13 +17,21 @@ See also RenderCategoryEditor.
 ---++ Implementation
 <verbatim class="tml">
 %STARTINCLUDE%<!-- -->
-%DBCALL{"Applications.ClassificationApp.RenderCategoryEditor" 
-  THEWEB="%IF{"defined THEWEB" then="%THEWEB%" else="%BASEWEB%"}%" 
-  TOP="%IF{"defined TOP" then="%TOP%" else="TopCategory"}%"
-  THEFORMAT="browser"
-}%
-<style>.clsClearButton, .clsUndoButton {display:none}</style>
-<!-- -->%STOPINCLUDE%
+<div class="jqHierarchy clsBrowser" data-web="%THEWEB{default="%BASEWEB%"}%" data-root="%TOP{default="TopCategory"}%" data-mode="%MODE{default="browse"}%" data-display-counts="true" data-container=".jqHierarchyContainer">
+  <div class="jqHierarchyButtons">
+    <input type="text" size="28" class="foswikiInputField jqHierarchySearchField" style="display:none" /> 
+    %BUTTON{"%MAKETEXT{"Filter"}%" icon="find" class="simple jqHierarchySearchButton" title="%MAKETEXT{"Search for matching categories"}%"}% 
+    %IF{"'%USERNAME%' ingroup 'AdminGroup'" 
+      then="%BUTTON{"%MAKETEXT{"Refresh"}%" icon="arrow_refresh" class="jqHierarchyRefreshButton simple" title="%MAKETEXT{"Refresh hierarchy cache on the backend"}%"}%"
+    }%%CLEAR% 
+  </div>
+  <div class="jqHierarchyContainer jqUITooltip" data-theme='default' data-position="right" data-arrow="true"></div>
+</div>
+%JQREQUIRE{"jstree, ui::tooltip, blockui"}%<!-- -->
+%ADDTOZONE{"script" 
+  text="<script src='%PUBURLPATH%/System/ClassificationPlugin/jquery.hierarchy.js'></script>" 
+  requires="JQUERYPLUGIN::JSTREE, JQUERYPLUGIN::BLOCKUI"
+}%<!-- -->%STOPINCLUDE%
 </verbatim>
 
 ---++ Test

diff --git a/data/Applications/ClassificationApp/RenderCategoryEditor.txt b/data/Applications/ClassificationApp/RenderCategoryEditor.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="micha" comment="autosave" date="1365700493" format="1.1" version="15"}%
+%META:TOPICINFO{author="ProjectContributor" comment="autosave" date="1365700493" format="1.1" version="15"}%
 %META:TOPICPARENT{name="TopicFunction"}%
 %TOC{depth="2"}%
 

diff --git a/data/Applications/ClassificationApp/RenderClassifiedTopicView.txt b/data/Applications/ClassificationApp/RenderClassifiedTopicView.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="autosave" date="1357565281" format="1.1" version="17"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1380203917" format="1.1" reprev="18" version="18"}%
 %META:TOPICPARENT{name="TopicFunction"}%
 %TOC{depth="2"}%
 

diff --git a/data/Applications/ClassificationApp/RenderHierarchyAsJSON.txt b/data/Applications/ClassificationApp/RenderHierarchyAsJSON.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="autosave" date="1357565281" format="1.1" version="21"}%
+%META:TOPICINFO{author="ProjectContributor" comment="autosave" date="1378908925" format="1.1" version="22"}%
 %META:TOPICPARENT{name="TopicFunction"}%
 %TOC{depth="2"}%
 
@@ -87,25 +87,25 @@ $indent}"
 
 ---++ Editor format
 <verbatim class="tml">
-%STARTSECTION{"editor"}%<a href='#' class='$name clsCategory {depth:$depth}' title='$title' value='$name'><img src='$icon' alt='$percntENCODE{\"$title\" type=\"entity\"}$percnt' /><noautolink>$percntENCODE{\"$title\" type=\"quote\"}$percnt</noautolink></a>%ENDSECTION{"editor"}%
+%STARTSECTION{"editor"}%<a href='#' class='$name clsCategory {depth:$depth}' title='$percntENCODE{\"$summary\" type=\"entity\"}$percnt' value='$name'><img src='$icon' alt='$percntENCODE{\"$title\" type=\"entity\"}$percnt' /><noautolink>$percntENCODE{\"$title\" type=\"quote\"}$percnt</noautolink></a>%ENDSECTION{"editor"}%
 </verbatim>
 
 ---++ Leaf select format
 <verbatim class="tml">
 %STARTSECTION{"leafselect"}%$percntIF{\"$leafs>0 and $depth <= %depth%\"
   then=\"<img src='$icon' alt='$percntENCODE{\"$title\" type=\"entity\"}$percnt' /><noautolink>$percntENCODE{\"$title\" type=\"quote\"}$percnt</noautolink>\"
-  else=\"<a href='#' title='$title' value='$name' class='$name clsCategory {depth:$depth}'><img src='$icon' alt='$percntENCODE{\"$title\" type=\"entity\"}$percnt' /><noautolink>$percntENCODE{\"$title\" type=\"quote\"}$percnt</noautolink></a>\"
+  else=\"<a href='#' title='$percntENCODE{\"$summary\" type=\"entity\"}$percnt' value='$name' class='$name clsCategory {depth:$depth}'><img src='$icon' alt='$percntENCODE{\"$title\" type=\"entity\"}$percnt' /><noautolink>$percntENCODE{\"$title\" type=\"quote\"}$percnt</noautolink></a>\"
 }%%ENDSECTION{"leafselect"}%
 </verbatim>
 
 ---++ Solr facet format
 <verbatim class="tml">
-%STARTSECTION{"solrfacet"}%<a href='#' class='$name clsCategory solrFacetValue {depth:$depth}' title='$title' value='category:$name'><img src='$icon' alt='$percntENCODE{\"$title\" type=\"entity\"}$percnt' /><noautolink>$percntENCODE{\"$title\" type=\"quote\"}$percnt</noautolink></a> $percntIF{\"$count>0\" then=\"($count)\"}$percnt%ENDSECTION{"solrfacet"}%
+%STARTSECTION{"solrfacet"}%<a href='#' class='$name clsCategory solrFacetValue {depth:$depth}' title='$percntENCODE{\"$summary\" type=\"entity\"}$percnt' value='category:$name'><img src='$icon' alt='$percntENCODE{\"$title\" type=\"entity\"}$percnt' /><noautolink>$percntENCODE{\"$title\" type=\"quote\"}$percnt</noautolink></a> $percntIF{\"$count>0\" then=\"($count)\"}$percnt%ENDSECTION{"solrfacet"}%
 </verbatim>
 
 ---++ Solr facet format (no counts)
 <verbatim class="tml">
-%STARTSECTION{"solrfacet_nocounts"}%<a href='#' class='$name clsCategory solrFacetValue {depth:$depth}' title='$title' value='category:$name'><img src='$icon' alt='$percntENCODE{\"$title\" type=\"entity\"}$percnt' /><noautolink>$percntENCODE{\"$title\" type=\"quote\"}$percnt</noautolink></a>%ENDSECTION{"solrfacet_nocounts"}%
+%STARTSECTION{"solrfacet_nocounts"}%<a href='#' class='$name clsCategory solrFacetValue {depth:$depth}' title='$percntENCODE{\"$summary\" type=\"entity\"}$percnt' value='category:$name'><img src='$icon' alt='$percntENCODE{\"$title\" type=\"entity\"}$percnt' /><noautolink>$percntENCODE{\"$title\" type=\"quote\"}$percnt</noautolink></a>%ENDSECTION{"solrfacet_nocounts"}%
 </verbatim>
 
 ---++ Test

diff --git a/data/Applications/ClassificationApp/RenderIconSelector.txt b/data/Applications/ClassificationApp/RenderIconSelector.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="micha" comment="reprev" date="1357824864" format="1.1" reprev="7" version="7"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1357824864" format="1.1" reprev="7" version="7"}%
 %META:TOPICPARENT{name="TopicFunction"}%
 %TOC{depth="2"}%
 

diff --git a/data/Applications/ClassificationApp/RenderKnownTagsSolr.txt b/data/Applications/ClassificationApp/RenderKnownTagsSolr.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="autosave" date="1357565281" format="1.1" version="6"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1370592984" format="1.1" reprev="7" version="7"}%
 %META:TOPICPARENT{name="TopicFunction"}%
 %TOC{depth="2"}%
 
@@ -20,7 +20,7 @@ if installed for better performance.
 <verbatim class="tml">
 %STARTINCLUDE%%SOLRSEARCH{
   web="%IF{"defined THEWEB" then="%THEWEB%" else="%BASEWEB%"}%"
-  facetlimit="tag=%IF{"defined LIMIT" then="%LIMIT%" else="10"}%"
+  facetlimit="tag=%IF{"defined LIMIT and not isempty LIMIT" then="%LIMIT%" else="10"}%"
   field="none"
   facets="tag"
   facetprefix="%IF{"defined TAG" then="%TAG%"}%"
@@ -35,7 +35,7 @@ if installed for better performance.
 ---++ Test
 <noautolink>
 <pre>
-%DBCALL{"%TOPIC%"}%
+%DBCALL{"%TOPIC%" THEWEB="%URLPARAM{"theweb"}%" TAG="%URLPARAM{"thetag"}%"}%
 </pre>
 </noautolink>
 

diff --git a/data/Applications/ClassificationApp/RenderSolrTagCloud.txt b/data/Applications/ClassificationApp/RenderSolrTagCloud.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="micha" comment="reprev" date="1366028972" format="1.1" reprev="29" version="30"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1381922633" format="1.1" reprev="29" version="31"}%
 %META:TOPICPARENT{name="TopicFunction"}%
 %TOC{depth="2"}%
 
@@ -119,7 +119,9 @@ jQuery(function($) {
 </verbatim>
 
 ---++ Test
+%STARTSECTION{"test"}%
 %DBCALL{"%TOPIC%" THEWEB="%URLPARAM{"theweb"}%"}%
+%ENDSECTION{"test"}%
 
 %DBCALL{"Applications.RenderFunctionCallers"}%