Author: jmorliaguet
Date: Thu May 25 11:24:41 2006
New Revision: 3212

Modified:
   cpsskins/branches/paris-sprint-2006/ui/authoring/configure.zcml
   cpsskins/branches/paris-sprint-2006/ui/configure.zcml
   cpsskins/branches/paris-sprint-2006/ui/screens/common/configure.zcml
   cpsskins/branches/paris-sprint-2006/ui/zmi/views.py

Log:

- fixes



Modified: cpsskins/branches/paris-sprint-2006/ui/authoring/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/authoring/configure.zcml     
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/authoring/configure.zcml     Thu May 
25 11:24:41 2006
@@ -1,176 +1,8 @@
 <configure
-    xmlns="http://namespaces.zope.org/zope";
-    xmlns:browser="http://namespaces.zope.org/browser";
-    xmlns:jsonrpc="http://namespaces.zope.org/jsonrpc";
-    xmlns:cpsskins="http://namespaces.zope.org/cpsskins";>
+    xmlns="http://namespaces.zope.org/zope";>
 
   <include package=".icons" />
-  <include package=".images" />
-
-  <browser:resource
-      name="authoring.css" file="authoring.css"
-      layer="cpsskins.browser.skin.cpsskins" />
-
-  <browser:resource
-      name="authoring.js" file="authoring.js"
-      layer="cpsskins.browser.skin.cpsskins" />
-
-  <!-- Negotiation view -->
-
-  <browser:view
-    for="*"
-    name="authoring"
-    provides=".views.IAuthoring"
-    class=".views.Authoring"
-    permission="zope.Public"
-    allowed_interface=".views.IAuthoring"
-    layer="cpsskins.browser.skin.cpsskins"
-  />
-
-  <browser:pages
-      for="*"
-      layer="cpsskins.browser.skin.cpsskins"
-      permission="zope.ManageContent"
-      class=".views.Authoring">
-
-      <browser:page
-          name="getThemeManager"
-          attribute="getThemeManager"
-      />
- 
-      <browser:page
-          name="setSelection"
-          attribute="setSelection"
-      />
-
-      <browser:page
-          name="getSelection"
-          attribute="getSelection"
-      />
-
-      <browser:page
-          name="setPerspective"
-          attribute="setPerspective"
-      />
-
-      <browser:page
-        name="setWorkTheme"
-        attribute="setWorkTheme"
-      />
-
-      <browser:page
-          name="addTheme"
-          attribute="addTheme"
-      />
-
-      <browser:page
-          name="addPage"
-          attribute="addPage"
-      />
-
-      <browser:page
-          name="clonePresentation"
-          attribute="clonePresentation"
-      />
-
-      <browser:page
-          name="addPresentation"
-          attribute="addPresentation"
-      />
-
-      <browser:page
-          name="removePresentation"
-          attribute="removePresentation"
-      />
-
-      <browser:page
-          name="customizeFormat"
-          attribute="customizeFormat"
-      />
-
-      <browser:page
-          name="uncustomizeFormat"
-          attribute="uncustomizeFormat"
-      />
 
-      <browser:page
-          name="renderElement"
-          attribute="renderElement"
-      />
-
-      <browser:page
-          name="moveElement"
-          attribute="moveElement"
-      />
-
-      <browser:page
-          name="editElement"
-          attribute="editElement"
-      />
-
-      <browser:page
-          name="copyElement"
-          attribute="copyElement"
-      />
-
-      <browser:page
-          name="pasteElement"
-          attribute="pasteElement"
-      />
-
-      <browser:page
-          name="moveDown"
-          attribute="moveDown"
-      />
-
-      <browser:page
-          name="moveUp"
-          attribute="moveUp"
-      />
-
-      <browser:page
-          name="insertElement"
-          attribute="insertElement"
-      />
-
-      <browser:page
-          name="duplicateElement"
-          attribute="duplicateElement"
-      />
-
-      <browser:page
-          name="deleteElement"
-          attribute="deleteElement"
-      />
-
-  </browser:pages>
-
-  <browser:pages
-      layer="cpsskins.browser.skin.cpsskins"
-      for="*"
-      permission="zope.ManageContent"
-      class=".views.JSONViews">
-
-      <browser:page
-          name="getHint"
-          attribute="getHint"
-      />
-
-      <browser:page
-          name="getModel"
-          attribute="getModel"
-      />
-
-      <browser:page
-          name="getView"
-          attribute="getView"
-      />
-
-      <browser:page
-          name="getController"
-          attribute="getController"
-      />
-
-  </browser:pages>
+  <include package=".images" />
 
 </configure>

Modified: cpsskins/branches/paris-sprint-2006/ui/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/configure.zcml       (original)
+++ cpsskins/branches/paris-sprint-2006/ui/configure.zcml       Thu May 25 
11:24:41 2006
@@ -6,7 +6,6 @@
 
   <include package=".authoring" />
 
