Changeset 1182

trunk/ClassificationPlugin/data/Applications/ClassificationApp/CategorizedTopic.txt

-                      r1178
+                      r1182
 %META:TOPICINFO{author="ProjectContributor" date="1202207995" format="1.1" version="$Rev$"}%
+%META:TOPICINFO{author="ProjectContributor" date="1228410891" format="1.1" reprev="1.2" version="$Rev$"}%
 %META:TOPICPARENT{name="TopicType"}%
 ---+!! %TOPIC%
 …
 ---++ Create a new topic %IFDEFINED{"%CAT%" then="in <nop>%CAT%'" glue="off"}%
 %STARTSECTION{"factory"}%
+<div class="twikiPageForm">
+%TWISTY{link="%BUTTON{"%IF{"defined 'LABEL'" then="%LABEL%" else="Create topic"}%" icon="add"}%%CLEAR%"}%
+<div class="twikiFormSteps">
 <form action="%SCRIPTURLPATH{"edit"}%/%BASEWEB%/" method="post">
 <input type="hidden" name="topicparent" value="%BASEWEB%.%BASETOPIC%" />
 …
 <input type="hidden" name="Summary" value="" />
 <input type="hidden" name="Category" value="%IFDEFINED{"%CAT%" then="%CAT%" else="TopCategory"}%" />
+<table>
+<tr>
+  <th class="foswikiFirstCol">Name:</th>
+  <td><input class="twikiInputField" type="text" name="topic" size="40" /></td>
+</tr>
+<tr>
+  <th class="foswikiFirstCol">&nbsp;</th>
+  <td style="padding-top:1em">
+    <input type="submit" class="twikiSubmit natOkButton" value="Submit" />
+    <input type="reset" class="foswikiButton natCancelButton" value="Reset" />
+  </td>
+</tr>
+</table>
+<div class="twikiFormStep">
+  <h3>Name:</h3>
+  <input class="twikiInputField" type="text" name="topic" size="40" />
+</div>
+<div class="twikiFormStep twikiFormButtons twikiFormLast">
+    %BUTTON{"%MAKETEXT{"Submit"}%" type="submit" icon="tick"}%
+    %CLEAR%
+</div>
 </form>
+</div>%ENDSECTION{"factory"}%
+</div>
+%ENDTWISTY%
+%ENDSECTION{"factory"}%
 %STOPINCLUDE%
 …
 %META:FORM{name="Applications.TopicType"}%
 %META:FIELD{name="TopicType" attributes="" title="TopicType" value="DocuTopic, TopicType, TWikiForm"}%
