Changeset 10817

Timestamp:

02/27/11 12:58:36 (2 years ago)

Author:

ArthurClemens

Message:

Item10417: 1.9.0 Added setting =outline= to control the summary text. Added form field !SummmaryImage to choose the attachment name to be displayed in the summary. Improved display of comments in list view. Added options to define image sizes.

Location:

trunk/BlogAddOn

Files:

• data/_BlogAddOn/BlogPost.txt (modified) (5 diffs)
• data/_BlogAddOn/BlogPostCommentTemplate.txt (modified) (1 diff)
• data/_BlogAddOn/BlogPostForm.txt (modified) (1 diff)
• data/_BlogAddOn/BlogPostViewTemplate.txt (modified) (1 diff)
• pub/System/BlogAddOn/screenshot_list.png (modified) (previous)
• pub/System/BlogAddOn/screenshot_post.png (modified) (previous)
• pub/System/BlogAddOn/screenshots.psd (modified) (previous)

trunk/BlogAddOn/data/_BlogAddOn/BlogPost.txt

@@ -7 +7 @@
         then="%display%"
         else="all"
+}%"
+poutline="%IF{
+        "defined outline and $outline!=''"
+        then="%outline%"
+        else="formfield(Summary)"
+}%"
+pdefaultoutline="summary(200)"
+ppicsizesummary="%IF{
+        "defined picsizesummary and $picsizesummary!=''"
+        then="%picsizesummary%"
+        else="85"
+}%"
+ppicsizeauthor="%IF{
+        "defined picsizeauthor and $picsizeauthor!=''"
+        then="%picsizeauthor%"
+        else="50"
+}%"
+ppicsizecommenter="%IF{
+        "defined picsizecommenter and $picsizecommenter!=''"
+        then="%picsizecommenter%"
+        else="20"
 }%"
 psort="%URLPARAM{
