Test suite runs and passes!

[zzz-floof.git] / floof / templates / comments / lib.mako

diff --git a/floof/templates/comments/lib.mako b/floof/templates/comments/lib.mako
index 0c8ebfb..93fe086 100644 (file)
--- a/floof/templates/comments/lib.mako
+++ b/floof/templates/comments/lib.mako
@@ -1,5 +1,5 @@
 <%def name="comment_block(comments)">
 <%def name="comment_block(comments)">

-<h1>${len(comments)} comments</h1>
+<h1>${len(comments)} comment${'' if len(comments) == 1 else 's'}</h1>

 <p><a href="${url(controller='comments', action='thread', owner_url=h.get_comment_owner_url(**c.route))}">View all</a></p>
 <p><a href="${url(controller='comments', action='reply', owner_url=h.get_comment_owner_url(**c.route))}">Reply</a></p>
 ${comment_thread(comments)}
 <p><a href="${url(controller='comments', action='thread', owner_url=h.get_comment_owner_url(**c.route))}">View all</a></p>
 <p><a href="${url(controller='comments', action='reply', owner_url=h.get_comment_owner_url(**c.route))}">Reply</a></p>
 ${comment_thread(comments)}


@@ -13,11 +13,21 @@ ${single_comment(comment)}
 </%def>
 
 <%def name="single_comment(comment)">
 </%def>
 
 <%def name="single_comment(comment)">

+% if hasattr(comment, 'indent'):

 <div class="comment" style="margin-left: ${comment.indent}em;">
 <div class="comment" style="margin-left: ${comment.indent}em;">

+% else:
+<div class="comment">
+% endif

     <div class="header">
         <div class="user">${comment.user.name}</div>
         <div class="time">${comment.time}</div>
     <div class="header">
         <div class="user">${comment.user.name}</div>
         <div class="time">${comment.time}</div>

-        <div class="link"><a href="${url(controller='comments', action='thread', id=comment.id, owner_url=h.get_comment_owner_url(**c.route))}">Link</a></div>
+        <div class="links">
+            <a href="${url(controller='comments', action='thread', id=comment.id, owner_url=h.get_comment_owner_url(**c.route))}">Link</a>
+            <a href="${url(controller='comments', action='reply', id=comment.id, owner_url=h.get_comment_owner_url(**c.route))}">Reply</a>
+            % if comment.parent:
+            <a href="${url(controller='comments', action='thread', id=comment.parent.id, owner_url=h.get_comment_owner_url(**c.route))}">Parent</a>
+            % endif
+        </div>

     </div>
     <p>${comment.text}</p>
 </div>
     </div>
     <p>${comment.text}</p>
 </div>