+%META:FIELD{name="TopicType" title="TopicType" value="DocuTopic, TopicType, TWikiForm"}%
 %META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value=""}%
 %META:FIELD{name="Inheritance" attributes="" title="Inheritance" value="ApplicationTopic"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/CategorizedTopicRenderIndexItem.txt

-                      r482
+                      r1182
 ---++ Implementation
 <verbatim>
 %STARTINCLUDE%<!-- ClassifiedTopicRenderIndexItem -->
+<verbatim class="tml">
+%STARTINCLUDE%<!-- CategorizedTopicRenderIndexItem -->
 %~~ DBQUERY{topic="%OBJECT%"
 ~~~   format="<div class='clsIndexItem clsTopicItem clsCategorizedTopicItem'>[[$web.$topic][$expand(TopicTitle or topic)]]
 *~~     &nbsp;$percntREDDOT{$web.$topic}$percnt
+~~~   format="<div class='clsIndexItem clsTopicItem clsCategorizedTopicItem'>[[$web.$topic][$expand(topictitle)]]
+~~~     $percntREDDOT{\"$web.$topic\"}$percnt
 ~~~     <div class='clsTopicInfo'>$expand(Summary and ', ')
+~~~      <span class='clsAuthorDateInfo'>last modified $formatTime(info.date)
+~~~        by $percntSPACEOUT{$expand(info.author)}$percnt</div>
+~~~     </span></div>
+~~~      <span class='clsAuthorDateInfo'>
+~~~        by $percntGETTOPICTITLE{\"
+~~~             $percntUSERINFO{\"$expand(info.author)\"
+~~~               format=\"$wikiusername\"
+~~~             }$percnt\"
+~~~           }$percnt,
+~~~           $formatTime(info.date)
+~~~     </span></div></div>
 ~~~   "
 ~~~ }%
 <!-- //ClassifiedTopicRenderIndexItem -->%STOPINCLUDE%
+<!-- //CategorizedTopicRenderIndexItem -->%STOPINCLUDE%
 </verbatim>

trunk/ClassificationPlugin/data/Applications/ClassificationApp/CategorizedTopicViewTemplate.txt

-                      r1178
+                      r1182
 %META:TOPICPARENT{name="TopicView"}%
 %TMPL:INCLUDE{"view"}%
+%TMPL:DEF{"textcontent"}%<div class="foswikiTopic">
+%DBCALL{"Applications.ClassificationApp.RenderClassifiedTopicView"}%
+%TEXT%
+</div>%TMPL:END% %{
+%RED%Note, this is only a view template.%ENDCOLOR%
+See also: TopicView
+}%
+%TMPL:DEF{"beforetext"}%%DBCALL{"Applications.ClassificationApp.RenderClassifiedTopicView"}%<hr class="clsTopicInfoSep" />%TMPL:END%
 %TMPL:DEF{"form"}%%TMPL:END%
 %META:FORM{name="Applications.ApplicationTopic"}%
 %META:FIELD{name="TopicType" attributes="" title="TopicType" value="TopicView"}%
+%META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="CategorizedTopicViewTemplate"}%
 %META:FIELD{name="Summary" attributes="" title="Summary" value="Display a categorized topic"}%
 %META:FIELD{name="TWikiApplication" attributes="" title="TWikiApplication" value="ClassificationApp"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/Category.txt

-                      r482
+                      r1182
 %META:TOPICINFO{author="ProjectContributor" date="1214469138" format="1.1" reprev="1.6" version="$Rev$"}%
 %META:TOPICPARENT{name="TopicType"}%
 ---+!! [[%WEB%.%TOPIC%][%TOPICTITLE%]]
+---+!! [[%BASEWEB%.%BASETOPIC%][%TOPICTITLE%]]
 %FORMFIELD{"Summary"}%
 …
 Categories themselves are CategorizedTopics thus implementing a hierarchy.
 See also: See CategorizedTopic, ClassifiedTopic, TaggedTopic, CategoryTemplate
+See also: See CategorizedTopic, ClassifiedTopic, TaggedTopic, CategoryTemplate, CategoryViewTemplate, CategoryEditTemplate
 %ENDSECTION{name="documentation" type="section"}%
 …
 %STARTINCLUDE%<!-- category -->
 %IFDEFINEDTHEN{"%URLPARAM{"name"}%" glue="off"}%
+%IFDEFINEDTHEN{"%URLPARAM{"catname"}%" glue="off"}%
 ~~~ <div class="clsTopicInfo">
 ~~~ <noautolink>
 %~~ CATINFO$nop{
 ~~~   cat="%URLPARAM{"name"}%"
+~~~   cat="%URLPARAM{"catname"}%"
 ~~~   format="<h1>$link
 ~~~     $percntIFDEFINED{\"$summary\"
 …
 ~~~ </div>
 <hr class="clsTopicInfoSep" />
+%$nopDBCALL{"Applications.ClassificationApp.RenderCategory" CAT="%URLPARAM{"name"}%"}%
+%ELSEDEFINED%
+---+!! %TOPIC%
+%FORMFIELD{"Summary"}%
+%$nopDBCALL{"Applications.ClassificationApp.RenderCategory" CAT="%URLPARAM{"catname"}%"}%
+%ELSEDEFINED%<!-- else category -->
+%$nopDBCALL{"Applications.ClassificationApp.RenderClassifiedTopicView"}%
 %$nopDBCALL{"Applications.ClassificationApp.RenderCategoryFactory"}%
 %FIDEFINED%
 <!-- category -->%STOPINCLUDE%
+<!-- //category -->%STOPINCLUDE%
 ---++ %TOPIC% form

trunk/ClassificationPlugin/data/Applications/ClassificationApp/CategoryEditTemplate.txt

-                      r482
+                      r1182
 %TMPL:DEF{"contenttitle"}%<!-- contenttitle -->
 %IFDEFINEDTHEN{"%IFEXISTS{"%WEB%.%TOPIC%"}%" as="1"}%
 <h1>[[%WEB%.%TOPIC%][%WEBLINK{format="$web"}%.%TOPIC%]] (%MAKETEXT{"edit category"}%)</h1>
+<h1 class="patternTemplateTitle">%TOPIC% (%MAKETEXT{"edit category"}%)</h1>
 %ELSEDEFINED%
 <h1><nop>%WEBLINK{format="$web"}%.%TOPIC% (%MAKETEXT{"new classified topic"}%)</h1>
+<h1 class="patternTemplateTitle"><nop>%TOPIC% (%MAKETEXT{"new classified topic"}%)</h1>
 %FIDEFINED%
 <!-- //contenttitle -->%TMPL:END%
 %TMPL:DEF{"topicinfo"}%<!-- topicinfo -->
+%TMPL:DEF{"topicmeta"}%<!-- topicmeta -->
 <literal>
 <div class="natEditTopicInfo">
 …
 </div>
 </literal>
 <!-- //topicinfo -->%TMPL:END%
+<!-- //topicmeta -->%TMPL:END%
 %TMPL:DEF{"formfields"}%<!-- formfields -->
 %TAB{"Categories" after="fixHeightOfPane()"}%
 …
     %DBCALL{"Applications.ClassificationApp.RenderIconSelector"
       VALUE="%URLPARAM{"Icon" default="%FORMFIELD{topic="%BASEWEB%.%BASETOPIC%" "Icon"}%"}%"
+      SOURCE="%CLASSIFICATIONPLUGIN_ICONSET%"
     }%
   </td>
 …
 %META:FORM{name="Applications.ApplicationTopic"}%
 %META:FIELD{name="TopicType" attributes="" title="TopicType" value="TopicView"}%
 %META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value=""}%
+%META:FIELD{name="TopicType" title="TopicType" value="TopicView"}%
+%META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="CategoryEditTemplate"}%
 %META:FIELD{name="Summary" attributes="" title="Summary" value="Editor for category topics, <nop>NatSkin version"}%
 %META:FIELD{name="TWikiApplication" attributes="" title="TWikiApplication" value="ClassificationApp"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/CategoryRenderIndexItem.txt

-                      r482
+                      r1182
 ---++ Implementation
 <verbatim>
+<verbatim class="tml">
 %STARTINCLUDE%<!-- CategoryRenderIndexItem -->
 %~~ CATINFO{cat="%DBQUERY{topic="%OBJECT%" format="$topic"}%"
 …
 ~~~       $link
 ~~~       $percntIFDEFINED{\"$leafs\" as=\"0\" then=\"\" else=\"&nbsp;($leafs)\"}$percnt
-*~~       &nbsp;$percntREDDOT{$web.$topic}$percnt
 ~~~       <div class='clsTopicInfo'>$summary</div>
 ~~~       <div class='clsSubCategories'>$children&nbsp;$more</div>
+~~~       <div class='clsSubCategories'>$children $more</div>
 *~~     </div>
 ~~~  "

trunk/ClassificationPlugin/data/Applications/ClassificationApp/CategoryViewTemplate.txt

-                      r1178
+                      r1182
 %META:TOPICPARENT{name="TopicView"}%
 %TMPL:INCLUDE{"view"}%
+%TMPL:DEF{"textcontent"}%<div class="foswikiTopic">
+%DBCALL{"Applications.ClassificationApp.RenderClassifiedTopicView"}%
+<hr class="clsTopicInfoSep" />
+%TEXT%
+</div>%TMPL:END%
+%TMPL:DEF{"beforetext"}%%DBCALL{"Applications.ClassificationApp.RenderClassifiedTopicView"}%<hr class="clsTopicInfoSep" />%TMPL:END%
 %TMPL:DEF{"form"}%%TMPL:END%
-%TMPL:DEF{"attachments"}%%TMPL:END%
 %META:FORM{name="Applications.ApplicationTopic"}%
 %META:FIELD{name="TopicType" attributes="" title="TopicType" value="TopicView"}%
+%META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="CategoryViewTemplate"}%
 %META:FIELD{name="Summary" attributes="" title="Summary" value="View for Categories"}%
 %META:FIELD{name="TWikiApplication" attributes="" title="TWikiApplication" value="ClassificationApp"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/ClassifiedTopic.txt

-                      r1178
+                      r1182
 %META:TOPICINFO{author="ProjectContributor" date="1207038788" format="1.1" version="$Rev$"}%
+%META:TOPICINFO{author="ProjectContributor" date="1228410698" format="1.1" version="$Rev$"}%
 %META:TOPICPARENT{name="TopicType"}%
 ---+!! %TOPIC%
 …
 <h2>Create a new topic %IFDEFINED{"%URLPARAM{"cat" default="%CAT%"}%" then=" in '[[%BASEWEB%.$test]]'" glue="off"}%</h2>
 %STARTSECTION{"factory"}%<!-- factory -->
+<style type="text/css">
+.twikiPageForm .foswikiFirstCol {
+  width:8em;
+}
+.twikiPageForm .twikiInputField,
+.twikiPageForm .twikiSelectField {
+  width:25em;
+}
+</style>
+<div class="twikiPageForm">
+%TWISTY{link="%BUTTON{"%IF{"defined 'LABEL'" then="%LABEL%" else="Create topic"}%" icon="add"}%%CLEAR%"}%
 <form action="%SCRIPTURLPATH{"edit"}%/%BASEWEB%/" method="post">
 <input type="hidden" name="topicparent" value="%BASEWEB%.%HOMETOPIC%" />
 …
 <input type="hidden" name="Summary" value="" />
 <input type="hidden" name="Tag" value="" />
+<table>
+<tr>
+  <th class="foswikiFirstCol">%IFDEFINED{"%LABEL%" then="$test" else="Name"}%:</th>
+  <td><input class="twikiInputField" type="text" name="topic" size="40" />
+  &nbsp;%TOGGLE{target=".toggleMe" text="Advanced Options"}%
+  </td>
+</tr>
+<tr class="toggleMe" style="display:none">
+  <th class="foswikiFirstCol">
+    <div>Category:</div>
+  </th>
+  <td>
+    <div>
+      <select class="twikiSelectField" name="Category">
+        <option value='' %IFDEFINED{"%URLPARAM{"cat" default="%CAT%"}%" as="" then=" selected"}%>ALL</option>
+<div class="twikiFormSteps">
+  <div class="twikiFormStep">
+    <h3>Name:</h3>
+    <input class="twikiInputField" type="text" name="topic" size="40" />
+    %TWISTYBUTTON{showlink="Show advanced options" hidelink="Hide advanced options" id="advancedopts"}%
+  </div>
+  %TWISTYTOGGLE{id="advancedopts"}%
+  <div class="twikiFormStep">
+    <h3>Category:</h3>
+    <select class="twikiSelectField" name="Category">
+      <option value='' %IFDEFINED{"%URLPARAM{"cat" default="%CAT%"}%" as="" then=" selected"}%>ALL</option>
 %~~     HIERARCHY{
 ~~~       web="%BASEWEB%"
 …
 ~~~         }$percnt>$indent $title</option>$n$children"
 ~~~     }%
+      </select>
+    </div>
+  </td>
+</tr>
+<tr class="toggleMe" style="display:none">
+  <th class="foswikiFirstCol">
+    <div>Template:</div>
+  </th>
+  <td><div>
+    </select>
+  </div>
+  <div class="twikiFormStep">
+    <h3>Template:</h3>
     <select class="twikiSelectField" name="templatetopic">
       <option value="Applications.ClassificationApp.ClassifiedTopicTemplate">DEFAULT</option>
 …
 ~~~   }%
     </select>
+    </div>
+  </td>
+</tr>
+<tr>
+  <th class="foswikiFirstCol">&nbsp;</th>
+  <td>
+    <input type="submit" class="twikiSubmit natOkButton" value="Submit" />
+    <input type="reset" class="foswikiButton natAltButton" value="Reset" />
+    <input type="button" class="foswikiButton natCancelButton" value="Cancel" onclick="window.location.href='%SCRIPTURLPATH{"view"}%/%BASEWEB%/%HOMETOPIC%';" />
+  </td>
+</tr>
+</table>
+  </div>
+  %ENDTWISTYTOGGLE%
+  <div class="twikiFormStep twikiFormButtons twikiFormLast">
+    %BUTTON{"%MAKETEXT{"Submit"}%" type="submit" icon="tick"}%
+    %CLEAR%
+  </div>
+</div>
 </form>
+</div>
+%ENDTWISTY%
 <!-- //factory -->%ENDSECTION{"factory"}%
 <!-- //classified topic -->%STOPINCLUDE%
 …
 %META:FORM{name="Applications.TopicType"}%
 %META:FIELD{name="TopicType" attributes="" title="TopicType" value="DocuTopic, TopicType, TWikiForm"}%
+%META:FIELD{name="TopicType" title="TopicType" value="DocuTopic, TopicType, TWikiForm"}%
 %META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value=""}%
 %META:FIELD{name="Inheritance" attributes="" title="Inheritance" value="CategorizedTopic, TaggedTopic"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/ClassifiedTopicEditTemplate.txt

-                      r1090
+                      r1182
 %TMPL:DEF{"contenttitle"}%<!-- contenttitle -->
 %IFDEFINEDTHEN{"%IFEXISTS{"%WEB%.%TOPIC%"}%" as="1"}%
 <h1>[[%WEB%.%TOPIC%][%WEBLINK{format="$web"}%.%TOPIC%]] (%MAKETEXT{"edit classified topic"}%)</h1>
+<h1 class="patternTemplateTitle">%TOPIC% (%MAKETEXT{"edit classified topic"}%)</h1>
 %ELSEDEFINED%
 <h1><nop>%WEBLINK{format="$web"}%.%TOPIC% (%MAKETEXT{"new classified topic"}%)</h1>
+<h1 class="patternTemplateTitle"><nop>%TOPIC% (%MAKETEXT{"new classified topic"}%)</h1>
 %FIDEFINED%
 <!-- //contenttitle -->%TMPL:END%
 %TMPL:DEF{"topicinfo"}%<!-- topicinfo -->
+%TMPL:DEF{"topicmeta"}%<!-- topicmeta -->
 <literal>
   <table cellspacing="0" cellpadding="0" class="twikiTable">
+  <table>
   <tr>
     <th class="foswikiFirstCol">Title:</th>
+    <th class="twikiFirstCol">Title:</th>
     <td><input class="twikiInputField" type="text" name="TopicTitle" size="80" value="%URLPARAM{"TopicTitle" default="%TOPICTITLE%"}%"/></td>
   </tr>
   <tr>
     <th class="foswikiFirstCol">Summary:</th>
+    <th class="twikiFirstCol">Summary:</th>
     <td><input class="twikiInputField" type="text" name="Summary" size="80" value="%URLPARAM{"Summary" default="%FORMFIELD{topic="%BASEWEB%.%BASETOPIC%" "Summary"}%"}%" /></td>
   </tr>
   </table>
-  <hr />
 </literal>
 <!-- //topicinfo -->%TMPL:END%
+<!-- //topicmeta -->%TMPL:END%
 %TMPL:DEF{"formfields"}%<!-- formfields -->
 %TAB{"Categories" after="fixHeightOfPane()"}%
 …
 %META:FORM{name="Applications.ApplicationTopic"}%
 %META:FIELD{name="TopicType" attributes="" title="TopicType" value="TopicView"}%
 %META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value=""}%
+%META:FIELD{name="TopicType" title="TopicType" value="TopicView"}%
+%META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="ClassifiedTopicEditTemplate"}%
 %META:FIELD{name="Summary" attributes="" title="Summary" value="Editor for classified topics, <nop>NatSkin version"}%
 %META:FIELD{name="TWikiApplication" attributes="" title="TWikiApplication" value="ClassificationApp"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/ClassifiedTopicRenderIndexItem.txt

-                      r482
+                      r1182
 %META:TOPICINFO{author="ProjectContributor" date="1206371854" format="1.1" reprev="1.1" version="$Rev$"}%
+%META:TOPICINFO{author="ProjectContributor" date="1227786459" format="1.1" reprev="1.2" version="$Rev$"}%
 %META:TOPICPARENT{name="TopicFunction"}%
 ---+!! Function: %TOPIC%
 …
 ---++ Implementation
 <verbatim>
+<verbatim class="tml">
 %STARTINCLUDE%<!-- ClassifiedTopicRenderIndexItem -->
 %~~ DBQUERY{topic="%OBJECT%"
 ~~~   format="<div class='clsIndexItem clsTopicItem clsCassifiedTopicItem'>[[$web.$topic][$expand(TopicTitle or topic)]]
 *~~     &nbsp;$percntREDDOT{$web.$topic}$percnt
+~~~   format="<div class='clsIndexItem clsTopicItem clsCassifiedTopicItem'>[[$web.$topic][$expand(topictitle)]]
+~~~     $percntREDDOT{\"$web.$topic\"}$percnt
 ~~~     <div class='clsTopicInfo'>$expand(Summary and ', ')
+~~~      <span class='clsAuthorDateInfo'>last modified $formatTime(info.date)
+~~~        by $percntSPACEOUT{$expand(info.author)}$percnt</div>
+~~~     </span></div>
+~~~      <span class='clsAuthorDateInfo'>
+~~~        by $percntGETTOPICTITLE{\"
+~~~             $percntUSERINFO{\"$expand(info.author)\"
+~~~               format=\"$wikiusername\"
+~~~             }$percnt\"
+~~~           }$percnt,
+~~~           $formatTime(info.date)
+~~~     </span></div></div>
 ~~~   "
 ~~~ }%
 …
 %META:FORM{name="Applications.ApplicationTopic"}%
 %META:FIELD{name="TopicType" attributes="" title="TopicType" value="DocuTopic, TopicFunction"}%
+%META:FIELD{name="TopicType" title="TopicType" value="DocuTopic, TopicFunction"}%
 %META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value=""}%
 %META:FIELD{name="Summary" attributes="" title="Summary" value="Render a summary for a ClassifiedTopic in a category index"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/ClassifiedTopicViewTemplate.txt

-                      r1178
+                      r1182
 %META:TOPICPARENT{name="TopicView"}%
 %TMPL:INCLUDE{"view"}%
+%TMPL:DEF{"textcontent"}%<div class="foswikiTopic">
+%DBCALL{"Applications.ClassificationApp.RenderClassifiedTopicView"}%
+<hr class="clsTopicInfoSep" />
+%TEXT%
+</div>%TMPL:END% %{
+%RED%Note, this is only a view template.%ENDCOLOR%
+See also: TopicView
+}%
+%TMPL:DEF{"beforetext"}%%DBCALL{"Applications.ClassificationApp.RenderClassifiedTopicView"}%<hr class="clsTopicInfoSep" />%TMPL:END%
 %TMPL:DEF{"form"}%%TMPL:END%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/IconSet.txt

-                      r482
+                      r1182
 %META:FORM{name="Applications.ApplicationTopic"}%
 %META:FIELD{name="TopicType" attributes="" title="TopicType" value="ApplicationTopic"}%
+%META:FIELD{name="TopicType" title="TopicType" value="ApplicationTopic"}%
 %META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="IconSet"}%
 %META:FIELD{name="Summary" attributes="" title="Summary" value=""}%
 …
 %META:FILEATTACHMENT{name="ipod_cast.png" attachment="ipod_cast.png" attr="h" comment="" date="1214251645" path="ipod_cast.png" size="711" stream="ipod_cast.png" tmpFilename="/var/tmp/CGItemp54156" user="ProjectContributor" version="1"}%
 %META:FILEATTACHMENT{name="presentation.png" attachment="presentation.png" attr="h" comment="" date="1214252360" path="presentation.png" size="715" stream="presentation.png" tmpFilename="/var/tmp/CGItemp53974" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="pencil.png" attachment="pencil.png" attr="h" comment="" date="1221736546" path="pencil.png" size="450" stream="IO::File=GLOB(0xab3c9bc)" tmpFilename="" user="ProjectContributor" version="1"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/NatSkinCategorizedTopicViewTemplate.txt

-                      r482
+                      r1182
 %META:TOPICPARENT{name="TopicView"}%
 %TMPL:INCLUDE{"view"}%
+%TMPL:DEF{"content"}%
+%DBCALL{"Applications.ClassificationApp.RenderClassifiedTopicView"}%
+<hr class="clsTopicInfoSep" />
+%TMPL:DEF{"content"}%%DBCALL{"Applications.ClassificationApp.RenderClassifiedTopicView"}%<hr class="clsTopicInfoSep" />
 %TEXT%
 %TMPL:END% %{

trunk/ClassificationPlugin/data/Applications/ClassificationApp/NatSkinCategoryEditTemplate.txt

-                      r482
+                      r1182
 %FIDEFINED%
 <!-- //contenttitle -->%TMPL:END%
 %TMPL:DEF{"topicinfo"}%<!-- topicinfo -->
+%TMPL:DEF{"topicmeta"}%<!-- topicmeta -->
 <literal>
 <div class="natEditTopicInfo">
 …
 </div>
 </literal>
 <!-- //topicinfo -->%TMPL:END%
+<!-- //topicmeta -->%TMPL:END%
 %TMPL:DEF{"formfields"}%<!-- formfields -->
 %TAB{"Categories" after="fixHeightOfPane()"}%
+<literal>
 <div class="natTopicEditForm">
   %DBCALL{"Applications.ClassificationApp.RenderEditCategoryBrowser"
 …
   }%
 </div>
+</literal>
 %ENDTAB%
 <!-- //formfields -->%TMPL:END%
 %TMPL:DEF{"settings"}%<!-- settings -->
 <div class="natSubmitOptions">
+<literal>
 <table>
 <tr>
 …
     %DBCALL{"Applications.ClassificationApp.RenderIconSelector"
       VALUE="%URLPARAM{"Icon" default="%FORMFIELD{topic="%BASEWEB%.%BASETOPIC%" "Icon"}%"}%"
+      SOURCE="%CLASSIFICATIONPLUGIN_ICONSET%"
     }%
   </td>
 </tr>
 </table>
+</literal>
 </div>%TMPL:END%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/NatSkinCategoryViewTemplate.txt

-                      r482
+                      r1182
 %META:TOPICPARENT{name="TopicView"}%
 %TMPL:INCLUDE{"view"}%
+%TMPL:DEF{"content"}%
+%DBCALL{"Applications.ClassificationApp.RenderClassifiedTopicView"}%
+<hr class="clsTopicInfoSep" />
+%TMPL:DEF{"content"}%%DBCALL{"Applications.ClassificationApp.RenderClassifiedTopicView"}%<hr class="clsTopicInfoSep" />
 %TEXT%
 %TMPL:END%
 …
 %META:FORM{name="Applications.ApplicationTopic"}%
 %META:FIELD{name="TopicType" attributes="" title="TopicType" value="TopicView"}%
+%META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="NatSkinCategoryViewTemplate"}%
 %META:FIELD{name="Summary" attributes="" title="Summary" value="View for Categories, <nop>NatSkin version"}%
 %META:FIELD{name="TWikiApplication" attributes="" title="TWikiApplication" value="ClassificationApp"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/NatSkinClassifiedTopicEditTemplate.txt

-                      r482
+                      r1182
 %FIDEFINED%
 <!-- //contenttitle -->%TMPL:END%
 %TMPL:DEF{"topicinfo"}%<!-- topicinfo -->
+%TMPL:DEF{"topicmeta"}%<!-- topicmeta -->
 <literal>
 <div class="natEditTopicInfo">
 …
 </div>
 </literal>
 <!-- //topicinfo -->%TMPL:END%
+<!-- //topicmeta -->%TMPL:END%
 %TMPL:DEF{"formfields"}%<!-- formfields -->
 %TAB{"Categories" after="fixHeightOfPane()"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/NatSkinClassifiedTopicViewTemplate.txt

-                      r482
+                      r1182
 %META:TOPICPARENT{name="TopicView"}%
 %TMPL:INCLUDE{"view"}%
+%TMPL:DEF{"content"}%
+%DBCALL{"Applications.ClassificationApp.RenderClassifiedTopicView"}%
+<hr class="clsTopicInfoSep" />
+%TMPL:DEF{"content"}%%DBCALL{"Applications.ClassificationApp.RenderClassifiedTopicView"}%<hr class="clsTopicInfoSep" />
 %TEXT%
 %TMPL:END% %{

trunk/ClassificationPlugin/data/Applications/ClassificationApp/NatSkinSearchViewTemplate.txt

-                      r482
+                      r1182
 %META:FORM{name="Applications.ApplicationTopic"}%
 %META:FIELD{name="TopicType" attributes="" title="TopicType" value="TopicView"}%
 %META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value=""}%
+%META:FIELD{name="TopicType" title="TopicType" value="TopicView"}%
+%META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="NatSkinSearchViewTemplate"}%
 %META:FIELD{name="Summary" attributes="" title="Summary" value="View for natsearch"}%
 %META:FIELD{name="TWikiApplication" attributes="" title="TWikiApplication" value="BusinessWarehouseApp"}%
+%META:FIELD{name="TWikiApplication" attributes="" title="TWikiApplication" value="ClassificationApp"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/OrgChart.txt

-                      r482
+                      r1182
 %META:TOPICINFO{author="ProjectContributor" date="1214237774" format="1.1" reprev="1.3" version="$Rev$"}%
 %META:TOPICPARENT{name="BusinessStructure"}%
+   * from <nop>IntranetDirectory to <nop>IntranetDirectory =
+     %DISTANCE{from="IntranetDirectory" to="IntranetDirectory"}% ...
+     should be 0
+   * from <nop>IntranetDirectory to <nop>BusinessStructure =
+     %DISTANCE{from="IntranetDirectory" to="BusinessStructure"}% ...
+     should be 2
+   * from <nop>BusinessStructure to <nop>IntranetDirectory =
+     %DISTANCE{from="BusinessStructure" to="IntranetDirectory"}% ...
+     should be -2
+   * from <nop>IntranetDirectory to <nop>%TOPIC% =
+     %DISTANCE{from="IntranetDirectory" to="%TOPIC%"}% ...
+     should be 3
+   * from <nop>%TOPIC% to <nop>IntranetDirectory =
+     %DISTANCE{from="%TOPIC%" to="IntranetDirectory"}% ...
+     should be -3
+   * from <nop>TestCategory8 to <nop>%TOPIC% =
+     %DISTANCE{from="TestCategory8" to="%TOPIC%"}% ...
+     should be 1
+   * from <nop>%TOPIC% to <nop>TestCategory8 =
+     %DISTANCE{from="%TOPIC%" to="TestCategory8"}% ...
+     should be -1
+   * from <nop>%TOPIC% to <nop>%TOPIC% =
+     %DISTANCE{from="%TOPIC%" to="%TOPIC%"}% ...
+     should be 0
+   * from <nop>%TOPIC% to <nop>TestTopic =
+     '%DISTANCE{from="%TOPIC%" to="TestTopic"}%' ...
+     should be ''
+   * from TestTopic0 to %TOPIC% =
+     %DISTANCE{from="TestTopic0" to="%TOPIC%"}% ...
+     should be
 …
 %META:FIELD{name="Summary" attributes="" title="Summary" value="This is a test topic with a nop  in it"}%
 %META:FIELD{name="Category" attributes="" title="Category" value="BusinessStructure, TestCategory8"}%
-%META:TOPICMOVED{by="micha" date="1214237774" from="Applications/ClassificationApp.TestCategorizedTopic1" to="Applications/ClassificationApp.OrgChart"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/RenderAllCategories.txt

r482	r1182
18	18
19	19	---++ Implementation
20		<verbatim>
	20	<verbatim class="tml">
21	21	%STARTINCLUDE%<!-- render all categories -->
22	22	<noautolink>

trunk/ClassificationPlugin/data/Applications/ClassificationApp/RenderCategory.txt

-                      r672
+                      r1182
 ---+++++ Parameters
    * CAT: category to be rendered, defaults to BASETOPIC
+   * KEYWORDS: keywords to filter for
+   * TAG: tags to be searching for in this category
+   * FORM: display the search form on or of, defaults to on
 %ENDSECTION{name="documentation" type="section"}%
 ---++ Implementation
 <verbatim>
+<verbatim class="tml">
 %STARTINCLUDE%<!-- rendercategory -->
 <noautolink>
+~~~ <form id="filterForm" action="%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%"
+~~~   style="%IFDEFINED{"%FORM%" as="off" then="display:none"}%">
+~~~ <input type="hidden" name="catname" value="%URLPARAM{"catname"}%" />
+~~~ <div class="clsFilterForm twikiFormSteps">
+~~~   <div class="twikiFormStep">
+~~~     <h4>Search</h4>
+~~~     <input type="text" name="search" value="%URLPARAM{"search" default="%IFDEFINED{"%KEYWORDS%"}%"}%" size="20" class="twikiInputField" />
+~~~   </div>
+~~~   <div class="twikiFormStep">
+~~~     <h4>Tag</h4>
+~~~     <select name="tag" style="max-width:20em" onchange="this.form.submit()">
+~~~       <option value='' %URLPARAM{"tag" default="%IFDEFINED{"%TAG%"}%" as="" then=" selected"}%>ALL</option>
+%~~       CATINFO{cat="%IFDEFINED{"%CAT%" then="%CAT%" else="%BASETOPIC%"}%"
+~~~         format="
+*~~           $percntFORMATLIST{\"$tags\"
+~~~             format=\"<option$dollarmarker>$1</option>\"
+~~~             selection=\"%URLPARAM{"tag" default="%IFDEFINED{"%TAG%"}%"}%\"
+~~~           }$percnt"
+~~~       }%
+~~~     </select>
+~~~   </div>
+~~~   <input type="submit" style="display:none" />
+~~~   <br clear="both" />
+~~~ </div>
+~~~ </form>
 %~~ MAKEINDEX{"
 *~~
 …
 *~~   "
 ~~~   cols="%IFDEFINED{"%CLASSIFICATIONPLUGIN_NRCOLS%" then="$test" else="3"}%"
-~~~   header="<h2>Categories</h2>
-~~~     There
-~~~     $percntIFDEFINED{\"$count\" as=\"1\"
-~~~       then=\" is one subcategory \"
-~~~       else=\" are $count subcategories \"
-~~~     }$percnt in this category."
 ~~~   split="\n"
 ~~~   pattern="(.*);(.*);(.*)"
+~~~   sort="nocase"
 ~~~   format="$percntDBCALL{\"$3.$2->RenderIndexItem\"}$percnt"
 ~~~ }%
 %~~ MAKEINDEX{"
 *~~
 %~~    DBQUERY{
 ~~~      "!(TopicType=~'\bCategory\b') AND
+~~~        ('%IFDEFINED{"%CAT%" then="%CAT%" else="%BASETOPIC%"}%' DISTANCE topic) = 1"
+~~~        ('%IFDEFINED{"%CAT%" then="%CAT%" else="%BASETOPIC%"}%' DISTANCE topic) = 1
+~~~        %FORMATLIST{"%URLPARAM{"tag" default="%IFDEFINED{"%TAG%"}%"}%"
+~~~          header="AND"
+~~~          format=" Tag=~'\b$1\b' "
+~~~          separator="AND"
+~~~        }%
+~~~        %FORMATLIST{"%URLPARAM{"search" default="%IFDEFINED{"%KEYWORDS%"}%"}%"
+~~~          header="AND"
+~~~          format=" uc(all) =~ uc('$1') "
+~~~          separator="AND"
+~~~        }%
+~~~      "
 ~~~      web="%BASEWEB%"
 ~~~      hidenull="on"
 …
 *~~   "
 ~~~   cols="%IFDEFINED{"%CLASSIFICATIONPLUGIN_NRCOLS%" then="$test" else="3"}%"
-~~~   header="<h2>Topics in $percntTOPICTITLE$percnt</h2>
-~~~     There
-~~~     $percntIFDEFINED{\"$count\" as=\"1\"
-~~~       then=\" is one topic \"
-~~~       else=\" are $count topics \"
-~~~     }$percnt in this category."
 ~~~   split="\n"
 ~~~   pattern="(.*);(.*);(.*)"
+~~~   sort="nocase"
 ~~~   format="$percntDBCALL{\"$3.$2->RenderIndexItem\"}$percnt"
 ~~~ }%
 …
 ---++ Toolbar
 <verbatim>
+<verbatim class="tml">
 %STARTSECTION{"toolbar"}%<!-- toolbar -->
 <div class="toolbar">
 …
 ~~~   title="Create a new topic in %CATINFO{cat="%BASEWEB%.%BASETOPIC%" format="<nop>$title"}%"
 ~~~ }%
 %IFDEFINEDTHEN{"%IFACCESS{"%MAINWEB%.AdminGroup" type="change"}%" as="1"}%
+%IFDEFINEDTHEN{"%IFACCESS{"%MAINWEB%.TWikiAdminGroupGroup" type="change"}%" as="1"}%
 %BUTTON{"Manage" href="%SCRIPTURLPATH{view}%/%BASEWEB%/Category" title="Manage categories"}%
 %BUTTON{"Browse" href="%SCRIPTURLPATH{view}%/%BASEWEB%/CategoryBrowser" title="Browse the hierarchy"}%
 …
 %META:FORM{name="Applications.ApplicationTopic"}%
 %META:FIELD{name="TopicType" attributes="" title="TopicType" value="DocuTopic, TopicFunction"}%
+%META:FIELD{name="TopicType" title="TopicType" value="DocuTopic, TopicFunction"}%
 %META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="RenderCategory"}%
 %META:FIELD{name="Summary" attributes="" title="Summary" value="Render tools to handle categories"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/RenderCategoryBrowser.txt

-                      r1090
+                      r1182
 ---++ Implementation
 <verbatim>
+<verbatim class="tml">
 %STARTINCLUDE%<div class="clsBrowser">
 ~~~ <noautolink>
 …
 ~~~          title=\"$summary\">
 ~~~         <img src='$icon' alt='$percntENCODE{$title}$percnt'/>
 ~~~         $title</a>
+~~~         <noautolink>$title</noautolink></a>
 ~~~       $percntIFDEFINED{\"$cyclic\" as=\"1\"
 ~~~         then=\" <span class='foswikiAlert'>C</span>\"
+~~~         then=\" <span class='twikiAlert'>C</span>\"
 ~~~       }$percnt
 ~~~     $percntIFDEFINED{\"$leafs \" as=\"0 \" then=\" \" else=\" ($leafs)\"}$percnt

trunk/ClassificationPlugin/data/Applications/ClassificationApp/RenderCategoryFactory.txt

-                      r1178
+                      r1182
 ---++ Implementation
 <verbatim>
+<verbatim class="tml">
 %STARTINCLUDE%<!-- render category factory -->
 ---++ Create a new category
 …
 <table>
 <tr>
   <th class="foswikiFirstCol">Title:</th>
+  <th class="twikiFirstCol">Title:</th>
   <td><input class="twikiInputField" type="text" id="title" name="TopicTitle" size="60" onblur="wikify('title','topic', 'Category')" onkeyup="wikify('title','topic', 'Category')" value="%URLPARAM{"TopicTitle"}%" /></td>
 </tr>
 <tr>
   <th class="foswikiFirstCol">Topic:</th>
+  <th class="twikiFirstCol">Topic:</th>
   <td><input class="twikiInputField" type="text" id="topic" name="topic" size="60" value="%URLPARAM{"topic"}%" /></td>
 </tr>
 <tr>
   <th class="foswikiFirstCol">Summary:</th>
+  <th class="twikiFirstCol">Summary:</th>
   <td><input class="twikiInputField" type="text" name="Summary" size="60" value="%URLPARAM{"Summary"}%"/></td>
 </tr>
 <tr>
   <th class="foswikiFirstCol" valign="top">Parent:</th>
+  <th class="twikiFirstCol" valign="top">Parent:</th>
   <td>
 %~~ DBCALL{"Applications.ClassificationApp.RenderEditCategoryBrowser"
 …
 </tr>
 <tr>
   <th class="foswikiFirstCol" valign="top">Icon:
+  <th class="twikiFirstCol" valign="top">Icon:
     %TWISTYBUTTON{showimg="%ICONURLPATH{plus}%" hideimg="%ICONURLPATH{minus}%" id="icons" link=""}%
   </th>
   <td>
     %TWISTYTOGGLE{id="icons"}%
       %DBCALL{"Applications.ClassificationApp.RenderIconSelector" BUTTONS="off" VALUE="%URLPARAM{"Icon"}%"}%
+      %DBCALL{"Applications.ClassificationApp.RenderIconSelector" BUTTONS="off" VALUE="%URLPARAM{"Icon"}%" SOURCE="%CLASSIFICATIONPLUGIN_ICONSET%"}%
     %ENDTWISTYTOGGLE%
   </td>
 </tr>
 <tr style="padding-top:1em">
   <th class="foswikiFirstCol">&nbsp;</th>
+  <th class="twikiFirstCol">&nbsp;</th>
   <td style="padding-top:1em">
     <input type="submit" class="twikiSubmit natOkButton" value="Submit" />&nbsp;

trunk/ClassificationPlugin/data/Applications/ClassificationApp/RenderClassifiedTopicView.txt

-                      r482
+                      r1182
 ---++ Implementation
 <verbatim>
 %STARTINCLUDE%
+<verbatim class="tml">
+%STARTINCLUDE%<!-- renderclassifiedtopicview -->
 ~~~ <div class="clsTopicInfo">
 ~~~ <noautolink>
 …
 ~~~ }%]]
 ~~~ </h1>
-~~~ </noautolink>
 ~~~ <div class="clsTagInfo">
 %~~ IFDEFINED{
 …
 ~~~   else="$percntTAGINFO{header=\"Tagged \"}$percnt"
 ~~~ }%
+~~~ </noautolink>
 ~~~ </div>
 ~~~ </div>
 ~~~ %STOPINCLUDE%
+<!-- //renderclassifiedtopicview-->%STOPINCLUDE%
 </verbatim>
 …
 %META:FORM{name="Applications.ApplicationTopic"}%
 %META:FIELD{name="TopicType" attributes="" title="TopicType" value="DocuTopic, TopicFunction"}%
 %META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value=""}%
+%META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="RenderClassifiedTopicView"}%
 %META:FIELD{name="Summary" attributes="" title="Summary" value="Renders the TopicView of a ClassifiedTopic"}%
 %META:FIELD{name="TWikiApplication" attributes="" title="TWikiApplication" value="ClassificationApp"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/RenderEditCategoryBrowser.txt

-                      r1178
+                      r1182
 ---++ Implementation
 <verbatim>
+<verbatim class="tml">
 %STARTINCLUDE%<div id="clsCatSelector_%NAME%"><noautolink>
 ~~~ <input type="hidden" size="75" name="%NAME%" id="%NAME%" value="%IFDEFINED{"%VALUE%"}%" />
 …
 ~~~            title='$percntENCODE{$summary}$percnt'>
 ~~~         <img src='$icon' alt='$percntENCODE{$title}$percnt'/>
 ~~~         $title</a>
+~~~         <noautolink>$title</noautolink></a>
 ~~~         $percntIFDEFINED{\"$subcats\" as=\"0\"
 ~~~           then=\"\" else=\"<ul><li><span class='placeholder'>&nbsp;</span></li></ul>\"

trunk/ClassificationPlugin/data/Applications/ClassificationApp/RenderEditTagCloud.txt

-                      r1178
+                      r1182
 ---++ Implementation
 <verbatim>
+<verbatim class="tml">
 %STARTINCLUDE%<!-- render edit tag cloud -->
+~~~ <link rel="stylesheet" href="%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/jquery.autocomplete.css" type="text/css" media="all" />
+~~~ <script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/jquery.autocomplete.js"></script>
 ~~~ <script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/ClassificationPlugin/jquery.tagselector.js"></script>
 ~~~ <script type="text/javascript">
 …
 ~~~ </div>
 ~~~ </td></tr></table>
-~~~ <div class="clsTagCloud">
 %~~ TAGCLOUD{
 ~~~   "$percntDBQUERY{\"TopicType=~'\b(Tagged|Classified)Topic\b'
 …
 ~~~    split=","
 ~~~    group=" <strong>$group</strong> "
+~~~    header="<div class='clsTagCloud'>"
+~~~    footer="</div>"
 ~~~    format="<span
 ~~~      style=\"font-size:$weight%;\">
 …
 ~~~         title=\"$count\">$term</a></span>"
 ~~~  }%
-~~~ </div>
 ~~~ </noautolink>
 ~~~ </div>%STOPINCLUDE%
 …
 <!-- disabled
 <verbatim>
+<verbatim class="tml">
 %~~   TAGCOOCCURRENCE{
 ~~~     web="%IFDEFINED{"%THEWEB%" then="$test" else="%BASEWEB%"}%"

trunk/ClassificationPlugin/data/Applications/ClassificationApp/RenderHierarchyAsJSON.txt

-                      r1090
+                      r1182
    * root: top category inside the hierarchy to start extracting information from, defaults to !TopCategory
    * depth: number of levels to extract, defaults to 2
    * format: one of "browser" or "editor", defaults to "browser"
+   * format: one of "browser", "sidebar", or "editor", defaults to "browser"
 %ENDSECTION{name="documentation" type="section"}%
 ---++ Implementation
 <verbatim>
+<verbatim class="tml">
 %STARTINCLUDE%
 *~~ [
 …
 ---++ Browser format
 <verbatim>
+<verbatim class="tml">
 %STARTSECTION{"browser"}%
 *~~  <a href='$url'
 …
 ~~~  </a>
 ~~~  $percntIFDEFINED{\"$cyclic\" as=\"1\"
 ~~~    then=\" <span class='foswikiAlert'>C</span>\"
+~~~    then=\" <span class='twikiAlert'>C</span>\"
 ~~~  }$percnt
 ~~~  $percntIFDEFINED{\"$leafs\" as=\"0\"
 …
 </verbatim>
+---++ Sidebar format
+<verbatim class="tml">
+%STARTSECTION{"sidebar"}%
+*~~  <table cellspacing='0' cellpadding='0'><tr>
+*~~    <td valign='top'><img class='clsCategoryIcon' src='$icon' alt='$percntENCODE{$title}$percnt' /></td>
+*~~    <td valign='top'><a href='$url' title='$percntENCODE{$summary}$percnt'><noautolink>$title</noautolink></a></td>
+*~~  </tr></table>
+*~~
+%ENDSECTION{"sidebar"}%
+</verbatim>
 ---++ Editor format
 <verbatim>
+<verbatim class="tml">
 %STARTSECTION{"editor"}%
 *~~  <a href='javascript:void(0)'
 …
 ~~~     >
 ~~~     <img src='$icon' alt='$percntENCODE{$title}$percnt' />
 ~~~    $title</a>
+~~~    <noautolink>$title</noautolink></a>
 *~~
 %ENDSECTION{"editor"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/RenderIconSelector.txt

r1178	r1182
27	27
28	28	---++ Implementation
29		<verbatim>
	29	<verbatim class="tml">
30	30	%STARTINCLUDE%<!-- render photo selector -->
31	31	~~~ <div class="clsIconSelector">

trunk/ClassificationPlugin/data/Applications/ClassificationApp/RenderTaggedTopicView.txt

-                      r482
+                      r1182
 ---++ Implementation
 <verbatim>
+<verbatim class="tml">
 %STARTINCLUDE%<!-- -->
 ---+!! <nop>%BASETOPIC%
 …
 ~~~      Tagged
 ~~~      $percntFORMATLIST{\"$formfield(Tag)\"
 ~~~        format=\"<a href=\\"%SCRIPTURLPATH{"view"}%/$web/WebTagCloud?search=$1\\">$1</a>\"
+~~~        format=\"<a href=\\"%SCRIPTURLPATH{"view"}%/$web/WebTagCloud?tag=$1\\">$1</a>\"
 ~~~      }$percnt
 ~~~    $percntFIDEFINED$percnt

trunk/ClassificationPlugin/data/Applications/ClassificationApp/RenderWebClassSearch.txt

-                      r1178
+                      r1182
 %META:TOPICINFO{author="ProjectContributor" date="1200331240" format="1.1" reprev="1.2" version="$Rev$"}%
+%META:TOPICINFO{author="ProjectContributor" date="1228423025" format="1.1" reprev="1.2" version="$Rev$"}%
 %META:TOPICPARENT{name="TopicFunction"}%
 ---+!! Function: %TOPIC%
 …
 ---++ Implementation
 <verbatim>
+<verbatim class="tml">
 %STARTINCLUDE%<!-- render web class search -->
+<div class="twikiPageForm">
+<div class="twikiFormSteps">
+<h2>Search for a topic</h2>
 <form action="%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%#results" DISmethod="post">
 <input type="hidden" name="trigger" value="on" />
 <input type="hidden" name="refresh" value="on" />
 <table>
 <tr>
    <th>Text:</th>
    <td><input class="twikiInputField" type="text" name="qtext" size="50" value="%IFDEFINED{"%QTEXT%"}%" />
 </tr>
 <tr>
    <th>Tags:</th>
+   <td><input class="twikiInputField" type="text" name="qtags" size="50" value="%IFDEFINED{"%QTAGS%"}%" />
 </tr>
 <tr>
    <th>Categories:</th>
    <td><input class="twikiInputField" type="text" name="qcats" size="50" value="%IFDEFINED{"%QCATS%"}%" />
 </tr>
 <tr>
   <th>&nbsp;</th>
   <td><input type="submit" value="Ok" class="twikiSubmit natOkButton" />&nbsp;
+      <input type="button" value="Reset" class="foswikiButton natCancelButton" onclick="window.location.href= '%SCRIPTURLPATH{view}%/%BASEWEB%/%BASETOPIC%';" />&nbsp;
       <label><input type="checkbox" value="on" name="searchallwebs" %IFDEFINED{"%SEARCHALLWEBS%" as="on" then=" checked "}% /> search in all webs</label>
              <input type="hidden" name="searchallwebs" value="off" />
+</tr>
 </table>
+<div class="twikiFormStep">
+  <h3>Text:</h3>
+  <input class="twikiInputField" type="text" name="qtext" size="50" value="%IFDEFINED{"%QTEXT%"}%" />
+</div>
+<div class="twikiFormStep">
+  <h3>Tags:</h3>
+  <input class="twikiInputField" type="text" name="qtags" size="50" value="%IFDEFINED{"%QTAGS%"}%" />
+</div>
+<div class="twikiFormStep">
+  <h3>Categories:</h3>
+  <input class="twikiInputField" type="text" name="qcats" size="50" value="%IFDEFINED{"%QCATS%"}%" />
+</div>
+<div class="twikiFormStep">
+  <h3>Options:</h3>
+  <label><input type="checkbox" value="on" name="searchallwebs" %IFDEFINED{"%SEARCHALLWEBS%" as="on" then=" checked "}% /> search in all webs</label>
+  <input type="hidden" name="searchallwebs" value="off" />
+</div>
+<div class="twikiFormStep twikiFormButton twikiFormLast">
+  %BUTTON{"Search" icon="find" type="submit"}%
+  %CLEAR%
+</div>
 </form>
 </div>
 …
 ~~~     header=\"
 ~~~       <h2>Results in $1</h2>
 ~~~       *Found <span class='foswikiAlert'> $dollarcount </span> topic(s)* %BR%
+~~~       *Found <span class='twikiAlert'> $dollarcount </span> topic(s)* %BR%
 ~~~       <noautolink><div class='clsHitList'> $n
 ~~~       | *Nr* | *Topic* | *Summary* | *Changed* | *By* |$n
 …
 %META:FORM{name="Applications.ApplicationTopic"}%
 %META:FIELD{name="TopicType" attributes="" title="TopicType" value="DocuTopic, TopicFunction"}%
+%META:FIELD{name="TopicType" title="TopicType" value="DocuTopic, TopicFunction"}%
 %META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value=""}%
 %META:FIELD{name="Summary" attributes="" title="Summary" value="Render a search tool for ClassifiedTopics"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/RenderWebTagCloud.txt

-                      r482
+                      r1182
 ---+++++ Parameters
+   * QUERY: comma separated list of tags to be searched for in the archive
+   * TAG: comma separated list of tags to be searched for in the archive
+   * CAT: restrict tag cloud to this category; displays all tags of all categories if unspecified
+   * KEYWORDS: keywords to filter for
    * MIN: minimum frequency of a tags to be shown
    * TAGCLOUDTOPIC: topic where to jump to when a tag is clicked, defaults to BASETOPIC
    * RECENCY: limit search for tags on most recently changed topics
-   * CAT: restrict tag cloud to this category; displays all tags of all categories if unspecified
    * CATTITLE: title of the category filter, defaults to 'Category'
    * TOPCAT: optional top category to display the category filter for
    * EXCLUDECAT: optionally exclude a category category from filter, defaults to <nop>TopCategory
    * SHOWFILTER: toggle the filter form, defaults to hidden
+   * FROMCOLOR: start color for most significant tags, this must be a set of three integers specifying RGB,
+                fades over to TOCOLOR, defaults to "194,199,204"
+   * TOCOLOR: end color for least significant tags, defaults to "0,102,204"
 %ENDSECTION{name="documentation" type="section"}%
 ---++ Implementation
 <verbatim>
 %STARTINCLUDE%
+<verbatim class="tml">
+%STARTINCLUDE%<!-- renderwebtagcloud -->
 <noautolink>
 <script type="text/javascript">
 …
   var form = document.getElementById('tagCloudForm');
   var newTags = new Array();
   var allTags = form.search.value.split(/\s*,\s*/);
+  var allTags = form.tag.value.split(/\s*,\s*/);
   var found = 0;
   for (var i = 0; i < allTags.length; i++) {
 …
+    }
+  }
   if (!found) {
+  if (!found && clickedTag) {
     newTags.push(clickedTag);
+  }
   form.search.value = newTags.join(",");
+  form.tag.value = newTags.join(", ");
   form.submit();
+}
 </script>
 ~~~ <form id="tagCloudForm" action="%SCRIPTURLPATH{"view"}%/%BASEWEB%/%IFDEFINED{"%TAGCLOUDTOPIC%" then="$test" else="%BASETOPIC%"}%">
 ~~~   <input type="hidden" name="search" value="%URLPARAM{"search"}%" />
+~~~   <input type="hidden" name="tag" value="%IFDEFINED{"%TAG%"}%" />
 %~~ IFDEFINEDTHEN{"%SHOWFILTER%" as="on"}%
+%~~ $nopTWISTY{
+~~~   link="&nbsp;Filter"
+~~~   firststart="hide"
+~~~   remember="on"
+~~~   prefix="<h3>"
+~~~   suffix="</h3>"
+~~~   showimgleft="%ICONURLPATH{plus}%"
+~~~   hideimgleft="%ICONURLPATH{minus}%"
+~~~ }%
+~~~ <div class="twikiPageForm">
+~~~   <table class="twikiTable" style="width:auto"><tr>
+~~~     <th>%IFDEFINED{"%CATTITLE%" then="%CATTITLE%" else="Category"}%:</th>
+~~~     <td>
+~~~       <select name="cat" style="max-width:20em">
+~~~         <option value='' %IFDEFINED{"%CAT%" as="" then=" selected"}%>ALL</option>
+%~~         HIERARCHY$nop{
+~~~           web="%BASEWEB%"
+~~~           top="%IFDEFINED{"%TOPCAT%" then="%TOPCAT%" else="TopCategory"}%"
+~~~           exclude="%IFDEFINED{"%EXCLUDECAT%" then="%EXCLUDECAT%" else="TopCategory"}%"
+~~~           indent="&nbsp;"
+~~~           format="<option value='$topic'
+~~~             $percntIFDEFINED{\"%CAT%\" as=\"$topic\"
+~~~               then=\" selected\"
+~~~             }$percnt>$indent $title</option>$n$children"
+~~~         }%
+~~~       </select>
+~~~     </td>
+~~~     <td>&nbsp;
+~~~     <input type="submit" class="natOkButton" value="OK" />
+~~~     <input type="button" class="natCancelButton" value="Cancel" onclick="window.location.href='%SCRIPTURL{"view"}%/%BASEWEB%/%BASETOPIC%';" />
+~~~     </td>
+~~~   </tr>
+~~~   </table>
+~~~ <div class="clsFilterForm twikiFormSteps">
+~~~   <div class="twikiFormStep">
+~~~     <h4>Search</h4>
+~~~     <input type="text" name="search" value="%KEYWORDS%" size="20" class="twikiInputField" />
+~~~   </div>
+~~~   <div class="twikiFormStep">
+~~~     <h4>Category</h4>
+~~~     <select name="cat" style="max-width:20em" onchange="submitTagCloud()">
+~~~       <option value='' %IFDEFINED{"%CAT%" as="" then=" selected"}%>ALL</option>
+%~~       HIERARCHY$nop{
+~~~         web="%BASEWEB%"
+~~~         top="%IFDEFINED{"%TOPCAT%" then="%TOPCAT%" else="TopCategory"}%"
+~~~         exclude="%IFDEFINED{"%EXCLUDECAT%" then="%EXCLUDECAT%" else="TopCategory"}%"
+~~~         tags="%IFDEFINED{"%TAG%"}%"
+~~~         unique="on"
+~~~         format="<option value='$topic'
+~~~           $percntIFDEFINED{\"%CAT%\" as=\"$topic\"
+~~~             then=\" selected\"
+~~~           }$percnt>$indent $title</option>$n$children"
+~~~       }%
+~~~     </select>
+~~~   </div>
+~~~   <input type="submit" style="display:none" />
+~~~   <br clear="both" />
 ~~~ </div>
-%~~ $nopENDTWISTY%
 %~~ FIDEFINED%
 %~~ TAGCLOUD{
 ~~~   "$percntDBQUERY{
 ~~~     \"TopicType=~'\b(Tagged|Classified)Topic\b'
+~~~       $percntFORMATLIST{\"%IFDEFINED{"%QUERY%"}%\"
+~~~         header=\"AND\"
+~~~         format=\" Tag=~'\b$1\b' \"
+~~~         separator=\"AND\"
+~~~       }$percnt
+~~~       %FORMATLIST{"%IFDEFINED{"%TAG%"}%"
+~~~         header="AND"
+~~~         format=" Tag=~'\b$1\b' "
+~~~         separator="AND"
+~~~       }%
+~~~       %FORMATLIST{"%IFDEFINED{"%KEYWORDS%"}%"
+~~~         header="AND"
+~~~         format=" lc(all)=~ lc('$1') "
+~~~         separator="AND"
+~~~       }%
 ~~~       %IFDEFINED{"%CAT%" then=" AND topic ISA '%CAT%'"}%
 ~~~     \"
 …
 ~~~   format="<a rel=\"nofollow\" name=\"$term\"
 ~~~        style=\"font-size:$weight%;
+~~~                color:$fadeRGB(194,199,204,0,102,204);\"
+~~~                color:$fadeRGB(
+*~~                  %IFDEFINED{"%FROMCOLOR%" then="$test" else="194,199,204"}%,
+*~~                  %IFDEFINED{"%TOCOLOR%" then="$test" else="0,102,204"}%
+*~~                );\"
 ~~~        href=\"javascript:submitTagCloud('$term')\"
 ~~~        $percntIFDEFINED{\"%QUERY%\"
+~~~        $percntIFDEFINED{\"%TAG%\"
 ~~~          as=\".*\b$term\b.*\"
 ~~~          then=\"class=\\"current\\"\"
 …
 ~~~ }%
 ~~~ </form>
 %IFDEFINEDTHEN{"%QUERY%" glue="off"}%
+%IFDEFINEDTHEN{"%TAG%%KEYWORDS%"}%
 <a name="results"></a>
 %~~   $nopDBCALL{"Applications.ClassificationApp.RenderWebTagCloudHitList"
 ~~~     QUERY="
 *~~       %$nopFORMATLIST{"%QUERY%"
+*~~       %$nopFORMATLIST{"%TAG%"
 ~~~         header="AND"
 ~~~         format=" Tag=~'\b$1\b' "
 …
 ~~~       }%
 ~~~     %IFDEFINED{"%CAT%" then=" AND topic ISA '%CAT%'"}%
+~~~     %FORMATLIST{"%IFDEFINED{"%KEYWORDS%"}%"
+~~~       header="AND"
+~~~       format=" lc(all)=~ lc('$1') "
+~~~       separator="AND"
+~~~     }%
 ~~~     "
-~~~     PARAMS="search=%QUERY%;cat=%CAT%;recency=%RECENCY%;min=%MIN%"
-~~~     HILITE="Tag"
 ~~~   }%
 %FIDEFINED%
 ~~~ </noautolink>
 %STOPINCLUDE%
+<!-- //renderwebtagcloud -->%STOPINCLUDE%
 </verbatim>
 …
 <div class="alt">
 %DBCALL{"%TOPIC%"
+  QUERY="%URLPARAM{"search"}%"
+  TAG="%URLPARAM{"tag"}%"
+  TAG="%URLPARAM{"search"}%"
   CAT="%URLPARAM{"cat"}%"
   RECENCY="%URLPARAM{"recency"}%"
   MIN="%URLPARAM{"min"}%"
+  FROMCOLOR="255,0,0"
+  TOCOLOR="0,0,255"
 }%
 </div>
 …
 ---++ Copyright
 <div style="text-align:justify;margin:1em;">
 &copy; 2007 Michael Daum http://wikiring.de
+&copy; 20072-2008 Michael Daum http://michaeldaumconsulting.com
 %DBCALL{"Applications.GnuGeneralPublicLicense" section="notice"}%
 …
 %META:FORM{name="Applications.ApplicationTopic"}%
+%META:FIELD{name="TopicType" attributes="" title="TopicType" value="DocuTopic, TopicFunction"}%
+%META:FIELD{name="TopicType" title="TopicType" value="DocuTopic, TopicFunction"}%
+%META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="RenderWebTagCloud"}%
 %META:FIELD{name="Summary" attributes="" title="Summary" value="Render a tool to list all classified topics in this web"}%
 %META:FIELD{name="TWikiApplication" attributes="" title="TWikiApplication" value="ClassificationApp"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/RenderWebTagCloudHitList.txt

-                      r482
+                      r1182
    * SKIP
    * LIMIT
-   * PARAMS
-   * HILITE
 ---+++++ Css
 …
 ---++ Implementation
+<verbatim>
+%STARTINCLUDE%
+*~~
+<noautolink>
+<verbatim class="tml">
+%STARTINCLUDE%<!-- rendertagcloudhitlist -->
+*~~ <noautolink>
 %~~ MAKEINDEX{"
 %~~   DBQUERY{"TopicType=~'\b(Tagged|Classified)Topic\b' %QUERY%"
 …
 ~~~   }%"
 ~~~   cols="%IFDEFINED{"%CLASSIFICATIONPLUGIN_NRCOLS%" then="$test" else="3"}%"
 ~~~   header="<h2 >Found $count topic(s)</h2>"
+~~~   header="<span class='twikiAlert'>$count</span> topic(s) found"
 ~~~   split="\n"
 ~~~   pattern="(.*);(.*);(.*)"
 …
 ~~~ "
 ~~~ }%
+%STOPINCLUDE%
+~~~ </noautolink>
+<!-- //rendertagcloudhitlist-->%STOPINCLUDE%
 </verbatim>
----++ Old Implementation
-<verbatim>
-%STARTSECTION{"oldimpl"}%
-*~~
-%~~ DBQUERY{"TopicType=~'\b(Tagged|Classified)Topic\b' %QUERY%"
-~~~    web="%BASEWEB%"
-~~~    sort="modified"
-~~~    limit="%IFDEFINED{"%LIMIT%" then="$test"}%"
-~~~    reverse="on"
-~~~    skip="%IFDEFINED{"%SKIP%" then="$test"}%"
-~~~    header="<noautolink><div class=\"clsHitList\"> $n
-~~~      | *Nr* | *Topic* | *Summary* | *Changed* | *By* |$n
-~~~      $percntTABLE{tablewidth=\"100%\"}$percnt$n"
-~~~    format="
-~~~      | $index
-~~~      | <a href=\"%SCRIPTURLPATH{"view"}%/$web/$topic\"
-~~~         %IFDEFINEDTHEN{"%HILITE%" glue="off"}%
-~~~           title=\"$expand(%HILITE%)\"
-~~~           onmouseover=\"hiliteElements('$expand(%HILITE%)','hilite');\"
-~~~           onmouseout=\"hiliteElements('%URLPARAM{"search"}%','current');\"
-~~~         %FIDEFINED%
-~~~         >$expand(TopicTitle or topic)</a>
-~~~      | $flatten($expand(Summary or Text or 'no description'))
-~~~      | <span style=\"white-space:nowrap\">$formatTime(info.date)</span>
-~~~      | [[%MAINWEB%.$expand(info.author)][$expand(info.author)]]
-~~~      |"
-~~~    footer="$n
-~~~      $percntIFDEFINEDTHEN{\"%LIMIT%\" glue=\"off\"}$percnt
-~~~        $percntDBCALL$nop{\"Applications.RenderPageNavigation\"
-~~~          SKIP=\"%IFDEFINED{"%SKIP%" then="$test"}%\"
-~~~          MAX=\"$count\"
-~~~          LIMIT=\"%IFDEFINED{"%LIMIT%" then="$test"}%\"
-~~~          PARAMS=\"%PARAMS%\"
-~~~        }$percnt
-~~~      $percntFIDEFINED$percnt
-~~~      </div></noautolink>"
-~~~ }%
-~~~
-%ENDSECTION{"oldimpl"}%
-</verbatim>
-<!-- interrupt glue -->
 ---++ Test
 <div class="alt">
 %DBCALL{"%TOPIC%" QUERY="%URLPARAM{"search"}%" LIMIT="%URLPARAM{"limit" default="2"}%" SKIP="%URLPARAM{"skip"}%"}%
+%DBCALL{"%TOPIC%" LIMIT="%URLPARAM{"limit" default="2"}%" SKIP="%URLPARAM{"skip"}%"}%
 </div>

trunk/ClassificationPlugin/data/Applications/ClassificationApp/TWikiForm.txt

r604	r1182
12	12	%META:FORM{name="Applications.TopicStub"}%
13	13	%META:FIELD{name="TopicType" attributes="" title="TopicType" value="TopicStub, TopicType"}%
14		%META:FIELD{name="Summary" attributes="" title="Summary" value="Tool to create ~~Data~~Forms"}%
	14	%META:FIELD{name="Summary" attributes="" title="Summary" value="Tool to create TWikiForms"}%
15	15	%META:FIELD{name="TWikiApplication" attributes="" title="TWikiApplication" value="TWikiWorkbench"}%
16	16	%META:FIELD{name="Target" attributes="" title="Target" value="Applications.TWikiForm"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/TaggedTopic.txt

-                      r1178
+                      r1182
 %META:TOPICINFO{author="ProjectContributor" date="1202208170" format="1.1" version="$Rev$"}%
+%META:TOPICINFO{author="ProjectContributor" date="1228410990" format="1.1" version="$Rev$"}%
 %META:TOPICPARENT{name="TopicType"}%
 ---+!! %TOPIC%
 …
 ---+++ Create a new topic
 %STARTSECTION{"factory"}%
+<div class="twikiPageForm">
+%TWISTY{link="%BUTTON{"%IF{"defined 'LABEL'" then="%LABEL%" else="Create topic"}%" icon="add"}%%CLEAR%"}%
+<div class="twikiFormSteps">
 <form action="%SCRIPTURLPATH{"edit"}%/%BASEWEB%/" method="post">
 <input type="hidden" name="topicparent" value="%BASEWEB%.%BASETOPIC%" />
 …
 <input type="hidden" name="Summary" value="" />
 <input type="hidden" name="Tag" value="" />
+<table>
+<tr>
+  <th class="foswikiFirstCol">Name:</th>
+  <td><input class="twikiInputField" type="text" name="topic" size="40" /></td>
+</tr>
+<tr>
+  <th class="foswikiFirstCol">&nbsp;</th>
+  <td style="padding-top:1em">
+    <input type="submit" class="twikiSubmit natOkButton" value="Submit" />
+    <input type="reset" class="foswikiButton natCancelButton" value="Reset" />
+  </td>
+</tr>
+</table>
+<div class="twikiFormStep">
+  <h3>Name:</h3>
+  <input class="twikiInputField" type="text" name="topic" size="40" />
+</div>
+<div class="twikiFormStep twikiFormButtons twikiFormLast">
+    %BUTTON{"%MAKETEXT{"Submit"}%" type="submit" icon="tick"}%
+    %CLEAR%
+</div>
 </form>
 </div>
+%ENDTWISTY%
 %ENDSECTION{"factory"}%
 %STOPINCLUDE%
 …
 %META:FORM{name="Applications.TopicType"}%
 %META:FIELD{name="TopicType" attributes="" title="TopicType" value="DocuTopic, TopicType, TWikiForm"}%
+%META:FIELD{name="TopicType" title="TopicType" value="DocuTopic, TopicType, TWikiForm"}%
 %META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value=""}%
 %META:FIELD{name="Inheritance" attributes="" title="Inheritance" value="ApplicationTopic"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/TaggedTopicViewTemplate.txt

-                      r482
+                      r1182
 %META:TOPICPARENT{name="TopicView"}%
 %TMPL:INCLUDE{"view"}%
+%TMPL:DEF{"simpleheader"}%
+%DBCALL{"Applications.ClassificationApp.RenderClassifiedTopicView"}%
+%TMPL:END%
+%TMPL:DEF{"beforetext"}%%DBCALL{"Applications.ClassificationApp.RenderClassifiedTopicView"}%<hr class="clsTopicInfoSep" />%TMPL:END%
 %TMPL:DEF{"form"}%%TMPL:END%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/TestCategorizedTopic1.txt

-                      r482
+                      r1182
 %META:TOPICINFO{author="ProjectContributor" date="1204297462" format="1.1" version="$Rev$"}%
 %META:TOPICPARENT{name="TestCategory3"}%
--- Main.MichaelDaum - 27 Oct 2006
+%META:FORM{name="Applications.ClassificationApp.CategorizedTopic"}%
+%META:FIELD{name="TopicType" attributes="" title="TopicType" value="CategorizedTopic"}%
+%META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value=""}%
+%META:FIELD{name="Summary" attributes="" title="Summary" value="This is a test topic with a nop  in it"}%
+%META:FIELD{name="Category" attributes="" title="Category" value="TestCategory3, TestCategory8, TestCategory4"}%
+%META:FORM{name="Applications.ClassificationApp.ClassifiedTopic"}%
+%META:FIELD{name="TopicType" title="TopicType" value="ClassifiedTopic, CategorizedTopic, TaggedTopic"}%
+%META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="TestCategorizedTopic1"}%
+%META:FIELD{name="Summary" attributes="" title="Summary" value="This is a test topic"}%
+%META:FIELD{name="Tag" attributes="" title="Tag" value="test, topic"}%
+%META:FIELD{name="Category" attributes="" title="Category" value="TestCategory5, TestCategory16"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/TestCategory.txt

-                      r482
+                      r1182
 %META:TOPICINFO{author="ProjectContributor" date="1213044787" format="1.1" version="$Rev$"}%
 %META:TOPICPARENT{}%
+%META:TOPICPARENT{name="IntranetDirectory"}%
 %DBCALL{"Applications.ClassificationApp.RenderCategory"}%
 …
 %META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="TestCategory"}%
 %META:FIELD{name="Summary" attributes="" title="Summary" value=""}%
+%META:FIELD{name="Category" attributes="" title="Category" value="TopCategory"}%
+%META:FIELD{name="Category" attributes="" title="Category" value=""}%
+%META:FIELD{name="Icon" attributes="" title="Icon" value=""}%
+%META:FIELD{name="ImportedCategory" attributes="" title="<nop>ImportedCategory" value=""}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/TestCategory16.txt

-                      r482
+                      r1182
 %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=""}%
+%META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="TestCategory16"}%
 %META:FIELD{name="Summary" attributes="" title="Summary" value="yet another test"}%
 %META:FIELD{name="Category" attributes="" title="Category" value="TopCategory"}%
+%META:FIELD{name="Icon" attributes="" title="Icon" value=""}%
+%META:FIELD{name="ImportedCategory" attributes="" title="<nop>ImportedCategory" value=""}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/TestCategory6.txt

-                      r482
+                      r1182
 %META:FORM{name="Applications.ClassificationApp.Category"}%
+%META:FIELD{name="TopicType" attributes="" title="TopicType" value="Category, CategorizedTopic"}%
+%META:FIELD{name="Summary" attributes="" title="Summary" value=""}%
+%META:FIELD{name="TopicType" title="TopicType" value="Category, CategorizedTopic"}%
+%META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="TestCategory6"}%
+%META:FIELD{name="Summary" attributes="" title="Summary" value="blabla"}%
 %META:FIELD{name="Category" attributes="" title="Category" value="TestCategory5"}%
+%META:FIELD{name="Icon" attributes="" title="Icon" value=""}%
+%META:FIELD{name="ImportedCategory" attributes="" title="<nop>ImportedCategory" value=""}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/TestTopic0.txt

-                      r482
+                      r1182
 %META:FORM{name="Applications.ClassificationApp.ClassifiedTopic"}%
 %META:FIELD{name="TopicType" attributes="" title="TopicType" value="ClassifiedTopic, CategorizedTopic, TaggedTopic"}%
 %META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="TestTopic0"}%
+%META:FIELD{name="TopicType" title="TopicType" value="ClassifiedTopic, CategorizedTopic, TaggedTopic"}%
+%META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="Foo"}%
 %META:FIELD{name="Summary" attributes="" title="Summary" value="foo bar"}%
 %META:FIELD{name="Tag" attributes="" title="Tag" value="client, fat, foo, sql"}%
 %META:FIELD{name="Category" attributes="" title="Category" value="PlansAndPresentations, TestCategory11"}%
+%META:FIELD{name="Tag" attributes="" title="Tag" value="fertig, festival, freak"}%
+%META:FIELD{name="Category" attributes="" title="Category" value="PlansAndPresentations"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/TestTopic1.txt

-                      r482
+                      r1182
 %META:TOPICINFO{author="ProjectContributor" date="1214239169" format="1.1" version="$Rev$"}%
 %META:TOPICPARENT{name="CorporateCategory"}%
+<verbatim>
    * ISA{IntranetDirectory}: %ISA{cat="IntranetDirectory"}%
    * ISA{CorporateCategory}: %ISA{cat="CorporateCategory"}%
 …
    * DISTANCE{from="TestCategory8" to="FinanceAndPlaning"}: %DISTANCE{from="TestCategory8" to="FinanceAndPlaning" abs="off"}%
    * DISTANCE{from="FinanceAndPlaning" to="TestCategory8"}: %DISTANCE{from="FinanceAndPlaning" to="TestCategory8" abs="off"}%
+</verbatim>
 …
 %META:FORM{name="Applications.ClassificationApp.ClassifiedTopic"}%
+%META:FIELD{name="TopicType" attributes="" title="TopicType" value="ClassifiedTopic, TaggedTopic, CategorizedTopic"}%
+%META:FIELD{name="TopicType" title="TopicType" value="ClassifiedTopic, CategorizedTopic, TaggedTopic"}%
+%META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="TestTopic1"}%
 %META:FIELD{name="Summary" attributes="" title="Summary" value=""}%
 %META:FIELD{name="Tag" attributes="" title="Tag" value="test, topic"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/WebChanges.txt

-                      r482
+                      r1182
 %META:TOPICINFO{author="ProjectContributor" date="1212998697" format="1.1" version="$Rev$"}%
 %META:TOPICPARENT{}%
+---+!! %TOPIC%
+%FORMFIELD{"Summary"}%
+%DBCALL{"Applications.RenderWebChanges"
+  SKIP="%URLPARAM{"skip" default=" 0"}%"
+  LIMIT="%URLPARAM{"limit" default="10"}%"
+}%
+%INCLUDE{"%SYSTEMWEB%.%TOPIC%"}%
 <!--
    * Set VIEW_TEMPLATE = Applications.HiddenFormView
+   * Set STYLETOPICACTIONS = off
 -->

trunk/ClassificationPlugin/data/Applications/ClassificationApp/WebLeftBar.txt

r764	r1182
9	9	%STARTINCLUDE% <!-- -->
10	10	%INCLUDE{"%IF{"context can_login" then="%SYSTEMWEB%.WebLeftBarLogin" else="<nop>"}%" warn="off"}%
	11	<b>Categories</b>
	12	%DBCALL{"Applications.ClassificationApp.RenderSideBar"}%
11	13	<b>Tools</b>
12	14	%DBCALL{"Applications.RenderSideBar"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/WebLinks.txt

-                      r482
+                      r1182
 %FORMFIELD{"Summary"}%
+%STARTINCLUDE%%DBCALL{"Applications.RenderSideBar"}%%STOPINCLUDE%
+%STARTINCLUDE%<!-- classificationapp.weblinks -->
+%DBCALL{"Applications.ClassificationApp.RenderSideBar"}%
+<h2 >TopicTypes</h2>
+%DBCALL{"Applications.RenderSideBar"}%
+<!-- //classificationapp.weblinks -->%STOPINCLUDE%
 %META:FORM{name="Applications.ApplicationTopic"}%
+%META:FIELD{name="TopicType" attributes="M" title="TopicType" value="WebTool"}%
+%META:FIELD{name="TopicType" attributes="" title="TopicType" value="WebTool"}%
+%META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value="WebLinks"}%
 %META:FIELD{name="Summary" attributes="" title="Summary" value="Navigation for the NatSkin WebSideBar"}%
 %META:FIELD{name="TWikiApplication" attributes="" title="TWikiApplication" value="TWikiWorkbench"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/WebNotify.txt

-                      r664
+                      r1182
 Examples:
    * %MAINWEB%.WikiGuest
    * %MAINWEB%.WikiGuest - example@your.company
+   * %MAINWEB%.TWikiGuest
+   * %MAINWEB%.TWikiGuest - example@your.company
 <!--

trunk/ClassificationPlugin/data/Applications/ClassificationApp/WebPreferences.txt

-                      r672
+                      r1182
    * Set #DENYWEBVIEW =
    * Set #ALLOWWEBVIEW =
    * Set DENYWEBCHANGE = %MAINWEB%.WikiGuest
    * Set ALLOWWEBCHANGE = %MAINWEB%.AdminGroup
    * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup
+   * Set DENYWEBCHANGE = %MAINWEB%.TWikiGuest
+   * Set ALLOWWEBCHANGE = %MAINWEB%.TWikiAdminGroupGroup
+   * Set ALLOWTOPICCHANGE = %MAINWEB%.TWikiAdminGroupGroup
 ---+++ Application Pointer
 …
    * Set WEBDB = TWiki::Plugins::DBCachePlugin::WebDB
    * Set CLASSIFICATIONPLUGIN_AUTOREPARENT  = 1
+   * Set THISBREADCRUMBS = %CATINFO{cat="%URLPARAM{"catname" default="%BASEWEB%.%BASETOPIC%"}%" header="$percntBREADCRUMBS{recurse=\"topicoff\" separator=\"<span class='natSep'>&nbsp;&#187; </span>\"}$percnt<span class='natSep'>&nbsp;&#187; </span>" format="$breadcrumb" separator="<span class='natSep'>&nbsp;&#187; </span>"}%
 TopicFunctions to generate html page header information:
 …
 ---+++ Misc
 Definition of DataForms:
    * Set WEBFORMS = Applications.TWikiTopic, Applications.TopicStub
+Definition of TWikiForms:
+   * Set WEBFORMS = Applications.ClassificationApp.Category, Applications.ClassificationApp.ClassifiedTopic, Applications.ClassificationApp.CategorizedTopic, Applications.ClassificationApp.TaggedTopic
    * Set FINALPREFERENCES = ATTACHFILESIZELIMIT, WIKIWEBMASTER, WEBCOPYRIGHT, WEBTOPICLIST, DENYWEBVIEW, ALLOWWEBVIEW, DENYWEBCHANGE, ALLOWWEBCHANGE, WEBDB

trunk/ClassificationPlugin/data/Applications/ClassificationApp/WebStatistics.txt

-                      r555
+                      r1182
 | *Month:* | *Topic <br /> views:* | *Topic <br /> saves:* | *File <br /> uploads:* | *Most popular <br /> topic views:* | *Top contributors for <br /> topic save and uploads:* |
 | <!--statDate--> | <!--statViews--> | <!--statSaves--> | <!--statUploads--> | <!--statTopViews--> | <!--statTopContributors--> |
+| Sep 2008 |  16 |  2 |  1 | &nbsp;&nbsp;6 [[WebHome]]<br />&nbsp;&nbsp;5 [[IconSet]]<br />&nbsp;&nbsp;3 [[RenderCategory]]<br />&nbsp;&nbsp;1 [[TopicFunction]]<br />&nbsp;&nbsp;1 [[BusinessStructure]] | &nbsp;&nbsp;3 Main.MichaelDaum |
 | Apr 2008 |  0 |  0 |  0 |  |  |
 | Mar 2008 |  52 |  6 |  0 | &nbsp;15 [[Category]]<br />&nbsp;&nbsp;7 [[RenderCategory]]<br />&nbsp;&nbsp;6 [[WebHome]]<br />&nbsp;&nbsp;6 [[TopicType]]<br />&nbsp;&nbsp;3 [[ClassifiedTopic]]<br />&nbsp;&nbsp;3 [[WebTagCloud]]<br />&nbsp;&nbsp;3 [[RenderClassifiedTopicView]]<br />&nbsp;&nbsp;2 [[NatSkinClassifiedTopicViewTemplate]]<br />&nbsp;&nbsp;2 [[TaggedTopic]]<br />&nbsp;&nbsp;1 [[WebClassSearch]]<br />&nbsp;&nbsp;1 [[CategorizedTopic]] | &nbsp;&nbsp;6 Main.MichaelDaum |
 …
 __Notes:__
         * Do not edit this topic, it is updated automatically. (You can also <a href="%SCRIPTURLPATH{"statistics"}%/%BASEWEB%">force</a> an update)
+        * Do not edit this topic, it is updated automatically. (You can also <a href="%SCRIPTURLPATH{"statistics"}%/%WEB%/%TOPIC%">force</a> an update)
         * %SYSTEMWEB%.CompleteDocumentation tells you how to enable the automatic updates of the statistics.
         * Suggestion: You could archive this topic once a year and delete the previous year's statistics from the table.
 %META:FORM{name="Applications.ApplicationTopic"}%
 %META:FIELD{name="TopicType" attributes="M" title="TopicType" value="WebTool"}%
+%META:FIELD{name="TopicType" title="TopicType" value="WebTool"}%
 %META:FIELD{name="Summary" attributes="" title="Summary" value="Statistics"}%
 %META:FIELD{name="TWikiApplication" attributes="" title="TWikiApplication" value="TWikiWorkbench"}%

trunk/ClassificationPlugin/data/Applications/ClassificationApp/WebTagCloud.txt

-                      r482
+                      r1182
 %STARTINCLUDE%<!-- applications.classificationapp.webtagcloud -->
 %~~ DBCALL{"Applications.ClassificationApp.RenderWebTagCloud"
+~~~   QUERY="%URLPARAM{"search"}%"
+~~~   KEYWORDS="%URLPARAM{"search"}%"
+~~~   TAG="%URLPARAM{"tag"}%"
 ~~~   CAT="%URLPARAM{"cat"}%"
 ~~~   TOPCAT="%URLPARAM{"topcat" default="%TOPCAT%"}%"
 ~~~   EXCLUDECAT="%URLPARAM{"excludecat" default="%EXCLUDECAT%"}%"
 ~~~   RECENCY="%URLPARAM{"recency"}%"
+~~~   MIN="%URLPARAM{"min"}%"
+~~~   MIN="%MIN%"
+~~~   MIN="%URLPARAM{"min" default="%MIN%"}%"
 ~~~   CATTITLE="%CATTITLE%"
 ~~~   SHOWFILTER="on"

trunk/ClassificationPlugin/data/Applications/ClassificationApp/WebTopicViewTemplate.txt

r1090	r1182
1	1	%META:TOPICINFO{author="ProjectContributor" date="1111929255" format="1.0" version="$Rev$"}%
2	2	%STARTSECTION{name="message"}%
3		---+ <span class="~~fos~~wikiAlert">Warning: this page does not exist.</span>
	3	---+ <span class="twikiAlert">Warning: this page does not exist.</span>
4	4
5	5

trunk/ClassificationPlugin/data/TWiki/ClassificationPlugin.txt

-                      r878
+                      r1182
 <tr>
   <td><img src="%ATTACHURLPATH%/wikiringlogo40x40.png"></td>
   <td><a href="http://wikiring.de" title="Make your Wiki ring!" style="text-decoration:none">
+  <td><a href="http://wikiring.com" title="Make your Wiki ring!" style="text-decoration:none">
       Powered by <br /> <nop>WikiRing Consultants </a>
   </td>
 …
 The ClassificationPlugin is a building block for <nop>TWikiApplications in need of
 tagging and hierarchies. The contained <nop>ClassificationApp is a basic
 categorization and tagging solution for TWiki based on DataForms.
+categorization and tagging solution for TWiki based on TWikiForms.

trunk/ClassificationPlugin/data/_ClassificationTemplate/WebLinks.txt

-                      r482
+                      r1182
 ---+ WebLinks for the %WEB% web
 %STARTINCLUDE%<!-- -->
+%STARTINCLUDE%<!-- weblinks -->
    * [[ClassifiedTopic][%MAKETEXT{"New Topic"}%]]
    * [[Category][Categories]]
 …
    * [[WebNotify][%MAKETEXT{"Notifications"}%]]
    * [[WebStatistics][%MAKETEXT{"Statistics"}%]]
-%IFDEFINEDTHEN{"%IFACCESS{"%BASEWEB%.WebPreferences" type="change"}%" as="1"}%
-   * [[WebPreferences][%MAKETEXT{"Preferences"}%]]
-%FIDEFINED%
 %~~ TAGRELATEDTOPICS{"%BASETOPIC%"
 ~~~   header="<h2><a name=\"related\">Related Topics</a></h2>$n"
 …
 ~~~   separator="$n"
 ~~~ }%
 <!-- -->%STOPINCLUDE%
+<!-- //weblinks -->%STOPINCLUDE%

trunk/ClassificationPlugin/data/_ClassificationTemplate/WebNotify.txt

r664	r1182
5	5	%MAKETEXT{"This is a subscription service to be automatically notified by e-mail when topics change in this [_1] web. This is a convenient service, so you do not have to come back and check all the time if something has changed. To subscribe, please add a bullet with your [_2] in alphabetical order to this list:" args="<nop>%WEB%,%SYSTEMWEB%.WikiName"}%
6	6
7		* Main.WikiGuest - example@your.company
	7	* Main.TWikiGuest - example@your.company
8	8
9	9

trunk/ClassificationPlugin/data/_ClassificationTemplate/WebPreferences.txt

-                      r672
+                      r1182
 *Web*:
    * #Set DENYWEBVIEW =
    * Set ALLOWWEBVIEW = %MAINWEB%.AdminGroup
+   * Set ALLOWWEBVIEW = %MAINWEB%.TWikiAdminGroupGroup
    * #Set DENYWEBCHANGE =
    * Set ALLOWWEBCHANGE = %MAINWEB%.AdminGroup
+   * Set ALLOWWEBCHANGE = %MAINWEB%.TWikiAdminGroupGroup
    * #Set DENYWEBRENAME =
    * Set ALLOWWEBRENAME = %MAINWEB%.AdminGroup
+   * Set ALLOWWEBRENAME = %MAINWEB%.TWikiAdminGroupGroup
 *Topic*
    * Set ALLOWTOPICCHANGE = %MAINWEB%.AdminGroup
    * Set ALLOWTOPICRENAME = %MAINWEB%.AdminGroup
+   * Set ALLOWTOPICCHANGE = %MAINWEB%.TWikiAdminGroupGroup
+   * Set ALLOWTOPICRENAME = %MAINWEB%.TWikiAdminGroupGroup
 ---++ Finalization

trunk/ClassificationPlugin/data/_ClassificationTemplate/WebStatistics.txt

r555	r1182
7	7
8	8	__Notes:__
9		* Do not edit this topic, it is updated automatically. (You can also <a href="%SCRIPTURLPATH{statistics}%/%WEB%">force</a> an update)
	9	* Do not edit this topic, it is updated automatically. (You can also <a href="%SCRIPTURLPATH{statistics}%/%WEB%/%TOPIC%">force</a> an update)
10	10	* %SYSTEMWEB%.CompleteDocumentation tells you how to enable the automatic updates of the statistics.
11	11	* Suggestion: You could archive this topic once a year and delete the previous year's statistics from the table.

trunk/ClassificationPlugin/lib/TWiki/Plugins/ClassificationPlugin.pm

-                      r1050
+                      r1182
 use vars qw(
   $VERSION $RELEASE $NO_PREFS_IN_TOPIC $SHORTDESCRIPTION
   $doneHeader $doneInit $baseTopic $baseWeb
+  $doneHeader $doneInit $baseTopic $baseWeb $header
 );
 …
 $NO_PREFS_IN_TOPIC = 1;
 $SHORTDESCRIPTION = 'A topic classification plugin and application';
+$header = <<'HERE';
+<link rel="stylesheet" href="%PUBURL%/%SYSTEMWEB%/ClassificationPlugin/styles.css" type="text/css" media="all" />
+<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/ClassificationPlugin/classification.js"></script>
+HERE
 ###############################################################################
 …
 ###############################################################################
 sub commonTagsHandler {
   return if $doneHeader;
+  my $link =
+    '<link rel="stylesheet" '.
+    'href="%PUBURL%/%SYSTEMWEB%/ClassificationPlugin/styles.css" '.
+    'type="text/css" media="all" />' . "\n" .
+    '<script type="text/javascript" ' .
+    'src="%PUBURL%/%SYSTEMWEB%/ClassificationPlugin/classification.js">' .
+    '</script>';
+  if ($_[0] =~ s/<head>(.*?[\r\n]+)/<head>$1$link\n/o) {
+    $doneHeader = 1;
+  }
+  $doneHeader = 1 if $_[0] =~ s/<head>(.*?[\r\n]+)/<head>$1$header/o;
+}

trunk/ClassificationPlugin/lib/TWiki/Plugins/ClassificationPlugin/Access.pm

r1050	r1182
18	18	use TWiki::Plugins::ClassificationPlugin;
19	19
20		use constant DEBUG => 1; # toggle m
	20	use constant DEBUG => 0; # toggle m
21	21
22	22	use constant NO_CATACL => 0;

trunk/ClassificationPlugin/lib/TWiki/Plugins/ClassificationPlugin/Category.pm

-                      r1050
+                      r1182
   my $this = shift;
   #writeDebug("purging category cache for $this->{name}");
+  writeDebug("purging category cache for $this->{name}");
   undef $this->{_topics};
+  undef $this->{_tags};
   undef $this->{_prefs};
   undef $this->{_subsumes};
 …
   my $this = shift;
-  $this->purgeCache();
   undef $this->{icon};
   undef $this->{parents};
 …
   my $this = shift;
   #writeDebug("init category $this->{name}");
+  writeDebug("init category $this->{name}");
   foreach my $name (keys %{$this->{parents}}) {
     my $parent = $this->{parents}{$name};
 …
   unless (defined($this->{_topics})) {
     writeDebug("refreshing _topics in $this->{name}");
+    #writeDebug("refreshing _topics in $this->{name}");
     my $hierarchy = $this->{hierarchy};
 …
 ###############################################################################
+sub getTagsOfTopics {
+  my $this = shift;
+  unless (defined($this->{_tags})) {
+    writeDebug("gathering tags in category $this->{name}");
+    my %tags;
+    my $hierarchy = $this->{hierarchy};
+    my $db = TWiki::Plugins::DBCachePlugin::Core::getDB($hierarchy->{web});
+    foreach my $topic ($this->getTopics()) {
+      my $topicObj = $db->fastget($topic);
+      next unless $topicObj;
+      my $form = $topicObj->fastget("form");
+      next unless $form;
+      $form = $topicObj->fastget($form);
+      next unless $form;
+      my $tags = $form->fastget('Tag');
+      next unless $tags;
+      foreach my $tag (split(/\s*,\s*/, $tags)) {
+        $tags{$tag}++;
+      }
+    }
+    %{$this->{_tags}} = %tags;
+  }
+  return keys %{$this->{_tags}};
+}
+###############################################################################
 # register a subcategory
 sub addChild {
 …
 sub setSummary {
   my ($this, $summary) = @_;
   $summary = TWiki::urlDecode($summary);
+  $summary = urlDecode($summary);
   $this->{summary} = $summary;
   $this->{gotUpdate} = 1;
 …
 sub setTitle {
   my ($this, $title) = @_;
   $title = TWiki::urlDecode($title);
+  $title = urlDecode($title);
   $this->{title} = $title;
   $this->{gotUpdate} = 1;
 …
   $seen ||= {};
-  #writeDebug("called importCategories($impCats)");
   #writeDebug("already seen=".join(',', sort keys %$seen));
 …
     $impWeb =~ s/\//\./go;
     next unless TWiki::Func::webExists($impWeb);
+    # prevent deep recursion importing from the same web
+    next if $thisWeb eq $impWeb;
     # SMELL: prevent deep recursion of two webs importing each other's categories
 …
       my $name = $impChild->{name};
       next if $name eq 'BottomCategory';
       next if $seen->{$name};
       $seen->{$name} = 1;
+      next if TWiki::Func::topicExists($thisWeb, $name);
       #writeDebug("importing category $name from $impChild->{hierarchy}->{web}");
       my %parents = map {$_->{name}=>1} $impChild->getParents();
 …
   $this->{gotUpdate} = 1;
-  #writeDebug("done importCategories()");
+}
 …
   my $icon = $this->{icon} || 'folder.gif';
+  my $pubUrlPath = $TWiki::cfg{PubUrlPath} || $Foswiki::cfg{PubUrlPath};
   return
     $TWiki::cfg{PubUrlPath}.
+    $pubUrlPath.
     '/Applications/ClassificationApp/IconSet/'.
     $icon;
 …
   my $this = shift;
   return "<a href='".$this->getUrl()."'>$this->{title}</a>";
+  return "<a href='".$this->getUrl()."'><noautolink>$this->{title}</noautolink></a>";
+}
 …
   if ($hierWeb ne $this->{origWeb}) {
     return TWiki::Func::getScriptUrl($hierWeb,
       'Category', 'view', name=>$this->{name});
+      'Category', 'view', catname=>$this->{name});
+  }
 …
 ###############################################################################
 sub toHTML {
+sub traverse {
   my ($this, $params, $nrCalls, $index, $nrSiblings, $seen, $depth) = @_;
 …
   #return '' unless $this->checkAccessPermission();
+  $$nrCalls++;
   my $header = $params->{header} || '';
 …
     unless defined $format;
-  #writeDebug("toHTML() nrCalls=$$nrCalls, name=$this->{name}");
   # format sub-categories
+  my @children = sort {$a->{name} cmp $b->{name}} $this->getChildren();
+  my $nrChildren = @children-1;
+  my @children =
+    map {$this->{children}{$_}}
+    grep {!/^BottomCategory$/}
+    sort {$a cmp $b}
+    keys %{$this->{children}};
+  my $nrChildren = @children;
   my $childIndex = 1;
   my @subResult;
+  #writeDebug("traverse() nrCalls=$$nrCalls, depth=$depth, name=$this->{name} nrChildren=$nrChildren");
+  #writeDebug("children=".join(', ', @children));
   my $open = $params->{open};
 …
   if ($open) {
     $doChildren = 0;
+    foreach my $opener (split(/\s*,\s*/, $open)) {
+      if ($this->{hierarchy}->subsumes($this, $opener)) {
+        $doChildren = 1;
+        last;
+    if ($nrChildren) {
+      foreach my $opener (split(/\s*,\s*/, $open)) {
+        #writeDebug("checking at $this->{name} opener '$opener'");
+        if ($this->subsumes($opener)) {
+          $doChildren = 1;
+          last;
+        }
+      }
+    }
 …
   if ($doChildren) {
+    #writeDebug("doing children");
     foreach my $child (@children) {
       next if $child->{name} eq 'BottomCategory';
       my $childResult = $child->toHTML($params, $nrCalls, $childIndex, $nrChildren, $seen, $depth+1);
+      my $childResult = $child->traverse($params, $nrCalls, $childIndex, $nrChildren, $seen, $depth+1);
       push @subResult, $childResult if $childResult;
       $childIndex++;
+    }
+  } else {
+    #writeDebug("not decending at $this->{name}");
+    if ($nrChildren) {
+      my $placeholder = $params->{placeholder};
+      push @subResult, $placeholder if $placeholder;
+    }
+  }
 …
+  }
+  $seen->{$this} = 0;
+  my $unique = $params->{unique} || 'off';
+  $seen->{$this} = 0 unless $unique eq 'on';
   my $minDepth = $params->{mindepth};
 …
   my $nrTopics = scalar(keys %{$this->{_topics}});
-  my $nrSubcats = scalar(grep !/^BottomCategory$/, keys %{$this->{children}});
   my $isCyclic = 0;
   $isCyclic = $this->isCyclic() if $format =~ /\$cyclic/;
 …
   my $iconUrl = $this->getIconUrl();
+  my $tags = '';
+  if ($header =~ /\$tags/ ||
+      $footer =~ /\$tags/ ||
+      $format =~ /\$tags/) {
+    writeDebug("getting tags");
+    my @tags = $this->getTagsOfTopics();
+    $tags = join(', ', @tags);
+  }
   if ($subResult) {
 …
       'summary'=>$this->{summary},
       'title'=>$this->{title},
-      'children'=>$subResult,
       'siblings'=>$nrSiblings,
       'count'=>$nrTopics,
       'index'=>$index,
       'subcats'=>$nrSubcats,
       'call'=>$$nrCalls++,
+      'subcats'=>$nrChildren,
+      'call'=>$$nrCalls,
       'leafs'=>$nrLeafs,
       'cyclic'=>$isCyclic,
 …
       'indent'=>$indent,
       'icon'=>$iconUrl,
+      'tags'=>$tags,
     );
     $footer = TWiki::Plugins::ClassificationPlugin::Core::expandVariables($footer,
 …
       'summary'=>$this->{summary},
       'title'=>$this->{title},
-      'children'=>$subResult,
       'siblings'=>$nrSiblings,
       'count'=>$nrTopics,
       'index'=>$index,
       'subcats'=>$nrSubcats,
       'call'=>$$nrCalls++,
+      'subcats'=>$nrChildren,
+      'call'=>$$nrCalls,
       'leafs'=>$nrLeafs,
       'cyclic'=>$isCyclic,
 …
       'indent'=>$indent,
       'icon'=>$iconUrl,
+      'tags'=>$tags,
     );
     $subResult = $header.$subResult.$footer;
+  }
+  my $tagFilter = $params->{tags};
+  if ($tagFilter) {
+    writeDebug("tagFilter=$tagFilter");
+    $this->getTagsOfTopics();
+    foreach my $tag (split(/\s*,\s*/, $tagFilter)) {
+      return $subResult unless defined $this->{_tags}{$tag};
+    }
+  }
 …
     'count'=>$nrTopics,
     'index'=>$index,
     'subcats'=>$nrSubcats,
     'call'=>$$nrCalls++,
+    'subcats'=>$nrChildren,
+    'call'=>$$nrCalls,
     'leafs'=>$nrLeafs,
     'cyclic'=>$isCyclic,
 …
     'indent'=>$indent,
     'icon'=>$iconUrl,
+    'tags'=>$tags,
   );
+}
+###############################################################################
+# from TWiki.pm
+sub urlDecode {
+    my $text = shift;
+    $text =~ s/%([\da-f]{2})/chr(hex($1))/gei;
+    return $text;
+}
 ;

trunk/ClassificationPlugin/lib/TWiki/Plugins/ClassificationPlugin/Core.pm

-                      r1050
+                      r1182
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
+#
 # Copyright (C) 2006-2007 Michael Daum http://michaeldaumconsulting.com
+# Copyright (C) 2006-2008 Michael Daum http://michaeldaumconsulting.com
+#
 # This program is free software; you can redistribute it and/or
 …
 use strict;
+use vars qw(%hierarchies $baseWeb $baseTopic);
+use vars qw(%hierarchies %timeStamps $baseWeb $baseTopic
+  $purgeMode
+  @touchedCats
+);
 use constant DEBUG => 0; # toggle me
+use constant FIXFORMFIELDS => 1; # work around a but in TWiki <= 4.2.3
 ###############################################################################
 …
   ($baseWeb, $baseTopic) = @_;
+  %hierarchies = ();
+  $purgeMode = 0;
+  @touchedCats = ();
+  #%hierarchies = ();
+  #%timeStamps = ();
+}
 …
 sub finish {
+  writeDebug("called finish()");
   foreach my $hierarchy (values %hierarchies) {
     next unless defined $hierarchy;
     $hierarchy->finish();
+    undef $hierarchies{$hierarchy->{web}};
+  }
+    #undef $hierarchies{$hierarchy->{web}};
+    #undef $timeStamps{$hierarchy->{web}};
+  }
+  writeDebug("done finish()");
+}
 …
   my $hierarchy = getHierarchy($thisWeb);
   return $hierarchy->toHTML($params);
+  return $hierarchy->traverse($params);
+}
 …
   my $hierarchy = getHierarchy($thisWeb);
+  #writeDebug("thisWeb=$thisWeb, thisTopic=$thisTopic");
   return '' unless $hierarchy;
 …
   my @categories = keys %$categories;
   #@categories = grep (!/^(TopCategory|BottomCategory)$/, @categories);
+  #writeDebug("categories=".join(', ', @categories));
   return '' unless @categories;
 …
+    }
     my $category = $hierarchy->getCategory($catName);
+    unless ($category) {
+      writeDebug("Woops: there's no category '$catName' ... found in $thisTopic");
+      next;
+    }
+    next unless $category;
+    #writeDebug("found $category");
     # skip catinfo from another branch of the hierarchy
 …
     my $parents = '';
+    my @parents;
+    if ($line =~ /\$parent/) {
+      @parents = sort {uc($a->{title}) cmp uc($b->{title})} $category->getParents();
+    }
     if ($line =~ /\$parents?\b/) {
       my @links = ();
       foreach my $parent ($category->getParents()) {
+      foreach my $parent (@parents) {
         push @links, $parent->getLink();
+      }
       $parents = join(', ', @links);
+      $parents = join($theSep, @links);
+    }
 …
     if ($line =~ /\$parents?names?/) {
       my @names = ();
       foreach my $parent ($category->getParents()) {
+      foreach my $parent (@parents) {
         push @names, $parent->{name};
+      }
       $parentsName = join(', ', @names);
+      $parentsName = join($theSep, @names);
+    }
 …
     if ($line =~ /\$parents?title/) {
       my @titles = ();
       foreach my $parent ($category->getParents()) {
+      foreach my $parent (@parents) {
         push @titles, $parent->{title};
+      }
       $parentsTitle = join(', ', @titles);
+      $parentsTitle = join($theSep, @titles);
+    }
 …
     if ($line =~ /\$parents?links?/) {
       my @links = ();
       foreach my $parent ($category->getParents()) {
+      foreach my $parent (@parents) {
         push @links, $parent->getLink();
+      }
       $parentLinks = join(', ', @links);
+      $parentLinks = join($theSep, @links);
+    }
 …
     if ($line =~ /\$parents?urls?/) {
       my @urls = ();
       foreach my $parent ($category->getParents()) {
+      foreach my $parent (@parents) {
         push @urls, $parent->getUrl();
+      }
+      $parentUrls = join(', ', @urls);
+      $parentUrls = join($theSep, @urls);
+    }
+    my $breadCrumbs = '';
+    if ($line =~ /\$breadcrumbs?/) {
+      my @breadCrumbs = ();
+      my $parent = $category;
+      my %seen = ();
+      while ($parent) {
+        last if $seen{$parent};
+        $seen{$parent} = 1;
+        push @breadCrumbs, $parent->getLink();
+        my @parents = $parent->getParents();
+        last unless @parents;
+        $parent = shift @parents;
+        last if $parent eq $parent->{hierarchy}{_top};
+      }
+      $breadCrumbs = join($theSep, reverse @breadCrumbs);
+    }
 …
     my $moreChildren = '';
     if ($line =~ /\$children/) {
+      @children = $category->getChildren();
+      @children = grep {$_->{name} ne 'BottomCategory'}
+        @children;
+      @children = sort {uc($a->{title}) cmp uc($b->{title})} $category->getChildren();
+      @children = grep {$_->{name} ne 'BottomCategory'} @children;
       if ($theHideNull eq 'on') {
 …
         push @links, $child->getLink();
+      }
       $children = join(', ', @links);
+      $children = join($theSep, @links);
+    }
 …
         push @names, $child->{name};
+      }
       $childrenName = join(', ', @names);
+      $childrenName = join($theSep, @names);
+    }
 …
         push @titles, $child->{title};
+      }
       $childrenTitle = join(', ', @titles);
+      $childrenTitle = join($theSep, @titles);
+    }
 …
         push @links, $child->getLink();
+      }
       $childrenLinks = join(', ', @links);
+      $childrenLinks = join($theSep, @links);
+    }
 …
         push @urls, $child->getUrl();
+      }
+      $childrenUrls = join(', ', @urls);
+    }
+      $childrenUrls = join($theSep, @urls);
+    }
+    my $tags = '';
+    if ($line =~ /\$tags/) {
+      $tags = join($theSep, sort $category->getTagsOfTopics());
+    }
     my $isCyclic = 0;
 …
     $line =~ s/\$cyclic/$isCyclic/g;
     $line =~ s/\$leafs/$countLeafs/g;
+    $line =~ s/\$breadcrumbs?/$breadCrumbs/g;
     $line =~ s/\$children?name/$childrenName/g;
     $line =~ s/\$children?title/$childrenTitle/g;
 …
     $line =~ s/\$children?/$children/g;
     $line =~ s/\$icon/$iconUrl/g;
+    $line =~ s/\$tags/$tags/g;
     push @result, $line;
+  }
 …
     $tag =~ s/\s+$//go;
     my $line = $theFormat;
     my $url = TWiki::Func::getScriptUrl($thisWeb, "WebTagCloud", "view", search=>$tag);
     my $link = "<a href='$url'>$tag</a>";
+    my $url = TWiki::Func::getScriptUrl($thisWeb, "WebTagCloud", "view", tag=>$tag);
+    my $link = "<a href='$url'><noautolink>$tag</noautolink></a>";
     $line =~ s/\$url/$url/g;
     $line =~ s/\$link/$link/g;
 …
   writeDebug("beforeSaveHandler($web, $topic)");
   my $doAutoReparent = TWiki::Func::getPreferencesFlag('CLASSIFICATIONPLUGIN_AUTOREPARENT', $web);
   $doAutoReparent = 1 unless defined $doAutoReparent;
 …
     my $session = $TWiki::Plugins::SESSION;
     $meta = new TWiki::Meta($session, $web, $topic, $text);
+    writeDebug("creating a new meta object");
+  }
+  # There's a serious bug in all TWiki's that it rewrites all of the
+  # topic text - including the meta data - if a topic gets moved to
+  # a different web. In an attempt to keep linking WikiWords intact,
+  # it rewrites the TWikiForm, i.e. the names and titles of the
+  # formfields. This however breaks mostly every code that relies
+  # on the formfields to be named like they where in the beginning.
+  # AFAICS, there's no case where renaming the formfield names is
+  # desired.
+  #
+  # What we do here is to loop pre-process the topic being saved right here
+  # and remove any leading webname from the those formfields
+  # playing a central role in this plugin, TopicType and Category.
+  #
+  if (FIXFORMFIELDS) {
+    #if (DEBUG) {
+    #  use Data::Dumper;
+    #  $Data::Dumper::Maxdepth = 3;
+    #  writeDebug("BEFORE FIXFORMFIELDS");
+    #  writeDebug(Dumper($meta));
+    #}
+    foreach my $field ($meta->find('FIELD')) {
+      my $name = $field->{name};
+      my $title = $field->{title};
+      if ($field->{name} =~ /TopicType|Category/) {
+        $field->{name} =~ s/^.*[\.\/](.*?)$/$1/;
+        $field->{title} =~ s/^.*[\.\/](.*?)$/$1/;
+        writeDebug("APPLYING FIX for formfield $name");
+      }
+    }
+    #if (DEBUG) {
+    #  use Data::Dumper;
+    #  $Data::Dumper::Maxdepth = 3;
+    #  writeDebug("AFTER FIXFORMFIELDS");
+    #  writeDebug(Dumper($meta));
+    #}
+  }
+  my $trashWeb = $Foswiki::cfg{TrashWebName} || $TWiki::cfg{TrashWebName};
+  if ($web eq $trashWeb) {
+    writeDebug("detected a move from $baseWeb to trash");
+    $web = $baseWeb;# operations are on the baseWeb
+  }
 …
   $topicType = $topicType->{value};
+  # fix topic type depending on the form
+  my $formName = $meta->getFormName();
+  my @topicType = split(/\s*,\s*/, $topicType);
+  my %newTopicType = map {$_ => 1} @topicType;
+  if ($formName =~ /^Applications[\.\/]ClassificationApp[\.\/]Category$/ &&
+    !($topicType =~ /\bCategory\b/ && $topicType =~ /\bCategorizedTopic\b/)) {
+    $newTopicType{Category} = 1;
+    $newTopicType{CategorizedTopic} = 1;
+  }
+  elsif ($formName =~ /^Applications[\.\/]ClassificationApp[\.\/]CategorizedTopic$/ &&
+    $topicType !~ /\bCategorizedTopic\b/) {
+    %newTopicType = map {$_ => 1} split(/\s*,\s*/, $topicType);
+    $newTopicType{CategorizedTopic} = 1;
+  }
+  elsif ($formName =~ /^Applications[\.\/]ClassificationApp[\.\/]TaggedTopic$/ &&
+    $topicType !~ /\bTaggedTopic\b/) {
+    %newTopicType = map {$_ => 1} split(/\s*,\s*/, $topicType);
+    $newTopicType{TaggedTopic} = 1;
+  }
+  elsif ($formName =~ /^Applications[\.\/]ClassificationApp[\.\/]ClassifiedTopic$/ &&
+    !($topicType =~ /\bClassifiedTopic\b/ && $topicType =~ /\bCategorizedTopic\b/ && $topicType =~ /\bTaggedTopic\b/)) {
+    %newTopicType = map {$_ => 1} split(/\s*,\s*/, $topicType);
+    $newTopicType{CategorizedTopic} = 1;
+    $newTopicType{ClassifiedTopic} = 1;
+    $newTopicType{TaggedTopic} = 1;
+  }
+  if ($formName !~ /^Applications[\.\/]TopicStub$/) {
+    delete $newTopicType{TopicStub};
+  }
+  if (keys %newTopicType) {
+    my @newTopicType;
+    foreach my $item (@topicType) {
+      next unless defined $newTopicType{$item};
+      push @newTopicType, $item;
+      delete $newTopicType{$item};
+    }
+    foreach my $item (keys %newTopicType) {
+      push @newTopicType, $item;
+    }
+    my $newTopicType = join(', ', @newTopicType);
+    $meta->putKeyed('FIELD', {name =>'TopicType', title=>'TopicType', value=>$newTopicType});
+  }
+  # get categories of this topic,
+  # must get it from current meta data
+  return unless $topicType =~ /ClassifiedTopic|CategorizedTopic|Category|TaggedTopic/;
+  my $hierarchy = getHierarchy($web);
+  my $catFields = $hierarchy->getCatFields(split(/\s*,\s*/,$topicType));
+  # get new categories from meta data
+  my %newCats;
+  foreach my $field (@$catFields) {
+    my $cats = $meta->get('FIELD',$field);
+    next unless $cats;
+    my $title = $cats->{title};
+    $cats = $cats->{value};
+    next unless $cats;
+    # assigning TopCategory only empties the cat field
+    if ($cats eq 'TopCategory') {
+      writeDebug("found TopCategory assignment");
+      $meta->putKeyed('FIELD', {name =>$field, title=>$title, value=>''});
+      next;
+    }
+    foreach my $cat (split(/\s*,\s*/,$cats)) {
+      $cat =~ s/^\s+//go;
+      $cat =~ s/\s+$//go;
+      $newCats{$cat} = 1;
+    }
+  }
+  # get old categories from store
+  my $db = TWiki::Plugins::DBCachePlugin::Core::getDB($web);
+  my $topicObj = $db->fastget($topic);
+  my %oldCats;
+  if (!$topicObj) {
+    $purgeMode = 2; # new topic
+  } else {
+    my $form = $topicObj->fastget("form");
+    if (!$form) {
+      $purgeMode = 2; # new form
+    } else {
+      $form = $topicObj->fastget($form);
+      foreach my $field (@$catFields) {
+        my $cats = $form->fastget($field);
+        next unless $cats;
+        foreach my $cat (split(/\s*,\s*/,$cats)) {
+          $cat =~ s/^\s+//go;
+          $cat =~ s/\s+$//go;
+          $oldCats{$cat} = 1;
+        }
+      }
+    }
+  }
+  # set the new parent topic
   if ($doAutoReparent) {
+    # get categories of this topic,
+    # must get it from current meta data
+    return unless $topicType =~ /ClassifiedTopic|CategorizedTopic|Category/;
+    my @allCats;
+    my $hierarchy = getHierarchy($web);
+    my $catFields = $hierarchy->getCatFields(split(/\s*,\s*/,$topicType));
+    # get categories from meta data
+    foreach my $field (@$catFields) {
+      my $cats = $meta->get('FIELD',$field);
+      next unless $cats;
+      $cats = $cats->{value};
+      next unless $cats;
+      foreach my $cat (split(/\s*,\s*/,$cats)) {
+        $cat =~ s/^\s+//go;
+        $cat =~ s/\s+$//go;
+        push @allCats, $cat;
+      }
+    }
+    # set the new parent topic
+    if (@allCats) {
+      @allCats = sort @allCats;
+      my $firstCat = shift @allCats;
+      # TODO: check if the firstCat exists and only then set the parent
+      # don't autoset to HomeTopic if TopCategory
+      $firstCat = $TWiki::cfg{HomeTopic} if $firstCat eq 'TopCategory';
+      $meta->remove('TOPICPARENT');
+      $meta->putKeyed('TOPICPARENT', {name=>$firstCat});
+    } else {
+      #$meta->putKeyed('TOPICPARENT', {name=>''});
+    }
+    writeDebug("autoreparenting");
+    my $newParentCat;
+    foreach my $cat (sort keys %newCats) {
+      if ($cat ne 'TopCategory') {
+        $newParentCat = $cat;
+        last;
+      }
+    }
+    my $homeTopicName = $Foswiki::cfg{HomeTopicName} || $TWiki::cfg{HomeTopicName};
+    $newParentCat = $homeTopicName unless defined $newParentCat;
+    writeDebug("newParentCat=$newParentCat");
+    $meta->remove('TOPICPARENT');
+    $meta->putKeyed('TOPICPARENT', {name=>$newParentCat});
   } else {
     writeDebug("not autoreparenting");
+  }
+  # cache invalidation
+  my $mode = 0;
+  $mode = 1 if $topicType =~ /\bTaggedTopic\b/;
+  $mode = 2 if $topicType =~ /\bCategorizedTopic\b/;
+  $mode = 3 if $topicType =~ /\bClassifiedTopic\b/;
+  $mode = 4 if $topicType =~ /\bCategory\b/;
+  # get touched categories
+  my %touchedCats;
+  foreach my $cat (keys %oldCats) {
+    $touchedCats{$cat} = 1;
+  }
+  foreach my $cat (keys %newCats) {
+    $touchedCats{$cat} = 1;
+  }
+  $touchedCats{$topic} = 1 if $topicType =~ /\bCategory\b/;
+  @touchedCats = keys %touchedCats; #remember
+  # cache invalidation: compute the purgeMode to be executed after save
+  $purgeMode = 1 if $topicType =~ /\bTaggedTopic\b/;
+  $purgeMode = 2 if $topicType =~ /\bCategorizedTopic\b/;
+  $purgeMode = 3 if $topicType =~ /\bClassifiedTopic\b/;
+  $purgeMode = 4 if $topicType =~ /\bCategory\b/;
   # try even harder if it missing the CategorizedTopic TopicType but
   # still uses categories
   if ($mode < 2) {
+  if ($purgeMode < 2) {
     my $hierarchy = getHierarchy($web);
     my $catFields = $hierarchy->getCatFields(split(/\s*,\s*/,$topicType));
     if ($catFields && @$catFields) {
+      $mode = ($mode < 1)?2:3;
+    }
+  }
+  writeDebug("mode=$mode");
+  if ($mode) {
+    my $hierarchy;
+    $hierarchy = getHierarchy($web);
+    $hierarchy->purgeCache($mode);
+#    $hierarchy->init();
+  }
+      $purgeMode = ($purgeMode < 1)?2:3;
+    }
+  }
+  writeDebug("purgeMode=$purgeMode");
+  writeDebug("touchedCats=".join(',', @touchedCats));
+}
 …
 sub afterSaveHandler {
   #my ($text, $topic, $web, $meta) = @_;
+  my $topic = $_[1];
+  my $web = $_[2];
+  writeDebug("afterSaveHandler($web, $topic)");
+  my $trashWeb = $Foswiki::cfg{TrashWebName} || $TWiki::cfg{TrashWebName};
+  if ($web eq $trashWeb) {
+    writeDebug("detected a move from $baseWeb to trash");
+    $web = $baseWeb;# operations are on the baseWeb
+  }
+  if ($purgeMode) {
+    writeDebug("purging hierarchy $web");
+    my $hierarchy;
+    $hierarchy = getHierarchy($web);
+    $hierarchy->purgeCache($purgeMode, \@touchedCats);
+  }
   finish(); # not called by modifyHeaderHandler
 …
+}
+################################################################################
+sub getCacheFile {
+  my $web = shift;
+  $web =~ s/^\s+//go;
+  $web =~ s/\s+$//go;
+  $web =~ s/[\/\.]/_/go;
+  return TWiki::Func::getWorkArea("ClassificationPlugin").'/'.$web.'.hierarchy';
+}
+###############################################################################
+sub getModificationTime {
+  my $web = shift;
+  my $cacheFile = getCacheFile($web);
+  my @stat = stat($cacheFile);
+  return $stat[9] || $stat[10] || 0;
+}
+###############################################################################
+sub isUpToDate {
+  my $web = shift;
+  return 0 if !$timeStamps{$web} || $timeStamps{$web} < getModificationTime($web);
+  return 1;
+}
 ###############################################################################
 …
   my $web = shift;
+  unless (defined $hierarchies{$web}) {
+  $web =~ s/\//\./go;
+  unless (isUpToDate($web)) {
+    writeDebug("constructing hierarchy for $web");
     require TWiki::Plugins::ClassificationPlugin::Hierarchy;
     $hierarchies{$web} = new TWiki::Plugins::ClassificationPlugin::Hierarchy($web);
+    $timeStamps{$web} = time();
+    writeDebug("DONE constructing hierarchy for $web");
+  }

trunk/ClassificationPlugin/lib/TWiki/Plugins/ClassificationPlugin/Hierarchy.pm

-                      r1090
+                      r1182
 require TWiki::Prefs;
 use constant OBJECTVERSION => 0.49;
+use constant OBJECTVERSION => 0.51;
 use constant DEBUG => 0; # toggle me
 …
 ################################################################################
-# static
-sub getCacheFile {
-  my $web = shift;
-  $web =~ s/^\s+//go;
-  $web =~ s/\s+$//go;
-  $web =~ s/[\/\.]/_/go;
-  return TWiki::Func::getWorkArea("ClassificationPlugin").'/'.$web.'.hierarchy';
+}
-################################################################################
 # constructor
 sub new {
 …
   #writeDebug("new hierarchy for web $web");
   my $this;
   my $cacheFile = getCacheFile($web);
+  my $cacheFile = TWiki::Plugins::ClassificationPlugin::Core::getCacheFile($web);
   my $session = $TWiki::Plugins::SESSION;
   my $refresh = '';
+  $refresh = $session->{cgiQuery}->param('refresh') || '' if defined $session;
+  my $query = TWiki::Func::getCgiQuery();
+  $refresh = $query->param('refresh') || '' if defined $session;
   $refresh = $refresh eq 'on'?1:0;
 …
   my $this = shift;
+  writeDebug("called finish()");
   my $gotUpdate = $this->{gotUpdate};
   $this->{gotUpdate} = 0;
+  foreach my $cat ($this->getCategories()) {
+    $gotUpdate ||= $cat->{gotUpdate};
+    $cat->{gotUpdate} = 0;
+  }
+  if (defined($this->{_categories})) {
+    foreach my $cat ($this->getCategories()) {
+      $gotUpdate ||= $cat->{gotUpdate};
+      $cat->{gotUpdate} = 0;
+    }
+  }
+  writeDebug("gotUpdate=$gotUpdate");
   if ($gotUpdate) {
     writeDebug("saving hierarchy $this->{web}");
+    my $cacheFile = getCacheFile($this->{web});
+    my $cacheFile = TWiki::Plugins::ClassificationPlugin::Core::getCacheFile($this->{web});
+    # SMELL: don't cache the prefs for now
+    undef $this->{_prefs};
+    #if (DEBUG) {
+    #  use Data::Dumper;
+    #  writeDebug(Dumper($this));
+    #}
     Storable::lock_store($this, $cacheFile);
+  }
+  writeDebug("done finish()");
+}
 …
 # mode = 5 -> clear all
 sub purgeCache {
   my ($this, $mode) = @_;
+  my ($this, $mode, $touchedCats) = @_;
   return unless $mode;
 …
   if ($mode > 1) { # categorized and classified topics
+    foreach my $catName (@$touchedCats) {
+      my $cat = $this->getCategory($catName);
+      $cat->purgeCache() if $cat;
+    }
+  }
+  if ($mode > 3) { # category topics
+    # nuke all categories
     foreach my $cat (values %{$this->{_categories}}) {
       $cat->purgeCache() if $cat;
+    }
+  }
-  if ($mode > 3) { # category topics
     undef $this->{_categories};
     undef $this->{_distance};
 …
     undef $this->{_bottom};
     undef $this->{_aclAttribute};
+    $this->{idCounter} = 0;
+  }
 …
 ################################################################################
-# destructor
-sub DESTROY {
-  my $this = shift;
-  $this->purgeCache(5);
+}
-################################################################################
 sub init {
   my $this = shift;
   # be anal
   die "recursive call to Hierarchy::init" if $insideInit{$this->{web}};
+  die "recursive call to Hierarchy::init for $this->{web}" if $insideInit{$this->{web}};
   $insideInit{$this->{web}} = 1;
   writeDebug("called Hierarchy::init for $this->{web}");
+  writeDebug("called Hierarchy::init for $this->{web} ... EXPENSIVE");
   my $session = $TWiki::Plugins::SESSION;
   $this->{_prefs} = new TWiki::Prefs($session);
 …
       $cat->setIcon($form->fastget("Icon"));
+      #writeDebug("$topicName has got title '$title'");
       # import foregin categories
       $cat->importCategories($form->fastget("ImportedCategory"), $seenImport);
 …
+  }
   #writeDebug("checking for default categories");
+  writeDebug("checking for default categories");
   # every hierarchy has one top node
   my $topCat =
 …
   writeDebug("finit");
+  #my $loops = 0;
   my $maxId = $this->{idCounter}-1;
   for my $id1 (0..$maxId) {
 …
         $distance[$id1][$id2] = -$dist if defined $dist;
+      }
+    }
+  }
+      #$loops++;
+    }
+  }
+  #writeDebug("maxId=$maxId, loops=$loops");
   writeDebug("done computeDistance() Wallace-Kollias");
