From 90fd32c3057bc56d4f0e97bf4486488e31cfe7d5 Mon Sep 17 00:00:00 2001
From: helmutm <helmutm@fd906abe-77d9-0310-91a1-e0d9ade77398>
Date: Tue, 11 Dec 2007 18:42:00 +0000
Subject: [PATCH] updated skin definition to avoid deprecation warnings

git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@2234 fd906abe-77d9-0310-91a1-e0d9ade77398
---
 ajax/dojo/configure.zcml      |  6 ++----
 ajax/dojo/macros.pt           |  3 ++-
 browser/configure.zcml        |  2 +-
 browser/liquid/__init__.py    |  8 ++++----
 browser/liquid/configure.zcml | 20 ++++++++++----------
 relation/configure.zcml       |  6 +++---
 6 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/ajax/dojo/configure.zcml b/ajax/dojo/configure.zcml
index feb6c1a..32a8366 100644
--- a/ajax/dojo/configure.zcml
+++ b/ajax/dojo/configure.zcml
@@ -5,10 +5,8 @@
     xmlns:zope="http://namespaces.zope.org/zope"
     i18n_domain="zope">
 
-  <resourceDirectory
-      name="ajax.dojo"
-      directory="dojo"
-      />
+  <resourceDirectory name="ajax.dojo" directory="dojo" />
+  <!-- <resourceDirectory name="ajax.dojo1" directory="dojo1" /> -->
 
   <page
       for="*"
diff --git a/ajax/dojo/macros.pt b/ajax/dojo/macros.pt
index 4ad58c0..79d527a 100644
--- a/ajax/dojo/macros.pt
+++ b/ajax/dojo/macros.pt
@@ -1,7 +1,8 @@
 <metal:def define-macro="main">
 
   <script type="text/javascript">
-      djConfig = { isDebug: true };
+      djConfig = { isDebug: true,
+                   parseOnLoad: true };
   </script>
 
   <script type="text/javascript" src="ajax.dojo/dojo.js"
diff --git a/browser/configure.zcml b/browser/configure.zcml
index 647dd19..df80f1e 100644
--- a/browser/configure.zcml
+++ b/browser/configure.zcml
@@ -26,7 +26,7 @@
         />
 
   <page name="controller"
-        for="zope.app.publisher.interfaces.browser.IBrowserView"
+        for="zope.publisher.interfaces.browser.IBrowserView"
         class="cybertools.browser.controller.Controller"
         permission="zope.Public"
         />
diff --git a/browser/liquid/__init__.py b/browser/liquid/__init__.py
index 1035a9a..cf1a3c0 100644
--- a/browser/liquid/__init__.py
+++ b/browser/liquid/__init__.py
@@ -2,15 +2,15 @@
 $Id$
 """
 
-from zope.publisher.interfaces.browser import IBrowserRequest
+#from zope.publisher.interfaces.browser import IBrowserRequest
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
 from zope.app.rotterdam import Rotterdam
 
 
-class liquid(IBrowserRequest):
-    """The `liquid` layer."""
+#class liquid(IBrowserRequest):
+#    """The `liquid` layer."""
 
 
-class Liquid(liquid, Rotterdam):
+class Liquid(Rotterdam):
     """ The Liquid skin """
 
diff --git a/browser/liquid/configure.zcml b/browser/liquid/configure.zcml
index bbcb7a6..5479d77 100644
--- a/browser/liquid/configure.zcml
+++ b/browser/liquid/configure.zcml
@@ -6,8 +6,8 @@
    i18n_domain="zope"
    >
 
-  <layer name="liquid"
-         interface="cybertools.browser.liquid.liquid" />
+  <!--<layer name="liquid"
+         interface="cybertools.browser.liquid.liquid" />-->
 
   <!--<skin name="Liquid"
         layers="liquid rotterdam default" />-->
@@ -21,27 +21,27 @@
   <page for="*"
         name="skin_macros" template="view_macros.pt"
         permission="zope.View"
-        layer="cybertools.browser.liquid.liquid" />
+        layer="cybertools.browser.liquid.Liquid" />
 
   <page for="*"
         name="base_macros" template="view_macros.pt"
         permission="zope.View"
-        layer="cybertools.browser.liquid.liquid" />
+        layer="cybertools.browser.liquid.Liquid" />
 
   <page name="controller"
-        for="zope.app.publisher.interfaces.browser.IBrowserView"
+        for="zope.publisher.interfaces.browser.IBrowserView"
         class="cybertools.browser.liquid.controller.Controller"
         permission="zope.Public"
-        layer="cybertools.browser.liquid.liquid"
+        layer="cybertools.browser.liquid.Liquid"
         />
 
   <resource name="zope3_tablelayout.css" file="zope3_tablelayout.css"
-        layer="cybertools.browser.liquid.liquid" />
+        layer="cybertools.browser.liquid.Liquid" />
   <resource name="base.css"   file="base.css"
-        layer="cybertools.browser.liquid.liquid" />
+        layer="cybertools.browser.liquid.Liquid" />
   <resource name="print.css"  file="print.css"
-        layer="cybertools.browser.liquid.liquid" />
+        layer="cybertools.browser.liquid.Liquid" />
   <resource name="custom.css" file="custom.css"
-        layer="cybertools.browser.liquid.liquid" />
+        layer="cybertools.browser.liquid.Liquid" />
 
 </configure>
diff --git a/relation/configure.zcml b/relation/configure.zcml
index 6d32cd8..0157c90 100644
--- a/relation/configure.zcml
+++ b/relation/configure.zcml
@@ -55,12 +55,12 @@
         />
 
   <!-- browser settings -->
-        
-  <browser:tool
+
+  <!--<browser:tool
       interface=".interfaces.IRelationRegistry"
       title="Relation Registry"
       description="Registry for relation objects."
-      />
+      />-->
 
   <browser:addMenuItem
       title="Relation Registry"