Author: jmorliaguet
Date: Sun Oct 30 02:02:10 2005
New Revision: 28808

Removed:
   z3lab/cpsskins/branches/jmo-perspectives/browser/editing/filters/
   
z3lab/cpsskins/branches/jmo-perspectives/engines/contentauthor/filters/dispatcher.py
   
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/dispatcher.py
   
z3lab/cpsskins/branches/jmo-perspectives/engines/pagedesigner/filters/dispatcher.py
Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/editing/configure.zcml
   z3lab/cpsskins/branches/jmo-perspectives/browser/rendering/engine.py
   z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/configure.zcml
   z3lab/cpsskins/branches/jmo-perspectives/engines/contentauthor/configure.zcml
   
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/configure.zcml
   
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/cell.pt
   
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/pageblock.pt
   
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/portlet.pt
   
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/slot.pt
   
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/themepage.pt
   z3lab/cpsskins/branches/jmo-perspectives/engines/pagedesigner/configure.zcml
Log:

- saving work:

  - simplified the registration of filters that call page templates.

  there are now 4 types of filters:

  - format filters (that use relations)

  - display filters (that adapt IDisplay to IFilter)

  - element filters (factory or template-based)




Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/editing/configure.zcml
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/browser/editing/configure.zcml     
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/editing/configure.zcml     
Sun Oct 30 02:02:10 2005
@@ -62,8 +62,6 @@
 
   <include package=".icons" />
 
-  <include package=".filters" />
-
 
   <!-- Portlet editor -->
 

Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/rendering/engine.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/browser/rendering/engine.py        
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/rendering/engine.py        
Sun Oct 30 02:02:10 2005
@@ -27,7 +27,6 @@
 from zope.publisher.interfaces import IRequest
 
 from cpsskins import getThemeManager, getContexts
-from cpsskins.filters import PageTemplateFilter
 from cpsskins.browser.negociation.interfaces import INegociation
 from cpsskins.browser.rendering.interfaces import IUpdateData
 from cpsskins.configuration.interfaces import IRegistry
@@ -319,10 +318,11 @@
                         % (filter_name, repr(adapted)))
                     continue
 
-            # the filter id refers to a display adapter
+            # the filter id is a display adapter
             elif IFilter.providedBy(filter_id):
                 filter = filter_id(display)
 
+            # the filter id is a page template applied to the rendered element
             elif isinstance(filter_id, ViewPageTemplateFile):
                 filter = ZPTViewFilter(element, request)
                 filter.setTemplate(filter_id)

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/configure.zcml
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/configure.zcml   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/configure.zcml   
Sun Oct 30 02:02:10 2005
@@ -1,7 +1,8 @@
 <configure
     xmlns="http://namespaces.zope.org/zope";
     xmlns:browser="http://namespaces.zope.org/browser";