-  if (0) {
-    my $oldDistance = $this->DISABLED_computeDistance();
-    foreach my $catName1 (sort $this->getCategoryNames()) {
-      my $cat1 = $this->{_categories}{$catName1};
-      my $catId1 = $cat1->{id};
-      foreach my $catName2 (sort $this->getCategoryNames()) {
-        my $cat2 = $this->{_categories}{$catName2};
-        my $catId2 = $cat2->{id};
-        my $dist =  $distance[$catId1][$catId2];
-        my $oldDist = $$oldDistance[$catId1][$catId2];
-        if (defined($dist)) {
-          if (defined($oldDist)) {
-            if ($oldDist == $dist) {
-              #writeDebug("distance($ancestors{$id1}->{name},$ancestors{$id2}->{name}) = $dist ... OK");
-            } else {
-              writeDebug("distance($catName1,$catName2) = $dist != $oldDist");
+            }
-          } else {
-            writeDebug("distance($catName1,$catName2) = $dist ... but NO OLD");
+          }
-        } else {
-          if (defined($oldDist)) {
-            writeDebug("distance($catName1,$catName2) = $oldDist ... but NO NEW");
+          }
+        }
+      }
+    }
+  }
   $this->{_distance} = \@distance;
   $this->{gotUpdate} = 1;
