Item13734: switch to GraphvizPlugin, as well as ...

- add support for LikePlugin in standard view templates - RSS view tempalte now uses OO-calling semantics to allow TopicTypes to override the defaul format of an entry in a feed - added support for AUTOINC in TopicType factory
foswiki · Sep 21, 2015 · c18a39f · c18a39f
1 parent 7fdddff
commit c18a39f
Show file tree

Hide file tree

Showing 18 changed files with 107 additions and 108 deletions.
diff --git a/data/Applications/AtomViewTemplate.txt b/data/Applications/AtomViewTemplate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1435666503" format="1.1"  version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1438504144" format="1.1" version="1"}%
 %META:TOPICPARENT{name="TopicView"}%
 %{<verbatim class="tml">}%
 %TMPL:P{"atomhead"}%%TMPL:P{"atombody"}%%TMPL:P{"atomfooter"}%
@@ -37,12 +37,10 @@
    $percntFORMATLIST{\"$expand(Author or createauthor)\"
       split=\"\s*,\s*\"
       format=\"<author><name>$1</name></author>\"
-   }$percnt
-   $percntCATINFO{\"$web.$topic\" 
+   }$percnt$percntCATINFO{\"$web.$topic\" 
       format=\"<category label=\\"$title\\" term=\\"$dollartopic\\" />\"
       separator=\"$n        \"
-   }$percnt
-   $percntTAGINFO{\"$web.$topic\"
+   }$percnt$percntTAGINFO{\"$web.$topic\"
       format=\"<category term=\\"$dollarname\\" />\"
       separator=\"$n        \"
    }$percnt

diff --git a/data/Applications/RenderIndexItem.txt b/data/Applications/RenderIndexItem.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1435666503" format="1.1"  version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1441719881" format="1.1" version="1"}%
 %META:TOPICPARENT{name="TopicFunction"}%
 %TOC{depth="2"}%
 
@@ -17,16 +17,22 @@ method was found.
 <verbatim class="tml">
 %STARTINCLUDE%
 %DBQUERY{topic="%OBJECT%"
-   format="<div class='clsIndexItem clsTopicItem'>[[$web.$topic][$expand(topictitle)]] $percntREDDOT{\"$web.$topic\"}$percnt
-     <div class='foswikiTopicInfo'>$expand(Summary and ', ')
-      <span class='clsAuthorDateInfo'>
-        $formatTime(info.date),
-        $percntGETTOPICTITLE{\"
-             $percntUSERINFO{\"$expand(info.author)\"
-               format=\"$wikiusername\"
-             }$percnt\"
-        }$percnt
-      </span>
+   format="<div class='clsIndexItem clsTopicItem'>
+      [[$web.$topic][$expand(topictitle)]]&nbsp;$percntREDDOT{\"$web.$topic\"}$percnt
+      $expand('<div class=\"foswikiTopicSummary\">' and Summary and '</div>')<!-- -->
+      <div class='foswikiTopicInfo'>
+         <span class='clsAuthorDateInfo'>
+         <!-- -->$formatTime(info.date) 
+         <span class='foswikiRevisionSep'>&#124;</span> 
+            <nop>$percntGETTOPICTITLE{\"
+               $percntUSERINFO{\"$expand(info.author)\"
+                  format=\"$wikiusername\"
+                }$percnt\"
+            }$percnt
+         </span>
+         $percntIF{\"'$expand(total_likes)'>0\"
+            then=\"<span class='foswikiRevisionSep'>&#124;</span> <span class='clsLikeInfo'>$percntTRANSLATE{\"[quant,_1,like,likes]\" args=\"$expand(total_likes)\"}$percnt</span>\"
+         }$percnt<!-- -->
      </div></div>"
 }%
 %STOPINCLUDE%
@@ -37,7 +43,6 @@ method was found.
 %DBCALL{"%TOPIC%" OBJECT="%TOPIC%"}%
 </div>
 
-
 %META:FORM{name="TopicFunction"}%
 %META:FIELD{name="TopicType" title="TopicType" value="TopicFunction, DocuTopic, ApplicationTopic, WikiTopic"}%
 %META:FIELD{name="TopicTitle" title="<nop>TopicTitle" value=""}%

diff --git a/data/Applications/RenderInheritanceGraph.txt b/data/Applications/RenderInheritanceGraph.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1435666503" format="1.1"  version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1439370068" format="1.1" version="1"}%
 %META:TOPICPARENT{name="TopicFunction"}%
 %TOC{depth="2"}%
 