-    xmlns:jsonrpc="http://namespaces.zope.org/jsonrpc";>
+    xmlns:jsonrpc="http://namespaces.zope.org/jsonrpc";
+    xmlns:cpsskins="http://namespaces.zope.org/cpsskins";>
 
   <include package=".icons" />
 

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/engines/contentauthor/configure.zcml
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/engines/contentauthor/configure.zcml   
    (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/engines/contentauthor/configure.zcml   
    Sun Oct 30 02:02:10 2005
@@ -2,6 +2,8 @@
     xmlns:browser="http://namespaces.zope.org/browser";
     xmlns="http://namespaces.zope.org/cpsskins";>
 
+  <include package=".filters" />
+
   <browser:page
       name="content-author.html"
       class=".Authoring"

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/configure.zcml
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/configure.zcml  
    (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/configure.zcml  
    Sun Oct 30 02:02:10 2005
@@ -1,6 +1,8 @@
 <configure
     xmlns:browser="http://namespaces.zope.org/browser";
-    xmlns:cpsskins="http://namespaces.zope.org/cpsskins";>
+    xmlns="http://namespaces.zope.org/cpsskins";>
+
+  <include package=".filters" />
 
   <browser:page
       name="layout-designer.html"
@@ -21,7 +23,8 @@
   />
 
   <browser:resource
-      name="layout_designer.css" file="layout_designer.css"
+      name="layout_designer.css"
+      file="layout_designer.css"
       layer="cpsskins"
   />
 
@@ -39,52 +42,74 @@
 
   <!-- Engine -->
 
-  <cpsskins:engine
+  <engine
       name="layout-designer"
   />
 
-  <cpsskins:renderer
+  <renderer
       for="cpsskins.elements.interfaces.ITheme"
       engine="layout-designer"
   />
 
-  <cpsskins:renderer
-      for="cpsskins.elements.interfaces.IThemePage
-           cpsskins.elements.interfaces.IPageBlock
-           cpsskins.elements.interfaces.ICell"
-      engine="layout-designer"
-      >
+  <renderer
+      for="cpsskins.elements.interfaces.ITheme"
+      engine="layout-designer">
 
-    <cpsskins:filter
-        name="layout editor"
+    <filter
+        name="theme editor (layout designer)"
     />
 
-    <cpsskins:filter
-        name="style"
+  </renderer>
+
+  <renderer
+      for="cpsskins.elements.interfaces.IThemePage"
+      engine="layout-designer">
+
+    <filter
+        name="themepage editor (layout designer)"
     />
 
-  </cpsskins:renderer>
+  </renderer>
+
+  <renderer
+      for="cpsskins.elements.interfaces.IPageBlock"
+      engine="layout-designer">
+
+    <filter
+        name="pageblock editor (layout designer)"
+    />
 
-  <cpsskins:renderer
+  </renderer>
+
+  <renderer
+      for="cpsskins.elements.interfaces.ICell"
+      engine="layout-designer">
+
+    <filter
+        name="cell editor (layout designer)"
+    />
+
+  </renderer>
+
+  <renderer
       for="cpsskins.elements.interfaces.ISlot"
-      engine="layout-designer"
-      >
+      engine="layout-designer">
 
-    <cpsskins:filter
-        name="slot editor (page designer)"
+    <filter
+        name="slot editor (layout designer)"
     />
 
-  </cpsskins:renderer>
+  </renderer>
 
-  <cpsskins:renderer
+  <renderer
       for="cpsskins.elements.interfaces.IPortlet"
-      engine="layout-designer"
-      >
+      engine="layout-designer">
 
-    <cpsskins:filter
+    <filter
         name="portlet editor (layout designer)"
     />
 
-  </cpsskins:renderer>
+  </renderer>
+
 
 </configure>

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/cell.pt
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/cell.pt 
    (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/cell.pt 
    Sun Oct 30 02:02:10 2005
@@ -6,8 +6,8 @@
     perspective globals/perspective;
     formats display/formattable:getFormatNames;
     title context/title;
-    id view/getId;
-    layout nocall:options/layout;
+    id context/identifier;
+    layout display/formattable:layout;
     layout_id layout/identifier;
     width layout/width"
   tal:attributes="

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/pageblock.pt
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/pageblock.pt
        (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/pageblock.pt
        Sun Oct 30 02:02:10 2005
@@ -6,8 +6,8 @@
     perspective globals/perspective;
     formats display/formattable:getFormatNames;
     title context/title;
-    layout nocall:options/layout;
-    this_id view/getId;
+    layout display/formattable:layout;
+    this_id context/identifier;
     layout_id layout/identifier;
     width layout/width">
 

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/portlet.pt
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/portlet.pt
  (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/portlet.pt
  Sun Oct 30 02:02:10 2005
@@ -6,7 +6,7 @@
     perspective globals/perspective;
     formats display/formattable:getFormatNames;
     title context/title;
-    id view/getId"
+    id context/identifier"
   tal:attributes="
     editable python:1;
     formattable python: formats and 1 or 0;

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/slot.pt
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/slot.pt 
    (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/slot.pt 
    Sun Oct 30 02:02:10 2005
@@ -5,8 +5,8 @@
   formats display/formattable:getFormatNames;
   slot_title context/title;
   slot_name context;
-  id view/getId;
-  icon view/getIcon">
+  id context/identifier;
+  icon context/@@getIcon">
 
   <div class="slotFrame editable draggable"
    tal:attributes="

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/themepage.pt
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/themepage.pt
        (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/engines/layoutdesigner/filters/themepage.pt
        Sun Oct 30 02:02:10 2005
@@ -1,3 +1,3 @@
-<div tal:define="id view/getId"
+<div tal:define="id context/identifier"
      tal:attributes="id id"
      tal:content="structure options/markup" />

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/engines/pagedesigner/configure.zcml
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/engines/pagedesigner/configure.zcml    
    (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/engines/pagedesigner/configure.zcml    
    Sun Oct 30 02:02:10 2005
@@ -2,6 +2,8 @@
     xmlns:browser="http://namespaces.zope.org/browser";
     xmlns="http://namespaces.zope.org/cpsskins";>
 
+  <include package=".filters" />
+
   <browser:page
       name="page-designer.html"
       class=".Authoring"
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to