diff --git a/ajax/__init__.py b/ajax/__init__.py
index 38314f3..12eb4a2 100644
--- a/ajax/__init__.py
+++ b/ajax/__init__.py
@@ -1,3 +1,28 @@
+#
+#  Copyright (c) 2006 Helmut Merz helmutm@cy55.de
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
 """
 $Id$
 """
+
+from zope.app.pagetemplate import ViewPageTemplateFile
+from zope.formlib.namedtemplate import NamedTemplateImplementation
+
+innerHtml = NamedTemplateImplementation(
+                    ViewPageTemplateFile('innerHtml.pt'))
+
diff --git a/ajax/dojo/configure.zcml b/ajax/dojo/configure.zcml
index 9ccab27..250c801 100644
--- a/ajax/dojo/configure.zcml
+++ b/ajax/dojo/configure.zcml
@@ -17,4 +17,19 @@
       permission="zope.Public"
       />
 
+  <page
+      for="*"
+      name="ajax.inner.html"
+      template="../innerHtml.pt"
+      permission="zope.ManageContent"
+      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 1600a20..5fd4e9a 100644
--- a/ajax/innerHtml.pt
+++ b/ajax/innerHtml.pt
@@ -1,4 +1,4 @@
-<tal:def define="macroName view/macroName;
-                 tpl view/template;">
+<tal:def define="macroName view/innerHtml_macro;
+                 tpl nocall:view/innerHtml_template;">
   <metal:use use-macro="tpl/macros/?macroName" />
-</tal:def>
\ No newline at end of file
+</tal:def>
diff --git a/container/base.py b/container/base.py
index e4547eb..9c83613 100644
--- a/container/base.py
+++ b/container/base.py
@@ -38,10 +38,10 @@ class ContainerView(JustContents):
 
     # informations for the ajax.inner.html view (template):
 
-    def template(self):
+    def innerHtml_template(self):
         basicView = zapi.getMultiAdapter((self.context, self.request),
                         Interface, name=u'contents.html')
         return basicView.index
 
-    macroName = 'contents'
+    innerHtml_macro = 'contents'
 
diff --git a/container/contents.pt b/container/contents.pt
index 82d8600..70768f1 100644
--- a/container/contents.pt
+++ b/container/contents.pt
@@ -160,7 +160,7 @@
                      tal:condition="python: first != current">1</a>
                   <span tal:condition="python: first &lt; previous-1">...</span>
                   <a href="#"
-                     tal:attributes="xhref batch/previous/url;
+                     tal:attributes="href batch/previous/url;
                                      onclick batch/previous/navOnClick"
                      tal:content="batch/previous/title"
                      tal:condition="python: first != previous and previous != current">2</a>