Item12865: improve rendering of revision info of WikiTopics

git-svn-id: http://svn.foswiki.org/trunk/WikiWorkbenchContrib@17548 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Apr 23, 2014 · 5669f11 · 5669f11
1 parent 041f5ed
commit 5669f11
Show file tree

Hide file tree

Showing 18 changed files with 42 additions and 24 deletions.
diff --git a/data/Applications/GetTopicTypes.txt b/data/Applications/GetTopicTypes.txt
@@ -52,7 +52,7 @@ scratch on as you will be able to create an initial !TopicType !TopicType this w
 %DBCALL{"Applications.RenderFunctionCallers"}%
 
 ---++ Copyright
-&copy; 2006-2013 Michael Daum http://michaeldaumconsulting.com
+&copy; 2006-2014 Michael Daum http://michaeldaumconsulting.com
 
 %DBCALL{"Applications.GnuGeneralPublicLicense" section="notice"}%
 

diff --git a/data/Applications/RenderApplicationDocumentation.txt b/data/Applications/RenderApplicationDocumentation.txt
@@ -44,7 +44,7 @@
 %DBCALL{"RenderFunctionCallers"}%
 
 ---++ Copyright
-&copy; 2006-2013 Michael Daum http://michaeldaumconsulting.com
+&copy; 2006-2014 Michael Daum http://michaeldaumconsulting.com
 
 %DBCALL{"GnuGeneralPublicLicense" section="notice"}%
 

diff --git a/data/Applications/RenderApplicationManifest.txt b/data/Applications/RenderApplicationManifest.txt
@@ -31,7 +31,7 @@
 %DBCALL{"RenderFunctionCallers"}%
 
 ---++ Copyright
-&copy; 2006-2013 Michael Daum http://michaeldaumconsulting.com
+&copy; 2006-2014 Michael Daum http://michaeldaumconsulting.com
 
 %DBCALL{"GnuGeneralPublicLicense" section="notice"}%
 

