[TWiki-Dev] [SVN] LynnwoodBrown r15121 - in twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data: TCAO TCAO/Installs TWiki

[<de...@de...>]

Author: LynnwoodBrown
Date: 2007-10-01 10:33:56 -0500 (Mon, 01 Oct 2007)
New Revision: 15121

Modified:
   twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/CreateNewWebLog.txt
   twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/Installs/NewsItemTemplate.txt
   twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/Installs/TopicTree.txt
   twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderAddClassification.txt
   twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderClassificationTopic.txt
   twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderCreateNewTopic.txt
   twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderSearchString.txt
   twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderTopicCreator.txt
   twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/SubjectArea.txt
   twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/TopicClassWebHomeIntro.txt
   twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/TopicTree.txt
   twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TWiki/TopicClassificationAddOn.txt
Log:
Item1715: Correcting some script names.

Modified: twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/CreateNewWebLog.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/CreateNewWebLog.txt	2007-10-01 14:51:17 UTC (rev 15120)
+++ twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/CreateNewWebLog.txt	2007-10-01 15:33:56 UTC (rev 15121)
@@ -10,7 +10,7 @@
 <input type="hidden" name="TopicType" value="WebLog" />
 <input type="hidden" name="templatetopic" value="%TCAOWEB%/Installs.WebLogTemplate" />
 <input type="hidden" name="formtemplate" value="%BASEWEB%.WebLogForm" />
-|    *Log Headline:* | <input type="text" name="Summary" size="50" onchange="document.newWebLog.topic.value=removeSpacesAndPunctiation(capitalize(this.value));" />   | _This is displayed as the <nop>WebLog's title._     |
+|    *Log Headline:* | <input type="text" name="Summary" size="50" onchange="document.newWebLog.topic.value=removeSpacesAndPunctuation(capitalize(this.value));" />   | _This is displayed as the <nop>WebLog's title._     |
 |    *URL:* | <input type="text" name="Url" size="50" value="%URLPARAM{url}%"/>  | _Address of web page post refers to (if applicable)._    |
 |     *Page title:* | <input type="text" name="Title" size="50" value="%URLPARAM{title}%"/>  | _Name of web page post refers to (if applicable)._     |
 |     *SubjectArea:* | <select name="SubjectArea" size="1"><option value=" "> Select... </option>%DBQUERY{ "Classification = 'SubjectArea'" web="%BASEWEB%" regex="on" separator=" " format="<option>$topic</option>" }% </select> _Optional: select a subject area this post relates to._     ||

Modified: twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/Installs/NewsItemTemplate.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/Installs/NewsItemTemplate.txt	2007-10-01 14:51:17 UTC (rev 15120)
+++ twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/Installs/NewsItemTemplate.txt	2007-10-01 15:33:56 UTC (rev 15121)
@@ -9,5 +9,6 @@
 
 ---+++ Comments
 
-#AddComments
-%INCLUDE{"%TCAOWEB%.RenderAddComment" }%
+---+++ Comments
+%DBCALL{"%TCAOWEB%.RenderCommentCountBar" warn="off"}% 
+%COMMENT{type="comment"}%

Modified: twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/Installs/TopicTree.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/Installs/TopicTree.txt	2007-10-01 14:51:17 UTC (rev 15120)
+++ twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/Installs/TopicTree.txt	2007-10-01 15:33:56 UTC (rev 15121)
@@ -1,14 +1,11 @@
 %META:TOPICINFO{author="TWikiContributor" date="1130441340" format="1.1" version="$rev$"}%
 %META:TOPICPARENT{name="TopicClassification"}%
 %INCLUDE{%TCAOWEB%.%TOPIC%}%
-%TREEVIEW{topic="%URLPARAM{root}%" web="%BASEWEB%" stoplevel="5" formatting="imageoutline:thread"}%
+%TREEVIEW{topic="%URLPARAM{"root" default="WebHome"}%" web="%BASEWEB%" stoplevel="5" formatting="imageoutline:thread"}%
 
 
 <!-- Topic Permissions
-	* Set ALLOWTOPICCHANGE = %USERSWEB%.TWikiAdminGroup
-	* Set ALLOWTOPICRENAME = %USERSWEB%.TWikiAdminGroup
+	* Set ALLOWTOPICCHANGE = %MAINWEB%.TWikiAdminGroup
+	* Set ALLOWTOPICRENAME = %MAINWEB%.TWikiAdminGroup
 -->
 
-
-%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="%25USERSWEB%25.TWikiAdminGroup"}%
-%META:PREFERENCE{name="ALLOWTOPICRENAME" title="ALLOWTOPICRENAME" type="Set" value="%25USERSWEB%25.TWikiAdminGroup"}%

Modified: twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderAddClassification.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderAddClassification.txt	2007-10-01 14:51:17 UTC (rev 15120)
+++ twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderAddClassification.txt	2007-10-01 15:33:56 UTC (rev 15121)
@@ -15,8 +15,8 @@
 %STARTSECTION{name="documentation" type="section"}%
 %TOPIC% is INCLUDED in TopicClassification and provides interface for adding new classifications to a web where TopicClassificationApplication is used.
 