-
   <!-- screens -->
 
   <include package=".screens" />

Modified: cpsskins/branches/paris-sprint-2006/ui/screens/common/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/common/configure.zcml        
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/common/configure.zcml        
Thu May 25 11:24:41 2006
@@ -2,11 +2,11 @@
     xmlns="http://namespaces.zope.org/browser";
     xmlns:zope="http://namespaces.zope.org/zope";>
 
-  <browser:resource
+  <resource
       name="authoring.css" file="authoring.css"
       layer="cpsskins.browser.skin.cpsskins" />
 
-  <browser:resource
+  <resource
       name="authoring.js" file="authoring.js"
       layer="cpsskins.browser.skin.cpsskins" />
 
@@ -90,7 +90,7 @@
 
   <!-- authoring -->
 
-  <browser:view
+  <view
     for="*"
     name="authoring"
     provides=".views.IAuthoring"
@@ -100,150 +100,150 @@
     layer="cpsskins.browser.skin.cpsskins"
   />
 
-  <browser:pages
+  <pages
       for="*"
       layer="cpsskins.browser.skin.cpsskins"
       permission="zope.ManageContent"
       class=".views.Authoring">
 
-      <browser:page
+      <page
           name="getThemeManager"
           attribute="getThemeManager"
       />
  
-      <browser:page
+      <page
           name="setSelection"
           attribute="setSelection"
       />
 
-      <browser:page
+      <page
           name="getSelection"
           attribute="getSelection"
       />
 
-      <browser:page
+      <page
           name="setPerspective"
           attribute="setPerspective"
       />
 
-      <browser:page
+      <page
         name="setWorkTheme"
         attribute="setWorkTheme"
       />
 
-      <browser:page
+      <page
           name="addTheme"
           attribute="addTheme"
       />
 
-      <browser:page
+      <page
           name="addPage"
           attribute="addPage"
       />
 
-      <browser:page
+      <page
           name="clonePresentation"
           attribute="clonePresentation"
       />
 
-      <browser:page
+      <page
           name="addPresentation"
           attribute="addPresentation"
       />
 
-      <browser:page
+      <page
           name="removePresentation"
           attribute="removePresentation"
       />
 
-      <browser:page
+      <page
           name="customizeFormat"
           attribute="customizeFormat"
       />
 
-      <browser:page
+      <page
           name="uncustomizeFormat"
           attribute="uncustomizeFormat"
       />
 
-      <browser:page
+      <page
           name="renderElement"
           attribute="renderElement"
       />
 
-      <browser:page
+      <page
           name="moveElement"
           attribute="moveElement"
       />
 
-      <browser:page
+      <page
           name="editElement"
           attribute="editElement"
       />
 
-      <browser:page
+      <page
           name="copyElement"
           attribute="copyElement"
       />
 
-      <browser:page
+      <page
           name="pasteElement"
           attribute="pasteElement"
       />
 
-      <browser:page
+      <page
           name="moveDown"
           attribute="moveDown"
       />
 
-      <browser:page
+      <page
           name="moveUp"
           attribute="moveUp"
       />
 
-      <browser:page
+      <page
           name="insertElement"
           attribute="insertElement"
       />
 
-      <browser:page
+      <page
           name="duplicateElement"
           attribute="duplicateElement"
       />
 
-      <browser:page
+      <page
           name="deleteElement"
           attribute="deleteElement"
       />
 
-  </browser:pages>
+  </pages>
 
-  <browser:pages
+  <pages
       layer="cpsskins.browser.skin.cpsskins"
       for="*"
       permission="zope.ManageContent"
       class=".views.JSONViews">
 
-      <browser:page
+      <page
           name="getHint"
           attribute="getHint"
       />
 
-      <browser:page
+      <page
           name="getModel"
           attribute="getModel"
       />
 
-      <browser:page
+      <page
           name="getView"
           attribute="getView"
       />
 
-      <browser:page
+      <page
           name="getController"
           attribute="getController"
       />
 
-  </browser:pages>
+  </pages>
 
 </configure>

Modified: cpsskins/branches/paris-sprint-2006/ui/zmi/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/zmi/views.py (original)
+++ cpsskins/branches/paris-sprint-2006/ui/zmi/views.py Thu May 25 11:24:41 2006
@@ -24,7 +24,7 @@
 from zope.traversing.api import getParent
 
 from cpsskins.elements.theme import Theme
-from cpsskins.ui.screens.commons.views import IAuthoring
+from cpsskins.ui.screens.common.views import IAuthoring
 from cpsskins.utils import getThemeManager, addThemeSkeleton
 from cpsskins.thememanager import IThemeManagementFolder
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to