Menu
▾
▴
[TWiki-Dev] [SVN] r7435 - in twiki/branches/DEVELOP/twikiplugins/BlogPlugin: data/TWiki data/_blog lib/TWiki/Plugins lib/TWiki/Plugins/BlogPlugin
|
From: <Mic...@nt...> - 2005-11-11 22:41:32
|
Author: MichaelDaum
Date: 2005-11-11 14:39:55 -0800 (Fri, 11 Nov 2005)
New Revision: 7435
Modified:
twiki/branches/DEVELOP/twikiplugins/BlogPlugin/data/TWiki/BlogPlugin.txt
twiki/branches/DEVELOP/twikiplugins/BlogPlugin/data/_blog/RenderBlogComment.txt
twiki/branches/DEVELOP/twikiplugins/BlogPlugin/data/_blog/RenderBlogComments.txt
twiki/branches/DEVELOP/twikiplugins/BlogPlugin/data/_blog/RenderBlogEntry.txt
twiki/branches/DEVELOP/twikiplugins/BlogPlugin/data/_blog/RenderSubComments.txt
twiki/branches/DEVELOP/twikiplugins/BlogPlugin/lib/TWiki/Plugins/BlogPlugin.pm
twiki/branches/DEVELOP/twikiplugins/BlogPlugin/lib/TWiki/Plugins/BlogPlugin/DEPENDENCIES
Log:
Item840:
* more careful use of timesince
* using twisty to fold threaded comments
* added TwistyPlugin to dependencies
Modified: twiki/branches/DEVELOP/twikiplugins/BlogPlugin/data/TWiki/BlogPlugin.txt
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/BlogPlugin/data/TWiki/BlogPlugin.txt 2005-11-11 22:34:03 UTC (rev 7434)
+++ twiki/branches/DEVELOP/twikiplugins/BlogPlugin/data/TWiki/BlogPlugin.txt 2005-11-11 22:39:55 UTC (rev 7435)
@@ -31,7 +31,7 @@
---++ Plugin Info
| Plugin Author: | TWiki:Main.MichaelDaum |
-| Plugin Version: | 11 Nov 2005 (v0.06) |
+| Plugin Version: | 11 Nov 2005 (v0.07) |
| Change History: | <!-- versions below in reverse order --> |
| 04 Nov 2005: | Initial version |
| TWiki Dependency: | $TWiki::Plugins::VERSION 1.1 |
Modified: twiki/branches/DEVELOP/twikiplugins/BlogPlugin/data/_blog/RenderBlogComment.txt
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/BlogPlugin/data/_blog/RenderBlogComment.txt 2005-11-11 22:34:03 UTC (rev 7434)
+++ twiki/branches/DEVELOP/twikiplugins/BlogPlugin/data/_blog/RenderBlogComment.txt 2005-11-11 22:39:55 UTC (rev 7435)
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="TWikiContributor" date="1131393412" format="1.1" version="1.1"}%
+%META:TOPICINFO{author="TWikiContributor" date="1131747451" format="1.1" version="1.1"}%
%META:TOPICPARENT{name="TopicFunction"}%
---+ Function: %TOPIC%
%FORMFIELD{"TopicDescription"}%
@@ -54,8 +54,9 @@
~~~ <span class=\"blogDate\">
~~~ replied
~~~ $percntTIMESINCE{
-~~~ \"$formatTime(createdate)\"
-~~~ format=\"$time ago\"
+~~~ from=\"$expand(@BaseRef.createdate)\"
+~~~ to=\"$expand(createdate)\"
+~~~ format=\"$time after the incident\"
~~~ null=\"immediately\"
~~~ }$percnt
~~~ </span>]]
@@ -67,6 +68,7 @@
~~~ $percntFIDEFINED$percnt$n
~~~ <div class=\"blogCommentText\">$n
~~~ $expand(Text)
+~~~ ... [[$web.$topic#bottomComment][reply]]
~~~ </div>$n
~~~ </noautolink>
*~~
Modified: twiki/branches/DEVELOP/twikiplugins/BlogPlugin/data/_blog/RenderBlogComments.txt
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/BlogPlugin/data/_blog/RenderBlogComments.txt 2005-11-11 22:34:03 UTC (rev 7434)
+++ twiki/branches/DEVELOP/twikiplugins/BlogPlugin/data/_blog/RenderBlogComments.txt 2005-11-11 22:39:55 UTC (rev 7435)
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="TWikiContributor" date="1131380199" format="1.1" version="1.1"}%
+%META:TOPICINFO{author="TWikiContributor" date="1131747476" format="1.1" version="1.1"}%
%META:TOPICPARENT{name="TopicFunction"}%
---+ Function: %TOPIC%
%FORMFIELD{"TopicDescription"}%
Modified: twiki/branches/DEVELOP/twikiplugins/BlogPlugin/data/_blog/RenderBlogEntry.txt
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/BlogPlugin/data/_blog/RenderBlogEntry.txt 2005-11-11 22:34:03 UTC (rev 7434)
+++ twiki/branches/DEVELOP/twikiplugins/BlogPlugin/data/_blog/RenderBlogEntry.txt 2005-11-11 22:39:55 UTC (rev 7435)
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="TWikiContributor" date="1131396296" format="1.1" version="1.1"}%
+%META:TOPICINFO{author="TWikiContributor" date="1131738723" format="1.1" version="1.1"}%
%META:TOPICPARENT{name="TopicFunction"}%
---+ Function: %TOPIC%
%FORMFIELD{"TopicDescription"}%
@@ -32,8 +32,7 @@
~~~ $n</noautolink>$n
~~~ <div class=\"blogInfo\">
~~~ <span class=\"blogDate\">
-~~~ $percntTIMESINCE{\"$formfield(createdate)\"
-~~~ format=\"$time ago\" null=\"about now\"}$percnt
+~~~ $formatTime(createdate, '$day $mon $year - $hour:$minute')
~~~ </span>
~~~ in
~~~ <span class=\"blogCategory\">
Modified: twiki/branches/DEVELOP/twikiplugins/BlogPlugin/data/_blog/RenderSubComments.txt
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/BlogPlugin/data/_blog/RenderSubComments.txt 2005-11-11 22:34:03 UTC (rev 7434)
+++ twiki/branches/DEVELOP/twikiplugins/BlogPlugin/data/_blog/RenderSubComments.txt 2005-11-11 22:39:55 UTC (rev 7435)
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="TWikiContributor" date="1131359559" format="1.1" version="1.1"}%
+%META:TOPICINFO{author="TWikiContributor" date="1131748190" format="1.1" version="1.1"}%
%META:TOPICPARENT{name="TopicFunction"}%
---+ Function: %TOPIC%
%FORMFIELD{"TopicDescription"}%
@@ -14,20 +14,37 @@
*~~ <div class=\"blogSubComment\">
~~~ <a name=\"$topic\"></a><a name=\"$formfield(Nr)\"></a>
~~~ <span class=\"blogCommentNr\">$formfield(Nr)</span>
-~~~ [[$web.$topic][$percntIFDEFINED{\"$formfield(Headline)\"
-~~~ then=\"$formfield(Headline), <nop>$formfield(Name)\"
-~~~ else=\"$formfield(Name)\"}$percnt
-~~~ <span class=\"blogDate\">
-~~~ replied
-~~~ $percntTIMESINCE{
-~~~ from=\"$formatTime(@BlogRef.createdate)\"
-~~~ to=\"$formatTime(createdate)\"
-~~~ null=\"immediately\"
-~~~ format=\"$time later\"
+~~~ $percntIFDEFINED{\"$formfield(Url)\"
+~~~ then=\"[[$formfield(Url)][$formfield(Name)]]\"
+~~~ else=\"$formfield(Name)\" glue=\"off\"
~~~ }$percnt
+~~~ [[$web.$topic][replied
+~~~ $percntIFDEFINED{\"$formfield(Headline)\"
+~~~ then=\"\\"$formfield(Headline)\\"\" glue=\"off\"
+~~~ }$percnt
+~~~ <span class=\"blogDate\">
+~~~ $percntTIMESINCE{
+~~~ from=\"$formatTime(@BlogRef.createdate)\"
+~~~ to=\"$formatTime(createdate)\"
+~~~ null=\"immediately\"
+~~~ format=\"$time later\"
+~~~ }$percnt
+~~~ </span>
~~~ ]]
+~~~ <span>
+~~~ $percntTWISTYSHOW{id=\"twist$topic\"
+~~~ img=\"$percntICONPATH{\"toggleopen\"}$percnt\"
+~~~ }$percnt
+~~~ $percntTWISTYHIDE{id=\"twist$topic\"
+~~~ img=\"$percntICONPATH{\"toggleclose\"}$percnt\"
+~~~ }$percnt
~~~ </span>
-*~~ $percntREDDOT{\"$web.$topic\" grant=\"MichaelDaum\"}$percnt
+~~~ $percntTWISTYTOGGLE{id=\"twist$topic\" mode=\"div\"}$percnt
+~~~ <div class=\"blogCommentText\">
+~~~ $formfield(Text)
+~~~ ... [[$web.$topic#$topic][reply]]
+~~~ </div>
+~~~ $percntENDTWISTYTOGGLE$percnt
~~~ $percntINCLUDE{\"RenderSubComments\" NAME=\"$topic\"}$percnt
*~~ </div>
*~~ "
Modified: twiki/branches/DEVELOP/twikiplugins/BlogPlugin/lib/TWiki/Plugins/BlogPlugin/DEPENDENCIES
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/BlogPlugin/lib/TWiki/Plugins/BlogPlugin/DEPENDENCIES 2005-11-11 22:34:03 UTC (rev 7434)
+++ twiki/branches/DEVELOP/twikiplugins/BlogPlugin/lib/TWiki/Plugins/BlogPlugin/DEPENDENCIES 2005-11-11 22:39:55 UTC (rev 7435)
@@ -1,8 +1,9 @@
TWiki::Plugins,>=1.026,perl,TWiki Dakar release.
TWiki::Plugins::RedDotPlugin,>=1.27,perl,Required
TWiki::Plugins::GluePlugin,>=1.5,perl,Required
-TWiki::Contrib::DBCacheContrib,>=Dakar,perl,Required
+TWiki::Contrib::DBCacheContrib,Dakar,perl,Required
TWiki::Plugins::ExtendedSelectionPlugin,>=1.002,perl,Required
TWiki::Plugins::HeadlinesPlugin,>=1.001,perl,Required
TWiki::Plugins::SpreadSheetPlugin,>=1.001,perl,Required
TWiki::Plugins::TimeSincePlugin,>=0.99,perl,Required
+TWiki::Plugins::TwistyPlugin,Dakar,perl,Required
Modified: twiki/branches/DEVELOP/twikiplugins/BlogPlugin/lib/TWiki/Plugins/BlogPlugin.pm
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/BlogPlugin/lib/TWiki/Plugins/BlogPlugin.pm 2005-11-11 22:34:03 UTC (rev 7434)
+++ twiki/branches/DEVELOP/twikiplugins/BlogPlugin/lib/TWiki/Plugins/BlogPlugin.pm 2005-11-11 22:39:55 UTC (rev 7435)
@@ -23,7 +23,7 @@
);
$VERSION = '$Rev$';
-$RELEASE = '0.06';
+$RELEASE = '0.07';
use TWiki::Contrib::DBCacheContrib;
use TWiki::Contrib::DBCacheContrib::Search;
|