From dbd3b7b792be3ee96409e35f57f05094b60186d7 Mon Sep 17 00:00:00 2001
From: helmutm <helmutm@fd906abe-77d9-0310-91a1-e0d9ade77398>
Date: Sun, 13 Aug 2006 21:59:29 +0000
Subject: [PATCH] clean-up inner HTML stuff

git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@1300 fd906abe-77d9-0310-91a1-e0d9ade77398
---
 ajax/__init__.py         |  4 +---
 ajax/dojo/configure.zcml |  7 -------
 ajax/innerHtml.pt        |  5 +----
 container/base.py        |  7 +++++--
 container/configure.zcml | 11 +----------
 5 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/ajax/__init__.py b/ajax/__init__.py
index 12eb4a2..44f5989 100644
--- a/ajax/__init__.py
+++ b/ajax/__init__.py
@@ -21,8 +21,6 @@ $Id$
 """
 
 from zope.app.pagetemplate import ViewPageTemplateFile
-from zope.formlib.namedtemplate import NamedTemplateImplementation
 
-innerHtml = NamedTemplateImplementation(
-                    ViewPageTemplateFile('innerHtml.pt'))
+innerHtml = ViewPageTemplateFile('innerHtml.pt')
 
diff --git a/ajax/dojo/configure.zcml b/ajax/dojo/configure.zcml
index 250c801..c8221d2 100644
--- a/ajax/dojo/configure.zcml
+++ b/ajax/dojo/configure.zcml
@@ -25,11 +25,4 @@
       menu="zmi_views" title="Contents"
       />
 
-  <!-- named template -->
-
-  <zope:adapter
-      factory="cybertools.ajax.innerHtml"
-      for="zope.publisher.interfaces.browser.IBrowserPublisher"
-      name="ajax.inner.html" />
-
 </configure>
diff --git a/ajax/innerHtml.pt b/ajax/innerHtml.pt
index 5fd4e9a..2c38fb2 100644
--- a/ajax/innerHtml.pt
+++ b/ajax/innerHtml.pt
@@ -1,4 +1 @@
-<tal:def define="macroName view/innerHtml_macro;
-                 tpl nocall:view/innerHtml_template;">
-  <metal:use use-macro="tpl/macros/?macroName" />
-</tal:def>
+<metal:use use-macro="view/macro" />
diff --git a/container/base.py b/container/base.py
index 9c83613..b8a8bc3 100644
--- a/container/base.py
+++ b/container/base.py
@@ -38,10 +38,13 @@ class ContainerView(JustContents):
 
     # informations for the ajax.inner.html view (template):
 
-    def innerHtml_template(self):
+    @Lazy
+    def template(self):
         basicView = zapi.getMultiAdapter((self.context, self.request),
                         Interface, name=u'contents.html')
         return basicView.index
 
-    innerHtml_macro = 'contents'
+    @Lazy
+    def macro(self):
+        return self.template.macros['contents']
 
diff --git a/container/configure.zcml b/container/configure.zcml
index 8375724..b7d33e5 100644
--- a/container/configure.zcml
+++ b/container/configure.zcml
@@ -14,15 +14,6 @@
       menu="zmi_views" title="Contents"
       />
 
-  <page
-      for="zope.app.container.interfaces.IOrderedContainer"
-      name="ajax.inner.html"
-      template="../ajax/innerHtml.pt"
-      class="cybertools.container.ordered.OrderedContainerView"
-      permission="zope.ManageContent"
-      menu="zmi_views" title="Contents"
-      />
-
   <page
       for="zope.app.container.interfaces.IContainer"
       name="contents.html"
@@ -36,7 +27,7 @@
       for="zope.app.container.interfaces.IContainer"
       name="ajax.inner.html"
       template="../ajax/innerHtml.pt"
-      class="cybertools.container.ordered.ContainerView"
+      class="cybertools.container.base.ContainerView"
       permission="zope.ManageContent"
       menu="zmi_views" title="Contents"
       />