From 2a656daa02f9f01abc29493702b2b7f904fc92b6 Mon Sep 17 00:00:00 2001
From: helmutm <helmutm@fd906abe-77d9-0310-91a1-e0d9ade77398>
Date: Thu, 22 Jan 2009 18:38:59 +0000
Subject: [PATCH] show object actions correctly on blogs and blog posts

git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3172 fd906abe-77d9-0310-91a1-e0d9ade77398
---
 compound/blog/browser.py     |  3 ++
 compound/blog/view_macros.pt | 63 +++++++++++++++++++-----------------
 2 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/compound/blog/browser.py b/compound/blog/browser.py
index 2681ed6..285a8db 100755
--- a/compound/blog/browser.py
+++ b/compound/blog/browser.py
@@ -156,6 +156,9 @@ class BlogPostView(ConceptView):
                   page=page, target=target))
             #self.registerDojoTextWidget()
             self.registerDojoDateWidget()
+        else:
+            actions = super(BlogPostView, self).getActions(category,
+                                                    page=page, target=target)
         return actions
 
     def render(self):
diff --git a/compound/blog/view_macros.pt b/compound/blog/view_macros.pt
index e5c5f4c..49aac32 100755
--- a/compound/blog/view_macros.pt
+++ b/compound/blog/view_macros.pt
@@ -2,42 +2,47 @@
      $Id$ -->
 
 <metal:block define-macro="blog">
-  <metal:title use-macro="item/conceptMacros/concepttitle" />
-  <div tal:repeat="related item/blogPosts"
-           class="blog">
-    <tal:child define="data related/data">
-      <h1 class="headline">
-        <a href="#"
-           tal:content="related/title"
-           tal:attributes="href python: view.getUrlForTarget(related);">Post</a>
-      </h1>
-      <div class="info"
-           tal:define="url data/creatorUrl|nothing">
-        <span tal:content="data/date">2008-01-02</span> /
-        <a tal:omit-tag="not:url"
-           tal:content="data/creator"
-           tal:attributes="href url">Will Smith</a>
-      </div>
-      <div class="description"
-           tal:define="description data/description"
-           tal:condition="description">
-        <span tal:content="structure description">Description</span></div>
-      <div class="text"
-           tal:condition="nothing"
-           xtal:condition="python: repeat['related'].index() < 3">
-        <span tal:content="structure python:
-                item.renderText(data['text'], related.adapted.textContentType)"></span>
-      </div>
-    </tal:child>
+  <div>
+    <metal:title use-macro="item/conceptMacros/concepttitle" />
+    <div tal:repeat="related item/blogPosts"
+             class="blog">
+      <tal:child define="data related/data">
+        <h1 class="headline">
+          <a href="#"
+             tal:content="related/title"
+             tal:attributes="href python: view.getUrlForTarget(related);">Post</a>
+        </h1>
+        <div class="info"
+             tal:define="url data/creatorUrl|nothing">
+          <span tal:content="data/date">2008-01-02</span> /
+          <a tal:omit-tag="not:url"
+             tal:content="data/creator"
+             tal:attributes="href url">Will Smith</a>
+        </div>
+        <div class="description"
+             tal:define="description data/description"
+             tal:condition="description">
+          <span tal:content="structure description">Description</span></div>
+        <div class="text"
+             tal:condition="nothing"
+             xtal:condition="python: repeat['related'].index() < 3">
+          <span tal:content="structure python:
+                  item.renderText(data['text'], related.adapted.textContentType)"></span>
+        </div>
+      </tal:child>
+    </div>
+    <metal:resources use-macro="item/conceptMacros/conceptchildren" />
+    <metal:resources use-macro="item/conceptMacros/conceptresources" />
   </div>
-  <metal:resources use-macro="item/conceptMacros/conceptchildren" />
-  <metal:resources use-macro="item/conceptMacros/conceptresources" />
 </metal:block>
 
 
 <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>