@@ -213 +234 @@
 }
 .blogPostAddOnExcerpt {%IF{
-"defined BLOGADDON_AUTHOR_PICTURE_FIELD and $'BLOGADDON_AUTHOR_PICTURE_FIELD'!=''" 
+"defined BLOGADDON_AUTHOR_PICTURE_FIELD and $BLOGADDON_AUTHOR_PICTURE_FIELD!=''" 
 then="
-        margin-left:50px;
+        margin-left:%ppicsizeauthor%px;
         padding-left:10px;
 "}%}
 .blogPostAddOnItem h3 {
-        font-size:115%;
+        font-size:120%;
         font-weight:bold;
-        padding:0 0 3px 0;
+        padding:0 0 5px 0;
         margin:0;
         border:none;
 }
 .blogPostAddOnSummary {
-        margin:.5em 0 0 0;
+        margin:10px 0 0 0;
+}
+.blogPostAddOnHasSummaryImage .blogPostAddOnSummaryText {
+        margin-left:%ppicsizesummary%px; /* image width %ppicsizesummary%px */
+        padding-left:15px;
+}
+.blogPostAddOnSummaryPicture {
+        float:left;
+        width:%ppicsizesummary%px;
+        min-height:%ppicsizesummary%px;
+        border:none;
+        margin:0 10px 5px 0;
 }
 .blogPostAddOnPicture {
         float:left;
 }
-.blogPostAddOnLatestComment {
+ul.blogPostAddOnCommentStatus {
         margin:.5em 0 0 0;
+        padding:0;
+        list-style:none;
+        position:relative;
+        width:35em;
+}
+ul.blogPostAddOnCommentStatus li {
+        display:block;
+        background:#f6f6f5;
+        padding:3px 0;
+        margin:0 0 2px 0;
+        font-size:86%;
+}
+ul.blogPostAddOnCommentStatus li .blogPostAddOnPicture {
+        margin:0 10px;
+}
+.blogPostAddOnCommentStatusText {
+        padding:0 10px;
 }
 .blogPostAddOnLatestCommentCount {}
@@ -315 +364 @@
 %STARTSECTION{"blogPostAddOnItem"}%<div class='blogPostAddOnItem'>
 %IF{
-"defined BLOGADDON_AUTHOR_PICTURE_FIELD and $'BLOGADDON_AUTHOR_PICTURE_FIELD'!=''" 
-then="$percntINCLUDE{$quot%WEB%.BlogPost$quot section=$quotblogPostAuthorPicture$quot imgWeb=$quot%USERSWEB%$quot imgTopic=$quot$formfield(Author)$quot imgWidth=$quot50$quot}$percnt"
+"defined BLOGADDON_AUTHOR_PICTURE_FIELD and $BLOGADDON_AUTHOR_PICTURE_FIELD!=''" 
+then="$percntINCLUDE{$quot%WEB%.BlogPost$quot section=$quotblogPostAuthorPicture$quot imgWeb=$quot%USERSWEB%$quot imgTopic=$quot$formfield(Author)$quot imgWidth=$quot%ppicsizeauthor%$quot}$percnt"
 }%<div class='blogPostAddOnExcerpt'><h3>[[$web.$topic][$formfield(Title)]]</h3>
+<!-- author, category, tags -->
 <div class='blogPostAddOnHeaderInfo foswikiUnvisited'>$percntINCLUDE{$quot%WEB%.%TOPIC%$quot section=$quotblogPostInfo$quot web=$quot$web$quot topic=$quot$topic$quot author=$quot$formfield(Author)$quot}$percnt</div>
-<div class='blogPostAddOnSummary'>$summary(200)</div>$percntSEARCH{$quot$topicComments%IF{"($WIKINAME = '%BLOGADDON_HIDE_COMMENTS%') OR (($WIKINAME ingroup '%BLOGADDON_HIDE_COMMENTS%')" then="n0nEToP1C"}%$quot web=$quot%IF{"defined BLOGADDON_COMMENTS_WEB and $BLOGADDON_COMMENTS_WEB!=''" then="%BLOGADDON_COMMENTS_WEB%" else="$web"}%$quot scope=$quottopic$quot nonoise=$quoton$quot format=$quot<span class='blogPostAddOnLatestComment foswikiGrayText'>Comments: $dollarcount(.*?(#CommentDate).*) - <a href='$percntSCRIPTURL{view}$percnt/$web/$topic?r=$dollarrev#BlogPostPrompt'>latest comment by $percntSPACEOUT{$quot<nop>$dollarwikiname$quot}$percnt</a> - $dollardate</span>$quot}$percnt
+<!-- summary -->
+<div class='blogPostAddOnSummary$percntIF{$quot'$formfield(SummaryImage)'!=''$quot then=$quot blogPostAddOnHasSummaryImage$quot}$percnt'>$percntIF{$quot'$formfield(SummaryImage)'!=''$quot then=$quot$percntINCLUDE{$quot%WEB%.%TOPIC%$quot section=$quotsummaryPicture$quot imgWeb=$quot$web$quot imgTopic=$quot$topic$quot imgName=$quot$formfield(SummaryImage)$quot}$percnt$quot}$percnt<div class='blogPostAddOnSummaryText'><div class='foswikiGrayText'>$percntIF{$quot'$%poutline%'!=''$quot then=$quot$%poutline%$quot else=$quot$%pdefaultoutline%$quot}$percnt</div>$percntSEARCH{$quot$topicComments%IF{"($WIKINAME = '%BLOGADDON_HIDE_COMMENTS%') OR (($WIKINAME ingroup '%BLOGADDON_HIDE_COMMENTS%')" then="n0nEToP1C"}%$quot web=$quot%IF{"defined BLOGADDON_COMMENTS_WEB and $BLOGADDON_COMMENTS_WEB!=''" then="%BLOGADDON_COMMENTS_WEB%" else="$web"}%$quot scope=$quottopic$quot nonoise=$quoton$quot format=$quot<ul class='blogPostAddOnCommentStatus'>
+<li><div class='blogPostAddOnCommentStatusText'>Comments: $dollarcount(.*?(#CommentDate).*)</div></li><li>$dollarpercntIF{$dollarquot(defined BLOGADDON_AUTHOR_PICTURE_FIELD and $BLOGADDON_AUTHOR_PICTURE_FIELD!='') AND (istopic '$dollarwikiusername')$dollarquot then=$dollarquot$percntINCLUDE{$quot%TOPIC%$quot section=$quotblogPostAuthorPicture$quot imgTopic=$quot$dollarwikiusername$quot imgWeb=$quot%USERSWEB%$quot imgWidth=$quot%ppicsizecommenter%$quot}$percnt$dollarquot}$dollarpercnt<div class='blogPostAddOnCommentStatusText'><a href='$percntSCRIPTURL{view}$percnt/$web/$topic?r=$dollarrev#BlogPostPrompt'>Latest comment by $percntSPACEOUT{$quot<nop>$dollarwikiname$quot}$percnt</a><span class='foswikiGrayText'> - $dollardate</span></div></li></ul>$quot}$percnt</div></div>
 </div><div class='foswikiClear'></div></div>%ENDSECTION{"blogPostAddOnItem"}%
 
@@ -343 +395 @@
 "%WEB%.%TOPIC%"
 section="%includeSection%"
-listtopic="%IF{"defined BLOGADDON_LIST_TOPIC and $'BLOGADDON_LIST_TOPIC'!=''" then="%BLOGADDON_LIST_TOPIC%" else="%WEB%.BlogPost"}%"
+listtopic="%IF{"defined BLOGADDON_LIST_TOPIC and $BLOGADDON_LIST_TOPIC!=''" then="%BLOGADDON_LIST_TOPIC%" else="%WEB%.BlogPost"}%"
 authortopic="%author%"
 }%%ENDSECTION{"_info"}%
@@ -388 +440 @@
 
 <!-- ###########################################################################
-authorPicture
-        params: imgWeb, imgTopic, imgWidth
+blogPostAuthorPicture
+        params: imgWeb, imgTopic
 -->
 %STARTSECTION{"blogPostAuthorPicture"}%<div class='blogPostAddOnPicture'>%INCLUDE{
+        "%TOPIC%"
+        section="%IF{"context ImagePluginEnabled" then="imagePluginImage" else="pubImage"}%"
+}%
+</div>%ENDSECTION{"blogPostAuthorPicture"}%
+
+%STARTSECTION{"pubImage"}%$percntIF{$quot'%imgWeb%/%CALC{$SUBSTITUTE(%imgTopic%,%USERSWEB%.,)}%'/%BLOGADDON_AUTHOR_PICTURE_FIELD%$quot then=$quot<a href='%SCRIPTURL{view}%/%imgWeb%/%CALC{$SUBSTITUTE(%imgTopic%,%USERSWEB%.,)}%'><img src='%PUBURL%/%imgWeb%/%CALC{$SUBSTITUTE(%imgTopic%,%USERSWEB%.,)}%/$percntQUERY{\"'%imgWeb%/%CALC{$SUBSTITUTE(%imgTopic%,%USERSWEB%.,)}%'/%BLOGADDON_AUTHOR_PICTURE_FIELD%\"}$percnt' width='%imgWidth%' title='%MAKETEXT{"Author page"}%' alt='%MAKETEXT{"Author picture"}%' /></a>$quot else=$quot<img src='%PUBURL%/%SYSTEMWEB%/PersonalInfoAddOn/silhouette.gif' width='%imgWidth%' alt='' />$quot}$percnt%ENDSECTION{"pubImage"}%
+
+%STARTSECTION{"imagePluginImage"}%$percntIF{$quot'%imgWeb%/%CALC{$SUBSTITUTE(%imgTopic%,%USERSWEB%.,)}%'/%BLOGADDON_AUTHOR_PICTURE_FIELD%$quot then=$quot$percntIMAGE{web=\"%imgWeb%\" topic=\"%CALC{$SUBSTITUTE(%imgTopic%,%USERSWEB%.,)}%\" href=\"%SCRIPTURL{view}%/%imgWeb%/%CALC{$SUBSTITUTE(%imgTopic%,%USERSWEB%.,)}%\" \"$percntQUERY{\"'%imgWeb%/%CALC{$SUBSTITUTE(%imgTopic%,%USERSWEB%.,)}%'/%BLOGADDON_AUTHOR_PICTURE_FIELD%\"}$percnt\" align=\"none\" zoom=\"on\" title=\"%MAKETEXT{"Author page"}%\" alt=\"%MAKETEXT{"Author picture"}%\" size=\"%imgWidth%\"}$percnt$quot else=$quot$percntIMAGE{web=\"%SYSTEMWEB%\" topic=\"PersonalInfoAddOn\" \"silhouette.gif\" align=\"none\" alt=\"\" size=\"%imgWidth%\"}$percnt$quot}$percnt%ENDSECTION{"imagePluginImage"}%
+
+
+<!-- ###########################################################################
+summaryPicture
+        params: imgWeb, imgTopic, imgName
+-->
+%STARTSECTION{"summaryPicture"}%<div class='blogPostAddOnSummaryPicture'>%INCLUDE{
 "%TOPIC%"
-section="%IF{"context ImagePluginEnabled" then="imagePluginImage" else="pubImage"}%"
-}%
-</div>%ENDSECTION{"blogPostAuthorPicture"}%
-
-%STARTSECTION{"pubImage"}%$percntIF{$quot'%imgWeb%/%CALC{$SUBSTITUTE(%imgTopic%,%USERSWEB%.,)}%'/%BLOGADDON_AUTHOR_PICTURE_FIELD%$quot then=$quot<a href='%SCRIPTURL{view}%/%imgWeb%/%CALC{$SUBSTITUTE(%imgTopic%,%USERSWEB%.,)}%'><img src='%PUBURL%/%imgWeb%/%CALC{$SUBSTITUTE(%imgTopic%,%USERSWEB%.,)}%/$percntQUERY{\"'%imgWeb%/%CALC{$SUBSTITUTE(%imgTopic%,%USERSWEB%.,)}%'/%BLOGADDON_AUTHOR_PICTURE_FIELD%\"}$percnt' width='%imgWidth%' title='%MAKETEXT{"Author page"}%' alt='%MAKETEXT{"Author picture"}%' /></a>$quot else=$quot<img src='%PUBURL%/%SYSTEMWEB%/PersonalInfoAddOn/silhouette.gif' width='%imgWidth%' alt='' />$quot}$percnt%ENDSECTION{"pubImage"}%
-
-%STARTSECTION{"imagePluginImage"}%$percntIF{$quot'%imgWeb%/%CALC{$SUBSTITUTE(%imgTopic%,%USERSWEB%.,)}%'/%BLOGADDON_AUTHOR_PICTURE_FIELD%$quot then=$quot$percntIMAGE{web=\"%imgWeb%\" topic=\"%CALC{$SUBSTITUTE(%imgTopic%,%USERSWEB%.,)}%\" href=\"%SCRIPTURL{view}%/%imgWeb%/%CALC{$SUBSTITUTE(%imgTopic%,%USERSWEB%.,)}%\" \"$percntQUERY{\"'%imgWeb%/%CALC{$SUBSTITUTE(%imgTopic%,%USERSWEB%.,)}%'/%BLOGADDON_AUTHOR_PICTURE_FIELD%\"}$percnt\" align=\"none\" title=\"%MAKETEXT{"Author page"}%\" alt=\"%MAKETEXT{"Author picture"}%\" size=\"%imgWidth%\"}$percnt$quot else=$quot$percntIMAGE{web=\"%SYSTEMWEB%\" topic=\"PersonalInfoAddOn\" \"silhouette.gif\" align=\"none\" alt=\"\" size=\"%imgWidth%\"}$percnt$quot}$percnt%ENDSECTION{"imagePluginImage"}%
+section="%IF{"context ImagePluginEnabled" then="summaryImagePluginImage" else="summaryPubImage"}%"
+imgWidth="%ppicsizesummary%"
+}%
+</div>%ENDSECTION{"summaryPicture"}%
+
+%STARTSECTION{"summaryPubImage"}%<a href='%SCRIPTURL{view}%/%imgWeb%/%imgTopic%'><img src='%PUBURL%/%imgWeb%/%imgTopic%/%imgName%' width='%imgWidth%' alt='' /></a>%ENDSECTION{"summaryPubImage"}%
+
+%STARTSECTION{"summaryImagePluginImage"}%$percntIMAGE{web=\"%imgWeb%\" topic=\"%imgTopic%\" \"%imgName%\" align=\"center\" alt=\"\" size=\"%imgWidth%x%imgWidth%\" zoom=\"on\" href=\"%SCRIPTURL{view}%/%imgWeb%/%imgTopic%\"}$percnt%ENDSECTION{"summaryImagePluginImage"}%
 
 <!-- ###########################################################################

trunk/BlogAddOn/data/_BlogAddOn/BlogPostCommentTemplate.txt

@@ -8 +8 @@
 <verbatim>
 %TMPL:DEF{FORM:blogpost}%#BlogPostPrompt
-<form method="post" action="%SCRIPTURL{save}%/%IF{"defined BLOGADDON_COMMENTS_WEB and $BLOGADDON_COMMENTS_WEB!=''" then="%BLOGADDON_COMMENTS_WEB%" else="%BASEWEB%"}%/%BASETOPIC%Comments" enctype="application/x-www-form-urlencoded" name="blogpostcomment" id="blogpostcomment">
+<form method="post" action="%SCRIPTURL{save}%/%IF{"defined BLOGADDON_COMMENTS_WEB and $BLOGADDON_COMMENTS_WEB!=''" then="%BLOGADDON_COMMENTS_WEB%" else="%BASEWEB%"}%/%BASETOPIC%Comments" enctype="application/x-www-form-urlencoded" name="blogpostcomment" id="blogpostcomment">%IF{
+        "$BLOGADDON_ALLOW_GUEST_COMMENTS='1'"
+        then='<input type="hidden" name="username" value="WikiGuest" />
+        <input type="hidden" name="password" value="" />'
+}%
 <input type="hidden" name="redirectto" value="%BASEWEB%.%BASETOPIC%" />
 <input type="hidden" name="topicparent" value="%BASEWEB%.%BASETOPIC%" />

trunk/BlogAddOn/data/_BlogAddOn/BlogPostForm.txt

@@ -6 +6 @@
 | *Name*  | *Type* | *Size* | *Values* | *Tooltip message* | *Attributes* |
 | Title | text | 80 | | Blog post title | M,H |
+| Author | text | 50 | %WIKINAME% | Blog post author | M,H |
+| <nop>PublishingDate | date | 30 | %GMTIME{"$day $month $year"}% | | H |
 | Category | select | 1 | %CALC{$LISTJOIN($comma,$LISTSORT($LISTUNIQUE(%FORMFIELD{"Category" topic="%BASEWEB%.%BASETOPIC%"}%, %SEARCH{"   *\s*.*?" topic="BlogCategory" type="regex" multiple="on" casesensitive="on" nonoise="on" separator="," format="$pattern(.*   \*\s*([^\n]*).*)"}%)))}% | Edit values in BlogCategory | H |
-| Author | text | 50 | %WIKINAME% | Blog post author | M,H |
 | Tags | text | 100 |  |  | H |
-| <nop>PublishingDate | date | 30 | %GMTIME{"$day $month $year"}% | | H |
+| Summary | textarea | 100x4 |  |  | H |
+| <nop>SummaryImage | select | 1 | ,%QUERY{"'%BASEWEB%.%BASETOPIC%'/attachments[NOT name=~'igp.*'].name"}% | | H |
 | <nop>CommentsDisabled | checkbox | 1 | disabled | | H |
 | <nop>CommentsClosed | checkbox | 1 | closed | | H |

trunk/BlogAddOn/data/_BlogAddOn/BlogPostViewTemplate.txt

@@ -67 +67 @@
 }%"
 }%</div><div class="foswikiClear"></div></div></noautolink>
-%TEXT% %IF{"(lc(CommentsDisabled)!='disabled') AND NOT (($WIKINAME = '%BLOGADDON_HIDE_COMMENTS%') OR (($WIKINAME ingroup '%BLOGADDON_HIDE_COMMENTS%'))" then="$percntTMPL:P{$quotcomments$quot}$percnt"}%
+%FORMFIELD{"Summary" format="<p>$value</p>"}% %TEXT% %IF{"(lc(CommentsDisabled)!='disabled') AND NOT (($WIKINAME = '%BLOGADDON_HIDE_COMMENTS%') OR (($WIKINAME ingroup '%BLOGADDON_HIDE_COMMENTS%'))" then="$percntTMPL:P{$quotcomments$quot}$percnt"}%
 #BlogPostEnd
 %TMPL:END%