-  return \@distance;
+}
-################################################################################
-# computes the distance between all categories using a modified floyd-warshall
-# algorithm for transitive closures
-sub DISABLED_computeDistance {
-  my $this = shift;
-  writeDebug("called computeDistance_FLOYD_WARSHALL()");
-  # init matrix
-  my $totalIterations = 0;
-  my $effectiveIteratons = 0;
-  my @distance;
-  my $bottomId = $this->{_bottom}->{id};
-  writeDebug("init");
-  for my $cat ($this->getCategories()) {
-    my $id = $cat->{id};
-    $distance[$id][$id] = 0; # diagonal
-    my @children = $cat->getChildren();
-    if (@children) {
-      foreach my $child (@children) {
-        $distance[$id][$child->{id}] = 1; # direct contectedness
+      }
-    } else {
-      unless ($id == $bottomId) { # bottom
-        $distance[$id][$bottomId] = 1; # leaf nodes
+      }
+    }
+  }
-  # floyd-warshall algorithm for transitive closure
-  # used to computing min- and max distances, reused in
-  # subsumption and partof relations
-  my $maxId = $this->{idCounter}-1;
-  writeDebug("propagate");
-  writeDebug("maxId=$maxId");
-  foreach my $catIId (0..$maxId) {
-    foreach my $catJId (0..$maxId) {
-      next if $catIId == $catJId; # skip current row
-      my $distIJ = $distance[$catIId][$catJId];
-      foreach my $catKId (0..$maxId) {
-        $totalIterations++;
-        next if $catKId == $catIId || $catKId == $catJId; # skip current row
-        my $distIK = $distance[$catIId][$catKId];
-        next unless $distIK;
-        my $distKJ = $distance[$catKId][$catJId];
-        next unless $distKJ;
-        my $minSum = $distIK+$distKJ;
-        $distance[$catIId][$catJId] = $minSum if !$distIJ || $distIJ > $minSum;
-        $effectiveIteratons++;
+      }
+    }
+  }
-  # fill other half of the matrix, the reverse relation,
-  # we are using qubic memory already anyway
-  writeDebug("finit");
-  for my $id1 (0..$maxId) {
-    for my $id2 (0..$maxId) {
-      next if $id1 == $id2;
-      my $dist = $distance[$id1][$id2];
-      next unless $dist;
-      $distance[$id2][$id1] = -$dist;
+    }
+  }
-  $this->{_distance} = \@distance;
-  $this->{gotUpdate} = 1;
-  writeDebug("totalIterations=$totalIterations, effectiveIteratons=$effectiveIteratons");
-  writeDebug("done computeDistance");
   return \@distance;
+}
 …
   # check topic1