-Restrict view to %USERSWEB%.ModeratorGroup. This makes this form invisible for anyone not authorized to add TopicClassifications.
-   * Set ALLOWTOPICVIEW = %USERSWEB%.ModeratorGroup
+Restrict view to %MAINWEB%.ModeratorGroup. This makes this form invisible for anyone not authorized to add TopicClassifications.
+   * Set ALLOWTOPICVIEW = %MAINWEB%.ModeratorGroup
 
 ---+++++ Parameters
    * TYPE = %RED% Required %ENDCOLOR% - type of Classification form is form
@@ -28,6 +28,7 @@
 ---++ Implementation
 <verbatim>
 %STARTINCLUDE%
+<script type="text/javascript" src="%PUBURL%/%TWIKIWEB%/TWikiJavascripts/twiki.js"></script>
 <script type="text/javascript" language="JavaScript"><!--
 // The following section create a list of Classification Summary fields from the templates.
 <noautolink>
@@ -38,26 +39,24 @@
 var null_summary;
 null_summary = " ";
 
-// These variables are for holding the Summary value when switching back and forth between predefined and new.
-var newSummary;
-newSummary = " ";
-
 function selectNewOrPre(selectedItem) {
    if (selectedItem == 'new' || selectedItem == 'none' ) {
-      //restore any previously entered new class name and summary
+      //restore any previously entered new class name 
       document.addType.topic.value=document.addType.new_type.value;
-      document.addType.Summary.value=newSummary;
+      // clear Summary field
+      document.addType.Summary.value=" ";
       // set default template for new class or over-ride by TEMPLATE value defined locally
 %IFDEFINEDTHEN{"%TEMPLATE%" glue="off"}%
       document.addType.templatetopic.value="%TEMPLATE%";
 %ELSEDEFINED%
       document.addType.templatetopic.value="%TCAOWEB%/Installs.%TYPE%Template";
 %FIDEFINED%
+      // Reset selectClass to "new" incase "Predefined..." is selected
+      document.getElementById("newClass").selected=true;
       // switch user interface
       document.getElementById("addNew").style.display = "block";
    } else {
-     // Save any new Summary that may have been entered.
-      newSummary=document.addType.Summary.value; 
+     // This section inserts the values for predefined classifications
       // Set in the topic name, template, and fill in summary field
       document.addType.topic.value=selectedItem;
       document.addType.templatetopic.value = ('%TCAOWEB%/Installs.' + selectedItem);
@@ -67,9 +66,8 @@
    }
 }
 
