Update of /cvsroot/roller/roller/web/WEB-INF/classes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25544/web/WEB-INF/classes
Modified Files:
comments.vm searchresults.vm searchresults_day.vm
Log Message:
display related fixes and improvements (per jira issues)
Index: comments.vm
===================================================================
RCS file: /cvsroot/roller/roller/web/WEB-INF/classes/comments.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** comments.vm 23 Jul 2004 02:24:30 -0000 1.3
--- comments.vm 26 Jul 2004 12:16:38 -0000 1.4
***************
*** 52,61 ****
#**
* Display comments for an entry.
* @param entry WeblogEntry object.
*#
#macro( showComments $entry )
! $dateFormatter.applyPattern($text.get( "macro.weblog.datepattern" ))
! <div class="comments" id="comments">
#if( $previewComments )
#set( $comments = $previewComments )
--- 52,91 ----
#**
+ * PRIVATE. Macro for displaying Comment details (not content).
+ **#
+ #macro( showCommentDetails $comment $showPermalink )
+ $dateFormatter.applyPattern($text.get( "macro.weblog.datepattern" ))
+ #set($email = $utilities.hexEncode($comment.email))
+ <p class="comment-details">
+ $text.get("macro.weblog.postedby")
+ #if (!$stringUtils.isEmpty($comment.name) &&
!$stringUtils.isEmpty($email) && !$stringUtils.isEmpty($comment.remoteHost))
+ <a href="mailto:$email"; title="$comment.remoteHost">$comment.name</a>
+ #elseif (!$stringUtils.isEmpty($comment.name) &&
!$stringUtils.isEmpty($email))
+ <a href="mailto:$email";>$comment.name</a>
+ #elseif (!$stringUtils.isEmpty($email) &&
!$stringUtils.isEmpty($comment.remoteHost))
+ <a href="mailto:$email";>$comment.remoteHost</a>
+ #elseif (!$stringUtils.isEmpty($comment.name) &&
!$stringUtils.isEmpty($comment.remoteHost))
+ <b>$comment.name</b> ($comment.remoteHost)
+ #elseif (!$stringUtils.isEmpty($comment.name))
+ <b>$comment.name</b>
+ #end
+ $text.get("macro.weblog.on") $dateFormatter.format($comment.postTime)
+ #if( $stringUtils.isNotEmpty($comment.url) )
+ $text.get( "macro.weblog.postedbywebsite", [$comment.url,
$comment.url] )
+ #end
+ #if( $showPermalink )
+ <a
href="${ctxPath}/comments/${userName}/${page.link}/${entry.anchor}#comment${velocityCount}"
+ class="entrypermalink"
+ title="$text.get( "macro.weblog.commentpermalink.title" )">#</a>
+ #end
+ </p>
+ #end
+
+ #**
* Display comments for an entry.
* @param entry WeblogEntry object.
*#
#macro( showComments $entry )
! <div class="comments" id="comments">
#if( $previewComments )
#set( $comments = $previewComments )
***************
*** 69,73 ****
#foreach( $comment in $comments )
#set($content = $utilities.encodeEmail($comment.content))
- #set($email = $utilities.hexEncode($comment.email))
#if($escapeHtml)
#set($content = $utilities.escapeHTML($content))
--- 99,102 ----
***************
*** 79,106 ****
${content}
! <p class="comment-details">
! $text.get("macro.weblog.postedby")
! #if (!$stringUtils.isEmpty($comment.name) &&
!$stringUtils.isEmpty($email) && !$stringUtils.isEmpty($comment.remoteHost))
! <a href="mailto:$email";
title="$comment.remoteHost">$comment.name</a>
! #elseif (!$stringUtils.isEmpty($comment.name) &&
!$stringUtils.isEmpty($email))
! <a href="mailto:$email";>$comment.name</a>
! #elseif (!$stringUtils.isEmpty($email) &&
!$stringUtils.isEmpty($comment.remoteHost))
! <a href="mailto:$email";>$comment.remoteHost</a>
! #elseif (!$stringUtils.isEmpty($comment.name) &&
!$stringUtils.isEmpty($comment.remoteHost))
! <b>$comment.name</b> ($comment.remoteHost)
! #elseif (!$stringUtils.isEmpty($comment.name))
! <b>$comment.name</b>
#end
! $text.get("macro.weblog.on") $dateFormatter.format($comment.postTime)
! #if( $stringUtils.isNotEmpty($comment.url) )
! $text.get( "macro.weblog.postedbywebsite", [$comment.url,
$comment.url] )
#end
! <a
href="${ctxPath}/comments/${userName}/${page.link}/${entry.anchor}#comment${velocityCount}"
! class="entrypermalink"
! title="$text.get( "macro.weblog.commentpermalink.title" )">#</a>
! </p>
</div>
#end
! </div>
#end
--- 108,162 ----
${content}
! #showCommentDetails($comment true)
! </div>
! #end
! </div>
! #end
!
! #**
! * Display recent comments for whole blog (not just one entry).
! **#
! #macro( showRecentComments $numComments )
! #if( !$numComments ) #set( $numComments = 20 ) #end
! #if( $numComments > 100 ) #set( $numComments = 50 ) #end
! #set( $comments = $pageModel.getRecentComments() )
! <div class="comments" id="comments">
! #foreach( $comment in $comments )
! #set($content = $utilities.encodeEmail($comment.content))
! #set($email = $utilities.hexEncode($comment.email))
! #if($escapeHtml)
! #set($content = $utilities.escapeHTML($content))
#end
! #if($autoformat)
! #set($content = $stringUtils.replace($content,"\n","<br />"))
#end
! <div class="comment" style="border: 1px solid #dadada; padding-left:
3px; padding-right: 5px;" >
! <p>Commenting on <a class="entrypermalink"
!
href="${ctxPath}${comment.weblogEntry.permaLink}">${comment.weblogEntry.title}</a>:</p>
! ${content}
! #showCommentDetails($comment false)
</div>
#end
! </div>
! #end
!
! #**
! * Display list of recent comments.
! **#
! #macro( showRecentCommentsList $numComments )
! #if( !$numComments ) #set( $numComments = 20 ) #end
! #if( $numComments > 100 ) #set( $numComments = 50 ) #end
! #set( $comments = $pageModel.getRecentComments() )
! <ul class="commentsList">Recent Comments
! #foreach( $comment in $comments )
! #set($content = $utilities.encodeEmail($comment.content))
! <li class="commentsListItem"><a
!
href="${ctxPath}/comments/${userName}/${page.link}/${comment.weblogEntry.anchor}#comments"
! class="entrypermalink"
! title="$text.get( "macro.weblog.commentpermalink.title" ) to
'${comment.weblogEntry.title}'"
! >$utilities.truncateNicely($content, 20, 25, "...")</a>
! </li>
! #end
! </ul>
#end
Index: searchresults.vm
===================================================================
RCS file: /cvsroot/roller/roller/web/WEB-INF/classes/searchresults.vm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** searchresults.vm 23 Jul 2004 02:24:30 -0000 1.9
--- searchresults.vm 26 Jul 2004 12:16:38 -0000 1.10
***************
*** 26,44 ****
</head>
<body>
! <div id="header">
! <span style="width:100%; text-align:right; margin: 3px">
! #showBasicNavBar( false )
! </span>
! <span>
! #showMenu( "editor-menu.xml" "/menu-tabbed.vm" )
! </span>
! </div>
!
! <div id="content">
! <div>#showStatusMessage()</div>
- <table border="0" align="left" width="95%"><tbody><tr>
- <td class="entries" width="100%" valign="top" bgcolor="#ffffff">
<center>
<h1>$siteName $text.get("macro.searchresults.results")</h1>
--- 26,41 ----
</head>
<body>
! <div id="header">
! <span style="width:100%; text-align:right; margin: 3px">
! #showBasicNavBar( false )
! </span>
! <span>
! #showMenu( "editor-menu.xml" "/menu-tabbed.vm" )
! </span>
! </div>
! <div id="content">
! #showStatusMessage()
<center>
<h1>$siteName $text.get("macro.searchresults.results")</h1>
***************
*** 72,83 ****
<script type="text/javascript"
src="$ctxPath/theme/scripts/searchhi.js"></script>
#showSearchResults("searchresults_day.vm")
- </td>
- </tr></tbody></table>
! <div id="footer"></div>
! </div> <!-- close content div -->
</body>
--- 69,79 ----
<script type="text/javascript"
src="$ctxPath/theme/scripts/searchhi.js"></script>
+ <br />
#showSearchResults("searchresults_day.vm")
! <div id="footer"></div>
! </div> <!-- close content div -->
</body>
Index: searchresults_day.vm
===================================================================
RCS file: /cvsroot/roller/roller/web/WEB-INF/classes/searchresults_day.vm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** searchresults_day.vm 24 Jun 2004 02:48:31 -0000 1.7
--- searchresults_day.vm 26 Jul 2004 12:16:38 -0000 1.8
***************
*** 22,26 ****
<div class="box">
<div class="entry">
! #showDayPermalink( $day )
#showEntryDate( $day )
</div>
--- 22,26 ----
<div class="box">
<div class="entry">
! <img src="$ctxPath/images/permalink.gif" alt="#formatDate(
$plainFormat $day )" />
#showEntryDate( $day )
</div>
***************
*** 33,35 ****
</p>
#end
! </div>
\ No newline at end of file
--- 33,36 ----
</p>
#end
! <br />
! </div>
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
|