-  my $extraDistance = 0;
   my $catObj = $this->getCategory($topic1);
+  my $firstIsTopic;
   if ($catObj) { # known category
+    $firstIsTopic = 0;
     $catSet1{$topic1} = $catObj->{id};
   } else {
+    $firstIsTopic = 1;
     my $cats = $this->getCategoriesOfTopic($topic1);
     return undef unless $cats; # no categories, no distance
 …
       $catSet1{$name} = $catObj->{id} if $catObj;
+    }
-    $extraDistance++; # going to its categories is one extra step
+  }
   # check topic2
+  my $secondIsTopic;
   $catObj = $this->getCategory($topic2);
   if ($catObj) { # known category
+    $secondIsTopic = 0;
     $catSet2{$topic2} = $catObj->{id};
   } else {
+    $secondIsTopic = 1;
     my $cats = $this->getCategoriesOfTopic($topic2);
     return undef unless $cats; # no categories, no distance
 …
       $catSet2{$name} = $catObj->{id} if $catObj
+    }
+    $extraDistance++; # going to its categories is one extra step
+  }
+  }
+  return 0 if
+    $firstIsTopic == 1 &&
+    $secondIsTopic == 1 &&
+    $topic1 eq $topic2;
   if (DEBUG) {
 …
   return undef unless defined($min);
+  $min += $extraDistance;
+  #writeDebug("min=$min");
+  $min = abs($min) + 2 if $firstIsTopic && $secondIsTopic;
+  $min-- if $firstIsTopic;
+  $min++ if $secondIsTopic;
   return $min;
 …
   my $result = $this->catDistance($cat1, $cat2);
   return (defined($result) && $result > 0)?1:0;
+  return (defined($result) && $result >= 0)?1:0;
+}
 …
     # try id
     if ($name =~ /^\d+/) {
       foreach my $cat (keys %{$this->{_categories}}) {
         last if $cat->{id} == $name;
+      foreach my $cat (values %{$this->{_categories}}) {
+        last if $cat->{id} eq $name;
+      }
+    }
 …
 # static
 sub inlineError {
   return '<span class="foswikiAlert">' . $_[0] . '</span>' ;
+  return '<span class="twikiAlert">' . $_[0] . '</span>' ;
+}
 ###############################################################################
 sub toHTML {
+sub traverse {
   my ($this, $params) = @_;
   #writeDebug("called toHTML for hierarchy in '$this->{web}'");
+  #writeDebug("called traverse for hierarchy in '$this->{web}'");
   my $nrCalls = 0;
 …
     next unless $cat;
     #writeDebug("found category ".$cat->{name});
     my $catResult =  $cat->toHTML($params, \$nrCalls);
+    my $catResult =  $cat->traverse($params, \$nrCalls);
     push @result, $catResult if $catResult
+  }
 …
   );
   #writeDebug("done toHTML");
+  #writeDebug("done traverse");
   return TWiki::Func::expandCommonVariables($header.$result.$footer);
+}