diff --git a/data/Applications/RenderImageSelector.txt b/data/Applications/RenderImageSelector.txt
@@ -115,7 +115,7 @@ jQuery(function($) {
 %DBCALL{"Applications.RenderFunctionCallers"}%
 
 ---++ Copyright
-&copy; 2006 - 2013 Michael Daum http://michaeldaumconsulting.com
+&copy; 2006-2014 Michael Daum http://michaeldaumconsulting.com
 
 %DBCALL{"Applications.GnuGeneralPublicLicense" section="notice"}%
 

diff --git a/data/Applications/RenderIndexItem.txt b/data/Applications/RenderIndexItem.txt
@@ -40,7 +40,7 @@ method was found.
 %DBCALL{"Applications.RenderFunctionCallers"}%
 
 ---++ Copyright
-&copy; 2008-2013 Michael Daum http://michaeldaumconsulting.com
+&copy; 2008-2014 Michael Daum http://michaeldaumconsulting.com
 
 %DBCALL{"Applications.GnuGeneralPublicLicense" section="notice"}%
 

diff --git a/data/Applications/RenderRecentChanges.txt b/data/Applications/RenderRecentChanges.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1368703686" format="1.1" reprev="15" version="17"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1397220662" format="1.1" reprev="15" version="18"}%
 %META:TOPICPARENT{name="TopicFunction"}%
 %TOC{depth="2"}%
 
@@ -45,7 +45,7 @@ This uses solr and infintescroll to create a frontpage widget.
 %STARTSECTION{"backend"}%<noautolink>
 %DBQUERY{
   "%URLPARAM{"filter" default="%FILTER%"}%"
-  exclude="^(WebChanges|WebPreferences|WebStatistics|WebTopicLinks|WebIndex|WebNotify|WebHome|WebLinks|TopCategory|Category|ClassifiedTopic|TopicType|WebTopicEditTemplate|WebAtom|WebRss|WebLeftBar|WebSearch.*)$"
+  exclude="^(WebChanges|WebPreferences|WebStatistics|WebTopicLinks|WebIndex|WebNotify|WebHome|WebLinks|TopCategory|Category|ClassifiedTopic|TopicType|WebTopicEditTemplate|WebAtom|WebRss|WebLeftBar|WebSearch.*|WebTagList)$"
   web="%URLPARAM{"web" default="%THEWEB%"}%"
   skip="%CALC{"$EVAL(%URLPARAM{"page" default="%PAGE%"}%*%URLPARAM{"limit" default="%LIMIT%"}%)"}%"
   limit="%URLPARAM{"limit" default="%LIMIT%"}%" 
@@ -63,7 +63,7 @@ This uses solr and infintescroll to create a frontpage widget.
 %DBCALL{"Applications.RenderFunctionCallers"}%
 
 ---++ Copyright
-&copy;2006-2013 Michael Daum http://michaeldaumconsulting.com
+&copy; 2006-2014 Michael Daum http://michaeldaumconsulting.com
 
 %DBCALL{"Applications.GnuGeneralPublicLicense" section="notice"}%
 

diff --git a/data/Applications/RenderSimpleTopicCreator.txt b/data/Applications/RenderSimpleTopicCreator.txt
@@ -108,7 +108,7 @@ This function renders a topic creator form that holds a set of initial input ele
 }%
 
 ---++ Copyright
-&copy; 2006-2013 Michael Daum http://michaeldaumconsulting.com
+&copy; 2006-2014 Michael Daum http://michaeldaumconsulting.com
 
 %DBCALL{"GnuGeneralPublicLicense" section="notice"}%
 

diff --git a/data/Applications/RenderTopicInstaller.txt b/data/Applications/RenderTopicInstaller.txt
@@ -113,7 +113,7 @@ jQuery(function($) {
 %DBCALL{"Applications.RenderFunctionCallers"}%
 
 ---++ Copyright
-&copy; 2006-2013 Michael Daum http://michaeldaumconsulting.com
+&copy; 2006-2014 Michael Daum http://michaeldaumconsulting.com
 
 %DBCALL{"Applications.GnuGeneralPublicLicense" section="notice"}%
 

diff --git a/data/Applications/RenderTopicThumbnail.txt b/data/Applications/RenderTopicThumbnail.txt
@@ -107,7 +107,7 @@ is returned if no image attachment is found.
 %DBCALL{"Applications.RenderFunctionCallers"}%
 
 ---++ Copyright
-&copy; 2006-2013 Michael Daum http://michaeldaumconsulting.com
+&copy; 2006-2014 Michael Daum http://michaeldaumconsulting.com
 
 %DBCALL{"Applications.GnuGeneralPublicLicense" section="notice"}%
 

diff --git a/data/Applications/RenderTopicsOfType.txt b/data/Applications/RenderTopicsOfType.txt
@@ -54,7 +54,7 @@
 %DBCALL{"Applications.RenderFunctionCallers"}%
 
 ---++ Copyright
-&copy; 2006-2013 Michael Daum http://michaeldaumconsulting.com
+&copy; 2006-2014 Michael Daum http://michaeldaumconsulting.com
 
 %DBCALL{"GnuGeneralPublicLicense" section="notice"}%
 

diff --git a/data/Applications/RenderWikiApplicationFactory.txt b/data/Applications/RenderWikiApplicationFactory.txt
@@ -75,7 +75,7 @@ jQuery(function($) {
 %DBCALL{"Applications.RenderFunctionCallers"}%
 
 ---++ Copyright
-&copy; 2006-2013 Michael Daum http://michaeldaumconsulting.com
+&copy; 2006-2014 Michael Daum http://michaeldaumconsulting.com
 
 %DBCALL{"Applications.GnuGeneralPublicLicense" section="notice"}%
 

diff --git a/data/Applications/RenderWikiApplicationWebHome.txt b/data/Applications/RenderWikiApplicationWebHome.txt
@@ -61,7 +61,7 @@ See the [[CompleteDocumentation]].
 <verbatim class="css">
 %STARTSECTION{"css"}%<literal>
 <style type="text/css">
-.natRevision {
+.foswikiRevision {
   display:none;
 }
 .wwbBox img {
@@ -96,7 +96,7 @@ See the [[CompleteDocumentation]].
 %DBCALL{"Applications.RenderFunctionCallers"}%
 
 ---++ Copyright
-&copy; 2008-2013 Michael Daum http://michaeldaumconsulting.com
+&copy; 2008-2014 Michael Daum http://michaeldaumconsulting.com
 
 %DBCALL{"Applications.GnuGeneralPublicLicense" section="notice"}%
 

diff --git a/data/Applications/RenderWikiTopicEditor.txt b/data/Applications/RenderWikiTopicEditor.txt
@@ -38,7 +38,7 @@ displayed at the topic of the text tab.
 %DBCALL{"Applications.RenderFunctionCallers"}%
 
 ---++ Copyright
-&copy; 2006-2013 Michael Daum http://michaeldaumconsulting.com
+&copy; 2006-2014 Michael Daum http://michaeldaumconsulting.com
 
 %DBCALL{"Applications.GnuGeneralPublicLicense" section="notice"}%
 

diff --git a/data/Applications/RenderWikiTopicView.txt b/data/Applications/RenderWikiTopicView.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1391157718" format="1.1" reprev="9" version="10"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1398190121" format="1.1" reprev="11" version="11"}%
 %META:TOPICPARENT{name="TopicFunction"}%
 %TOC{depth="2"}%
 
@@ -19,7 +19,18 @@ showing its title and the summary line.
   format="[[$web.$topic][<span itemprop='name'>$expand(topictitle)</span>]] %IF{
       "defined TITLE_EXTRA and not isempty TITLE_EXTRA" 
       then="<span class='foswikiTopicExtra'>%TITLE_EXTRA%</span>"}% $expand('<div itemprop=\"description\" class=\"foswikiTopicSummary\">' and Summary and '</div>')"
-}%</h1></noautolink>%STOPINCLUDE%
+}%</h1>
+<span class="foswikiRevision">
+  %JQICON{"fa-calendar"}%
+  %REVINFO{"<span itemprop='dateModified' content='$iso'>$date - $hour:$min</span>" rev="%CURREV%"}%
+  <span class='foswikiRevisionSep'>&#124;</span>
+  %JQICON{"fa-flag"}%
+  %MAKETEXT{"Version [_1]" args="%REVINFO{"<span itemprop='version'>$rev</span>" rev="%CURREV%"}%"}%
+  <span class='foswikiRevisionSep'>&#124;</span>
+  %JQICON{"fa-user"}%
+  <span class='foswikiRevisionAuthor' itemprop='author'>%REVINFO{"[[$wikiusername]]" rev="%CURREV%"}%</span> 
+</span>
+</noautolink>%STOPINCLUDE%
 </verbatim>
 
 ---++ Test
@@ -28,7 +39,7 @@ showing its title and the summary line.
 %DBCALL{"Applications.RenderFunctionCallers"}%
 
 ---++ Copyright
-&copy; 2006-2013 Michael Daum http://michaeldaumconsulting.com
+&copy; 2006-2014 Michael Daum http://michaeldaumconsulting.com
 
 %DBCALL{"Applications.GnuGeneralPublicLicense" section="notice"}%
 

diff --git a/data/Applications/WikiTopicViewTemplate.txt b/data/Applications/WikiTopicViewTemplate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1371559360" format="1.1" reprev="4" version="4"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1398188957" format="1.1" reprev="5" version="5"}%
 %META:TOPICPARENT{name="TopicView"}%
 %{<verbatim class="tml">}%
 %TMPL:INCLUDE{"view"}%
@@ -12,6 +12,9 @@
 
 %{<verbatim class="tml">}%
 %TMPL:DEF{"form"}%%TMPL:END% 
+%TMPL:DEF{"topicinfo"}%%TMPL:END%
+%TMPL:DEF{"revinfo"}%%TMPL:END%
+%TMPL:DEF{"fixRevisionPosition"}%%TMPL:END%
 %{</verbatim>}%
 
 %{<verbatim class="tml">}%
@@ -25,7 +28,6 @@
 }%%TMPL:END%
 %{</verbatim>}%
 
-
 %META:FORM{name="Applications.ApplicationTopic"}%
 %META:FIELD{name="TopicType" title="TopicType" value="TopicView"}%
 %META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value=""}%