@@ -13,9 +13,10 @@ This function requires [[%SYSTEMWEB%.DirectedGraphPlugin]]
 %STARTINCLUDE%<!-- -->
 <noautolink>
 <div class="overflow">
-<dot map="on" file="%BASEWEB%">
+<graphviz topic="%BASEWEB%.%BASETOPIC%" inline="on">
 digraph G {
-   rankdir=TB;
+   tooltip=" "
+   node [tooltip=" "]
    node[shape="box" fontsize="10"];
    edge[arrowsize="0.5"];
    ratio="auto";
@@ -40,7 +41,7 @@ digraph G {
       separator="$n"
    }%
 }
-</dot>
+</graphviz>
 </div>
 </noautolink>
 <!-- -->%STOPINCLUDE%

diff --git a/data/Applications/RenderRecentChanges.txt b/data/Applications/RenderRecentChanges.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1435666503" format="1.1"  version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1438173475" format="1.1" version="1"}%
 %META:TOPICPARENT{name="TopicFunction"}%
 %TOC{depth="2"}%
 
@@ -24,11 +24,11 @@ This uses solr and infintescroll to create a frontpage widget.
   LIMIT="%LIMIT{default="20"}%"
   PAGE="%PAGE{default="0"}%"
   THEWEB="%THEWEB{default="%BASEWEB%"}%"
-  FILTER="%FILTER{default=""}%"
+  FILTER="%FILTER{default="TopicType!~'\bTopicStub\b'"}%"
 }%
 </div>
 <div class="jqInfiniteScrollNavi foswikiHidden">