-
 function nameNew() {
-   document.addType.topic.value=removeSpacesAndPunctiation(capitalize(document.addType.new_type.value));
+   document.addType.topic.value=removeSpacesAndPunctuation(capitalize(document.addType.new_type.value));
    document.addType.new_type.value=document.addType.topic.value;
    insertHtml((document.addType.topic.value + "Template"), "newTemplateFeedback");
    insertHtml((document.addType.topic.value + "Form"), "newFormFeedback");
@@ -98,16 +96,16 @@
 %~~     DBQUERY{ "Classification = '%TYPE%'" 
 ~~~            web="%TCAOWEB%/Installs" 
 ~~~           order="topic" 
-~~~           exclude="(
+~~~           exclude="
 *~~           
 %~~              DBQUERY{ "Classification = '%TYPE%'" 
 ~~~                 web="%BASEWEB%" 
 ~~~                 order="topic" 
-~~~                 format="$topic" 
-~~~                 separator="|"
+~~~                 format="|$topic" 
+~~~                 separator=""
 ~~~                 remote="off"
 ~~~               }%
-*~~            )" 
+*~~            " 
 ~~~           format="<option value=\"$topic\">- <nop>$topic</option>" 
 ~~~           separator="" 
 ~~~           remote="off"
@@ -115,21 +113,26 @@
 ~~~   </select>
 </p>
 </div><!--/twikiFormStep--><div class="twikiFormStep">
-<span id="addNew" style="display:inline;"  >%TABLE{tablewidth="100%" columnwidths="14%,86%" }%
-|  *Name:* | <input type="text" name="new_type"  size="25" onblur="nameNew();" > |
-%IFDEFINEDTHEN{"%NEWEXTRA%" glue="off"}%
-%INCLUDE{"%TOPIC%" section="%NEWEXTRA%" TYPE="%TYPE%"}% 
-%FIDEFINED%
-</span>
+<div id="addNew" style="display:inline;"  >%TABLE{tablewidth="100%" columnwidths="14%,86%" }%
+|  *Name:* | <input type="text" name="new_type"  size="25" onblur="nameNew();" > 
+~~~     %IFDEFINEDTHEN{"%NEWEXTRA%" glue="off"}%
+~~~     %INCLUDE{"%TOPIC%" section="%NEWEXTRA%" TYPE="%TYPE%"}% 
+~~~     %FIDEFINED%
+~~~     |
+</div>
 %TABLE{tablewidth="100%" columnwidths="14%,86%" }%
-|  *Summary:* | <input type="text" name="Summary" size="40" value=' ' /> <br /> _Provide short summary of new %TYPE%_   |
+|  *Summary:* | <input type="text" name="Summary" size="40" value=' ' /> <br /> _Provide short summary of new <nop>%TYPE%_   |
 |  *Facets:* | <input type="text" name="Facets" size="40" />  <br /> _Optional: Identify classifications to cross reference._   | 
 %IFDEFINEDTHEN{"%ALLEXTRA%" glue="off"}%
 %INCLUDE{"%TOPIC%" section="%ALLEXTRA%" TYPE="%TYPE%"}% 
 %FIDEFINED%
 <input type="hidden" name="new_headline" value="Enter summary for your new <nop>%TYPE%..." />
 <input type="hidden" name="topic" size="20" value=" " />
-<input type="hidden" name="templatetopic" size="40" value="Template" />
+%IFDEFINEDTHEN{"%TEMPLATE%" glue="off"}%
+<input type="hidden" name="templatetopic" size="40" value="%TEMPLATE%" />
+%ELSEDEFINED%
+<input type="hidden" name="templatetopic" size="40" value="%TCAOWEB%/Installs.%TYPE%Template" />
+%FIDEFINED%
 <input type="hidden" name="formtemplate" value="TopicClassForm" />
 <input type="hidden" name="Classification" value="%TYPE%" />
 <p /><input type="submit" id="submit" value=" Create New <nop>%TYPE%  " />
@@ -151,16 +154,14 @@
 ---+++ defaultTemplate NEWEXTRA section
 Use this section to create a new template topic based on the name of the new classification. Requires an accompanying CREATETOPIC tag in the template for the new class.
 <verbatim>
-%STARTSECTION{name="defaultTemplate" type="section"}%
-| A new template topic called <span id="newTemplateFeedback" class="twikiInputFieldDisabled">...<!--generated name will be put here--></span> will automatically be created.    ||
-%ENDSECTION{"defaultTemplate"}%
+%STARTSECTION{name="defaultTemplate" type="section"}% %BR% A new template topic called <span id="newTemplateFeedback" class="twikiInputFieldDisabled">...<!--generated name will be put here--></span> will automatically be created. %ENDSECTION{"defaultTemplate"}%
 </verbatim>
 
 ---+++ selectClassParent ALLEXTRA section
 Use this section to add a select element for assigning parent topic that list topics _of the same class_ as the one being created.
 <verbatim>
 %STARTSECTION{name="selectClassParent" type="section"}%
-|  *Change Parent:* | <select name="topicparent"> <option>%BASETOPIC%</option> %DBQUERY{"Classification='%BASETOPIC%'" web="%BASEWEB%" format="<option>$topic</option>" separator=" "}%</select>   | _Optional_   |
+|  *Change Parent:* | <select name="topicparent"> <option>%BASETOPIC%</option> %DBQUERY{"Classification='%BASETOPIC%'" web="%BASEWEB%" format="<option>$topic</option>" separator=" "}%</select>   |
 %ENDSECTION{"selectClassParent"}%
 </verbatim>
 

Modified: twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderClassificationTopic.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderClassificationTopic.txt	2007-10-01 14:51:17 UTC (rev 15120)
+++ twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderClassificationTopic.txt	2007-10-01 15:33:56 UTC (rev 15121)
@@ -31,14 +31,44 @@
 <select name="subject" size="1" onchange="document.location=this.value;"> <option>Jump to different <nop>%FORMFIELD{"Classification" topic="%BASEWEB%.%BASETOPIC%"}%...</option>%DBQUERY{ "Classification='%FORMFIELD{"Classification" topic="%BASEWEB%.%BASETOPIC%"}%'" web="%BASEWEB%"  exclude="%BASETOPIC%" regex= "on" noheader="on" nosearch="on" nosummary="on" nototal="on" order="topic" format= "<option>$topic</option>" }% </select></form> </span>
 ---++!! %SPACEOUT{%BASETOPIC%}%
 %IF{"defined CLASS_DESCRIPTION" then="%CLASS_DESCRIPTION%"}%
-%IFDEFINED{"%FORMFIELD{"Classification" topic="%BASEWEB%.%BASETOPIC%"}%" as="TopicType" then="<p /><form method=\"link\" action=\"$percntSCRIPTURL{view}$percnt/$percntBASEWEB$percnt/CreateNewTopic\"><input type=hidden name=type value=$percntBASETOPIC$percnt><input type=hidden name=step value=two><input type=hidden name=parent value=$percntBASETOPIC$percnt><input type=\"submit\" class=\"twikiButton\" value=\"Create new <nop>$percntBASETOPIC$percnt \" /></form>" else="" glue="off"}%
+%~~   IFDEFINED{"%FORMFIELD{"Classification" topic="%BASEWEB%.%BASETOPIC%"}%" 
+~~~         as="TopicType" 
+~~~         then="<p /><form method=\"link\" 
+~~~             action=\"$percntSCRIPTURL{view}$percnt/$percntBASEWEB$percnt/CreateNewTopic\">
+~~~             <input type=hidden name=type value=$percntBASETOPIC$percnt>
+~~~             <input type=hidden name=step value=two>
+~~~            <input type=hidden name=parent value=$percntBASETOPIC$percnt>
+~~~            <input type=\"submit\" class=\"twikiButton\" value=\"Create new <nop>$percntBASETOPIC$percnt \" />
+~~~            </form>" 
+~~~        glue="off"
+~~~    }%
 
+%~~   IFDEFINED{"
+*~~
+%~~      DBQUERY{"parent = '%BASETOPIC%' 
+~~~            AND Classification = '%FORMFIELD{"Classification" topic="%BASEWEB%.%BASETOPIC%"}%'"
+~~~         web="%BASEWEB%"
+~~~         format="none"
+~~~         header="$count"
+~~~         hidenull="on"
+~~~       }%"
+~~~      then="<em>See also sub-%FORMFIELD{"Classification" topic="%BASEWEB%.%BASETOPIC%"}%s: 
+~~~         $percntDBQUERY{\"parent = '%BASETOPIC%'
+~~~            AND Classification = '%FORMFIELD{"Classification" topic="%BASEWEB%.%BASETOPIC%"}%'\"
+~~~            web=\"%BASEWEB%\"
+~~~            format=\"$web.$topic\"
+~~~            separator=\", \" 
+~~~         }$percnt</em>"
+~~~      glue="off"
+~~~    }%
+
 %IFDEFINEDTHEN{"%LISTFORMAT%" glue="off" }%
 %INCLUDE{"%LISTFORMAT%"}%
 %ELSEDEFINED%
 %~~  INCLUDE{"%TCAOWEB%.RenderTableSearchResults" 
+~~~       remote="on"
 ~~~       FACETS="%FORMFIELD{"Facets" topic="%BASEWEB%.%BASETOPIC%"}%" 
-~~~       BASESEARCH="%FORMFIELD{"Classification" topic="%BASEWEB%.%BASETOPIC%"}% = '%BASETOPIC%'" }%
+~~~       BASESEARCH="%FORMFIELD{"Classification" topic="%BASEWEB%.%BASETOPIC%"}% =~ '%BASETOPIC%'" }%
 ~~~  %FIDEFINED%
 _For more information on content organization within the *%BASEWEB%* web, see %BASEWEB%.TopicClassification._
 