trunk/ClassificationPlugin/lib/TWiki/Plugins/ClassificationPlugin/MANIFEST

-                      r64
+                      r1182
 data/Applications/ClassificationApp/BusinessStructure.txt 0644
 data/Applications/ClassificationApp/CampainManagementCategory.txt 0644
+data/Applications/ClassificationApp/CategorizedTopicEditTemplate.txt 0644
 data/Applications/ClassificationApp/CategorizedTopicRenderIndexItem.txt 0644
 data/Applications/ClassificationApp/CategorizedTopicTemplate.txt 0644
+data/Applications/ClassificationApp/CategorizedTopic.txt 0644
 data/Applications/ClassificationApp/CategorizedTopicViewTemplate.txt 0644
-data/Applications/ClassificationApp/CategorizedTopic.txt 0644
 data/Applications/ClassificationApp/CategoryBrowser.txt 0644
 data/Applications/ClassificationApp/CategoryEditTemplate.txt 0644
 data/Applications/ClassificationApp/CategoryRenderIndexItem.txt 0644
 data/Applications/ClassificationApp/CategoryTemplate.txt 0644
+data/Applications/ClassificationApp/Category.txt 0644
 data/Applications/ClassificationApp/CategoryViewTemplate.txt 0644
-data/Applications/ClassificationApp/Category.txt 0644
 data/Applications/ClassificationApp/ChannelManagementCategory.txt 0644
 data/Applications/ClassificationApp/ClassificationApp.txt 0644
 …
 data/Applications/ClassificationApp/ClassifiedTopicRenderIndexItem.txt 0644
 data/Applications/ClassificationApp/ClassifiedTopicTemplate.txt 0644
