From 49cca0954f84a765c0a345d67440df0e1246020a Mon Sep 17 00:00:00 2001
From: helmutm <helmutm@fd906abe-77d9-0310-91a1-e0d9ade77398>
Date: Mon, 20 Apr 2009 06:41:47 +0000
Subject: [PATCH] standardize blog view

git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3341 fd906abe-77d9-0310-91a1-e0d9ade77398
---
 compound/blog/browser.py     |  7 +++----
 compound/blog/view_macros.pt | 20 ++++++++------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/compound/blog/browser.py b/compound/blog/browser.py
index 285a8db..992acfd 100755
--- a/compound/blog/browser.py
+++ b/compound/blog/browser.py
@@ -141,10 +141,9 @@ class BlogPostView(ConceptView):
             data['privateComment'] = u''
         return data
 
-    @Lazy
-    def description(self):
-        return self.renderText(self.context.description, 'text/restructured')
-
+    #@Lazy
+    #def description(self):
+    #    return self.renderText(self.context.description, 'text/restructured')
 
     def getActions(self, category='object', page=None, target=None):
         actions = []
diff --git a/compound/blog/view_macros.pt b/compound/blog/view_macros.pt
index 49aac32..ee2d123 100755
--- a/compound/blog/view_macros.pt
+++ b/compound/blog/view_macros.pt
@@ -3,7 +3,7 @@
 
 <metal:block define-macro="blog">
   <div>
-    <metal:title use-macro="item/conceptMacros/concepttitle" />
+    <metal:title use-macro="view/concept_macros/concepttitle" />
     <div tal:repeat="related item/blogPosts"
              class="blog">
       <tal:child define="data related/data">
@@ -31,8 +31,8 @@
         </div>
       </tal:child>
     </div>
-    <metal:resources use-macro="item/conceptMacros/conceptchildren" />
-    <metal:resources use-macro="item/conceptMacros/conceptresources" />
+    <metal:resources use-macro="view/concept_macros/conceptchildren" />
+    <metal:resources use-macro="view/concept_macros/conceptresources" />
   </div>
 </metal:block>
 
@@ -40,12 +40,7 @@
 <div metal:define-macro="blogpost"
      tal:define="data item/data"
      class="blogpost">
-  <tal:actions condition="view/showObjectActions">
-        <div metal:use-macro="views/node_macros/object_actions" />
-  </tal:actions>
-  <h1 tal:attributes="ondblclick item/openEditWindow">
-    <span tal:content="item/title">Title</span>
-  </h1>
+  <metal:block use-macro="view/concept_macros/concepttitle_only" />
   <div class="info"
        tal:define="url data/creatorUrl|nothing">
     <span tal:content="data/date">2008-01-02</span> /
@@ -57,7 +52,7 @@
     </span>
   </div>
   <div class="description"
-       tal:define="description description|item/description"
+       tal:define="description description|item/renderedDescription"
        tal:condition="description">
     <span tal:content="structure description">Description</span>
   </div>
@@ -69,6 +64,7 @@
     <h4 i18n:translate="" class="headline">Private Comment</h4>
     <div tal:content="structure python:
                 item.renderText(comment, 'text/restructured')">Comment</div></div>
-  <metal:resources use-macro="item/conceptMacros/conceptchildren" />
-  <metal:resources use-macro="item/conceptMacros/conceptresources" />
+  <metal:resources use-macro="view/concept_macros/conceptchildren" />
+  <metal:resources use-macro="view/concept_macros/conceptresources" />
+  <metal:block use-macro="view/comment_macros/comments" />
 </div>