Author: jmorliaguet
Date: Wed May 10 22:20:54 2006
New Revision: 3101

Modified:
   z3ecm/trunk/src/ecm/cpsskins/README.txt
   z3ecm/trunk/src/ecm/cpsskins/example1/configure.zcml
   z3ecm/trunk/src/ecm/cpsskins/example2/configure.zcml
   z3ecm/trunk/src/ecm/cpsskins/example3/configure.zcml
   z3ecm/trunk/src/ecm/cpsskins/example3/items.py
   z3ecm/trunk/src/ecm/cpsskins/example4/actions.py
   z3ecm/trunk/src/ecm/cpsskins/example4/configure.zcml
   z3ecm/trunk/src/ecm/cpsskins/example6/configure.zcml

Log:

- API updates



Modified: z3ecm/trunk/src/ecm/cpsskins/README.txt
==============================================================================
--- z3ecm/trunk/src/ecm/cpsskins/README.txt     (original)
+++ z3ecm/trunk/src/ecm/cpsskins/README.txt     Wed May 10 22:20:54 2006
@@ -93,7 +93,7 @@
 
 Download the code from z3lab::
 
- $ svn co https://svn.z3lab.org/z3lab/cpsskins/branches/jmo-perspectives \
+ $ svn co https://svn.z3lab.org/z3lab/cpsskins/branches/paris-sprint-2006 \
    cpsskins
 
 

Modified: z3ecm/trunk/src/ecm/cpsskins/example1/configure.zcml
==============================================================================
--- z3ecm/trunk/src/ecm/cpsskins/example1/configure.zcml        (original)
+++ z3ecm/trunk/src/ecm/cpsskins/example1/configure.zcml        Wed May 10 
22:20:54 2006
@@ -11,7 +11,7 @@
       name="ecm.cpsskins.example1"
       title="Example1: Hello portlet"
       description="This portlet displays 'hello world'"
-      factory=".hello.HelloPortlet"
+      class=".hello.HelloPortlet"
       schema=".hello.IHelloPortlet"
       icon="hello-icon.png"
   />

Modified: z3ecm/trunk/src/ecm/cpsskins/example2/configure.zcml
==============================================================================
--- z3ecm/trunk/src/ecm/cpsskins/example2/configure.zcml        (original)
+++ z3ecm/trunk/src/ecm/cpsskins/example2/configure.zcml        Wed May 10 
22:20:54 2006
@@ -11,7 +11,7 @@
       name="ecm.cpsskins.example2"
       title="Example2: Text portlet"
       description="A simple text portlet"
-      factory=".text.TextPortlet"
+      class=".text.TextPortlet"
       schema=".text.ITextPortlet"
       icon="text-icon.png"
   />

Modified: z3ecm/trunk/src/ecm/cpsskins/example3/configure.zcml
==============================================================================
--- z3ecm/trunk/src/ecm/cpsskins/example3/configure.zcml        (original)
+++ z3ecm/trunk/src/ecm/cpsskins/example3/configure.zcml        Wed May 10 
22:20:54 2006
@@ -11,7 +11,7 @@
       name="ecm.cpsskins.example3"
       title="example3: Items portlet"
       description="A portlet that returns a list of items"
-      factory=".items.ItemsPortlet"
+      class=".items.ItemsPortlet"
       schema=".items.IItemsPortlet"
       icon="items-icon.png"
   />
@@ -25,7 +25,7 @@
 
       <cpsskins:format
          name="widget"
-         type="vertical_menu"
+         types="standard.vertical_menu"
       />
 
       <cpsskins:format

Modified: z3ecm/trunk/src/ecm/cpsskins/example3/items.py
==============================================================================
--- z3ecm/trunk/src/ecm/cpsskins/example3/items.py      (original)
+++ z3ecm/trunk/src/ecm/cpsskins/example3/items.py      Wed May 10 22:20:54 2006
@@ -22,7 +22,8 @@
 
 from cpsskins import Portlet
 from cpsskins.interfaces import IPortlet
-from cpsskins.model import Items, Item
+from cpsskins.standard.ds.menuitem import MenuItem
+from cpsskins.standard.ds.menuitems import MenuItems
 
 class IItemsPortlet(IPortlet):
     """Interface for the Items portlet.
@@ -37,7 +38,7 @@
         self.title = title
 
     def __call__(self, info):
-        info.data = Items([
-            Item(title=u'first', url='http://www.somesite.com'),
-            Item(title=u'second', url='http://www.someothersite.com'),
+        info.data = MenuItems([
+            MenuItem(title=u'first', url='http://www.somesite.com'),
+            MenuItem(title=u'second', url='http://www.someothersite.com'),
             ])

Modified: z3ecm/trunk/src/ecm/cpsskins/example4/actions.py
==============================================================================
--- z3ecm/trunk/src/ecm/cpsskins/example4/actions.py    (original)
+++ z3ecm/trunk/src/ecm/cpsskins/example4/actions.py    Wed May 10 22:20:54 2006
@@ -25,7 +25,8 @@
 
 from cpsskins import Portlet
 from cpsskins.interfaces import IPortlet
-from cpsskins.model import Items, Item
+from cpsskins.standard.ds.menuitem import MenuItem
+from cpsskins.standard.ds.menuitems import MenuItems
 
 class IActionsPortlet(IPortlet):
     """Interface for the actions portlet.
@@ -53,12 +54,6 @@
         except ComponentLookupError:
            items = []
         else:
-           items = [
-               Item(
-                   title=ac['title'],
-                   url=ac['action'],
-                   icon=ac['icon'],
-                   )
-               for ac in menu]
-
+           items = [MenuItem(title=ac['title'], url=ac['action'],
+                             icon=ac['icon']) for ac in menu]
         info.data = items

Modified: z3ecm/trunk/src/ecm/cpsskins/example4/configure.zcml
==============================================================================
--- z3ecm/trunk/src/ecm/cpsskins/example4/configure.zcml        (original)
+++ z3ecm/trunk/src/ecm/cpsskins/example4/configure.zcml        Wed May 10 
22:20:54 2006
@@ -11,7 +11,7 @@
       name="ecm.cpsskins.example4"
       title="Example4: Actions portlet"
       description="A portlet that returns a list of actions items"
-      factory=".actions.ActionsPortlet"
+      class=".actions.ActionsPortlet"
       schema=".actions.IActionsPortlet"
       icon="actions-icon.png"
   />
@@ -25,7 +25,7 @@
 
       <format
          name="widget"
-         type="vertical_menu"
+         types="standard.vertical_menu"
       />
 
       <format

Modified: z3ecm/trunk/src/ecm/cpsskins/example6/configure.zcml
==============================================================================
--- z3ecm/trunk/src/ecm/cpsskins/example6/configure.zcml        (original)
+++ z3ecm/trunk/src/ecm/cpsskins/example6/configure.zcml        Wed May 10 
22:20:54 2006
@@ -11,7 +11,7 @@
       name="ecm.cpsskins.example6"
       title="Example6: Counter portlet"
       description="This portlet increments a counter."
-      factory=".counter.CounterPortlet"
+      class=".counter.CounterPortlet"
       schema=".counter.ICounterPortlet"
       icon="counter-icon.png"
   />
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to