+data/Applications/ClassificationApp/ClassifiedTopic.txt 0644
 data/Applications/ClassificationApp/ClassifiedTopicViewTemplate.txt 0644
-data/Applications/ClassificationApp/ClassifiedTopic.txt 0644
 data/Applications/ClassificationApp/CompetitionCategory.txt 0644
 data/Applications/ClassificationApp/ContactsCategory.txt 0644
 …
 data/Applications/ClassificationApp/DepartmentsCategory.txt 0644
 data/Applications/ClassificationApp/DevelopmentForum.txt 0644
+data/Applications/ClassificationApp/DocumentationForum.txt 0644
 data/Applications/ClassificationApp/DocuTopic.txt 0644
-data/Applications/ClassificationApp/DocumentationForum.txt 0644
 data/Applications/ClassificationApp/EmployeeDirectoryCategory.txt 0644
 data/Applications/ClassificationApp/EventsForum.txt 0644
 …
 data/Applications/ClassificationApp/HRPoliciesCategory.txt 0644
 data/Applications/ClassificationApp/HumanResourcesCategory.txt 0644
-data/Applications/ClassificationApp/ITCategory.txt 0644
-data/Applications/ClassificationApp/ITHelpDeskCategory.txt 0644
-data/Applications/ClassificationApp/ITPoliciesCategory.txt 0644
 data/Applications/ClassificationApp/IconSet.txt 0644
 data/Applications/ClassificationApp/IndustryCategory.txt 0644
 data/Applications/ClassificationApp/InstallationForum.txt 0644
 data/Applications/ClassificationApp/IntranetDirectory.txt 0644