-  <a href="%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%?page=1&section=backend&skin=text&web=%THEWEB{default="%BASEWEB%"}%&filter=%FULTER{default=""}%&limit=%LIMIT{default="20"}%" class='jqInfiniteScrollNext'>More</a>
+  <a href="%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%?page=1&section=backend&skin=text&web=%THEWEB{default="%BASEWEB%"}%&filter=%FILTER{default="TopicType!~'\bTopicStub\b'"}%&limit=%LIMIT{default="20"}%" class='jqInfiniteScrollNext'>More</a>
 </div>
 <literal><style>
 .recentChanges {
@@ -43,8 +43,8 @@ This uses solr and infintescroll to create a frontpage widget.
 ---++ Backend
 <verbatim class="tml">
 %STARTSECTION{"backend"}%<noautolink>%DBQUERY{
-  "%URLPARAM{"filter" default="%FILTER{default=""}%"}%"
-  exclude="^(WebChanges|WebPreferences|WebStatistics|WebTopicList|WebIndex|WebNotify|WebHome|WebLinks|TopCategory|Category|ClassifiedTopic|TopicType|UncategorizedTopics|WebTopicEditTemplate|WebAtom|WebRss|WebLeftBar|WebSearch.*|WebTagList)$"
+  "%URLPARAM{"filter" default="%FILTER{default="TopicType!~'\bTopicStub\b'"}%"}%"
+  exclude="^(WebChanges|WebPreferences|WebStatistics|WebTopicList|WebIndex|WebNotify|WebHome|WebLinks|TopCategory|Category|ClassifiedTopic|TopicType|UncategorizedTopics|WebTopicEditTemplate|WebAtom|WebRss|WebLeftBar|WebSearch.*|WebTagList|CategoryBrowser)$"
   web="%URLPARAM{"web" default="%THEWEB{default="%BASEWEB%"}%"}%"
   skip="%CALC{"$EVAL(%URLPARAM{"page" default="%PAGE{default="0"}%"}%*%URLPARAM{"limit" default="%LIMIT{default="20"}%"}%)"}%"
   limit="%URLPARAM{"limit" default="%LIMIT{default="20"}%"}%" 

diff --git a/data/Applications/RenderRss.txt b/data/Applications/RenderRss.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="micha" comment="reprev" date="1437121382" format="1.1" reprev="1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1438508309" format="1.1" version="1"}%
 %META:TOPICPARENT{name="TopicFunction"}%
 %TOC{depth="2"}%
 
@@ -15,20 +15,22 @@ These are then called automatically using the =<literal>%<nop>DBCALL{"web.topic-
 
 ---++ Implementation
 <verbatim class="tml">
-%STARTINCLUDE%%IF{
-   "'%DBQUERY{topic="%OBJECT%" format="$expand(_sections)"}%'=~'teaser'"
-   then="$percntDBCALL{\"%OBJECT%\" section=\"teaser\"}}$percnt"
-   else="$percntDBCALL{\"%OBJECT%\"}$percnt"
-}%
-%TAGINFO{
-   "%OBJECT%"
-   header="<p>%MAKETEXT{"Tags"}%: "
-   format="$name"
-   footer="</p>"
+%STARTINCLUDE%%DBQUERY{topic="%OBJECT%"
+   format="<item rdf:about=\"%SCRIPTURL{"view"}%/$web/$topic\">
+      <title>$expand(topictitle)</title>
+      <link>%SCRIPTURL{"view"}%/$web/$topic</link>
+      <dc:creator>$expand(@createauthor.topictitle)</dc:creator>
+      <dc:date>$formatTime(createdate, '$year-$mo-$dayT$hour:$minute:$secondsZ')</dc:date>
+      <dc:contributor>
+         <rdf:Description link="%SCRIPTURL{"view"}%/%USERSWEB%/$expand(info.author)">
+            <rdf:value>$expand(info.author)</rdf:value>
+         </rdf:Description>
+      </dc:contributor>
+      <description> <![CDATA[ $percntDBCALL{\"$web.$topic\"}$percnt ]]></description>
+   </item>"
 }%%STOPINCLUDE%
 </verbatim>
 
-
 %META:FORM{name="Applications.TopicFunction"}%
 %META:FIELD{name="TopicType" title="TopicType" value="TopicFunction, DocuTopic, ApplicationTopic, WikiTopic"}%
 %META:FIELD{name="TopicTitle" title="<nop>TopicTitle" value=""}%

diff --git a/data/Applications/RenderSimpleTopicCreator.txt b/data/Applications/RenderSimpleTopicCreator.txt
@@ -44,7 +44,7 @@ This function renders a topic creator form that holds a set of initial input ele
 <input type="hidden" name="templatetopic" value="%TEMPLATE{default=""}%" />
 <input type="hidden" name="formtemplate" value="%FORM{default="%INCLUDINGWEB%.%INCLUDINGTOPIC%"}%" />
 <input type="hidden" name="template" value="%EDITOR{default=""}%" />
-<input type="hidden" name="topic" value="%TOPICVALUE{default="%VALUE{default=""}%"}%" %IF{"'%TOPICVALUE%'=~'AUTOINC'" else="class=\"jqWikiWord {source:'.createTopicForm input[name=TopicTitle]'}\""}% />
+<input type="hidden" name="topic" value="%TOPICVALUE{default="%VALUE{default=""}%"}%" %IF{"'%TOPICVALUE%'=~'AUTOINC'" else="class='jqWikiWord' data-source='.createTopicForm input[name=TopicTitle]' data-transliterate='true'"}% />
 %EXTRA{default=""}%
 <h2 >%IF{"defined TEXT"
        then="$percntTEXT$percnt" 

diff --git a/data/Applications/RenderWikiTopicView.txt b/data/Applications/RenderWikiTopicView.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1435666503" format="1.1"  version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1441719872" format="1.1" version="1"}%
 %META:TOPICPARENT{name="TopicFunction"}%
 %TOC{depth="2"}%
 
@@ -8,6 +8,7 @@ This function renders a view for a wiki topic,
 showing its title and the summary line.
 
 ---+++ Parameters
+   * OBJECT: the topic to render the view for, defaults to %<nop>BASEWEB%.%<nop>BASETOPIC%
    * TITLE_EXTRA: optional addition put behind the topic title
    * DISPLAYREVISIONINFO: boolean flag to switch on/off revinfo rendered underneath the h1 element
 
@@ -16,29 +17,33 @@ showing its title and the summary line.
 ---++ Implementation
 <verbatim class="tml">
 %STARTINCLUDE%<noautolink><h1>
-[[%BASEWEB%.%BASETOPIC%][<span itemprop='name'>%GETTOPICTITLE{topic="%BASEWEB%.%BASETOPIC%" rev="%URLPARAM{"rev"}%"}%</span>]] %IF{
+[[%OBJECT{default="%BASEWEB%.%BASETOPIC%"}%][<span itemprop='name'>%GETTOPICTITLE{topic="%OBJECT{default="%BASEWEB%.%BASETOPIC%"}%" rev="%URLPARAM{"rev"}%"}%</span>]] %IF{
    "defined TITLE_EXTRA and not isempty TITLE_EXTRA" 
    then="<span class='foswikiTopicExtra'>%TITLE_EXTRA%</span>"
 }%%IF{
-   "'%BASEWEB%.%BASETOPIC%'/Summary"
-   then="<div class='foswikiTopicSummary'>$percntFORMFIELD{\"Summary\" topic=\"%BASEWEB%.%BASETOPIC%\" rev=\"%URLPARAM{"rev"}%\"}$percnt</div>"
+   "'%OBJECT{default="%BASEWEB%.%BASETOPIC%"}%'/Summary"
+   then="<div class='foswikiTopicSummary'>$percntFORMFIELD{\"Summary\" topic=\"%OBJECT{default="%BASEWEB%.%BASETOPIC%"}%\" rev=\"%URLPARAM{"rev"}%\"}$percnt</div>"
 }%</h1>
 %IF{"'%DISPLAYREVISIONINFO{default="on"}%'='on'"
-   then="$percntDBCALL{\"%WEB%.%TOPIC%\" section=\"revinfo\"}$percnt"
+   then="$percntDBCALL{\"%WEB%.%TOPIC%\" OBJECT=\"%OBJECT%\" section=\"revinfo\"}$percnt"
 }%</noautolink>%STOPINCLUDE%
 </verbatim>
 
 ---++ Revision Info
 <verbatim class="tml">
 %STARTSECTION{"revinfo"}%<span class="foswikiRevision">
   %JQICON{"fa-calendar"}%
-  %REVINFO{"<span itemprop='dateModified' content='$iso'>$date - $hour:$min</span>" rev="%CURREV%" topic="%BASEWEB%.%BASETOPIC%"}%
+  %REVINFO{"<span itemprop='dateModified' content='$iso'>$date - $hour:$min</span>" rev="%CURREV%" topic="%OBJECT{default="%BASEWEB%.%BASETOPIC%"}%"}%
   <span class='foswikiRevisionSep'>&#124;</span>
   %JQICON{"fa-flag"}%
-  %MAKETEXT{"Version [_1]" args="%REVINFO{"<span itemprop='version'>$rev</span>" rev="%CURREV%" topic="%BASEWEB%.%BASETOPIC%"}%"}%
+  %MAKETEXT{"Version [_1]" args="%REVINFO{"<span itemprop='version'>$rev</span>" rev="%CURREV%" topic="%OBJECT{default="%BASEWEB%.%BASETOPIC%"}%"}%"}%
   <span class='foswikiRevisionSep'>&#124;</span>
   %JQICON{"fa-user"}%
-  <span class='foswikiRevisionAuthor' itemprop='author'>%REVINFO{"[[$wikiusername]]" rev="%CURREV%" topic="%BASEWEB%.%BASETOPIC%"}%</span> 
+  <span class='foswikiRevisionAuthor' itemprop='author'>%REVINFO{"[[$wikiusername]]" rev="%CURREV%" topic="%OBJECT{default="%BASEWEB%.%BASETOPIC%"}%"}%</span> 
+  %DBQUERY{"total_likes>0"
+     topic="%OBJECT{default="%BASEWEB%.%BASETOPIC%"}%"
+     format="<span class='foswikiRevisionSep'>&#124;</span> %JQICON{"fa-heart"}% $percntTRANSLATE{\"[quant,_1,like,likes]\" args=\"$expand(total_likes)\"}$percnt"
+  }%<!-- -->
 </span>%ENDSECTION{"revinfo"}%
 </verbatim>
 

diff --git a/data/Applications/RssViewTemplate.txt b/data/Applications/RssViewTemplate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="micha" comment="reprev" date="1437120556" format="1.1" reprev="4" version="4"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1438506699" format="1.1" version="1"}%
 %META:TOPICPARENT{name="TopicView"}%
 %{<verbatim class="tml">}%
 %TMPL:P{"rsshead"}%%TMPL:P{"rssbody"}%%TMPL:P{"rssfooter"}%
@@ -44,21 +44,7 @@
    reverse="on" 
    limit="%LIMIT{default="10"}%" 
    separator="$n"
-   format="   <item rdf:about=\"%SCRIPTURL{"view"}%/$web/$topic\">
-      <title>$expand(topictitle)</title>
-      <link>%SCRIPTURL{"view"}%/$web/$topic</link>
-      <dc:creator>$expand(@createauthor.topictitle)</dc:creator>
-      <dc:date>$formatTime(createdate, '$year-$mo-$dayT$hour:$minute:$secondsZ')</dc:date>
-      <dc:subject>$expand(Summary)</dc:subject>
-      <dc:contributor>
-         <rdf:Description link=\"%SCRIPTURL{"view"}%/%USERSWEB%/$expand(createauthor)\">
-            <rdf:value>$expand(@createauthor.topictitle)</rdf:value>
-         </rdf:Description>
-      </dc:contributor>
-      <description> <![CDATA[
-$percntDBCALL{\"$web.$topic->RenderRss\"}$percnt
-       ]]></description>
-   </item>"
+   format="$percntDBCALL{\"$web.$topic->RenderRss\"}$percnt"
 }%
 %TMPL:END%
 %{</verbatim>}%

diff --git a/data/Applications/TopicType.txt b/data/Applications/TopicType.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1435666503" format="1.1"  version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1441024559" format="1.1" version="1"}%
 %DBCALL{"RenderTopicInstaller" TYPE="TopicType" PARENT="TopicType"}%
 ---++ Documentation
 %STARTSECTION{"documentation"}%
@@ -36,6 +36,7 @@ create <nop>TopicTypes for each.
 %STOPINCLUDE%
 
 ---++ !TopicType form
+<div class="overflow">
 | *Name:*| *Type:* | *Size:* | *Values:* | *Description:* | *Attributes:* | *Default:* |
 | TopicType | label | 1 | TopicType, DataForm, DocuTopic, ApplicationTopic, WikiTopic | topic type  | | |
 | <nop>TopicTitle | text | 75 | |  | | |
@@ -44,8 +45,9 @@ create <nop>TopicTypes for each.
 | Icon | icon | 30 | include="^fa\-" | icon to be displayed in the topic creator |  | |
 | Editor | topic+values | 30 | url="%SCRIPTURLPATH{"view"}%/Applications/TopicType?section=editors&skin=text&contenttype=application/json&t=%GMTIME{"$epoch"}%" | editor for this topic type | | |
 | Template | topic+values | 30 | url="%SCRIPTURLPATH{"view"}%/Applications/TopicType?section=templates&skin=text&contenttype=application/json&t=%GMTIME{"$epoch"}%" | topic template to be used for this topic type | | |
+| Topic Naming | text | 30 | | a template for the name of topics being created, e.g. <nop>ProjectAUTOINC0 | | |
 | WikiApplication| wikiapp | 1 | | Application this topic belongs to | | |
-
+</div>
 ---++ editors
 
 <verbatim class="tml">
@@ -108,4 +110,5 @@ create <nop>TopicTypes for each.
 %META:FIELD{name="Icon" title="Icon" value="fa-tree"}%
 %META:FIELD{name="Editor" title="Editor" value="TopicTypeEditTemplate"}%
 %META:FIELD{name="Template" title="Template" value="Applications.TopicTypeTemplate"}%
+%META:FIELD{name="TopicNaming" title="Topic Naming" value=""}%
 %META:FIELD{name="WikiApplication" title="WikiApplication" value="WikiWorkbench"}%
diff --git a/data/Applications/TopicTypeEditTemplate.txt b/data/Applications/TopicTypeEditTemplate.txt
@@ -13,17 +13,15 @@
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
-%TMPL:DEF{"formfields"}%%TMPL:PREV%%TMPL:P{"detailstab"}%
-%TMPL:END%
+%TMPL:DEF{"formfields"}%%TMPL:PREV%%TMPL:P{"detailstab"}%%TMPL:END%
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
 %TMPL:DEF{"detailstab"}%%TAB{"%MAKETEXT{"Details"}%"}%
 %RENDERFOREDIT{
    exclude="TopicType|Summary|TopicTitle"
 }%
-%ENDTAB%
-%TMPL:END%
+%ENDTAB%%TMPL:END%
 %{</verbatim>}%
 
 %META:FORM{name="TopicView"}%

diff --git a/data/Applications/WebPreferences.txt b/data/Applications/WebPreferences.txt
@@ -1,31 +1,29 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1435666503" format="1.1"  version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1438506191" format="1.1" version="1"}%
 %TOC%
 
----+++ DataForms
+---++ DataForms
    * Set WEBFORMS = ApplicationLicense, ApplicationTopic, DataForm, DataFormAttribute, DocuTopic, TopicFunction, TopicStub, TopicTemplate, TopicType, TopicView, WebTool, WikiApplication, WikiTopic
 
----+++ Naming
-Text to be displayed on the sitemap and in the headerbar describing this web
-using a kind of tagline:
-   * Set WEBSUMMARY = Applications Library
+---++ Editing
+   * Set NOWYSIWYG = on
 
-Color to be displayed in the sitemap representing this web:
+---++ Naming
+   * Set WEBSUMMARY = Applications Library
    * Set WEBBGCOLOR = #E2DCC8
-
-Flag to enable/disable listing this web on the sitemap:
    * Set SITEMAPLIST = off
 
----+++ Access rights
+---++ Translations
+
+   * Set CONTENT_LEXICON = Applications.WebLexicon
+   * Set WEBMETADATA = Applications.LexiconForm
+
+---++ Access rights
    * Set #DENYWEBVIEW =
    * Set #ALLOWWEBVIEW = 
    * Set #DENYWEBCHANGE = 
    * Set ALLOWWEBCHANGE = %USERSWEB%.AdminGroup
    * Set ALLOWTOPICCHANGE = %USERSWEB%.AdminGroup
 
----++ Translations
-
-   * Set CONTENT_LEXICON = Applications.WebLexicon
-   * Set WEBMETADATA = Applications.LexiconForm
 
 %META:FORM{name="Applications.ApplicationTopic"}%
 %META:FIELD{name="TopicType" title="TopicType" value="ApplicationTopic, WikiTopic"}%

diff --git a/data/Applications/WebStatistics.txt b/data/Applications/WebStatistics.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1435666503" format="1.1"  version="1"}%
+%META:TOPICINFO{author="BaseUserMapping_333" comment="" date="1442789945" format="1.1" version="1"}%
 %META:TOPICPARENT{name="WebHome"}%
 ---+ Statistics for <nop>%BASEWEB% Web
 

diff --git a/data/Applications/WikiApplicationTemplate.txt b/data/Applications/WikiApplicationTemplate.txt
@@ -25,5 +25,3 @@
 %META:FIELD{name="Summary" title="Summary" value="TopicTemplate to generate a WikiApplication topic"}%
 %META:FIELD{name="ForTopicType" title="For TopicType" value="WikiApplication"}%
 %META:FIELD{name="WikiApplication" title="WikiApplication" value="WikiWorkbench"}%
-%META:FILEATTACHMENT{name="Inheritance_Applications.png" attachment="Inheritance_Applications.png" attr="h" comment="<nop>DirectedGraphPlugin: DOT graph" date="1435666503" size="68810" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="Inheritance_Applications.cmapx" attachment="Inheritance_Applications.cmapx" attr="h" comment="<nop>DirectedGraphPlugin: DOT graph" date="1435666503" size="3908" user="ProjectContributor" version="1"}%
diff --git a/data/Applications/WikiTopicEditTemplate.txt b/data/Applications/WikiTopicEditTemplate.txt
@@ -36,14 +36,14 @@
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
-%TMPL:DEF{"titleaction"}%%MAKETEXT{"edit [_1]" args="%TMPL:P{"topictype"}%"}%%TMPL:END%
+%TMPL:DEF{"titleaction"}%%TRANSLATE{"edit [_1]" args="%TMPL:P{"topictype"}%"}%%TMPL:END%
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
 %TMPL:DEF{"contenttitle"}%<h1 class="natEditTitle"><noautolink>
 %IF{"istopic '%WEB%.%TOPIC%'"
-  then="[[%WEB%.%TOPIC%][$percntTMPL:P{\"topictitle\"}$percnt]] (%MAKETEXT{"edit [_1]" args="%TMPL:P{"topictype"}%"}%)"
-  else="$percntTMPL:P{\"topictitle\"}$percnt (%MAKETEXT{"new [_1]" args="%TMPL:P{"topictype"}%"}%)"
+  then="[[%WEB%.%TOPIC%][%URLPARAM{"TopicTitle" default="$percntTMPL:P{\\"topictitle\\" hideautoinc=\\"off\\"}$percnt"}%]] (%MAKETEXT{"edit [_1]" args="%TMPL:P{"topictype"}%"}%)" 
+  else="<nop>%URLPARAM{"TopicTitle" default="%TMPL:P{"topictitle" hideautoinc="off"}%"}% (%MAKETEXT{"new [_1]" args="%TMPL:P{"topictype"}%"}%)"
 }%
 </h1></noautolink>%ADDTOZONE{"head" id="WIKIWORKBENCH::H1" text="<style>.ui-natedit-h1 {display:none}</style>"}%
 %{</verbatim>}%