diff --git a/data/System/WikiWorkbenchContrib.txt b/data/System/WikiWorkbenchContrib.txt
@@ -157,6 +157,8 @@ target webs...
 |  Version: | %$VERSION% |
 |  Release: | %$RELEASE% |
 |  Change History: | |
+|  22 Apr 2014 | improved rendering of revision info in <nop>WikiTopics; remove traces of <nop>NatSkin css classes |
+|  04 Apr 2014 | fix wikiapp formfield to work on foswiki >= 1.2.0 |
 |  18 Mar 2014 | improved thumbnailing for topics; \
                  support jquery.validate in topic creator; \
                  added dependency on [[Foswiki:Extensions/NatEditPlugin][NatEditPlugin]] |

diff --git a/data/_WikiApplicationTemplate/CompleteDocumentation.txt b/data/_WikiApplicationTemplate/CompleteDocumentation.txt
@@ -23,6 +23,6 @@
 %META:FIELD{name="Summary" attributes="c" title="Summary" value="TopicTemplate to generate a WikiApplication topic"}%
 %META:FIELD{name="Version" attributes="" title="Version" value=""}%
 %META:FIELD{name="Author" attributes="" title="Author" value=""}%
-%META:FIELD{name="Copyright" attributes="" title="Copyright" value="&copy; 2013 Your Name"}%
+%META:FIELD{name="Copyright" attributes="" title="Copyright" value="&copy; 2014 Your Name"}%
 %META:FIELD{name="License" attributes="" title="License" value="Applications.GnuGeneralPublicLicense"}%
 %META:FIELD{name="Dependencies" attributes="" title="Dependencies" value=""}%
diff --git a/lib/Foswiki/Contrib/WikiWorkbenchContrib.pm b/lib/Foswiki/Contrib/WikiWorkbenchContrib.pm
@@ -16,8 +16,11 @@
 
 package Foswiki::Contrib::WikiWorkbenchContrib;
 
-our $VERSION = '1.30';
-our $RELEASE = '1.30';
+use strict;
+use warnings;
+
+our $VERSION = '1.31';
+our $RELEASE = '1.31';
 our $SHORTDESCRIPTION = 'Framework for <nop>WikiApplications';
 
 1;