+data/Applications/ClassificationApp/ITCategory.txt 0644
+data/Applications/ClassificationApp/ITHelpDeskCategory.txt 0644
+data/Applications/ClassificationApp/ITPoliciesCategory.txt 0644
+data/Applications/ClassificationApp/.kinoupdate 0644
 data/Applications/ClassificationApp/KnowledgeBaseCategory.txt 0644
 data/Applications/ClassificationApp/LegalCategory.txt 0644
 …
 data/Applications/ClassificationApp/MeetingRoomReservationCategory.txt 0644
 data/Applications/ClassificationApp/MigrationAndConversionForum.txt 0644
+data/Applications/ClassificationApp/NatSkinCategorizedTopicEditTemplate.txt 0644
 data/Applications/ClassificationApp/NatSkinCategorizedTopicViewTemplate.txt 0644
 data/Applications/ClassificationApp/NatSkinCategoryEditTemplate.txt 0644
 …
 data/Applications/ClassificationApp/NatSkinClassifiedTopicViewTemplate.txt 0644
 data/Applications/ClassificationApp/NatSkinSearchViewTemplate.txt 0644
+data/Applications/ClassificationApp/NatSkinTaggedTopicEditTemplate.txt 0644
 data/Applications/ClassificationApp/NatSkinTaggedTopicViewTemplate.txt 0644
 data/Applications/ClassificationApp/NewsAndAnnouncementsCategory.txt 0644
 …
 data/Applications/ClassificationApp/RenderHierarchyAsJSON.txt 0644
 data/Applications/ClassificationApp/RenderIconSelector.txt 0644
+data/Applications/ClassificationApp/RenderSideBar.txt 0644
 data/Applications/ClassificationApp/RenderTaggedTopicView.txt 0644
 data/Applications/ClassificationApp/RenderWebClassSearch.txt 0644
 …
 data/Applications/ClassificationApp/StarterKitCategory.txt 0644
 data/Applications/ClassificationApp/SupportForum.txt 0644
+data/Applications/ClassificationApp/TWikiApplication.txt 0644
+data/Applications/ClassificationApp/TWikiFormAttribute.txt 0644
+data/Applications/ClassificationApp/TWikiForm.txt 0644
+data/Applications/ClassificationApp/TWikiTopic.txt 0644
+data/Applications/ClassificationApp/TaggedTopicEditTemplate.txt 0644
 data/Applications/ClassificationApp/TaggedTopicTemplate.txt 0644
+data/Applications/ClassificationApp/TaggedTopic.txt 0644
 data/Applications/ClassificationApp/TaggedTopicViewTemplate.txt 0644
-data/Applications/ClassificationApp/TaggedTopic.txt 0644
 data/Applications/ClassificationApp/TestCategorizedTopic1.txt 0644
 data/Applications/ClassificationApp/TestCategory0.txt 0644
 …
 data/Applications/ClassificationApp/TrainingCategory.txt 0644
 data/Applications/ClassificationApp/TravelingCategory.txt 0644
+data/Applications/ClassificationApp/TWikiApplication.txt 0644
+data/Applications/ClassificationApp/TWikiFormAttribute.txt 0644
+data/Applications/ClassificationApp/TWikiForm.txt 0644
+data/Applications/ClassificationApp/TWikiTopic.txt 0644
 data/Applications/ClassificationApp/UpgradingForum.txt 0644
 data/Applications/ClassificationApp/WebAtom.txt 0644
 …
 data/_ClassificationTemplate/Category.txt 0644
 data/_ClassificationTemplate/ClassifiedTopic.txt 0644
-data/_ClassificationTemplate/TWikiTopic.txt 0644
 data/_ClassificationTemplate/TaggedTopic.txt 0644
 data/_ClassificationTemplate/TopCategory.txt 0644
 …
 data/_ClassificationTemplate/TopicTemplate.txt 0644
 data/_ClassificationTemplate/TopicType.txt 0644
+data/_ClassificationTemplate/TWikiTopic.txt 0644
 data/_ClassificationTemplate/WebAtom.txt 0644
 data/_ClassificationTemplate/WebChanges.txt 0644
 …
 pub/Applications/ClassificationApp/IconSet/wrench_orange.png 0644
 pub/Applications/ClassificationApp/IconSet/wrench.png 0644
+pub/TWiki/ClassificationPlugin/aqua-pill-18.gif 0644
+pub/TWiki/ClassificationPlugin/classification.js 0644
 pub/TWiki/ClassificationPlugin/FormDotPm-4_1_2.patch 0644
-pub/TWiki/ClassificationPlugin/classification.js 0644
 pub/TWiki/ClassificationPlugin/jquery.tagselector.js 0644
 pub/TWiki/ClassificationPlugin/styles.css 0644

trunk/ClassificationPlugin/lib/TWiki/Plugins/ClassificationPlugin/build.pl

-                      r1065
+                      r1182
+}
 use TWiki::Contrib::Build;
+use Foswiki::Contrib::Build;
 # Create the build object
 $build = new TWiki::Contrib::Build( 'ClassificationPlugin' );
+$build = new Foswiki::Contrib::Build( 'ClassificationPlugin' );
 # Build the target on the command line, or the default target

trunk/ClassificationPlugin/pub/TWiki/ClassificationPlugin/jquery.tagselector.js

-                      r64
+                      r1182
 /*
  * jQuery TagSelector plugin 1.0
+ * jQuery TagSelector plugin 1.1
+ *
  * Copyright (c) 2008 Michael Daum http://michaeldaumconsulting.com
 …
       var initialTags;
-      var doneHandleKeys = false;
-      // key handler *********************************************************
-      function handleKeys(ev) {
-        writeDebug("called handleKey(), event type="+ev.type+" keyCode="+ev.keyCode);
-        // key press
-        if (ev.type == 'keypress') {
-          if (ev.keyCode == 9) {
-            handleTabKey();
-            return false; // suppress default actions
-          } else if (ev.keyCode == 13) {
-            handleReturnKey();
-            return false; // suppress default actions
+          }
-          return true;
+        }
-        doneHandleKeys = false;
-        window.setTimeout(function() {
-          _handleKeysJob(ev.keyCode)
-        }, 100);
-        if (ev.keyCode == 9 || ev.keyCode == 13) {
-          //writeDebug("suppressing default action");
-          return false; // suppress default actions
-        } else {
-          return true;
+        }
+      }
-      // update selection, called by key handler
-      function _handleKeysJob(keyCode) {
-        if (doneHandleKeys) {
-          return;
+        }
-        doneHandleKeys = true;
-        //writeDebug("called _handleKeysJob()");
-        // key up
-        //writeDebug("keyCode="+keyCode);
-        switch(keyCode) {
-          case 37: // arrow keys
-          case 38:
-          case 39:
-          case 40:
-            return;
-          case 224:
-          case 17:
-          case 16:
-          case 18:
-            return;
-          case 46: // delete
-          case 8: // backspace
-          case 9: // tab
-          case 13: // return
-          case 27:
-          case 32: // space
+        }
-        $("a", $tagCloud).removeClass('typed current');
-        var selection = $input.val();
-        //writeDebug("selection="+selection);
-        var tmpValues = selection.split(/\s*,\s*/);
-        var values = new Array();
-        for (var i = 0; i < tmpValues.length; i++) {
-          values.push(tmpValues[i].replace(/([^0-9A-Za-z_])/, '\\$1'));
+        }
-        var filter = "a#"+values.join(",a#");
-        //writeDebug("filter="+filter);
-        $(filter, $tagCloud).addClass("current");
-        var last = tmpValues[tmpValues.length-1];
-        if (last.match(/^ *$/)) {
-          return;
+        }
-        $("a[id^="+last+"]", $tagCloud).each(function() {
-          var id = $(this).attr('id');
-          if (selection.indexOf(id) < 0) {
-            $(this).addClass("typed");
+          }
-        });
+      }
-      // tab handler *********************************************************
-      function handleTabKey() {
-        //writeDebug("called handleTabKey()");
-        var elem = $input.get(0);
-        elem.focus();
-        var currentTags = $input.val();
-        //writeDebug("currentTags="+currentTags);
-        var values = currentTags.split(/\s*,\s*/);
-        var last = values.pop();
-        var startPos = elem.selectionStart;
-        var endPos = elem.selectionEnd;
-        var origLast = last;
-        if (last.match(/^ *$/)) {
-          //writeDebug("no last");
-          return;
+        }
-        if (startPos != endPos) {
-          last = last.substring(0, last.length-endPos+startPos);
-          //writeDebug("substracted selection, last="+last);
+        }
-        // find all matching tags
-        var matchedTags = new Array();
-        currentTags = values.join(", ");
-        $("a[id^="+last+"]", $tagCloud).each(function() {
-          var id = $(this).attr('id');
-          if (currentTags.indexOf(id) < 0) {
-            matchedTags.push(id);
+          }
-        });
-        //writeDebug("matchedTags="+matchedTags);
-        // decide which tag to use
-        if (matchedTags.length == 0) {
-          //writeDebug("no matched tags");
-          return;
+        }
-        if (matchedTags.length == 1) {
-          values.push(matchedTags[0]);
-          setTags(values, false);
-          startPos = endPos = $input.val().length;
-        } else {
-          setTags(values);
-          currentTags = $input.val();
-          var nextTag = matchedTags[0];
-          var state = 0;
-          for (var i = 0; i < matchedTags.length; i++) {
-            if (matchedTags[i] == origLast) {
-              state = 1;
-            } else {
-              if (state == 1) {
-                nextTag = matchedTags[i];
-                break;
+              }
+            }
+          }
-          //writeDebug("nextTag="+nextTag);
-          startPos = currentTags.length+last.length;
-          endPos = currentTags.length+nextTag.length;
-          if (currentTags.length > 0) {
-            startPos += 2;
-            endPos += 2;
+          }
-          //writeDebug("1 - startPos="+startPos+" endPos="+endPos)
-          if (currentTags.match(/^ *$/)) {
-            currentTags = nextTag;
-          } else {
-            currentTags += ", "+nextTag;
+          }
-          $input.val(currentTags);
+        }
-        // set cursor and selection
-        if (typeof(elem.setSelectionRange) == 'function') {
-          elem.setSelectionRange(startPos, endPos);
-          //writeDebug("using setSelectionRange");
-        } else if (document.selection) { // IE
-          //writeDebug("found document.selection");
-        } else { // standard browsers
-          elem.selectionStart = startPos;
-          elem.selectionEnd = endPos;
+        }
-        var startPos = elem.selectionStart;
-        var endPos = elem.selectionEnd;
-        //writeDebug("2 - startPos="+startPos+" endPos="+endPos)
+      }
-      // return handler ******************************************************
-      function handleReturnKey() {
-        //writeDebug("called handleReturnKey()");
-        var currentTags = $input.val();
-        var values = currentTags.split(/\s*,\s*/);
-        var newValues = new Object();
-        // remove dupplicates
-        for (var i = 0; i < values.length; i++) {
-          newValues[values[i]] = 1;
+        }
-        values = new Array();
-        for (var key in newValues) {
-          values.push(key);
+        }
-        $input.val(values.sort().join(", "));
-        var elem = $input.get(0);
-        elem.focus();
-        // set cursor
-        var length = $input.val().length;
-        if (typeof(elem.setSelectionRange) == 'function') {
-          elem.setSelectionRange(length, length);
-          //writeDebug("using setSelectionRange");
-        } else if (document.selection) { // IE
-          //writeDebug("found document.selection");
-        } else { // browsers that don't have setSelectionRange
-          elem.selectionStart = length;
-          elem.selectionEnd = length;
+        }
+      }
       // toggle a tag in the input field and the cloud ***********************
 …
         var filter = "#"+tmpValues.join(",#");
         //writeDebug("filter="+filter);
         $(filter, $tagCloud).addClass("current");
+        $tagCloud.find(filter).addClass("current");
         if (doSort) {
           values = values.sort();
 …
         // events
         writeDebug("called init()");
+        $input.keyup(handleKeys).keypress(handleKeys);
+        var tags = [];
+        $this.find('.clsTagCloud a').each(function() {
+          tags.push([$(this).text(),$(this).attr('title')]);
+        });
+        writeDebug("tags = "+tags);
+        $input.autocomplete(
+          tags,
+          {
+            multiple: true,
+            autoFill: true,
+            formatItem: function(tag, i, total) {
+              return '<table width="100%"><tr><td align="left">'+tag[0]+'</td><td align="right">'+tag[1]+'</td></tr></table>';
+            },
+            formatMatch: function(tag, i, total) {
+              return tag[0];
+            }
+          }
+        ).result(function(event, data, formatted) {
+          $tagCloud.find("#"+formatted).addClass("current");
+        });
         $(thisOpt.clearButton, $this).click(function() {
           clearSelection();

trunk/ClassificationPlugin/pub/TWiki/ClassificationPlugin/styles.css

-                      r1178
+                      r1182
 .clsTopicInfo {
   color:gray;
+  color:#808080;
+}
 .clsTopicInfoSep {
 …
+}
 .clsBrowser a {
   text-decoration:none;
+  text-decoration:none !important;
+}
 .clsBrowser a.foswikiCurrentTopicLink {
+.clsBrowser a.twikiCurrentTopicLink {
   color:red;
+}
 …
   margin-bottom:5px;
+}
+.clsBrowser ul li a:hover,
+.clsBrowser ul li a {
+  background-image:none;
+  padding:0px;
+}
+.clsSideBar.clsBrowser {
+  border:0px;
+  padding:0px;
+  margin-bottom:0px;
+}
+.clsIconSelector label {
+  padding:0px;
+}
 .clsTagSelector table td,
 .clsTagSelector table th {
 …
   margin:5px 0px;
   width:auto !important;
+}
-.clsButtonBox
-.aquaPillSelected,
-.aquaPill {
-  background-repeat:no-repeat;
-  background-image:url('aqua-pill-18.gif');
-  background-position:left top;
-  text-decoration:none !important;
-  font-size:11px;
-  line-height:18px;
-  height:18px;
-  float:left;
-  vertical-align:middle;
+}
-.aquaPillSelected span,
-.aquaPill span {
-  color:white;
-  font-weight:bold;
-  margin:0px 0px 0px 10px;
-  padding:0px 10px 0px 0px;
-  background-image:url('aqua-pill-18.gif');
-  background-repeat:no-repeat;
-  background-position:right top;
-  font-size:11px;
-  line-height:18px;
-  line-height:18px;
-  height:18px;
-  float:left;
-  vertical-align:middle;
+}
-.aquaPill:hover,
-.aquaPillSelected:hover {
-  text-decoration:none;
-  color:white;
+}
-.aquaPill:hover,
-.aquaPillSelected {
-  background-image:url('aqua-pill-18.gif') !important;
-  background-position:left bottom !important;
+}
-.aquaPill:hover span,
-.aquaPillSelected span {
-  background-position:right bottom;
+}
 #clsNewCategory, #clsNewTopic {
 …
   background:pink;
+}
 .clsCategoryFactory .foswikiFirstCol {
+.clsCategoryFactory .twikiFirstCol {
   width:100px;
+}
 …
   margin:1em 0px;
+}
+.fltMakeIndexWrapper table {
+  width:100%;
+}
+.fltMakeIndexWrapper a {
+  text-decoration:none;
+}
 .fltMakeIndexWrapper h3 {
+  margin:0px !important;
+  border:0px;
+  margin:0px;
+  padding:0px;
+  font-size:110%;
+}
 .fltMakeIndexWrapper ul {
   margin:0px;
   padding-top:0px;
   padding-bottom:0px;
+  margin:0em 0em 1.0em 0em;
+  padding:0em;
+  list-style-type:none;
+}
 .fltMakeIndexWrapper li {
   padding:7px 0px 0px 0px;
   margin:0px 0px 3px 0px;
+  padding:0.5em 0em 0.5em 0em;
+  margin:0em 0em 0.5em 0em;
   border-bottom:1px solid #eeeeee;
+  min-height:16px;
+}
 .fltMakeIndexWrapper .clsTopicInfo {
   color:gray;
+  color:#808080;
   margin:0px;
+}
 …
 .fltMakeIndexWrapper .clsSubCategories {
+  display:inline;
   margin-top:0.2em;
   margin-bottom:0.2em;
 …
 .fltMakeIndexWrapper .clsSubCategories a,
 .fltMakeIndexWrapper .clsSubCategories {
+  color:gray;
+  color:#808080;
+}
+.fltAnchors {
+  margin:1.5em 0em 0em;
+  /*
+  text-align:center;
+  border-bottom:1px solid #eeeeee;
+  */
+}
+.fltMakeIndexWrapper .fltAnchors a {
+  /*text-decoration:none;*/
+  padding:2px 4px;
+  margin:0px;
+}
+.clsIndexItem {
+  min-height:16px;
+}
 .clsTopicItem {
   padding-left:18px;
+  padding-left:20px;
   background-image:url(../../Applications/ClassificationApp/IconSet/text.png);
   background-repeat:no-repeat;
+}
 .clsCategoryItem {
   padding-left:18px;
+  padding-left:20px;
   background-image:url(../../Applications/ClassificationApp/IconSet/folder.gif);
   background-repeat:no-repeat;
 …
+}
+.clsCategoryIcon {
+  margin:0px 5px 0px 3px;
+}
+.clsFilterForm.twikiFormSteps {
+  border-width:1px 0px;
+  margin:1.5em 0em 0em;
+}
+.clsFilterForm .twikiFormStep {
+  float:left;
+  border:0px;
+  margin:0.5em 2em 0.5em 0.5em;
+}
+.clsFilterForm .twikiFormStep h3,
+.clsFilterForm .twikiFormStep h4 {
+  display:inline;
+  font-weight:bold;
+  text-decoration:none;
+  border:0px;
+  font-style:normal;
+}
 /* pattern skin tweaks */
 .foswikiTopic h1 a,
 .foswikiTopic h2 a,
 .foswikiTopic h3 a,
 .foswikiTopic h4 a,
 .foswikiTopic h5 a,
 .foswikiTopic h6 a {
   text-decoration:none;
+#patternMainContents h1 a,
+#patternMainContents h2 a,
+#patternMainContents h3 a,
+#patternMainContents h4 a,
+#patternMainContents h5 a,
+#patternMainContents h6 a {
+  text-decoration:none !important;
+}

Context Navigation

Legend:

Download in other formats: