From 59ea8b368c374ae6694191d2b0c248ffd1557e18 Mon Sep 17 00:00:00 2001
From: helmutm <helmutm@fd906abe-77d9-0310-91a1-e0d9ade77398>
Date: Sun, 15 Aug 2010 09:24:51 +0000
Subject: [PATCH] prepare for customizable macro lookup via controller

git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3954 fd906abe-77d9-0310-91a1-e0d9ade77398
---
 browser/common.py | 13 +++++++++++--
 browser/node.py   |  8 ++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/browser/common.py b/browser/common.py
index b03fd39..cd0b2b8 100644
--- a/browser/common.py
+++ b/browser/common.py
@@ -51,6 +51,7 @@ from zope.traversing.browser import absoluteURL
 from zope.traversing.api import getName, getParent
 
 from cybertools.ajax.dojo import dojoMacroTemplate
+#from cybertools.browser.macro import MacroTemplate
 from cybertools.browser.view import GenericView
 from cybertools.meta.interfaces import IOptions
 from cybertools.relation.interfaces import IRelationRegistry
@@ -71,8 +72,10 @@ from loops import version
 from loops.versioning.interfaces import IVersionable
 
 
+#concept_macros = MacroTemplate(ViewPageTemplateFile('concept_macros.pt'))
 concept_macros = ViewPageTemplateFile('concept_macros.pt')
 conceptMacrosTemplate = concept_macros      #
+#resource_macros = MacroTemplate(ViewPageTemplateFile('resource_macros.pt'))
 resource_macros = ViewPageTemplateFile('resource_macros.pt')
 
 
@@ -133,13 +136,15 @@ class BaseView(GenericView, I18NView):
 
     @Lazy
     def conceptMacros(self):
-        return concept_macros.macros
+        return self.controller.getTemplateMacros('concept', concept_macros)
+        #return concept_macros.macros
 
     concept_macros = conceptMacros
 
     @Lazy
     def resource_macros(self):
-        return resource_macros.macros
+        return self.controller.getTemplateMacros('resource', resource_macros)
+        #return resource_macros.macros
 
     @Lazy
     def name(self):
@@ -288,6 +293,10 @@ class BaseView(GenericView, I18NView):
     def description(self):
         return self.adapted.description
 
+    @Lazy
+    def additionalInfos(self):
+        return []
+
     @Lazy
     def dublincore(self):
         zdc = IZopeDublinCore(self.context)
diff --git a/browser/node.py b/browser/node.py
index 7eccaee..aa782f7 100644
--- a/browser/node.py
+++ b/browser/node.py
@@ -573,9 +573,13 @@ class ObjectInfo(NodeView):
 
     __call__ = innerHtml
 
-    @property
+    @Lazy
+    def macros(self):
+        return self.controller.getTemplateMacros('info', info_macros)
+
+    @Lazy
     def macro(self):
-        return info_macros.macros['object_info']
+        return self.macros['object_info']
 
     @Lazy
     def dialog_name(self):