[z3-checkins] r28633 - z3/Sfive/trunk

[philikon at codespeak.net]

Author: philikon
Date: Sat Jun 10 17:38:00 2006
New Revision: 28633

Added:
   z3/Sfive/trunk/browser.zcml
      - copied, changed from r28627, z3/Sfive/trunk/configure.zcml
Modified:
   z3/Sfive/trunk/configure.zcml
Log:
Move browser config out to browser.zcml


Copied: z3/Sfive/trunk/browser.zcml (from r28627, z3/Sfive/trunk/configure.zcml)
==============================================================================
--- z3/Sfive/trunk/configure.zcml	(original)
+++ z3/Sfive/trunk/browser.zcml	Sat Jun 10 17:38:00 2006
@@ -1,47 +1,7 @@
 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:browser="http://namespaces.zope.org/browser"
-           xmlns:five="http://namespaces.zope.org/five"
-           xmlns:i18n="http://namespaces.zope.org/i18n"
-           xmlns:zcml="http://namespaces.zope.org/zcml"
-           i18n_domain="sfive"
            >
 
-  <permission
-      id="sfive.AddPresentations"
-      title="Add Sfive Presentations"
-      />
-
-  <permission
-      id="sfive.EditPresentations"
-      title="Edit Sfive Presentations"
-      />
-
-  <class class=".presentation.Presentation">
-    <require
-        permission="zope2.View"
-        interface=".interfaces.IPresentation"
-        />
-    <require
-        permission="sfive.EditPresentations"
-        set_schema=".interfaces.IPresentation"
-        />
-  </class>
-
-  <utility
-      component=".presentation.PresentationFactory"
-      name="sfive.Presentation"
-      />
-
-  <five:registerClass
-      class=".presentation.Presentation"
-      meta_type="Sfive Presentation"
-      permission="sfive.AddPresentations"
-      addview="sfive.Presentation"
-      zcml:condition="installed Zope2"
-      />
-
-  <adapter factory=".presentation.PresentationSize" />
-
   <browser:page
       for=".interfaces.IPresentation"
       name="edit.html"
@@ -74,6 +34,4 @@
       permission="zope2.View"
       />
 
-  <i18n:registerTranslations directory="locales" />
-
 </configure>

Modified: z3/Sfive/trunk/configure.zcml
==============================================================================
--- z3/Sfive/trunk/configure.zcml	(original)
+++ z3/Sfive/trunk/configure.zcml	Sat Jun 10 17:38:00 2006
@@ -1,5 +1,4 @@
 <configure xmlns="http://namespaces.zope.org/zope"
-           xmlns:browser="http://namespaces.zope.org/browser"
            xmlns:five="http://namespaces.zope.org/five"
            xmlns:i18n="http://namespaces.zope.org/i18n"
            xmlns:zcml="http://namespaces.zope.org/zcml"
@@ -42,38 +41,8 @@
 
   <adapter factory=".presentation.PresentationSize" />
 
-  <browser:page
-      for=".interfaces.IPresentation"
-      name="edit.html"
-      class=".browser.EditPresentation"
-      permission="sfive.EditPresentations" 
-      />
-
-  <browser:page
-      for="zope.app.container.interfaces.IAdding"
-      name="sfive.Presentation"
-      class=".browser.AddPresentation"
-      permission="sfive.AddPresentations" 
-      />
-
-  <browser:defaultView
-      for=".interfaces.IPresentation"
-      name="index.html"
-      />
-
-  <browser:page
-      for=".interfaces.IPresentation"
-      name="index.html"
-      class=".browser.ViewPresentation"
-      permission="zope2.View"
-      />
-
-  <browser:resourceDirectory
-      name="s5ui"
-      directory="ui"
-      permission="zope2.View"
-      />
-
   <i18n:registerTranslations directory="locales" />
 
+  <include file="browser.zcml" />
+
 </configure>