Item12865: improve rendering of revision info

git-svn-id: http://svn.foswiki.org/trunk/BlogPlugin@17549 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Apr 23, 2014 · 3270226 · 3270226
1 parent 8086f8c
commit 3270226
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 19 deletions.
diff --git a/data/Applications/BlogApp/CompleteDocumentation.txt b/data/Applications/BlogApp/CompleteDocumentation.txt
@@ -23,7 +23,7 @@
 %META:FIELD{name="Summary" attributes="c" title="Summary" value="Complete documentation for the BlogApp"}%
 %META:FIELD{name="Version" attributes="" title="Version" value="2.0"}%
 %META:FIELD{name="Author" attributes="" title="Author" value="Michael Daum"}%
-%META:FIELD{name="Copyright" attributes="" title="Copyright" value="&copy; 2005 - 2014 http://michaeldaumconsulting.com"}%
+%META:FIELD{name="Copyright" attributes="" title="Copyright" value="&copy; 2005-2014 http://michaeldaumconsulting.com"}%
 %META:FIELD{name="License" attributes="" title="License" value="Applications.GnuGeneralPublicLicense"}%
 %META:FIELD{name="Dependencies" attributes="" title="Dependencies" value="Applications.ClassificationApp.ClassificationApp"}%
 %META:TOPICMOVED{by="micha" date="1335189669" from="Applications/BlogApp.BlogApp" to="Applications/BlogApp.CompleteDocumentation"}%
diff --git a/data/Applications/BlogApp/RenderArchives.txt b/data/Applications/BlogApp/RenderArchives.txt
@@ -50,8 +50,6 @@
 
 %DBCALL{"Applications.GnuGeneralPublicLicense" section="notice"}%
 
-</verbatim>
-
 %META:FORM{name="Applications.ApplicationTopic"}%
 %META:FIELD{name="TopicType" title="TopicType" value="DocuTopic, TopicFunction"}%
 %META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value=""}%

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

diff --git a/data/Applications/BlogApp/RenderBlogEntries.txt b/data/Applications/BlogApp/RenderBlogEntries.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="micha" comment="reprev" date="1397223562" format="1.1" reprev="29" version="29"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1397223562" format="1.1" reprev="29" version="29"}%
 %META:TOPICPARENT{name="TopicFunction"}%
 %TOC{depth="2"}%
 
@@ -71,19 +71,19 @@ This TopicFunction displays a collection of BlogEntries within the given CATegor
         <div class='foswikiTopicSummary'>$expand(Summary')</div>
       </h2>
       %JQICON{"fa-calendar"}% <nop>$formatTime(createdate, '$day $mon $year')
-      <span class='natRevisionSep'>&#124;</span> %JQICON{"fa-user"}% $percntFORMATLIST{ 
+      <span class='foswikiRevisionSep'>&#124;</span> %JQICON{"fa-user"}% $percntFORMATLIST{ 
          \"$expand(Author or createauthor)\"  
          split=\"\s*,\s*\"  
          format=\"$dollarpercntIF{\\"istopic '%USERSWEB%.$1'\\" then=\\"[[%USERSWEB%.$1]]\\" else=\\"<nop>$1\\"}$dollarpercnt\"  
          separator=\", \" 
       }$percnt
       $percntCATINFO{
         topic=\"$web.$topic\"
-        header=\"<span class='natRevisionSep'>&#124;</span> %JQICON{"fa-folder"}% \"
+        header=\"<span class='foswikiRevisionSep'>&#124;</span> %JQICON{"fa-folder"}% \"
       }$percnt<!-- -->
       $percntTAGINFO{
         topic=\"$web.$topic\"
-        header=\"<span class='natRevisionSep'>&#124;</span> %JQICON{"fa-tag"}% \"
+        header=\"<span class='foswikiRevisionSep'>&#124;</span> %JQICON{"fa-tag"}% \"
       }$percnt<!-- -->
     </div>
     <div class='blogText hyphenate'>