Modified: twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderCreateNewTopic.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderCreateNewTopic.txt	2007-10-01 14:51:17 UTC (rev 15120)
+++ twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderCreateNewTopic.txt	2007-10-01 15:33:56 UTC (rev 15121)
@@ -38,11 +38,13 @@
 <input name="step" type="hidden" value="two">
 <input type="hidden" name="parent" value="<nop>%URLPARAM{parent}%" />
 </form>
-%BR% _%ICON{help}% For more information about how topics are organized within the <nop>%BASEWEB% web, see %BASEWEB%.TopicClassification._
 
 %IFDEFINEDTHEN{"%URLPARAM{step}%" as="two" glue="off"}%
 %INCLUDE{ %IFDEFINED{ "%URLPARAM{type}%" as="Blank Topic" then="\"%TCAOWEB%.RenderTopicCreator\" FORM=\"none\"" else="\"%BASEWEB%.%URLPARAM{type}%\" section=\"new\"" }% }%
 %FIDEFINED%
+
+%BR% _%ICON{help}% For more information about how topics are organized within the <nop>%BASEWEB% web, see %BASEWEB%.TopicClassification._
+
 %STOPINCLUDE%
 </verbatim>
 

Modified: twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderSearchString.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderSearchString.txt	2007-10-01 14:51:17 UTC (rev 15120)
+++ twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderSearchString.txt	2007-10-01 15:33:56 UTC (rev 15121)
@@ -35,7 +35,7 @@
 ~~~   "%BASESEARCH% 
 *~~   
 %~~    FORMATLIST{"%FACETS%" separator=" " 
-~~~          format="$percntIF{ \"$'URLPARAM{$1}'!=''\" then=\" AND $1 = '$percntURLPARAM{$1}$percnt'\" }$percnt"
+~~~          format="$percntIF{ \"$'URLPARAM{$1}'!=''\" then=\" AND $1 =~ '$percntURLPARAM{$1}$percnt'\" }$percnt"
 ~~~    }%" 
 ~~~   %FIDEFINED%
 ~~~    order="%URLPARAM{"sort" default="%INITSORT%"}%"  

Modified: twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderTopicCreator.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderTopicCreator.txt	2007-10-01 14:51:17 UTC (rev 15120)
+++ twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/RenderTopicCreator.txt	2007-10-01 15:33:56 UTC (rev 15121)
@@ -19,10 +19,13 @@
    * TOPICSUMMARY: If defined, a Summary input box will be included and the value of this parameter will be listed as a "tip" below the input box.
    * FACETS: List of classifications or TopicTypes for which to provide select elements. 
    * TYPE: initial TopicType value 