@@ -147,8 +147,6 @@ $percntDBCALL{\"$web.$topic\"}$percnt <span class='blogMore'>&#8230;&nbsp;[[$web
 
 %DBCALL{"Applications.GnuGeneralPublicLicense" section="notice"}%
 
-</verbatim>
-
 %META:FORM{name="Applications.ApplicationTopic"}%
 %META:FIELD{name="TopicType" title="TopicType" value="DocuTopic, TopicFunction"}%
 %META:FIELD{name="TopicTitle" attributes="" title="<nop>TopicTitle" value=""}%

diff --git a/data/Applications/BlogApp/RenderBlogEntryTitle.txt b/data/Applications/BlogApp/RenderBlogEntryTitle.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="micha" comment="reprev" date="1397223725" format="1.1" reprev="11" version="11"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1398191715" format="1.1" reprev="11" version="11"}%
 %META:TOPICPARENT{name="TopicFunction"}%
 %TOC{depth="2"}%
 
@@ -14,12 +14,17 @@
 ---++ Implementation
 <verbatim class="tml">
 %STARTINCLUDE%<!-- -->
-%DBCALL{"Applications.RenderWikiTopicView" TITLE_EXTRA="%TITLE_EXTRA%"}% 
+<h1> 
+%DBQUERY{topic="%BASEWEB%.%BASETOPIC%" 
+  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> 
 <div class="blogInfo">
   %DBQUERY{
     topic="%BASEWEB%.%BASETOPIC%" 
     format="%JQICON{"fa-calendar"}% <span itemprop='datePublished' content='$formatTime(createdate, '$year-$mo-$day')'>$formatTime(createdate, '$day $mon $year')</span>
-      <span class='natRevisionSep'>&#124;</span> %JQICON{"fa-user"}% $percntFORMATLIST{
+      <span class='foswikiRevisionSep'>&#124;</span> %JQICON{"fa-user"}% $percntFORMATLIST{
       \"$expand(Author or createauthor)\" 
       split=\"\s*,\s*\" 
       format=\"$dollarpercntIF{\\"istopic '%USERSWEB%.$1'\\" then=\\"<a href='%SCRIPTURLPATH{view}%/%USERSWEB%/$1' rel='author' itemprop='author'>$dollarpercntGETTOPICTITLE{%USERSWEB%.$1}$dollarpercnt</a>\\" else=\\"<nop>$1\\"}$dollarpercnt\" 
@@ -28,12 +33,12 @@
   }%
   %CATINFO{
     "%BASEWEB%.%BASETOPIC%" 
-    header="<span class='natRevisionSep'>&#124;</span> %JQICON{"fa-folder"}% "
+    header="<span class='foswikiRevisionSep'>&#124;</span> %JQICON{"fa-folder"}% "
     format="<a href='$url' rel='tag' itemprop='keywords' class='$name'><noautolink>$title</noautolink></a>"
   }% <!-- -->
   %TAGINFO{
     "%BASEWEB%.%BASETOPIC%"
-    header="<span class='natRevisionSep'>&#124;</span> %JQICON{"fa-tag"}% "
+    header="<span class='foswikiRevisionSep'>&#124;</span> %JQICON{"fa-tag"}% "
     format="<a href='$url' rel='tag' itemprop='keywords' class='$class'><noautolink>$name</noautolink></a>"
   }% <!-- -->
 </div>

diff --git a/data/System/BlogPlugin.txt b/data/System/BlogPlugin.txt
@@ -78,6 +78,7 @@ Note that your posting will not be publicly visible unless you switched its *Sta
 |  Release: | %$RELEASE% |
 |  Version: | %$VERSION% |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
+|  15 Apr 2014: | improved topic info layout |
 |  04 Apr 2014: | flag rest handlers that don't require authentication |
 |  18 Mar 2014: | improve css of headings |
 |  07 Nov 2013: | rewrite migrating most features to other Foswiki plugins |

diff --git a/lib/Foswiki/Plugins/BlogPlugin.pm b/lib/Foswiki/Plugins/BlogPlugin.pm
@@ -21,8 +21,8 @@ use warnings;
 use Error qw(:try);
 
 our $core;
-our $VERSION = '2.05';
-our $RELEASE = '2.05';
+our $VERSION = '2.06';
+our $RELEASE = '2.06';
 our $NO_PREFS_IN_TOPIC = 1;
 our $SHORTDESCRIPTION = 'A blogging system for Foswiki';
 our $baseTopic;

diff --git a/lib/Foswiki/Plugins/BlogPlugin/DEPENDENCIES b/lib/Foswiki/Plugins/BlogPlugin/DEPENDENCIES
@@ -1,5 +1,5 @@
-Foswiki::Plugins::ClassificationPlugin,>=2.00,perl,Required.
-Foswiki::Contrib::WikiWorkbenchContrib,>=1.20,perl,Required.
+Foswiki::Plugins::ClassificationPlugin,>=3.01,perl,Required.
+Foswiki::Contrib::WikiWorkbenchContrib,>=1.31,perl,Required.
 Foswiki::Plugins::DBCachePlugin,>=4.10,perl,Required.
 Foswiki::Plugins::FilterPlugin,>=2.08,perl,Required; 
 Foswiki::Plugins::FlexFormPlugin,>=2.60,perl,Required.