+   * CLASS_NAME: Optional alternative class name. Defaults to !TopicType.
    * EXTRA: additional =&lt;input ... />= . Note: items much be formatted as follows:
       * quotes must be escaped with <em>double</em> backslashes ("\\").
       * Each extra item must be formatted as a TWiki 2-column table row. E.g.: ==|  *Name of item:* |   <input type="text" ...etc > |==
    * SAVE: Included "checkbox" option to directly save topic (skip "edit" screen"). If set to "checked" then checkbox will be checked by default. If set to "option" then the option will be provided but will not be checked.
+   * ALLOWNONWIKIWORD - If defined, will check option to allow non-wiki word.
+   * PARENT - If defined as "choice" then form will include section with choices for setting the parent. If defined as the same as one of the FACETS, then the parent will be set to the selection from that facet's dropdown. If set to any other value (a topic), the parent will be set to that topic. 
 
 %ENDSECTION{name="documentation" type="section"}%
 ---+++++ Css
@@ -33,7 +36,8 @@
 ---++ Implementation
 <verbatim>
 %STARTINCLUDE%
-%INCLUDE{"%SYSTEMWEB%.WebTopicCreator" section="javascriptfunctions" }%
+<script type="text/javascript" src="%PUBURL%/%TWIKIWEB%/TWikiJavascripts/twiki.js"></script>
+%INCLUDE{"%TWIKIWEB%.WebTopicCreator" section="javascriptfunctions" }%
 <script type="text/javascript">
 //<![CDATA[
 /**
@@ -53,6 +57,11 @@
 
 function broadcastFacet( facet, value ) {
     insertHtml(value, "insert"+facet);
+%IFDEFINEDTHEN{"%PARENT%" glue="off"}%
+    if (facet == "%PARENT%") {
+      document.newtopic.topicparent.value = value;
+    }
+%FIDEFINED%
 }
 
 function assignParent( form, parent ) {
@@ -72,51 +81,71 @@
 <noautolink>
 <input type="hidden" name="templatetopic" value="%IFDEFINED{"%TEMPLATE%" then="%ENCODE{%TEMPLATE%}%" else=""}%" />
 <input type="hidden" name="formtemplate" value="%IFDEFINED{"%FORM%" then="%FORM%" else="TopicForm"}%" />
-<input type="hidden" name="TopicType" value="%IFDEFINED{"%TYPE%"}%" />
+<input type="hidden" name="%IFDEFINED{"%CLASS_NAME%" then="$test" else="TopicType" glue="off"}%" value="%IFDEFINED{"%TYPE%"}%" />
+%~~  IFDEFINEDTHEN{"%PARENT%"
+~~~     as="choice"
+~~~     glue="on"
+~~~  }%%ELSEDEFINED%
+<input type="hidden" name="topicparent" value='%PARENT%' />
+%FIDEFINED%
 <div class="tcaoCreateNewTopic">
 %TABLE{ tablewidth="90%"  columnwidths="20%, 80%" dataalign="right, left"}%
 |   *Topic name:* |  
-~~~      %IFDEFINEDTHEN{ "%NAME%" as="auto" }%  
-~~~           <input type="hidden" name="topic" value="%IFDEFINED{"%VALUE%"}%AUTOINC0000"/>
+~~~      %IFDEFINEDTHEN{ "%NAME%" as="auto" glue="off"}%  
+~~~           <input type="hidden" name="topic" value="%IFDEFINED{"%VALUE%" glue="off"}%AUTOINC0000"/>
 ~~~           <em>Your %IFDEFINED{"%TYPE%" then=" %TYPE% "}% topic will be auto-named.</em>  
 *~~         %ELSEDEFINED% 
 ~~~        <input type="text" class="twikiInputField" name="topic" id="topic" size="40" 
+~~~            value="%IFDEFINED{"%VALUE%" glue="off"}%"
 ~~~            onkeyup="canSubmit(this.form,false);" 
 ~~~            onchange="canSubmit(this.form,false);"  
 ~~~            onblur="canSubmit(this.form,true);" /> 
-~~~        <input type="checkbox" class="twikiCheckbox" id="nonwikiword" name="nonwikiword" 
-~~~               onchange="canSubmit(this.form,false);" onmouseup="canSubmit(this.form,false);" />
+~~~        <input type="checkbox" class="twikiCheckbox" id="nonwikiword" 
+~~~               name="nonwikiword" %IFDEFINED{"%ALLOWNONWIKIWORD%" then="checked" glue="off"}%
+~~~               onchange="canSubmit(this.form,false);" 
+~~~               onmouseup="canSubmit(this.form,false);" />
 ~~~              <label for="nonwikiword">%MAKETEXT{"Allow non <nop>WikiWord"}%</label>  %BR% 
 ~~~      <span id="webTopicCreatorFeedback" class="twikiInputFieldDisabled"><!--generated name will be put here--></span>
 ~~~     %FIDEFINED%    |
+*~~
 %IFDEFINEDTHEN{"%TOPICSUMMARY%" glue="off" }%
 |   *Topic Summary:* |
 ~~~     <input type="text" name="Summary" size="40"  />  %BR%
 ~~~        %ICON{help}% <em>%TOPICSUMMARY%</em>   
 ~~~       | %FIDEFINED%    
+*~~ 
 %IFDEFINEDTHEN{"%FACETS%" glue="off"}%
 %~~       FORMATLIST{"%FACETS%" 
-~~~          separator=" $n" 
 ~~~          format="|    *$1:* | <select name=\"$1\" id=\"$1\" onchange=\"broadcastFacet(this.id, this.value)\" > 
 ~~~              <option value=$percntURLPARAM{$1}$percnt > $percntURLPARAM{\"$1\" default=\"Select...\" }$percnt </option> 
 ~~~             $percntDBQUERY{
-~~~                  \"$percntDBQUERY{\".\" topic=\"$1\" web=\"$percntBASEWEB$percnt\" format=\"$formfield(Classification)\"}$percnt='$1'\" 
+~~~                  \"$percntDBQUERY{topic=\"$1\" web=\"$percntBASEWEB$percnt\" format=\"$formfield(Classification)\"}$percnt=~'$1'\" 
 ~~~                  web=\"%BASEWEB%\" 
-~~~                  format=\"<option>$topic</option>\" separator=\" \" }$percnt </select> </noautolink> |  "}%  %FIDEFINED%   
+~~~                  format=\"<option>$topic</option>\" 
+~~~                  separator=\" \" 
+~~~              }$percnt 
+~~~              </select> </noautolink>  | "
+~~~          split=", "
+~~~          separator="$n" 
+~~~          }%%FIDEFINED%
 *~~
-%~~      IFDEFINED{"%EXTRA%" 
-~~~          then="$n%EXTRA%"
-~~~          glue="off" 
-~~~       }%
+%IFDEFINEDTHEN{"%EXTRA%" glue="off"}%
+%EXTRA%%FIDEFINED%
+*~~
+%~~     IFDEFINEDTHEN{"%PARENT%"
+~~~         as="choice"
+~~~         glue="off"
+~~~     }%
 |    *%MAKETEXT{"Topic parent:"}%* |  
 ~~~     <input type="radio" name="topicparent" checked value="%URLPARAM{\"parent\"}%" 
 ~~~          onclick="this.form.topicparentList.disabled=true;" > <nop>%URLPARAM{"parent" default="no parent, orphaned topic"}%  
 ~~~      %BR% %IFDEFINEDTHEN{"%FACETS%" as=".*SubjectArea"}% 
 ~~~            <input type="radio" name="topicparent" onclick="this.value=this.form.SubjectArea.value;this.form.topicparentList.disabled=true;" value="" > 
 ~~~            Selected !SubjectArea: <span id="insertSubjectArea" > </span> %BR% %FIDEFINED%
-~~~      <input type="radio" name="topicparent" value="" onclick="this.form.topicparentList.disabled=false"> Select topic parent: <select name="topicparentList" size="1"  diabled ~~~            onchange="assignParent(this.form, this.value);" ><option value="" > Select... </option><option value="">%MAKETEXT{"(no parent, orphaned topic)"}%</option>
+~~~      <input type="radio" name="topicparent" value="" onclick="this.form.topicparentList.disabled=false"> Select topic parent: <select name="topicparentList" size="1"  diabled 
+~~~            onchange="assignParent(this.form, this.value);" ><option value="" > Select... </option><option value="">%MAKETEXT{"(no parent, orphaned topic)"}%</option>
 ~~~            %TOPICLIST{"<option>$name</option>" separator=" " }% </select>
-~~~      <br />%ICON{help}% _Topic "parentage" defines the hierarchy in [[%BASEWEB%.TopicTree][TopicTree]]._   |
+~~~      <br />%ICON{help}% _Topic "parentage" defines the hierarchy in [[%BASEWEB%.TopicTree][TopicTree]]._   |%FIDEFINED%
 || <input id="submit" type="submit" class="twikiSubmit" value='%MAKETEXT{"Create this topic"}%' />
 ~~~        
 %~~        IFDEFINED{"%SAVE%" then="<input type=\"checkbox\" $variable name=\"directSave\" value=\"save\"> 
@@ -127,25 +156,25 @@
 
 </div> <!-- tcaoCreateNewTopic -->
 </form>
+<script type="text/javascript">
+//<![CDATA[
+%IFDEFINED{"%SAVE%" then="toggleDirectSave(document.forms.newtopic);" glue="off"}%
 %IFDEFINEDTHEN{"%NAME%" as="auto" glue="off"}%
 %ELSEDEFINED%
-<script type="text/javascript">
-//<![CDATA[
 // start with a check
 canSubmit(document.forms.newtopic,false);
 // focus input field
 document.forms.newtopic.topic.focus();
-%IFDEFINED{"%SAVE%" then="toggleDirectSave(document.forms.newtopic);" glue="off"}%
 //]]>
+%FIDEFINED%
 </script>
-%FIDEFINED%
 </noautolink>
 %STOPINCLUDE%
 </verbatim>
 
 ---++ Test
 
-%DBCALL{"%TOPIC%" TEXT="Topic" TYPE="DiscussionTopic" VALUE="TWikiTopic" FACETS="TopicType, SubjectArea" SAVE="option" PARENT="topic" TOPICSUMMARY="Enter short summary statement about your new topic" }%
+%DBCALL{"%TOPIC%" TEXT="Topic" TYPE="DiscussionTopic" VALUE="TWikiTopic" FACETS="TopicType, SubjectArea " SAVE="option" PARENT="topic" TOPICSUMMARY="Enter short summary statement about your new topic" }%
 
 
 %DBCALL{"RenderFunctionCallers"}%
@@ -158,7 +187,6 @@
 </div>
 
 
-
 %META:FORM{name="TopicForm"}%
 %META:FIELD{name="TopicType" attributes="" title="TopicType" value="TopicFunction"}%
 %META:FIELD{name="SubjectArea" attributes="" title="SubjectArea" value="TcaoUse"}%

Modified: twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/SubjectArea.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/SubjectArea.txt	2007-10-01 14:51:17 UTC (rev 15120)
+++ twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/SubjectArea.txt	2007-10-01 15:33:56 UTC (rev 15121)
@@ -1,18 +1,24 @@
-%META:TOPICINFO{author="LynnwoodBrown" date="1165967999" format="1.1" version="1.5"}%
-%META:TOPICPARENT{}%
-%DBCALL{"%TCAOWEB%.RenderClassificationTopic" }%
+%META:TOPICINFO{author="LynnwoodBrown" date="1160083624" format="1.1" version="1.4"}%
+<!-- Optional Topic Settings
+To enable any of these settings, replace the explanation with the value you want and remove the "#" before "Set". 
+   * Set CLASS_DESCRIPTION = <b><i>%FORMFIELD{"Summary" topic="%BASEWEB%.%BASETOPIC%"}%</b></i>
+   * #Set ADD_FILTER = Optional setting for setting different sort/filter bar for topic list.
+   * #Set SEARCH_FORMAT = Optional custom format for search results. Defaults to bulleted list with topic name and the !Summary formfield.
+   * #Set HEADER_FORMAT = Optional custom format for search results header. Defaults to empty header.
+   * #Set FOOTER_FORMAT = Optional custom format for search results footer. Defaults to "Number of topics found = $count".
+   * #Set SEARCH_ORDER = Option for changing the default order for the search. Defaults to "name."
+   * #Set SEARCH_REVERSE = Option to reverse the search order. Defaults to "off."
+-->
+%INCLUDE{"%TCAOWEB%.RenderClassificationTopic" }%
 
 %DBCALL{"%TCAOWEB%.RenderAddClassification" TYPE="SubjectArea" }%
 
 <!-- Topic Permissions
-	* Set ALLOWTOPICCHANGE = %USERSWEB%.TWikiAdminGroup
-	* Set ALLOWTOPICRENAME = %USERSWEB%.TWikiAdminGroup
+   * Set ALLOWTOPICCHANGE = %MAINWEB%.ModeratorGroup
+   * Set ALLOWTOPICRENAME = %MAINWEB%.ModeratorGroup
 -->
 
 %META:FORM{name="TopicClassForm"}%
-%META:FIELD{name="Classification" attributes="" title="Classification" value="Classification"}%
-%META:FIELD{name="Summary" attributes="" title="Summary" value="TCAO/Installs web content subject areas."}%
-%META:FIELD{name="Facets" attributes="" title="Facets" value=""}%
-%META:REVCOMMENT{ncomments="0"}%
-%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="%25USERSWEB%25.TWikiAdminGroup"}%
-%META:PREFERENCE{name="ALLOWTOPICRENAME" title="ALLOWTOPICRENAME" type="Set" value="%25USERSWEB%25.TWikiAdminGroup"}%
+%META:FIELD{name="Classification" attributes="" title="Classification" value="SubjectArea"}%
+%META:FIELD{name="Summary" attributes="" title="Summary" value=""}%
+%META:FIELD{name="Facets" attributes="" title="Facets" value="TopicType"}%

Modified: twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/TopicClassWebHomeIntro.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/TopicClassWebHomeIntro.txt	2007-10-01 14:51:17 UTC (rev 15120)
+++ twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/TopicClassWebHomeIntro.txt	2007-10-01 15:33:56 UTC (rev 15121)
@@ -7,7 +7,7 @@
 
 %TABLE{ dataalign="right,left" columnwidths="15%, 85%"}%
 |  *[[%BASEWEB%.TopicType][Topic Types]]:* | %DBQUERY{"Classification = 'TopicType'" web="%BASEWEB%" format="[[$web.$topic][$percntSPACEOUT{$topic}$percnts <span class=\"twikiSmall\">($percntDBQUERY{\"TopicType='$topic'\" web=\"$web\" format=\"none\" footer=\"$dollarcount\"}$percnt)</span>]]" separator=", "}%   |
-%DBQUERY{"Classification = 'Classification'" exclude="TopicType" web="%BASEWEB%" separator="$n" format="|  *[[$web.$topic][$percntSPACEOUT{$topic}$percnt]]:* | $percntDBQUERY{\"Classification = '$topic'\" format=\"[[$dollarweb.$dollartopic][$dollarpercntSPACEOUT{$dollartopic}$dollarpercnt <span class=\\"twikiSmall\\">($dollarpercntDBQUERY{\\"$topic='$dollartopic'\\" web=\\"$dollarweb\\" format=\\"none\\" footer=\\"$dollardollarcount\\"}$dollarpercnt)</span>]]\" separator=\", \" }$percnt   |" }%
+%DBQUERY{"Classification = 'Classification'" exclude="TopicType" web="%BASEWEB%" separator="$n" format="|  *[[$web.$topic][$percntSPACEOUT{$topic}$percnt]]:* | $percntDBQUERY{\"Classification = '$topic'\" format=\"[[$dollarweb.$dollartopic][$dollarpercntSPACEOUT{$dollartopic}$dollarpercnt <span class=\\"twikiSmall\\">($dollarpercntDBQUERY{\\"$topic =~ '$dollartopic'\\" web=\\"$dollarweb\\" format=\\"none\\" footer=\\"$dollardollarcount\\"}$dollarpercnt)</span>]]\" separator=\", \" }$percnt   |" }%
 
 _See also %BASEWEB%.TopicTree for a tree-outline of topics._
 

Modified: twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/TopicTree.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/TopicTree.txt	2007-10-01 14:51:17 UTC (rev 15120)
+++ twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TCAO/TopicTree.txt	2007-10-01 15:33:56 UTC (rev 15121)
@@ -1,8 +1,9 @@
-%META:TOPICINFO{author="LynnwoodBrown" date="1171687135" format="1.1" reprev="1.2" version="1.2"}%
-%STARTINCLUDE%
----++ <nop>%TOPIC% Using <nop>%URLPARAM{"root" default="(no root selected)"}% as Root
-
-<div style="float:right;width:30%;border:2px dotted %WEBBGCOLOR%;padding:1em;margin:0.5em;">
+%META:TOPICINFO{author="TWikiContributor" date="1171687135" format="1.1" reprev="1.2" version="1.2"}%
+%META:TOPICPARENT{name="TopicClassification"}%
+%STARTINCLUDE%
+---++ <nop>%TOPIC% Using <nop>%URLPARAM{"root" default="(no root selected)"}% as Root
+
+<div class="twikiRight" style="width:30%;border:2px dotted %WEBBGCOLOR%;padding:1em;margin:0.5em;">
 <noautolink>
 *Select Other Roots* %BR%
 <form name="selectType" action="%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%BASEWEB%/%BASETOPIC%" >
@@ -19,13 +20,12 @@
 </form>
 </noautolink>
 </div>
-%STOPINCLUDE%
-
-%TREEVIEW{topic="%URLPARAM{root}%" web="%BASEWEB%" stoplevel="5" formatting="imageoutline:thread"}%
-
+%STOPINCLUDE%
+
+%TREEVIEW{topic="%URLPARAM{"root" default="WebHome"}%" web="%BASEWEB%" stoplevel="5" formatting="imageoutline:thread"}%
+
+
 %META:FORM{name="TopicForm"}%
 %META:FIELD{name="TopicType" attributes="" title="TopicType" value="MasterTopic"}%
 %META:FIELD{name="SubjectArea" attributes="" title="SubjectArea" value="TcaoUse"}%
 %META:FIELD{name="Summary" attributes="" title="Summary" value="Displays topic parent-child relationships as tree."}%
-%META:PREFERENCE{name="ALLOWTOPICCHANGE" title="ALLOWTOPICCHANGE" type="Set" value="%25USERSWEB%25.TWikiAdminGroup"}%
-%META:PREFERENCE{name="ALLOWTOPICRENAME" title="ALLOWTOPICRENAME" type="Set" value="%25USERSWEB%25.TWikiAdminGroup"}%

Modified: twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TWiki/TopicClassificationAddOn.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TWiki/TopicClassificationAddOn.txt	2007-10-01 14:51:17 UTC (rev 15120)
+++ twiki/branches/MAIN/twikiplugins/TopicClassificationAddOn/data/TWiki/TopicClassificationAddOn.txt	2007-10-01 15:33:56 UTC (rev 15121)
@@ -83,6 +83,15 @@
 |  Copyright: | &copy; |
 |  License: | [[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]] |
 | Change&nbsp;History: | |
+|  13160 | <a rel='nofollow' href='http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item1715'>Item1715</a>  Fixing change in name of removeSpacesAndPunctuation function, and changing form for creation new classes to table. |
+|  13112 | <a rel='nofollow' href='http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item1715'>Item1715</a>  Add new format for display of search results in table |
+|  13111 | <a rel='nofollow' href='http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item1715'>Item1715</a>  Further improvements to TopicTypes and navigation |
+|  13058 | <a rel='nofollow' href='http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item1715'>Item1715</a>  various fixes and improvements. Changed discussion topic format. |
+|  13047 | <a rel='nofollow' href='http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item1715'>Item1715</a>  removing files not intended for distribution |
+|  12981 | <a rel='nofollow' href='http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item1715'>Item1715</a>  Minor fixes |
+|  12980 | <a rel='nofollow' href='http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item1715'>Item1715</a> Further updates to ver 2.0 |
+|  12966 | <a rel='nofollow' href='http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item1715'>Item1715</a>  Misc fixes to MANIFEST, the plugin topic, and some TopicTypes. |
+|  12965 | <a rel='nofollow' href='http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item1715'>Item1715</a>  Clean up plugin topic. |
 |  12949 | <a rel='nofollow' href='http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item1715'>Item1715</a>  Uploading Version 2.0 of TopicClassificationAddOn |
 |  <!-- versions below in reverse order -->&nbsp;' | <!-- versions below in reverse order -->&nbsp; |
 |  Dependencies: | %$DEPENDENCIES% |