[Z3lab-checkins] r27783 - z3lab/cpsskins/branches/jmo-perspectives/browser/images

[svn]

Author: jmorliaguet
Date: Fri Sep 30 17:40:54 2005
New Revision: 27783

Removed:
   z3lab/cpsskins/branches/jmo-perspectives/browser/images/img_onelevelup.png
   z3lab/cpsskins/branches/jmo-perspectives/browser/images/tip-16.png
   z3lab/cpsskins/branches/jmo-perspectives/browser/images/topic_folder_off.png
   z3lab/cpsskins/branches/jmo-perspectives/browser/images/topic_folder_on.png
   z3lab/cpsskins/branches/jmo-perspectives/browser/images/type_folder_off.png
   z3lab/cpsskins/branches/jmo-perspectives/browser/images/type_folder_on.png
Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/images/configure.zcml
Log:

- removed unused images



Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/images/configure.zcml
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/images/configure.zcml  
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/images/configure.zcml  
Fri Sep 30 17:40:54 2005
@@ -19,26 +19,6 @@
   layer="cpsskins" />
 
   
-
-  
-
-  
-
-  
-
-  
-
-  
 
@@ -86,8 +66,4 @@
   name="bg-panel.png" file="bg-panel.png"
   layer="cpsskins" />
 
-  
-
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27784 - z3lab/cpsskins/branches/jmo-perspectives/browser/icons

[svn]

Author: jmorliaguet
Date: Fri Sep 30 17:43:24 2005
New Revision: 27784

Removed:
   z3lab/cpsskins/branches/jmo-perspectives/browser/icons/editlayout-16.png
   z3lab/cpsskins/branches/jmo-perspectives/browser/icons/editstyle-16.png
   z3lab/cpsskins/branches/jmo-perspectives/browser/icons/movedown-12.png
   z3lab/cpsskins/branches/jmo-perspectives/browser/icons/moveleft-12.png
   z3lab/cpsskins/branches/jmo-perspectives/browser/icons/moveright-12.png
   z3lab/cpsskins/branches/jmo-perspectives/browser/icons/moveup-12.png
Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/icons/configure.zcml
Log:

- removed unused icons



Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/icons/configure.zcml
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/icons/configure.zcml   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/icons/configure.zcml   
Fri Sep 30 17:43:24 2005
@@ -11,14 +11,6 @@
   layer="cpsskins" />
 
   
-
-  
-
-  
 
@@ -43,22 +35,6 @@
   layer="cpsskins" />
 
   
-
-  
-
-  
-
-  
-
-  
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27789 - z3lab/cpsskins/branches/jmo-perspectives/storage

[svn]

Author: jmorliaguet
Date: Fri Sep 30 18:58:19 2005
New Revision: 27789

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/storage/interfaces.py
Log:

- added missing interface declaration



Modified: z3lab/cpsskins/branches/jmo-perspectives/storage/interfaces.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/storage/interfaces.py  
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/storage/interfaces.py  Fri Sep 
30 18:58:19 2005
@@ -70,3 +70,5 @@
 def getThirds():
 """ """
 
+def __delitem__(item):
+""" """
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27791 - in z3lab/zope/xmlschema/trunk: . demo demo/etc etc

[svn]

Author: janguenot
Date: Fri Sep 30 21:24:41 2005
New Revision: 27791

Added:
   z3lab/zope/xmlschema/trunk/SETUP.cfg   (contents, props changed)
   z3lab/zope/xmlschema/trunk/demo/etc/
   z3lab/zope/xmlschema/trunk/demo/etc/zope.xmlschema.demo-configure.zcml
  - copied unchanged from r27706, 
z3lab/zope/xmlschema/trunk/demo/zope.xmlschema.demo-configure.zcml.in
   z3lab/zope/xmlschema/trunk/etc/
   z3lab/zope/xmlschema/trunk/etc/zope.xmlschema-meta.zcml
  - copied unchanged from r27706, 
z3lab/zope/xmlschema/trunk/zope.xmlschema-meta.zcml.in
Removed:
   z3lab/zope/xmlschema/trunk/demo/zope.xmlschema.demo-configure.zcml.in
   z3lab/zope/xmlschema/trunk/zope.xmlschema-meta.zcml.in
Modified:
   z3lab/zope/xmlschema/trunk/INSTALL.txt
Log:
zpkg setup

Modified: z3lab/zope/xmlschema/trunk/INSTALL.txt
==
--- z3lab/zope/xmlschema/trunk/INSTALL.txt  (original)
+++ z3lab/zope/xmlschema/trunk/INSTALL.txt  Fri Sep 30 21:24:41 2005
@@ -1,16 +1,11 @@
 $Id$
 
-There is currently no automatic setup, the following steps are done manually.
-
 Installation :
 ---
 
-Copy the xmlschema package within the src/zope/ sub-dir of your Zope3 instance.
+At the root of your instance Zope instance type : 
 
-Copy the file 'zope.xmlschema-meta.zcml.in' included within the xmlschema
-package to the site-packages of your zope3 instance as zope.xmlschema-meta.zcml
-(not if you are working within a Zope3 checkout the location is now within 
-$ZOPE3_ROOT/zopeskel/etc/package-includes)
+$ make
 
 Restart your Zope3 instance.
 

Added: z3lab/zope/xmlschema/trunk/SETUP.cfg
==
--- (empty file)
+++ z3lab/zope/xmlschema/trunk/SETUP.cfgFri Sep 30 21:24:41 2005
@@ -0,0 +1,7 @@
+# Tell zpkg how to install the ZCML slugs.
+
+
+  demo/etc/zope.xmlschema.demo-configure.zcml
+  etc/zope.xmlschema-meta.zcml
+
+
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27792 - in z3lab/zope/xforms/trunk: . demo/etc etc

[svn]

Author: janguenot
Date: Fri Sep 30 21:35:22 2005
New Revision: 27792

Added:
   z3lab/zope/xforms/trunk/demo/etc/
   z3lab/zope/xforms/trunk/demo/etc/zope.xforms.demo-configure.zcml
  - copied unchanged from r27704, 
z3lab/zope/xforms/trunk/demo/zope.xforms.demo-configure.zcml.in
   z3lab/zope/xforms/trunk/etc/
   z3lab/zope/xforms/trunk/etc/zope.xforms-meta.zcml
  - copied unchanged from r27704, 
z3lab/zope/xforms/trunk/zope.xforms-meta.zcml.in
Modified:
   z3lab/zope/xforms/trunk/INSTALL.txt
Log:
zpkg setup

Modified: z3lab/zope/xforms/trunk/INSTALL.txt
==
--- z3lab/zope/xforms/trunk/INSTALL.txt (original)
+++ z3lab/zope/xforms/trunk/INSTALL.txt Fri Sep 30 21:35:22 2005
@@ -1,16 +1,11 @@
 $Id$
 
-There is currently no automatic setup, the following steps are done manually.
-
 Installation :
 ---
 
-Copy the xforms package within the src/zope/ sub-dir of your Zope3 instance.
+At the root of your Zope2 checkout type : 
 
-Copy the file 'zope.xforms-meta.zcml.in' included within the xforms
-package to the site-packages of your zope3 instance as zope.xforms-meta.zcml
-(not if you are working within a Zope3 checkout the location is now within 
-$ZOPE3_ROOT/zopeskel/etc/package-includes)
+$ make
 
 Restart your Zope3 instance.
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27793 - in z3lab/zope/xforms/trunk: . demo

[svn]

Author: janguenot
Date: Fri Sep 30 21:35:55 2005
New Revision: 27793

Added:
   z3lab/zope/xforms/trunk/SETUP.cfg   (contents, props changed)
Removed:
   z3lab/zope/xforms/trunk/demo/zope.xforms.demo-configure.zcml.in
   z3lab/zope/xforms/trunk/zope.xforms-meta.zcml.in
Log:
forgot those

Added: z3lab/zope/xforms/trunk/SETUP.cfg
==
--- (empty file)
+++ z3lab/zope/xforms/trunk/SETUP.cfg   Fri Sep 30 21:35:55 2005
@@ -0,0 +1,7 @@
+# Tell zpkg how to install the ZCML slugs.
+
+
+  etc/zope.xforms-meta.zcml
+  demo/etc/zope.xforms.demo-configure.zcml
+
+
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27824 - in z3lab/cpsskins/branches/jmo-perspectives: browser/authoring browser/authoring/filters browser/authoring/filters/content browser/authoring/filters/page configuration/storages controllers elements elements/displays elements/formats relations storage

[svn]

Author: jmorliaguet
Date: Sat Oct  1 20:55:42 2005
New Revision: 27824

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.js
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring_macros.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/configure.zcml
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_panel.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/editing.css
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/cell_edit_layout.pt
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/content/portlet_edit.pt
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/page/portlet_edit.pt
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/page/slot_edit.pt
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/pageblock_edit_layout.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/interfaces.py
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt
   
z3lab/cpsskins/branches/jmo-perspectives/configuration/storages/metaconfigure.py
   z3lab/cpsskins/branches/jmo-perspectives/controllers/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/elements/displays/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/elements/formats/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py
   z3lab/cpsskins/branches/jmo-perspectives/elements/theme.py
   z3lab/cpsskins/branches/jmo-perspectives/elements/views.py
   z3lab/cpsskins/branches/jmo-perspectives/relations/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/relations/configure.zcml
   z3lab/cpsskins/branches/jmo-perspectives/relations/interfaces.py
   z3lab/cpsskins/branches/jmo-perspectives/storage/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/storage/interfaces.py
Log:

- saving work in progress: almost functional view editor



Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py  
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py  
Sat Oct  1 20:55:42 2005
@@ -30,6 +30,7 @@
 from zope.component.interfaces import IFactory
 from zope.event import notify
 from zope.interface import implements
+from zope.security.proxy import removeSecurityProxy
 
 from jsonserver.interfaces import IJSONRPCPublisher
 
@@ -43,10 +44,14 @@
 from cpsskins.thememanager import getThemeManager
 
 class Authoring(BrowserView):
-
 adapts(IElement)
 implements(IAuthoring)
 
+def _redirect(self):
+request = self.request
+target = request.get('HTTP_REFERER', '.')
+request.response.redirect(target)
+
 def draw(self, **kw):
 """Draws a the canvas element in edit mode
 """
@@ -73,46 +78,56 @@
 def setCanvasMode(self, mode=None):
 """Set the canvas view mode
 """
-request = self.request
 pkg_id = 'cpsskins'
-session = ISession(request)[pkg_id]
+session = ISession(self.request)[pkg_id]
 if mode is not None:
 session['canvas_mode'] = mode
-target = request.get('HTTP_REFERER', '.')
-request.response.redirect(target)
+self._redirect()
 
 def setPerspective(self, perspective=None):
 """Set the perspective
 """
-request = self.request
 pkg_id = 'cpsskins'
-session = ISession(request)[pkg_id]
+session = ISession(self.request)[pkg_id]
 tmutil = getThemeManager()
-theme = tmutil.getDefaultTheme()
+theme = tmutil.getEffectiveTheme(self.context)
 perspective = theme.getPerspectiveById(perspective)
-if not perspective:
-perspective = None
+
+# remove the security proxy before storing the object in the session
+if perspective is not None:
+perspective = removeSecurityProxy(perspective)
 session['perspective'] = perspective
-target = request.get('HTTP_REFERER', '.')
-request.response.redirect(target)
+self._redirect()
+
+def cloneView(self, perspective=None):
+"""Clone a view in a given perspective by:
+
+- assigning a new display to it
+
+- by associating the original display's formats to the new display
+
+"""
+tmutil = getThemeManager()
+theme = tmutil.getEffectiveTheme(self.context)
+perspective = theme.getPerspectiveById(perspective)
+display = IDisplayable(self.context).getDisplay(perspective)
+if display is None:
+IViewable(self.context).cloneView(perspective)
+sel

[Z3lab-checkins] r27827 - z3lab/cpsskins/branches/jmo-perspectives/browser/icons

[svn]

Author: jmorliaguet
Date: Sun Oct  2 13:56:02 2005
New Revision: 27827

Added:
   z3lab/cpsskins/branches/jmo-perspectives/browser/icons/add-16.png   
(contents, props changed)
   z3lab/cpsskins/branches/jmo-perspectives/browser/icons/checked-16.png   
(contents, props changed)
   
z3lab/cpsskins/branches/jmo-perspectives/browser/icons/checked-disabled-16.png  
 (contents, props changed)
   z3lab/cpsskins/branches/jmo-perspectives/browser/icons/remove-16.png   
(contents, props changed)
   z3lab/cpsskins/branches/jmo-perspectives/browser/icons/unchecked-16.png   
(contents, props changed)
Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/icons/configure.zcml
Log:

- new icons



Added: z3lab/cpsskins/branches/jmo-perspectives/browser/icons/add-16.png
==
Binary file. No diff available.

Added: z3lab/cpsskins/branches/jmo-perspectives/browser/icons/checked-16.png
==
Binary file. No diff available.

Added: 
z3lab/cpsskins/branches/jmo-perspectives/browser/icons/checked-disabled-16.png
==
Binary file. No diff available.

Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/icons/configure.zcml
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/icons/configure.zcml   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/icons/configure.zcml   
Sun Oct  2 13:56:02 2005
@@ -38,4 +38,24 @@
   name="perspective-12.png" file="perspective-12.png"
   layer="cpsskins" />
 
+  
+
+  
+
+  
+
+  
+
+  
+
 

Added: z3lab/cpsskins/branches/jmo-perspectives/browser/icons/remove-16.png
==
Binary file. No diff available.

Added: z3lab/cpsskins/branches/jmo-perspectives/browser/icons/unchecked-16.png
==
Binary file. No diff available.
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27828 - in z3lab/cpsskins/branches/jmo-perspectives: browser/authoring elements

[svn]

Author: jmorliaguet
Date: Sun Oct  2 13:56:49 2005
New Revision: 27828

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/editing.css
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt
   z3lab/cpsskins/branches/jmo-perspectives/elements/views.py
Log:

- view editor updated (cosmetic)



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt 
Sun Oct  2 13:56:49 2005
@@ -2,9 +2,13 @@
   
+   display python: displayable.getEffectiveDisplay(perspective);
+   current_theme python:tmutil.getThemeInContext(context)">
+
+
 
 
 
@@ -40,7 +44,7 @@
 
 
   
-Switch views
+Manage views
   
 
 

Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/editing.css
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/editing.css  
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/editing.css  
Sun Oct  2 13:56:49 2005
@@ -1,6 +1,11 @@
 
 /* popup window */
 
+img {
+  border: none;
+  vertical-align: middle;
+}
+
 .panel {
   background: #fff url(/++skin++cpsskins/@@/bg-panel.png) repeat-x;
   overflow: hidden;
@@ -200,15 +205,11 @@
 }
 
 .views {
-  font: 13px "Trebuchet MS", Verdana, Arial, Sans-Serif;
+  font: 11px Verdana, Arial, Sans-Serif;
   position: absolute;
-  top: 15px;
-  right: 15px;
+  top: 54px;
+  right: 27px;
   color: #666;
-  background-color: #fff;
-  padding: 0.2em 0.5em 0.2em 0.5em;
-  border: 1px solid #999;
-  -moz-border-radius: 6px;
 }
 
 .views a {
@@ -407,35 +408,34 @@
 }
 
 table.inline {
-  border-collapse: collapse;
-  border-left: 1px solid #999;
-  border-bottom: 1px solid #999;
   margin: 1em 0em 1em 0em;
-  text-align: left;
+  font-size: 120%;
 }
 
 table.inline th {
-  background: #e3e0e0;
-  border-top: 1px solid #999;
-  border-bottom: 1px solid #999;
-  border-right: 1px solid #999;
-  padding: 0.2em 2.5em 0.2em 2.5em;
+  background-color: #e6e0e0;
+  padding: 0.2em 3em 0.2em 3em;
   text-transform: lowercase;
-  text-align: center;
+  font-size: 120%;
+  font-weight: normal;
 }
 
 table.inline td {
-  border-right: 1px solid #999;
   padding: 0.2em 1em;
-  vertical-align: top;
+  font-size: 110%;
   text-align: center;
+  color: #333;
 }
 
 table.inline tr {
-  background-color: #fcfcfc;
+  background-color: #f6f3f3;
+  border-bottom: 1px solid #ccc;
 }
 
 table.inline tr.even {
-  background-color: #f3f3f3;
+  background-color: #fff;
 }
 
+table.inline a {
+  text-decoration: none;
+}

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt   
Sun Oct  2 13:56:49 2005
@@ -1,59 +1,64 @@
 
   
-
+
   View editor
-
   The views associated to this element are listed in the table 
below:
   
-
   
 View
+Display
 
   
 
-Action
   
   
 

+
+  
+
+  
+
+  
+  
+
+  
+
+
+  
+
+  
+
   
-
-  
-  
-
-  
-
+
+  
+
+
+  
+
   
+
+  ←
 
   
 
-
- 
- 
- > Add a "" view
- 
-
 
   
 

Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/views.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/elements/views.py  (original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/views.py  Sun Oct  2 
13:56:49 2005
@@ -100,7 +100,20 @@
 object = self.context
 reltool = RelationTool(object)
 
+tmutil = getThemeManager()
+theme = tmutil.getThemeInContext(object)
+
 views = {}
+
+# set initial values
+for perspective in theme.listPerspectives():
+views[str(perspective)] = {
+'relation': None,
+'displ

[Z3lab-checkins] r27833 - in z3lab/cpsskins/branches/jmo-perspectives: . browser/authoring elements elements/formats relations storage

[svn]

Author: jmorliaguet
Date: Sun Oct  2 21:21:50 2005
New Revision: 27833

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/Makefile
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/configure.zcml
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/editing.css
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt
   z3lab/cpsskins/branches/jmo-perspectives/elements/formats/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py
   z3lab/cpsskins/branches/jmo-perspectives/elements/views.py
   z3lab/cpsskins/branches/jmo-perspectives/relations/tool.py
   z3lab/cpsskins/branches/jmo-perspectives/storage/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/storage/interfaces.py
   z3lab/cpsskins/branches/jmo-perspectives/storage/relations.py
Log:

- added methods to customize / uncustomize formats

  (functional view editor)



Modified: z3lab/cpsskins/branches/jmo-perspectives/Makefile
==
--- z3lab/cpsskins/branches/jmo-perspectives/Makefile   (original)
+++ z3lab/cpsskins/branches/jmo-perspectives/Makefile   Sun Oct  2 21:21:50 2005
@@ -3,7 +3,7 @@
 all: i18n clean
 
 i18n:
-   python ~/Zope3/utilities/i18nextract.py -d cpsskins -p ./ -o ./locales/
+   python2.4 ~/Zope3/utilities/i18nextract.py -d cpsskins -p ./ -o 
./locales/
 
 clean:
find . \( -name "*.pyc" -o -name "*.pyo" -o -name "*~" \) -exec rm -f 
{} \;

Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py  
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py  
Sun Oct  2 21:21:50 2005
@@ -129,6 +129,19 @@
 IViewable(self.context).removeView(perspective)
 self._redirect()
 
+def customizeFormat(self, name='', perspective=None):
+tmutil = getThemeManager()
+theme = tmutil.getEffectiveTheme(self.context)
+perspective = theme.getPerspectiveById(perspective)
+IViewable(self.context).customizeFormat(name, perspective)
+self._redirect()
+
+def uncustomizeFormat(self, name='', perspective=None):
+tmutil = getThemeManager()
+theme = tmutil.getEffectiveTheme(self.context)
+perspective = theme.getPerspectiveById(perspective)
+IViewable(self.context).uncustomizeFormat(name, perspective)
+self._redirect()
 
 class Editing(BrowserView):
 

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/configure.zcml
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/configure.zcml   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/configure.zcml   
Sun Oct  2 21:21:50 2005
@@ -155,6 +155,16 @@
   attribute="removeView"
   />
 
+  
+
+  
+
   
 
 

Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/editing.css
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/editing.css  
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/editing.css  
Sun Oct  2 21:21:50 2005
@@ -212,7 +212,7 @@
   color: #666;
 }
 
-.views a {
+.views a, .views a:visited {
   text-decoration: none;
 }
 

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt   
Sun Oct  2 21:21:50 2005
@@ -22,15 +22,18 @@
 
-   
 
+  
+
+  
   
 
   
+   tal:attributes="href 
string:@@cloneView?perspective=$perspective">
 
   
   
   
 
+  
   
-
-  
-
-
-  
+
+  
+
+  
+
+  
+  
+
+  
+
+
+  
 
   
 

Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/formats/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/elements/formats/__init__.py   
(original)
+++ z3lab/cpsskins/bra

[Z3lab-checkins] r27834 - in z3lab/cpsskins/branches/jmo-perspectives: browser browser/authoring configuration/storages configuration/widgets elements elements/displays elements/formats relations storage

[svn]

Author: jmorliaguet
Date: Sun Oct  2 21:44:23 2005
New Revision: 27834

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/caching.py
   
z3lab/cpsskins/branches/jmo-perspectives/configuration/storages/metaconfigure.py
   
z3lab/cpsskins/branches/jmo-perspectives/configuration/widgets/metaconfigure.py
   z3lab/cpsskins/branches/jmo-perspectives/elements/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/elements/displays/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/elements/formats/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/elements/formats/interfaces.py
   z3lab/cpsskins/branches/jmo-perspectives/elements/theme.py
   z3lab/cpsskins/branches/jmo-perspectives/elements/views.py
   z3lab/cpsskins/branches/jmo-perspectives/relations/interfaces.py
   z3lab/cpsskins/branches/jmo-perspectives/storage/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/storage/interfaces.py
Log:

- UI / cosmetic

- removed unused formats



Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py  
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py  
Sun Oct  2 21:44:23 2005
@@ -39,7 +39,6 @@
 from cpsskins.elements.interfaces import IViewable, IDisplayable, IFormattable
 from cpsskins.browser.elements.interfaces import INodeAdding, INodeRemoving
 from cpsskins.browser.elements.interfaces import INodeOrdering
-from cpsskins.browser.negociation.interfaces import INegociation
 from cpsskins.browser.renderers.interfaces import IRenderer
 from cpsskins.thememanager import getThemeManager
 

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt 
Sun Oct  2 21:44:23 2005
@@ -1,5 +1,6 @@
 
   http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27836 - in z3lab/cpsskins/branches/jmo-perspectives/locales: . en/LC_MESSAGES fr/LC_MESSAGES

[svn]

Author: jmorliaguet
Date: Sun Oct  2 22:08:14 2005
New Revision: 27836

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/locales/cpsskins.pot
   z3lab/cpsskins/branches/jmo-perspectives/locales/en/LC_MESSAGES/cpsskins.mo
   z3lab/cpsskins/branches/jmo-perspectives/locales/en/LC_MESSAGES/cpsskins.po
   z3lab/cpsskins/branches/jmo-perspectives/locales/fr/LC_MESSAGES/cpsskins.mo
   z3lab/cpsskins/branches/jmo-perspectives/locales/fr/LC_MESSAGES/cpsskins.po
Log:

- i18n updates



Modified: z3lab/cpsskins/branches/jmo-perspectives/locales/cpsskins.pot
==
--- z3lab/cpsskins/branches/jmo-perspectives/locales/cpsskins.pot   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/locales/cpsskins.pot   Sun Oct 
 2 22:08:14 2005
@@ -59,6 +59,9 @@
 msgid "menu-paste"
 msgstr ""
 
+msgid "menu-format"
+msgstr ""
+
 #: src/cpsskins/browser/authoring/configure.zcml:101
 msgid "Page authoring modes"
 msgstr ""

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/locales/en/LC_MESSAGES/cpsskins.mo
==
Binary files. No diff available.

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/locales/en/LC_MESSAGES/cpsskins.po
==
--- z3lab/cpsskins/branches/jmo-perspectives/locales/en/LC_MESSAGES/cpsskins.po 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/locales/en/LC_MESSAGES/cpsskins.po 
Sun Oct  2 22:08:14 2005
@@ -45,6 +45,9 @@
 msgid "menu-paste"
 msgstr "Paste"
 
+msgid "menu-format"
+msgstr "Format"
+
 #: src/cpsskins/browser/authoring/configure.zcml:101
 msgid "Page authoring modes"
 msgstr ""

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/locales/fr/LC_MESSAGES/cpsskins.mo
==
Binary files. No diff available.

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/locales/fr/LC_MESSAGES/cpsskins.po
==
--- z3lab/cpsskins/branches/jmo-perspectives/locales/fr/LC_MESSAGES/cpsskins.po 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/locales/fr/LC_MESSAGES/cpsskins.po 
Sun Oct  2 22:08:14 2005
@@ -52,6 +52,9 @@
 msgid "menu-paste"
 msgstr "Coller"
 
+msgid "menu-format"
+msgstr "Formatter"
+
 #: src/cpsskins/browser/authoring/configure.zcml:101
 msgid "Page authoring modes"
 msgstr ""
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27837 - in z3lab/cpsskins/branches/jmo-perspectives: browser/authoring browser/icons elements

[svn]

Author: jmorliaguet
Date: Sun Oct  2 23:35:38 2005
New Revision: 27837

Added:
   z3lab/cpsskins/branches/jmo-perspectives/browser/icons/format-16.png
  - copied unchanged from r27833, 
z3lab/cpsskins/branches/jmo-perspectives/browser/icons/customize-16.png
Removed:
   z3lab/cpsskins/branches/jmo-perspectives/browser/icons/customize-16.png
Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.css
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring_macros.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/editing.css
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/icons/configure.zcml
   z3lab/cpsskins/branches/jmo-perspectives/elements/views.py
Log:

- misc UI improvements



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.css
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.css
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.css
Sun Oct  2 23:35:38 2005
@@ -259,8 +259,8 @@
   background-image: url(/++skin++cpsskins/@@/edit-16.png);
 }
 
-.context-menu .customize {
-  background-image: url(/++skin++cpsskins/@@/customize-16.png);
+.context-menu .format {
+  background-image: url(/++skin++cpsskins/@@/format-16.png);
 }
 
 .context-menu .copy {

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring_macros.pt
==
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring_macros.pt  
(original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring_macros.pt  
Sun Oct  2 23:35:38 2005
@@ -96,10 +96,10 @@
 
 
 
-
+
   menu-format
   
+   action="format" expand="1" choice="formats">
 
 
 

Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/editing.css
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/editing.css  
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/editing.css  
Sun Oct  2 23:35:38 2005
@@ -208,12 +208,13 @@
   font: 11px Verdana, Arial, Sans-Serif;
   position: absolute;
   top: 54px;
-  right: 27px;
-  color: #666;
+  right: 24px;
 }
 
 .views a, .views a:visited {
   text-decoration: none;
+  text-transform: lowercase;
+  color: #006;
 }
 
 .views img {
@@ -409,12 +410,12 @@
 
 table.inline {
   margin: 1em 0em 1em 0em;
-  font-size: 120%;
+  font-size: 11px;
 }
 
 table.inline th {
   background-color: #e6e0e0;
-  padding: 0.2em 3em 0.2em 3em;
+  padding: 0.2em 2.2em 0.2em 2.2em;
   text-transform: lowercase;
   font-size: 120%;
   font-weight: normal;
@@ -439,3 +440,10 @@
 table.inline a {
   text-decoration: none;
 }
+
+
+/* View editor */
+
+.effective {
+  background-color: #efc;
+}

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt   
Sun Oct  2 23:35:38 2005
@@ -23,7 +23,8 @@
 even repeat/view/even;
 display info/display;
 formats info/formats;
-perspective info/perspective"
+perspective info/perspective;
+current_formats python: 
views[str(current_perspective)]['formats']"
 tal:attributes="class python: even and 'even' or nothing">
 
   
@@ -36,8 +37,8 @@
tal:attributes="href 
string:@@cloneView?perspective=$perspective">
 
   
-  
 
   
@@ -48,26 +49,35 @@
   
 
   
-  
+  
 
-  
-
-  
-
-  
-  
+
+  
+
+
+  
 
   
+  
+
+  
 
-
-  
+  
 
-  
+
+  
 
   ←

Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/icons/configure.zcml
==
--- z3lab/cpsskins/branches/jmo-perspectives/

[Z3lab-checkins] r27838 - z3lab/cpsskins/branches/jmo-perspectives/browser/authoring

[svn]

Author: jmorliaguet
Date: Sun Oct  2 23:54:41 2005
New Revision: 27838

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/editing.css
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt
Log:

- misc fixes



Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/editing.css
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/editing.css  
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/editing.css  
Sun Oct  2 23:54:41 2005
@@ -415,7 +415,7 @@
 
 table.inline th {
   background-color: #e6e0e0;
-  padding: 0.2em 2.2em 0.2em 2.2em;
+  padding: 0.2em 2.4em 0.2em 2.4em;
   text-transform: lowercase;
   font-size: 120%;
   font-weight: normal;

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt   
Sun Oct  2 23:54:41 2005
@@ -24,7 +24,8 @@
 display info/display;
 formats info/formats;
 perspective info/perspective;
-current_formats python: 
views[str(current_perspective)]['formats']"
+current_formats python: current_perspective and 
+
views[str(current_perspective)]['formats'] or []"
 tal:attributes="class python: even and 'even' or nothing">
 
   
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27843 - z3lab/zope/xforms/trunk/demo/etc

[svn]

Author: janguenot
Date: Mon Oct  3 14:25:21 2005
New Revision: 27843

Modified:
   z3lab/zope/xforms/trunk/demo/etc/zope.xforms.demo-configure.zcml
Log:
Typo

Modified: z3lab/zope/xforms/trunk/demo/etc/zope.xforms.demo-configure.zcml
==
--- z3lab/zope/xforms/trunk/demo/etc/zope.xforms.demo-configure.zcml
(original)
+++ z3lab/zope/xforms/trunk/demo/etc/zope.xforms.demo-configure.zcmlMon Oct 
 3 14:25:21 2005
@@ -1 +1 @@
-
+
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27866 - in z3lab/zope/xmlschema/trunk: . demo tests/examples

[svn]

Author: janguenot
Date: Mon Oct  3 16:19:51 2005
New Revision: 27866

Modified:
   z3lab/zope/xmlschema/trunk/demo/configure.zcml
   z3lab/zope/xmlschema/trunk/demo/foo.xs
   z3lab/zope/xmlschema/trunk/handler.py
   z3lab/zope/xmlschema/trunk/tests/examples/simple.xs
   z3lab/zope/xmlschema/trunk/tests/examples/simple.xsd
Log:
Fix schema validity

Modified: z3lab/zope/xmlschema/trunk/demo/configure.zcml
==
--- z3lab/zope/xmlschema/trunk/demo/configure.zcml  (original)
+++ z3lab/zope/xmlschema/trunk/demo/configure.zcml  Mon Oct  3 16:19:51 2005
@@ -23,7 +23,6 @@
   schema=".interfaces.IFoo"
   label="Add a Foo content object"
   content_factory=".foo.Foo"
-  
   name="addFoo.html"
   permission="zope.ManageContent"
   />

Modified: z3lab/zope/xmlschema/trunk/demo/foo.xs
==
--- z3lab/zope/xmlschema/trunk/demo/foo.xs  (original)
+++ z3lab/zope/xmlschema/trunk/demo/foo.xs  Mon Oct  3 16:19:51 2005
@@ -1,5 +1,5 @@
 
 http://www.w3.org/2001/XMLSchema";>
-  
-  
+  
+  
 

Modified: z3lab/zope/xmlschema/trunk/handler.py
==
--- z3lab/zope/xmlschema/trunk/handler.py   (original)
+++ z3lab/zope/xmlschema/trunk/handler.py   Mon Oct  3 16:19:51 2005
@@ -42,6 +42,7 @@
 """XML Schema handler
 """
 
+# Common XML Data Types
 _mapping = {
 'string'  : StringField,
 'normalizedString' : NormalizedStringField,
@@ -57,6 +58,7 @@
 # Lookup the schema from the global utility given it's name.
 # Check the XMLSchema meta directive for more information on
 # the Schema registration
+
 schema = zope.component.getUtility(IXMLSchema, schema_id)
 self._doc = schema._doc
 
@@ -87,14 +89,15 @@
 def __call__(self, attrs):
 
 # Handle top level elements
-for elt in self._getElements(self._root, 'attribute'):
+for elt in self._getElements(self._root, 'element'):
 _name = elt.attrib.get('name')
 _type = self._getElementType(elt)
 # Add a zope interface fields to the schema
 field_mapper = self._mapping.get(_type)
 if field_mapper is None:
 raise NotImplementedError(
-"%s xsd data type is not implemented yet sorry !"
+"%s xsd data type "
+"is not implemented yet sorry !"
 %_type
 )
 attrs[_name] = field_mapper(elt)()

Modified: z3lab/zope/xmlschema/trunk/tests/examples/simple.xs
==
--- z3lab/zope/xmlschema/trunk/tests/examples/simple.xs (original)
+++ z3lab/zope/xmlschema/trunk/tests/examples/simple.xs Mon Oct  3 16:19:51 2005
@@ -1,5 +1,5 @@
 
 http://www.w3.org/2001/XMLSchema";>
-  
-  
+  
+  
 

Modified: z3lab/zope/xmlschema/trunk/tests/examples/simple.xsd
==
--- z3lab/zope/xmlschema/trunk/tests/examples/simple.xsd(original)
+++ z3lab/zope/xmlschema/trunk/tests/examples/simple.xsdMon Oct  3 
16:19:51 2005
@@ -1,5 +1,5 @@
 
 http://www.w3.org/2001/XMLSchema";>
-  
-  
+  
+  
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27869 - z3lab/zope/xforms/trunk/demo

[svn]

Author: janguenot
Date: Mon Oct  3 16:31:53 2005
New Revision: 27869

Modified:
   z3lab/zope/xforms/trunk/demo/bar.xf
   z3lab/zope/xforms/trunk/demo/bar.xs
   z3lab/zope/xforms/trunk/demo/configure.zcml
Log:
Update

Modified: z3lab/zope/xforms/trunk/demo/bar.xf
==
--- z3lab/zope/xforms/trunk/demo/bar.xf (original)
+++ z3lab/zope/xforms/trunk/demo/bar.xf Mon Oct  3 16:31:53 2005
@@ -1,5 +1,5 @@
 
-http://www.w3.org/1999/xhtml";
 xmlns:xf="http://www.w3.org/2002/xforms";
 xmlns:ev="http://www.w3.org/2001/xml-events";
@@ -52,4 +52,4 @@
 
 -->
   
-
+

Modified: z3lab/zope/xforms/trunk/demo/bar.xs
==
--- z3lab/zope/xforms/trunk/demo/bar.xs (original)
+++ z3lab/zope/xforms/trunk/demo/bar.xs Mon Oct  3 16:31:53 2005
@@ -1,5 +1,5 @@
 
 http://www.w3.org/2001/XMLSchema";>
-  
-  
+  
+  
 

Modified: z3lab/zope/xforms/trunk/demo/configure.zcml
==
--- z3lab/zope/xforms/trunk/demo/configure.zcml (original)
+++ z3lab/zope/xforms/trunk/demo/configure.zcml Mon Oct  3 16:31:53 2005
@@ -9,7 +9,7 @@
   
 
   
   
 
@@ -32,7 +32,7 @@
   http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27871 - z3lab/zope/xforms/trunk

[svn]

Author: janguenot
Date: Mon Oct  3 16:54:29 2005
New Revision: 27871

Modified:
   z3lab/zope/xforms/trunk/definition.py
Log:
Don't validate for the moment

Modified: z3lab/zope/xforms/trunk/definition.py
==
--- z3lab/zope/xforms/trunk/definition.py   (original)
+++ z3lab/zope/xforms/trunk/definition.py   Mon Oct  3 16:54:29 2005
@@ -38,6 +38,8 @@
 self._root = self._doc.getroot()
 
 def _validate(self):
+# XXX don't check for validity
+return True
 xforms_doc = lxml.etree.parse(xforms_path)
 xforms = lxml.etree.XMLSchema(xforms_doc)
 return xforms.validate(self._doc)
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27876 - z3lab/cpsskins/branches/jmo-perspectives

[svn]

Author: jmorliaguet
Date: Mon Oct  3 18:11:00 2005
New Revision: 27876

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/INSTALL.txt
Log:

- INSTALL.txt update ('jsolait' bundled with jsonserver must be installed)



Modified: z3lab/cpsskins/branches/jmo-perspectives/INSTALL.txt
==
--- z3lab/cpsskins/branches/jmo-perspectives/INSTALL.txt(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/INSTALL.txtMon Oct  3 
18:11:00 2005
@@ -23,6 +23,12 @@
   
 
 
+- install jsolait (the JSON-RPC javascript library)
+
+  $ cd .../jsonserver/jsolait
+  $ python install_jsolait.py
+
+
 - in the Zope3 folder, type 'make'.
   The cpsskins configuration files will get installed.
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27878 - z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters

[svn]

Author: jmorliaguet
Date: Mon Oct  3 18:55:45 2005
New Revision: 27878

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/layout.py
Log:

- permission fix (which caused page rendering in "content authoring" mode
  to fail to display the correct layout values)



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/layout.py
==
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/layout.py
(original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/layout.py
Mon Oct  3 18:55:45 2005
@@ -22,6 +22,7 @@
 from zope.component import adapts
 from zope.interface import implements
 from zope.publisher.interfaces import IRequest
+from zope.security.proxy import removeSecurityProxy
 
 from cpsskins.elements.formats.interfaces import IFormat
 from interfaces import IFilter
@@ -145,6 +146,7 @@
 for k, v in context.items():
 if not v:
 continue
+v = removeSecurityProxy(v)
 if k == 'width':
 style_attr += 'width:%s;' % v
 elif k == 'align':
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27888 - z3lab/cpsskins/branches/jmo-perspectives/browser/authoring

[svn]

Author: jmorliaguet
Date: Mon Oct  3 19:20:11 2005
New Revision: 27888

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_panel.pt
Log:

- simplification: the edited element to display initially in the edit panel
  will be computed earlier.



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_panel.pt
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_panel.pt
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_panel.pt
Mon Oct  3 19:20:11 2005
@@ -3,18 +3,12 @@
 
+ element_url element/@@absolute_url">
   
   
+   tal:attributes="src string:${element_url}/@@edit.html" />
   
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27893 - z3lab/cpsskins/branches/jmo-perspectives/browser/authoring

[svn]

Author: jmorliaguet
Date: Mon Oct  3 22:02:41 2005
New Revision: 27893

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_panel.pt
Log:

- fixed url redirection in the edit panel



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt 
Mon Oct  3 22:02:41 2005
@@ -1,13 +1,18 @@
 
   
+   formattable display/formattable:this;
+   format python: format_name is not None and 
formattable.getFormat(format_name) or None;
+   format_url format/@@absolute_url;
+   main_url python: format_name and format_url or '.'"
+   tal:attributes="onload string:parent.main.location.href = 
'$main_url/@@edit.html'">
 
 
 
@@ -30,7 +35,7 @@
 
   
   
-
   
 
 
-
   
 

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_panel.pt
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_panel.pt
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_panel.pt
Mon Oct  3 22:02:41 2005
@@ -3,10 +3,11 @@
 
   
+   tal:attributes="src 
string:${element_url}/@@edit-menu.html?format=$format" />
   
   http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27894 - z3lab/cpsskins/branches/jmo-perspectives/browser/authoring

[svn]

Author: jmorliaguet
Date: Mon Oct  3 22:04:01 2005
New Revision: 27894

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt
Log:

- simpler code



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt 
Mon Oct  3 22:04:01 2005
@@ -9,7 +9,7 @@
actual_display python: displayable.getDisplay(perspective);
display python: displayable.getEffectiveDisplay(perspective);
formattable display/formattable:this;
-   format python: format_name is not None and 
formattable.getFormat(format_name) or None;
+   format python: format_name and 
formattable.getFormat(format_name) or nothing;
format_url format/@@absolute_url;
main_url python: format_name and format_url or '.'"
tal:attributes="onload string:parent.main.location.href = 
'$main_url/@@edit.html'">
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27895 - z3lab/cpsskins/branches/jmo-perspectives/browser/authoring

[svn]

Author: jmorliaguet
Date: Mon Oct  3 22:38:32 2005
New Revision: 27895

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt
Log:

- fixed all redirection problems in the edit panels.



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt 
Mon Oct  3 22:38:32 2005
@@ -12,22 +12,18 @@
format python: format_name and 
formattable.getFormat(format_name) or nothing;
format_url format/@@absolute_url;
main_url python: format_name and format_url or '.'"
-   tal:attributes="onload string:parent.main.location.href = 
'$main_url/@@edit.html'">
+   tal:attributes="onload python: format_name and 'parent.main.location.href = 
\'%s/@@edit.html\'' % main_url
+  or 'parent.main.location.reload()'">
 
 
 
-
-
-  
-
-
 
 
 
   
   
-
+
   
   
 
@@ -38,8 +34,8 @@
 
-  
 
   
@@ -49,7 +45,8 @@
 
 
 
-  
+  
 Manage views
   
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27896 - z3lab/cpsskins/branches/jmo-perspectives/elements/formats

[svn]

Author: jmorliaguet
Date: Mon Oct  3 23:52:32 2005
New Revision: 27896

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/elements/formats/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/elements/formats/interfaces.py
   z3lab/cpsskins/branches/jmo-perspectives/elements/formats/layout.py
Log:

- moved the layout's traverse() method to elements.formats



Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/formats/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/elements/formats/__init__.py   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/formats/__init__.py   
Mon Oct  3 23:52:32 2005
@@ -96,8 +96,13 @@
 return self
 
 def traverse(self, name, remaining):
+context = self.context
 if name in format_registry:
 return self.getFormat(name)
+if hasattr(context, 'get'):
+value = context.get(name)
+if value is not None:
+return value
 return getattr(self, name)
 
 def storeFormat(self, format=None):

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/elements/formats/interfaces.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/elements/formats/interfaces.py 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/formats/interfaces.py 
Mon Oct  3 23:52:32 2005
@@ -31,9 +31,6 @@
 class ILayout(IFormat, IContainer):
 """A layout element"""
 
-def traverse(name, remaining):
-   """Return the value of layout attributes"""
-
 def getLayoutId():
"""Return the layout id"""
 

Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/formats/layout.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/elements/formats/layout.py 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/formats/layout.py Mon Oct 
 3 23:52:32 2005
@@ -18,7 +18,6 @@
 __docformat__ = "reStructuredText"
 
 from zope.app.container.btree import BTreeContainer
-from zope.app.traversing.interfaces import ITraversable
 from zope.interface import implements
 
 from cpsskins.elements.formats import Format
@@ -51,7 +50,7 @@
 {u'width': '', u'text-align': '', u'height': ''}
 
 """
-implements(ILayout, ITraversable)
+implements(ILayout)
 
 __super_setitem = BTreeContainer.__setitem__
 
@@ -62,9 +61,6 @@
 Format.__init__(self, id=id)
 self._resetFields()
 
-def traverse(self, name, remaining):
-return str(self.get(name))
-
 def __repr__(self):
 return "Layout('%s')" % self.getLayoutId()
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27897 - z3lab/cpsskins/branches/jmo-perspectives/elements/formats

[svn]

Author: jmorliaguet
Date: Tue Oct  4 00:36:33 2005
New Revision: 27897

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/elements/formats/__init__.py
Log:

- added some comments to the format's traverse() method



Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/formats/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/elements/formats/__init__.py   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/formats/__init__.py   
Tue Oct  4 00:36:33 2005
@@ -97,12 +97,15 @@
 
 def traverse(self, name, remaining):
 context = self.context
+# get a format by name
 if name in format_registry:
 return self.getFormat(name)
+# get an attribute of the format
 if hasattr(context, 'get'):
 value = context.get(name)
 if value is not None:
 return value
+# return a method of the adapter
 return getattr(self, name)
 
 def storeFormat(self, format=None):
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27898 - z3lab/cpsskins/branches/jmo-perspectives/browser/authoring

[svn]

Author: jmorliaguet
Date: Tue Oct  4 00:37:04 2005
New Revision: 27898

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/editing.css
Log:

- simpler and more robust code for the edit panel



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt 
Tue Oct  4 00:37:04 2005
@@ -3,16 +3,18 @@
class="panel" i18n:domain="cpsskins"
tal:define="tmutil context/@@getThemeManager;
perspective context/@@getPerspective;
-   format_name request/form/format|nothing;
+   format_name request/form/format|string:;
+   location request/form/location|nothing;
current_theme python:tmutil.getThemeInContext(context);
displayable context/displayable:this;
actual_display python: displayable.getDisplay(perspective);
display python: displayable.getEffectiveDisplay(perspective);
formattable display/formattable:this;
-   format python: format_name and 
formattable.getFormat(format_name) or nothing;
-   format_url format/@@absolute_url;
-   main_url python: format_name and format_url or '.'"
-   tal:attributes="onload python: format_name and 'parent.main.location.href = 
\'%s/@@edit.html\'' % main_url
+   edited formattable/?format_name|context;
+   edit_url string:${edited/@@absolute_url}/@@edit.html;
+   main_url request/form/main_url|edit_url"
+   tal:attributes="onload python: main_url and
+ 'parent.main.location.href = \'%s\'' % main_url
   or 'parent.main.location.reload()'">
 
 
@@ -22,8 +24,8 @@
 
   
   
-
+
   
   
 
@@ -45,8 +47,8 @@
 
 
 
-  
+  
 Manage views
   
 

Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/editing.css
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/editing.css  
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/editing.css  
Tue Oct  4 00:37:04 2005
@@ -207,8 +207,8 @@
 .views {
   font: 11px Verdana, Arial, Sans-Serif;
   position: absolute;
-  top: 54px;
-  right: 24px;
+  top: 55px;
+  right: 26px;
 }
 
 .views a, .views a:visited {
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27899 - in z3lab/memramcached: . browser interfaces tests

[svn]

Author: tziade
Date: Tue Oct  4 00:39:29 2005
New Revision: 27899

Added:
   z3lab/memramcached/
   z3lab/memramcached/__init__.py
   z3lab/memramcached/browser/
   z3lab/memramcached/browser/__init__.py   (contents, props changed)
   z3lab/memramcached/browser/configure.zcml   (contents, props changed)
   z3lab/memramcached/browser/memramcachedview.py
   z3lab/memramcached/browser/memramedit.pt   (contents, props changed)
   z3lab/memramcached/browser/memramstats.pt   (contents, props changed)
   z3lab/memramcached/configure.zcml
   z3lab/memramcached/interfaces/
   z3lab/memramcached/interfaces/__init__.py   (contents, props changed)
   z3lab/memramcached/interfaces/memramcached.py
   z3lab/memramcached/memramcached.py
   z3lab/memramcached/memramcaching.py
   z3lab/memramcached/tests/
   z3lab/memramcached/tests/__init__.py
   z3lab/memramcached/tests/test_memramcached.py
Log:
initial commit of a tentative ramcache based on memcached server

Added: z3lab/memramcached/__init__.py
==
--- (empty file)
+++ z3lab/memramcached/__init__.py  Tue Oct  4 00:39:29 2005
@@ -0,0 +1 @@
+#
\ No newline at end of file

Added: z3lab/memramcached/browser/__init__.py
==
--- (empty file)
+++ z3lab/memramcached/browser/__init__.py  Tue Oct  4 00:39:29 2005
@@ -0,0 +1 @@
+#
\ No newline at end of file

Added: z3lab/memramcached/browser/configure.zcml
==
--- (empty file)
+++ z3lab/memramcached/browser/configure.zcml   Tue Oct  4 00:39:29 2005
@@ -0,0 +1,30 @@
+http://namespaces.zope.org/zope";
+   xmlns="http://namespaces.zope.org/browser";
+   >
+
+  
+
+  
+
+  
+
+
+
+  
+
+

Added: z3lab/memramcached/browser/memramcachedview.py
==
--- (empty file)
+++ z3lab/memramcached/browser/memramcachedview.py  Tue Oct  4 00:39:29 2005
@@ -0,0 +1,34 @@
+#!/usr/bin/python
+# -*- coding: ISO-8859-15 -*-
+# (C) Copyright 2005 Nuxeo SARL 
+# Author: Tarek Ziad� <[EMAIL PROTECTED]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+#
+# $Id:$
+__docformat__ = 'restructuredtext'
+
+from zope.app.publisher.browser import BrowserView
+from memramcached.interfaces.memramcached import IMemRAMCached
+
+class MemRAMCachedView(BrowserView):
+
+__used_for__ = IMemRAMCached
+
+def action(self, maxEntries=None, maxAge=None, cleanupInterval=None,
+   memcachedHost='127.0.0.1', memcachedPort=11211):
+self.context.update(maxEntries, maxAge, cleanupInterval,
+memcachedHost, memcachedPort)
+self.request.response.redirect('.')

Added: z3lab/memramcached/browser/memramedit.pt
==
--- (empty file)
+++ z3lab/memramcached/browser/memramedit.ptTue Oct  4 00:39:29 2005
@@ -0,0 +1,80 @@
+
+
+
+
+  You can configure the memcached RAM Cache here.
+
+  
+Errors:
+
+  :
+  
+
+  
+  
+
+  
+
+  
+
+  Maximum cached entries
+
+
+  
+
+
+  
+  
+
+  Maximum age of cached entries
+
+
+  
+
+
+  
+  
+
+  Time between cache cleanups
+
+
+  
+
+
+  
+  
+
+  memcached server
+
+
+  
+
+
+  
+  
+
+  memcached port
+
+
+  
+
+
+  
+
+
+
+
+  
+  
+
+
+
+
+

Added: z3lab/memramcached/browser/memramstats.pt
==
--- (empty file)
+++ z3lab/memramcached/browser/memramstats.pt   Tue Oct  4 00:39:29 2005
@@ -0,0 +1,41 @@
+
+
+
+
+  
+MemRAMCached statistics
+
+  
+Errors:
+
+  :
+  
+
+  
+  
+  
+
+  Path
+  Hits
+  Misses
+  Size, bytes
+  Entries
+
+
+  
+ 
+ 
+ 
+ 
+ 
+  
+
+  
+
+  
+
+
+
+

Added: z3lab/memramcached/configure.zcml
==
---

[Z3lab-checkins] r27900 - z3lab/cpsskins/branches/jmo-perspectives/elements/formats

[svn]

Author: jmorliaguet
Date: Tue Oct  4 00:58:24 2005
New Revision: 27900

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/elements/formats/layout.py
Log:

- replaced traverse() with a conditional get()



Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/formats/layout.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/elements/formats/layout.py 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/formats/layout.py Tue Oct 
 4 00:58:24 2005
@@ -64,6 +64,11 @@
 def __repr__(self):
 return "Layout('%s')" % self.getLayoutId()
 
+def get(self, k, default):
+if k in self._getAllowedKeys():
+return str(self[k])
+return default
+
 def __setitem__(self, k, v):
 if not isinstance(v, str):
 raise TypeError, \
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27901 - in z3lab/cpsskins/branches/jmo-perspectives/elements: . formats

[svn]

Author: jmorliaguet
Date: Tue Oct  4 01:09:22 2005
New Revision: 27901

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/elements/formats/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/elements/formats/interfaces.py
   z3lab/cpsskins/branches/jmo-perspectives/elements/formats/layout.py
   z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py
Log:

- reverted to the original traverse() to avoid side-effects.

- test fixes



Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/formats/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/elements/formats/__init__.py   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/formats/__init__.py   
Tue Oct  4 01:09:22 2005
@@ -100,11 +100,6 @@
 # get a format by name
 if name in format_registry:
 return self.getFormat(name)
-# get an attribute of the format
-if hasattr(context, 'get'):
-value = context.get(name)
-if value is not None:
-return value
 # return a method of the adapter
 return getattr(self, name)
 

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/elements/formats/interfaces.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/elements/formats/interfaces.py 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/formats/interfaces.py 
Tue Oct  4 01:09:22 2005
@@ -31,6 +31,9 @@
 class ILayout(IFormat, IContainer):
 """A layout element"""
 
+def traverse(name, remaining):
+   """Get a layout attribute by traversal."""
+
 def getLayoutId():
"""Return the layout id"""
 

Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/formats/layout.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/elements/formats/layout.py 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/formats/layout.py Tue Oct 
 4 01:09:22 2005
@@ -18,6 +18,7 @@
 __docformat__ = "reStructuredText"
 
 from zope.app.container.btree import BTreeContainer
+from zope.app.traversing.interfaces import ITraversable
 from zope.interface import implements
 
 from cpsskins.elements.formats import Format
@@ -50,7 +51,7 @@
 {u'width': '', u'text-align': '', u'height': ''}
 
 """
-implements(ILayout)
+implements(ILayout, ITraversable)
 
 __super_setitem = BTreeContainer.__setitem__
 
@@ -64,10 +65,10 @@
 def __repr__(self):
 return "Layout('%s')" % self.getLayoutId()
 
-def get(self, k, default):
-if k in self._getAllowedKeys():
-return str(self[k])
-return default
+def traverse(self, name, remaining):
+if name in self._getAllowedKeys():
+return str(self[name])
+return None
 
 def __setitem__(self, k, v):
 if not isinstance(v, str):

Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py Tue Oct 
 4 01:09:22 2005
@@ -198,9 +198,6 @@
 readonly=True,
 )
 
-def getFormatName():
-""" """
-
 def findDisplays():
 """ """
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27912 - z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters

[svn]

Author: jmorliaguet
Date: Tue Oct  4 11:38:21 2005
New Revision: 27912

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/widget.py
Log:

- added a  container to basicHTML widget to make it possible to assign
  a CSS class name to it.



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/widget.py
==
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/widget.py
(original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/widget.py
Tue Oct  4 11:38:21 2005
@@ -168,14 +168,16 @@
 """Display the data with minimal formatting.
 """
 
-_preview = 'Header level 1' \
+_preview = '' \
+   'Header level 1' \
'Header level 2' \
'Header level 3' \
'Header level 4' \
-   'Some paragraph'
+   'Some paragraph' \
+   ''
 
 def __call__(self, data, **kw):
-return data.content()
+return '%s' % data.content()
 
 class BasicImageView(WidgetView):
 """Display an image with minimal formatting
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27915 - in z3lab/memramcached: . browser interfaces tests

[svn]

Author: tziade
Date: Tue Oct  4 12:20:08 2005
New Revision: 27915

Added:
   z3lab/memramcached/README.txt
   z3lab/memramcached/ZPL.txt
Modified:
   z3lab/memramcached/browser/memramcachedview.py
   z3lab/memramcached/interfaces/__init__.py
   z3lab/memramcached/interfaces/memramcached.py
   z3lab/memramcached/memramcached.py
   z3lab/memramcached/memramcaching.py
   z3lab/memramcached/tests/test_memramcached.py
Log:
normalized headers and added README, and ZPL

Added: z3lab/memramcached/README.txt
==
--- (empty file)
+++ z3lab/memramcached/README.txt   Tue Oct  4 12:20:08 2005
@@ -0,0 +1,9 @@
+$Id:$
+
+memramcached
+
+
+This package is an intent to create a
+ram cache based on distributed memcached server.
+
+It is in early stage at this time and should not be used yet.

Added: z3lab/memramcached/ZPL.txt
==
--- (empty file)
+++ z3lab/memramcached/ZPL.txt  Tue Oct  4 12:20:08 2005
@@ -0,0 +1,54 @@
+Zope Public License (ZPL) Version 2.1
+-
+
+A copyright notice accompanies this license document that
+identifies the copyright holders.
+
+This license has been certified as open source. It has also
+been designated as GPL compatible by the Free Software
+Foundation (FSF).
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the
+following conditions are met:
+
+1. Redistributions in source code must retain the
+   accompanying copyright notice, this list of conditions,
+   and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the accompanying
+   copyright notice, this list of conditions, and the
+   following disclaimer in the documentation and/or other
+   materials provided with the distribution.
+
+3. Names of the copyright holders must not be used to
+   endorse or promote products derived from this software
+   without prior written permission from the copyright
+   holders.
+
+4. The right to distribute this software or to use it for
+   any purpose does not give you the right to use
+   Servicemarks (sm) or Trademarks (tm) of the copyright
+   holders. Use of them is covered by separate agreement
+   with the copyright holders.
+
+5. If any files are modified, you must cause the modified
+   files to carry prominent notices stating that you changed
+   the files and the date of any change.
+
+Disclaimer
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
+  AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+  NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+  AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+  NO EVENT SHALL THE COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+  DAMAGE.

Modified: z3lab/memramcached/browser/memramcachedview.py
==
--- z3lab/memramcached/browser/memramcachedview.py  (original)
+++ z3lab/memramcached/browser/memramcachedview.py  Tue Oct  4 12:20:08 2005
@@ -1,23 +1,19 @@
-#!/usr/bin/python
+##
 # -*- coding: ISO-8859-15 -*-
-# (C) Copyright 2005 Nuxeo SARL 
-# Author: Tarek Ziad� <[EMAIL PROTECTED]>
+# Copyright (c) 2005 Nuxeo and Contributors.
+# All Rights Reserved.
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as published
-# by the Free Software Foundation.
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-#
-# $Id:$
+

[Z3lab-checkins] r27918 - z3lab/cpsskins/branches/jmo-perspectives/model

[svn]

Author: jmorliaguet
Date: Tue Oct  4 13:00:26 2005
New Revision: 27918

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/model/interfaces.py
Log:

- added missing schema field (caused access violation issues)



Modified: z3lab/cpsskins/branches/jmo-perspectives/model/interfaces.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/model/interfaces.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/model/interfaces.pyTue Oct 
 4 13:00:26 2005
@@ -75,6 +75,12 @@
 required=False,
 )
 
+path = TextLine(
+title=_("Image path"),
+description=_("The image's path."),
+required=False,
+)
+
 class IItems(Interface):
 """Menu items.
 """
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27919 - z3lab/cpsskins/branches/jmo-perspectives/browser/authoring

[svn]

Author: jmorliaguet
Date: Tue Oct  4 13:14:05 2005
New Revision: 27919

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt
Log:

- fixed typo



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt 
Tue Oct  4 13:14:05 2005
@@ -37,7 +37,7 @@
 tal:condition="formats"
 tal:repeat="format formats">
   
 
   
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27920 - z3lab/cpsskins/branches/jmo-perspectives/browser/authoring

[svn]

Author: jmorliaguet
Date: Tue Oct  4 13:27:11 2005
New Revision: 27920

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt
Log:

- UI improvement: the current view can be changed directly on the view
  manager screen



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt   
Tue Oct  4 13:27:11 2005
@@ -24,6 +24,7 @@
 display info/display;
 formats info/formats;
 perspective info/perspective;
+perspective_is_current python: perspective == 
current_perspective;
 current_formats python: current_perspective and 
 
views[str(current_perspective)]['formats'] or []"
 tal:attributes="class python: even and 'even' or nothing">
@@ -80,8 +81,12 @@
 
   
 
-  ←
+  
+⇐ current 
view
+ 
+  
 
   
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27921 - z3lab/Zope3Benchs/trunk/shoots/trunk/report/test_BuddyDemoApp-2005-10-04T03-58-47

[svn]

Author: janguenot
Date: Tue Oct  4 13:31:39 2005
New Revision: 27921

Modified:
   
z3lab/Zope3Benchs/trunk/shoots/trunk/report/test_BuddyDemoApp-2005-10-04T03-58-47/index.html
   
z3lab/Zope3Benchs/trunk/shoots/trunk/report/test_BuddyDemoApp-2005-10-04T03-58-47/index.rst
Log:
Update with funkload fix

Modified: 
z3lab/Zope3Benchs/trunk/shoots/trunk/report/test_BuddyDemoApp-2005-10-04T03-58-47/index.html
==
--- 
z3lab/Zope3Benchs/trunk/shoots/trunk/report/test_BuddyDemoApp-2005-10-04T03-58-47/index.html
(original)
+++ 
z3lab/Zope3Benchs/trunk/shoots/trunk/report/test_BuddyDemoApp-2005-10-04T03-58-47/index.html
Tue Oct  4 13:31:39 2005
@@ -83,10 +83,10 @@
 Startup delay between thread: 0.2s
 FunkLoad version: 1.1.0
 
-No test ended during the bench.
 
 
 2   Test stats
+Sorry no test have finished during a cycle, the cycle duration is too 
short.
 
 
 3   Page stats
@@ -218,7 +218,14 @@
 
 
 5   5 Slowest requests
-For cycle with None CUs:
+For cycle with 1 CUs:
+
+In page 044 get: /0.676282355851/@@contents.html took 0.155s
+In page 043 redirect: /0.676282355851/@@contents.html took 
0.150s
+In page 037 redirect: /0.676282355851/@@contents.html took 
0.149s
+In page 031 redirect: /0.676282355851/@@contents.html took 
0.142s
+In page 038 get: /0.676282355851/@@contents.html took 0.141s
+
 
 
 6   Page detail stats
@@ -5306,7 +5313,7 @@
 
 
 
-Generated on: 2005-10-04 02:15 UTC.
+Generated on: 2005-10-04 11:29 UTC.
 
 
 

Modified: 
z3lab/Zope3Benchs/trunk/shoots/trunk/report/test_BuddyDemoApp-2005-10-04T03-58-47/index.rst
==
--- 
z3lab/Zope3Benchs/trunk/shoots/trunk/report/test_BuddyDemoApp-2005-10-04T03-58-47/index.rst
 (original)
+++ 
z3lab/Zope3Benchs/trunk/shoots/trunk/report/test_BuddyDemoApp-2005-10-04T03-58-47/index.rst
 Tue Oct  4 13:31:39 2005
@@ -21,11 +21,12 @@
 * Startup delay between thread: 0.2s
 * FunkLoad version: 1.1.0
 
-No test ended during the bench.
 
 Test stats
 --
 
+Sorry no test have finished during a cycle, the cycle duration is too short.
+
 
 Page stats
 --
@@ -60,8 +61,18 @@
 5 Slowest requests
 --
 
-For cycle with None CUs:
+For cycle with 1 CUs:
 
+* In page 044 get: /0.676282355851/@@contents.html took 0.155s
+  
+* In page 043 redirect: /0.676282355851/@@contents.html took 0.150s
+  
+* In page 037 redirect: /0.676282355851/@@contents.html took 0.149s
+  
+* In page 031 redirect: /0.676282355851/@@contents.html took 0.142s
+  
+* In page 038 get: /0.676282355851/@@contents.html took 0.141s
+  
 
 Page detail stats
 -
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27922 - z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters

[svn]

Author: jmorliaguet
Date: Tue Oct  4 14:04:14 2005
New Revision: 27922

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/effect.py
Log:

- permission fix

- image conversion fix (using PIL drafts to make sure that images are converted
  correctly before saving them)



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/effect.py
==
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/effect.py
(original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/effect.py
Tue Oct  4 14:04:14 2005
@@ -25,6 +25,8 @@
 from zope.interface import implements
 from zope.publisher.interfaces import IRequest
 from zope.schema.vocabulary import SimpleVocabulary
+from zope.interface import Interface, providedBy
+from zope.security.proxy import removeSecurityProxy
 
 from cpsskins.model.interfaces import IImage
 from cpsskins.elements.displays.interfaces import IDisplay
@@ -52,6 +54,7 @@
 def __call__(self, data='', info=None, **kw):
 """Apply the filter.
 """
+data = removeSecurityProxy(data)
 context = self.context
 content = data.content
 element = info.element
@@ -59,7 +62,6 @@
 if not (PILImage and IImage.providedBy(content)):
 return data
 
-
 new_size = (context.width, context.height)
 tmutil = getThemeManager()
 cache = tmutil.getImageCache()
@@ -96,6 +98,8 @@
 
 def _resize(self, im, size):
 new_data = StringIO()
+im.draft("RGB", im.size)
+im = im.convert("RGB")
 im.resize(size, PILImage.ANTIALIAS).save(new_data, self.context.format)
 return Image(new_data)
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27927 - z3lab/cpsskins/branches/jmo-perspectives/browser/authoring

[svn]

Author: jmorliaguet
Date: Tue Oct  4 18:25:45 2005
New Revision: 27927

Modified:
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring_macros.pt
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/content_authoring.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_control.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_panel.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/effect_editor.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/layout_editor.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/page_authoring.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/portlet_editor.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/style_editor.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/widget_editor.pt
Log:

- coding style



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring_macros.pt
==
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring_macros.pt  
(original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring_macros.pt  
Tue Oct  4 18:25:45 2005
@@ -1,13 +1,13 @@
 
   
+   tal:define="actions 
current_theme/@@view_get_menu/cpsskins_authoring_actions"
+   tal:condition="actions">
  
+tal:repeat="info actions"
+tal:attributes="href info/action;
+class info/selected"
+tal:content="info/title"
+i18n:translate="" />
   
 
 
@@ -24,17 +24,17 @@
 
 
   
+ tal:define="portlets 
current_theme/@@view_get_menu/cpsskins_add_portlet"
+ tal:condition="portlets">
 
   
 
+tal:define="title portlet/title"
+tal:attributes="type_name portlet/action">
   
+   i18n:attributes="title"
+   tal:attributes="title title;
+   src string:/++skin++cpsskins/++resource++${portlet/icon}" 
/>
   
 
   
@@ -42,36 +42,36 @@
 
 
   
+   tal:define="actions 
current_theme/@@view_get_menu/cpsskins_page_authoring_modes"
+   tal:condition="actions">
  
+tal:repeat="info actions"
+tal:attributes="href info/action;
+class info/selected"
+tal:content="info/title"
+i18n:translate="" />
   
 
 
 
   
+action="@@setPerspective" method="post"
+tal:define="perspectives current_theme/listPerspectives;
+current context/@@getPerspective">
 
   default
   
+  tal:content="perspective"
+  tal:attributes="value perspective;
+  selected python:perspective == current
+   and 'selected' or nothing" />
 
   
 
 
 
   
+   tal:define="perspective context/@@getPerspective">
 
@@ -99,7 +99,7 @@
 
   menu-format
   
+   action="format" expand="1" choice="formats">
 
 
 
@@ -115,24 +115,24 @@
 
 
 
+  tal:define="themes tmutil/getThemes">
   
+ border="0" summary="">
 
   
 
   
 
+ tal:attributes="src string:${context/++resource++ltab.png}" />
   
   
 
+   tal:content="theme/title"
+   tal:attributes="href 
string:${theme/@@absolute_url}/@@${view/__name__}" />
   
   
 
+ tal:attributes="src string:${context/++resource++rtab.png}" />
   
   
 
@@ -143,14 +143,14 @@
 
 
 
+  tal:define="pages current_theme/getPages">
   
 
   
 
+   tal:content="page/title"
+   tal:attributes="href 
string:${page/@@absolute_url}/@@${view/__name__}" />
 
   
 

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/content_authoring.pt
==
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/content_authoring.pt 
(original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/content_authoring.pt 
Tue Oct  4 18:25:45 2005
@@ -1,25 +1,24 @@
 http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
 http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"
- tal:define="tmutil context/@@getThemeManager;
- current_theme python:tmutil.getThemeInContext(context);
- effective_page python:tmutil.getEffectivePage(context, request)">
+  tal:define="tmutil context/@@getThemeManager;
+  current_theme python:tmutil.getThemeInContext(context);
+  effective_pa

[Z3lab-checkins] r27928 - z3lab/Zope3Benchs/trunk

[svn]

Author: janguenot
Date: Tue Oct  4 18:40:08 2005
New Revision: 27928

Modified:
   z3lab/Zope3Benchs/trunk/Zope3.conf
   z3lab/Zope3Benchs/trunk/test_Zope3.py
Log:
Update functionnal tests and configuration

Modified: z3lab/Zope3Benchs/trunk/Zope3.conf
==
--- z3lab/Zope3Benchs/trunk/Zope3.conf  (original)
+++ z3lab/Zope3Benchs/trunk/Zope3.conf  Tue Oct  4 18:40:08 2005
@@ -5,8 +5,8 @@
 # Main section
 #
 [main]
-title=Simple Zope3 tests
-description=Testing Zope3
+title=Testing Zope3
+description=Functional tests against Zope3 for benching purpose
 
 # the server url to test without the trailing '/'
 url=http://localhost:8080
@@ -15,12 +15,33 @@
 admin_id=admin
 admin_pwd=nimda
 
+member_id=member
+member_pwd=rebmem
+
 
 # 
 # Tests description and configuration
 #
-[test_anonymous]
-description=Check Anonymous access
+
+[test_EmptyInstance_As_Anonymous]
+description=Render default page as anonymous user
+
+[test_EmptyInstance_As_Manager]
+description=Render default page as Manager
+
+[test_EmptyInstance_As_Member]
+description=Render default page as Member
+
+[test_00_BuddyDemoApp_RW]
+description=Read / write tests on the buddy demo app
+nb_buddies_folder=5
+nb_buddies_per_folder=5
+
+[test_BuddyDemoApp_READ_As_Manager]
+description=Read tests on the buddy demo app as Manager
+
+[test_BuddyDemoApp_READ_As_Member]
+description=Read tests on the buddy demo app as Member
 
 # 
 # Monitoring configuration
@@ -72,7 +93,7 @@
 cycles =  1:2:3
 
 # duration = duration of a cycle in seconds
-duration = 30
+duration = 250
 
 # startup_delay = time to wait between starting-up threads in seconds
 startup_delay = 0.2

Modified: z3lab/Zope3Benchs/trunk/test_Zope3.py
==
--- z3lab/Zope3Benchs/trunk/test_Zope3.py   (original)
+++ z3lab/Zope3Benchs/trunk/test_Zope3.py   Tue Oct  4 18:40:08 2005
@@ -19,10 +19,10 @@
 
 $Id$
 """
-
-from random import random
 import unittest
+from random import random
 from funkload.FunkLoadTestCase import FunkLoadTestCase
+from funkload.Lipsum import Lipsum
 
 class Zope3(FunkLoadTestCase):
 """Testing Zope3
@@ -33,37 +33,63 @@
 def setUp(self):
 """Setting up test.
 """
-
 self.logd("setUp.")
 self.zope_url = self.conf_get('main', 'url')
 self.admin_id = self.conf_get('main', 'admin_id')
 self.admin_pwd = self.conf_get('main', 'admin_pwd')
+self.member_id = self.conf_get('main', 'member_id')
+self.member_pwd = self.conf_get('main', 'member_pwd')
 
-##def test_EmptyInstance_As_Anonymous(self):
-##"""Test an empty instance as anonymous user
-##"""
-##
-##server_url = self.zope_url
-##self.get("%s/" % server_url)
-##
-##def test_EmptyInstance_As_Manager(self):
-##
-##server_url = self.zope_url
-##
-##self.setBasicAuth(self.admin_id, self.admin_pwd)
-##self.get("%s/" % server_url)
+# For cleaning up at the end
+self._buddies_folder_ids = []
 
-def test_BuddyDemoApp(self):
+def test_EmptyInstance_As_Anonymous(self):
+"""Test an empty instance as anonymous user
 
+This request the default Zope3 page
+"""
 server_url = self.zope_url
+self.get("%s/" % server_url, description="Zope3 default page")
+
+def test_EmptyInstance_As_Manager(self):
+"""Test an ampty instance as Manager
 
+This request the default Zope3 page
+"""
+server_url = self.zope_url
 self.setBasicAuth(self.admin_id, self.admin_pwd)
-self.get("%s/" % server_url)
-self.get("%s/@@+" % server_url)
+self.get("%s/" % server_url, description="Zope3 default page")
 
-j = 0
+def test_EmptyInstance_As_Member(self):
+"""Test an ampty instance as Member
+
+This request the default Zope3 page
+"""
+server_url = self.zope_url
+self.setBasicAuth(self.admin_id, self.admin_pwd)
+self.get("%s/" % server_url, description="Zope3 default page")
+
+def test_00_BuddyDemoApp_RW(self):
+"""Test the buddy demo application.
+
+The buddy demo application is a simple application involving
+containers and objects within the container
+"""
+server_url = self.zope_url
+
+nb_buddies_folder = self.conf_get(
+'test_00_BuddyDemoApp_RW', 'nb_buddies_folder')
+nb_buddies_per_folder = self.conf_get(
+'test_00_BuddyDemoApp_RW', 'nb_buddies_per_folder')
 
-while j < 5:
+self.setBasicAuth(self.admin_id, self.admin_pwd)
+self.get("%s/" % server_url, description="Zope3 default page")
+self.get("%s/@@+" % server_url,
+ description="Zop

[Z3lab-checkins] r27930 - z3lab/Zope3Benchs/trunk/shoots/trunk/report

[svn]

Author: janguenot
Date: Tue Oct  4 18:46:40 2005
New Revision: 27930

Removed:
   z3lab/Zope3Benchs/trunk/shoots/trunk/report/
Log:
remove this
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27932 - z3lab/Zope3Benchs/trunk/shoots/trunk

[svn]

Author: janguenot
Date: Tue Oct  4 19:15:17 2005
New Revision: 27932

Removed:
   z3lab/Zope3Benchs/trunk/shoots/trunk/zope3-bench.log
   z3lab/Zope3Benchs/trunk/shoots/trunk/zope3-bench.xml
   z3lab/Zope3Benchs/trunk/shoots/trunk/zope3-test.log
   z3lab/Zope3Benchs/trunk/shoots/trunk/zope3-test.xml
Log:
remove this
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27933 - z3lab/Zope3Benchs/trunk

[svn]

Author: janguenot
Date: Tue Oct  4 19:20:30 2005
New Revision: 27933

Modified:
   z3lab/Zope3Benchs/trunk/README.txt
Log:
Update

Modified: z3lab/Zope3Benchs/trunk/README.txt
==
--- z3lab/Zope3Benchs/trunk/README.txt  (original)
+++ z3lab/Zope3Benchs/trunk/README.txt  Tue Oct  4 19:20:30 2005
@@ -25,17 +25,7 @@
 
 The tests are done against the buddydemo application _[2]
 
-What does it test ? 
--
-
- - First test
-
-   As Manager, (x5)
-
- o create a buddy folder
- o create 10 buddies inside
-
- XXX : continue
+See the Zope3.conf for a description of the tests.
 
 How to run the functional tests : 
 --
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27934 - z3lab/Zope3Benchs/trunk

[svn]

Author: janguenot
Date: Tue Oct  4 19:35:59 2005
New Revision: 27934

Modified:
   z3lab/Zope3Benchs/trunk/test_Zope3.py
Log:
Use Lipsum to generate words

Modified: z3lab/Zope3Benchs/trunk/test_Zope3.py
==
--- z3lab/Zope3Benchs/trunk/test_Zope3.py   (original)
+++ z3lab/Zope3Benchs/trunk/test_Zope3.py   Tue Oct  4 19:35:59 2005
@@ -40,6 +40,9 @@
 self.member_id = self.conf_get('main', 'member_id')
 self.member_pwd = self.conf_get('main', 'member_pwd')
 
+# To generate words
+self._lipsum = Lipsum()
+
 # For cleaning up at the end
 self._buddies_folder_ids = []
 
@@ -92,7 +95,7 @@
 while j < int(nb_buddies_folder):
 
 # Create the buddies folder
-buddies_folder_id = str(random())
+buddies_folder_id = self._lipsum.getUniqWord()
 params = [
 ['type_name', 'BrowserAdd__buddydemo.buddy.BuddyFolder'],
 ['id', buddies_folder_id],
@@ -113,7 +116,7 @@
 
 # Create the buddies folder
 # Step1 : Ask for the creation given an id
-buddy_id = str(random())
+buddy_id = self._lipsum.getUniqWord()
 params = [
 ['type_name', 'AddBuddy.html'],
 ['id', buddy_id],
@@ -125,10 +128,10 @@
 # Give informations and create the buddy
 params = [
 ['type_name', 'AddBuddy.html'],
-['field.first', 'Julien'],
-['field.last', 'Anguenot'],
+['field.first', self._lipsum.getWord()],
+['field.last', self._lipsum.getWord()],
 ['field.email', '[EMAIL PROTECTED]'],
-['field.address', 'Paris France'],
+['field.address', self._lipsum.getAddress(lang="fr")],
 ['field.postal_code','75015'],
 ['UPDATE_SUBMIT', 'Add'],
 ]
@@ -150,10 +153,10 @@
 # Edit back the buddy
 
 params = [
-['field.first', 'Julien'],
-['field.last', 'Anguenot'],
+['field.first', self._lipsum.getWord()],
+['field.last', self._lipsum.getWord()],
 ['field.email', '[EMAIL PROTECTED]'],
-['field.address', 'Helsinki Suomi'],
+['field.address', self._lipsum.getAddress()],
 ['field.postal_code','33000'],
 ['UPDATE_SUBMIT', 'Change'],
 ]
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27935 - z3lab/Zope3Benchs/trunk

[svn]

Author: janguenot
Date: Tue Oct  4 19:47:31 2005
New Revision: 27935

Added:
   z3lab/Zope3Benchs/trunk/monitor.conf   (contents, props changed)
Log:
Add monitor.conf

Added: z3lab/Zope3Benchs/trunk/monitor.conf
==
--- (empty file)
+++ z3lab/Zope3Benchs/trunk/monitor.confTue Oct  4 19:47:31 2005
@@ -0,0 +1,23 @@
+# default configuration file for the monitor server
+# note that %(FLOAD_HOME)s is accessible
+#
+# $Id$
+
+# 
+[server]
+# configuration used by monitord
+host = localhost
+port = 8008
+
+# sleeptime between monitoring in second
+# note that load average is updated by the system only every 5s
+interval = .5
+
+# network interface to monitor lo, eth0
+interface = lo
+
+# 
+[client]
+# configuration used by monitorctl
+host = localhost
+port = 8008
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27937 - in z3lab/cpsskins/branches/jmo-perspectives: browser/renderers browser/skin portlets/actions portlets/breadcrumbs portlets/custom portlets/dummy portlets/image portlets/macroslot

[svn]

Author: jmorliaguet
Date: Tue Oct  4 21:07:05 2005
New Revision: 27937

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/browser/skin/template.pt
   z3lab/cpsskins/branches/jmo-perspectives/portlets/actions/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/portlets/breadcrumbs/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/portlets/custom/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/portlets/dummy/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/portlets/image/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/portlets/macroslot/__init__.py
Log:

- fixed the rendering of macroslot's content

  location, request, view, template parameters will be converted into 
  a Context object



Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/__init__.py  
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/__init__.py  
Tue Oct  4 21:07:05 2005
@@ -192,7 +192,8 @@
 if element.isLeaf():
 location = kw.get('location')
 view = kw.get('view')
-data = element.getDisplayData(location, request, view)
+template = kw.get('template')
+data = element.getDisplayData(location, request, view, template)
 else:
 nodes = element.getChildNodes(info=info)
 # XXX avoid inserting kw arguments here

Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/skin/template.pt
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/skin/template.pt   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/skin/template.pt   Tue Oct 
 4 21:07:05 2005
@@ -18,6 +18,7 @@
   tmutil=tmutil,
   location=context,
   view=view,
+  template=template,
   engine='default')" />
   
 

Modified: z3lab/cpsskins/branches/jmo-perspectives/portlets/actions/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/portlets/actions/__init__.py   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/portlets/actions/__init__.py   
Tue Oct  4 21:07:05 2005
@@ -34,7 +34,7 @@
 self.category = category
 Portlet.__init__(self, **kw)
 
-def getDisplayData(self, location, request, view):
+def getDisplayData(self, location, request, view, template):
 try:
menu = getMenu(self.category, location, request)
 except ComponentLookupError:

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/portlets/breadcrumbs/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/portlets/breadcrumbs/__init__.py   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/portlets/breadcrumbs/__init__.py   
Tue Oct  4 21:07:05 2005
@@ -33,8 +33,7 @@
 def __init__(self, **kw):
 Portlet.__init__(self, **kw)
 
-def getDisplayData(self, location, request, view):
- 
+def getDisplayData(self, location, request, view, template):
 url = getMultiAdapter((location, request), IAbsoluteURL)
 items = [
 Item(

Modified: z3lab/cpsskins/branches/jmo-perspectives/portlets/custom/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/portlets/custom/__init__.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/portlets/custom/__init__.py
Tue Oct  4 21:07:05 2005
@@ -57,8 +57,7 @@
 markup = html_quote(e)
 return markup
 
-def getDisplayData(self, location, request, view):
-
+def getDisplayData(self, location, request, view, template):
 format = self.format
 if format in page_factories:
 page = page_factories[format]()

Modified: z3lab/cpsskins/branches/jmo-perspectives/portlets/dummy/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/portlets/dummy/__init__.py 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/portlets/dummy/__init__.py Tue Oct 
 4 21:07:05 2005
@@ -47,6 +47,6 @@
 self.text = text
 Portlet.__init__(self, **kw)
 
-def getDisplayData(self, location, request, view):
+def getDisplayData(self, location, request, view, template):
 markup = '%s' % self.text
 return DisplayData(title=self.title, content=HTML(markup))

Modified: z3lab/cpsskins/branches/jmo-perspectives/portlets/image/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/portlets/image/__ini

[Z3lab-checkins] r27938 - in z3lab/cpsskins/branches/jmo-perspectives: browser/renderers portlets/actions portlets/breadcrumbs portlets/custom portlets/dummy portlets/image portlets/macroslot

[svn]

Author: jmorliaguet
Date: Tue Oct  4 21:36:45 2005
New Revision: 27938

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/portlets/actions/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/portlets/breadcrumbs/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/portlets/custom/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/portlets/dummy/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/portlets/image/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/portlets/macroslot/__init__.py
Log:

- simpler code:  the information about the rendering context is store in the
  'info' Context object



Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/__init__.py  
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/__init__.py  
Tue Oct  4 21:36:45 2005
@@ -182,6 +182,11 @@
 request = info.request
 element = info.element
 
+# context info
+info.location = kw.get('location')
+info.template = kw.get('template')
+info.view = kw.get('view')
+
 # XXX this can be cached.
 tmutil = getThemeManager()
 theme = tmutil.getThemeInContext(element)
@@ -190,10 +195,7 @@
 data = []
 
 if element.isLeaf():
-location = kw.get('location')
-view = kw.get('view')
-template = kw.get('template')
-data = element.getDisplayData(location, request, view, template)
+data = element.getDisplayData(info=info)
 else:
 nodes = element.getChildNodes(info=info)
 # XXX avoid inserting kw arguments here

Modified: z3lab/cpsskins/branches/jmo-perspectives/portlets/actions/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/portlets/actions/__init__.py   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/portlets/actions/__init__.py   
Tue Oct  4 21:36:45 2005
@@ -34,9 +34,9 @@
 self.category = category
 Portlet.__init__(self, **kw)
 
-def getDisplayData(self, location, request, view, template):
+def getDisplayData(self, info):
 try:
-   menu = getMenu(self.category, location, request)
+   menu = getMenu(self.category, info.location, info.request)
 except ComponentLookupError:
items = []
 else:

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/portlets/breadcrumbs/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/portlets/breadcrumbs/__init__.py   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/portlets/breadcrumbs/__init__.py   
Tue Oct  4 21:36:45 2005
@@ -33,8 +33,8 @@
 def __init__(self, **kw):
 Portlet.__init__(self, **kw)
 
-def getDisplayData(self, location, request, view, template):
-url = getMultiAdapter((location, request), IAbsoluteURL)
+def getDisplayData(self, info):
+url = getMultiAdapter((info.location, info.request), IAbsoluteURL)
 items = [
 Item(
 title=bc['name'],

Modified: z3lab/cpsskins/branches/jmo-perspectives/portlets/custom/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/portlets/custom/__init__.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/portlets/custom/__init__.py
Tue Oct  4 21:36:45 2005
@@ -57,13 +57,13 @@
 markup = html_quote(e)
 return markup
 
-def getDisplayData(self, location, request, view, template):
+def getDisplayData(self, info):
 format = self.format
 if format in page_factories:
 page = page_factories[format]()
-page = contained(page, location)
+page = contained(page, info.location)
 page.setSource(self.source)
-markup = self._renderPage(page, request)
+markup = self._renderPage(page, info.request)
 else:
 markup = _("Page not configured.")
 

Modified: z3lab/cpsskins/branches/jmo-perspectives/portlets/dummy/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/portlets/dummy/__init__.py 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/portlets/dummy/__init__.py Tue Oct 
 4 21:36:45 2005
@@ -47,6 +47,7 @@
 self.text = text
 Portlet.__init__(self, **kw)
 
-def getDisplayData(self, location, request, view, template):
+def getDisplayData(self, info):
 markup = '%s' % self.text
 return DisplayData(title=self.title, content

[Z3lab-checkins] r27939 - z3lab/cpsskins/branches/jmo-perspectives/doc

[svn]

Author: jmorliaguet
Date: Tue Oct  4 22:46:00 2005
New Revision: 27939

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt
Log:

- test updates



Modified: z3lab/cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt
==
--- z3lab/cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt  
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt  Tue Oct 
 4 22:46:00 2005
@@ -30,8 +30,9 @@
to obtain the data, the portlet's getDisplayData()' method is called:
 
 >>> from cpsskins.model import DisplayData
->>> location, view = (None, None)
->>> data = portlet.getDisplayData(location, request, view)
+>>> from cpsskins.browser.renderers import Context
+>>> info = Context({'request': request})
+>>> data = portlet.getDisplayData(info)
 
which should return a 'DisplayData' object:
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27940 - z3lab/cpsskins/branches/jmo-perspectives/elements

[svn]

Author: jmorliaguet
Date: Tue Oct  4 22:47:29 2005
New Revision: 27940

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py
Log:

- interface update



Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py Tue Oct 
 4 22:47:29 2005
@@ -217,7 +217,7 @@
 def getIdentifier():
 """ """
 
-def getDisplayData(location, request, view):
+def getDisplayData(info):
 """ """
 
 class ISlot(ICanvas, IContentContainer):
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27941 - in z3lab/cpsskins/branches/jmo-perspectives: relations storage

[svn]

Author: jmorliaguet
Date: Tue Oct  4 23:07:07 2005
New Revision: 27941

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/relations/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/storage/relations.py
Log:

- test fix



Modified: z3lab/cpsskins/branches/jmo-perspectives/relations/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/relations/__init__.py  
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/relations/__init__.py  Tue Oct 
 4 23:07:07 2005
@@ -212,10 +212,7 @@
 '_ is white'
 
 >>> r
-
-
->>> r()
-'snow is white'
+
 
 >>> relates = r.values()
 >>> relates[0] is first
@@ -239,7 +236,8 @@
 "A monadic relation only has a first element."
 
 def __repr__(self):
-return '' % str(self)
+predicate = str(self()).replace('_', '%s')
+return "" % (predicate % str(self.first))
 
 
 class DyadicRelation(Relation):
@@ -256,10 +254,7 @@
 '_ has format _'
 
 >>> r
-
-
->>> r()
-'Box has format Vertical Menu'
+
 
 >>> relates = r.values()
 >>> relates[0] is first
@@ -290,7 +285,10 @@
 "A dyadic relation only has a first and a second element."
 
 def __repr__(self):
-return '' % str(self)
+predicate = str(self()).replace('_', '%s')
+return "" % (
+predicate % (str(self.first), str(self.second))
+)
 
 
 class TriadicRelation(Relation):
@@ -308,10 +306,7 @@
 '_ converts _ into _'
 
 >>> r
-
-
->>> r()
-'converter converts text into html'
+
 
 >>> relates = r.values()
 >>> relates[0] is first
@@ -349,7 +344,10 @@
 "A triadic relation only has a first, second and third element."
 
 def __repr__(self):
-return '' % str(self)
+predicate = str(self()).replace('_', '%s')
+return "" % (
+predicate % (str(self.first), str(self.second), str(self.third))
+)
 
 class TestRelate:
 """A relatable object for testing.

Modified: z3lab/cpsskins/branches/jmo-perspectives/storage/relations.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/storage/relations.py   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/storage/relations.py   Tue Oct 
 4 23:07:07 2005
@@ -17,6 +17,8 @@
 """
 __docformat__ = "reStructuredText"
 
+from pprint import pprint
+
 from BTrees.OOBTree import OOBTree
 
 from zope.app import zapi
@@ -71,8 +73,8 @@
 >>> predicate = Predicate('_ depends on _')
 >>> r = DyadicRelation(predicate, first, second)
 
->>> r()
-'this depends on that'
+>>> r
+
 
 >>> list(storage._relates.keys())
 []
@@ -183,19 +185,17 @@
 >>> storage['some_black'] = b_is_black
 
 The relations matching '_ is white' are:
->>> res = storage.list(Predicate(is_white))
->>> res, [storage[r] for r in res]
-([u'some_white'], ['snow is white'])
+>>> pprint([repr(storage[r]) for r in storage.list(Predicate(is_white))])
+[""]
 
 The relations matching '_ is black' are:
->>> res = storage.list(Predicate(is_black))
->>> res, [storage[r] for r in res]
-([u'some_black'], ['ebony is black'])
+>>> pprint([repr(storage[r]) for r in storage.list(Predicate(is_black))])
+[""]
 
 Relations matching the compound ('_ is black', '_is white') are:
 >>> res = storage.list(CompoundPredicate(is_black_or_white))
->>> res, [storage[r] for r in res]
-([u'some_black', u'some_white'], ['ebony is black', 'snow is white'])
+>>> pprint([repr(storage[r]) for r in res])
+["", ""]
 
 Finally, we clear the storage:
 >>> list(storage.keys())
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27942 - z3lab/cpsskins/branches/jmo-perspectives/elements

[svn]

Author: jmorliaguet
Date: Tue Oct  4 23:14:52 2005
New Revision: 27942

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/elements/portlet.py
Log:

- API update



Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/portlet.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/elements/portlet.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/portlet.pyTue Oct 
 4 23:14:52 2005
@@ -35,16 +35,16 @@
 >>> portlet
 Portlet('Some portlet')
 
->>> portlet.getDisplayData(None, None, None)
+>>> portlet.getDisplayData(None)
 Traceback (most recent call last):
 ...
 NotImplementedError: Portlet needs to override getDisplayData()
 
->>> def fake_getDisplayData(location, request, view):
+>>> def fake_getDisplayData(info):
 ... return 'Some data'
 
 >>> portlet.getDisplayData = fake_getDisplayData
->>> portlet.getDisplayData(None, None, None)
+>>> portlet.getDisplayData(None)
 'Some data'
 
 """
@@ -58,7 +58,7 @@
 def __repr__(self):
 return "Portlet('%s')" % self.title
 
-def getDisplayData(self, location, request, view):
+def getDisplayData(self, info):
 raise NotImplementedError(
   "Portlet needs to override getDisplayData()")
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27943 - in z3lab/cpsskins/branches/jmo-perspectives: relations storage

[svn]

Author: jmorliaguet
Date: Tue Oct  4 23:39:24 2005
New Revision: 27943

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/relations/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/storage/relations.py
Log:

- more readable __repr__() for relations



Modified: z3lab/cpsskins/branches/jmo-perspectives/relations/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/relations/__init__.py  
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/relations/__init__.py  Tue Oct 
 4 23:39:24 2005
@@ -237,7 +237,7 @@
 
 def __repr__(self):
 predicate = str(self()).replace('_', '%s')
-return "" % (predicate % str(self.first))
+return "" % (predicate % repr(self.first))
 
 
 class DyadicRelation(Relation):
@@ -287,7 +287,7 @@
 def __repr__(self):
 predicate = str(self()).replace('_', '%s')
 return "" % (
-predicate % (str(self.first), str(self.second))
+predicate % (repr(self.first), repr(self.second))
 )
 
 
@@ -346,7 +346,7 @@
 def __repr__(self):
 predicate = str(self()).replace('_', '%s')
 return "" % (
-predicate % (str(self.first), str(self.second), str(self.third))
+predicate % (repr(self.first), repr(self.second), repr(self.third))
 )
 
 class TestRelate:
@@ -360,3 +360,6 @@
 def __str__(self):
 return self.name
 
+def __repr__(self):
+return self.name
+

Modified: z3lab/cpsskins/branches/jmo-perspectives/storage/relations.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/storage/relations.py   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/storage/relations.py   Tue Oct 
 4 23:39:24 2005
@@ -238,8 +238,7 @@
 relation_name = chooser.chooseName(name, relation)
 self[relation_name] = relation
 logger.log(DEBUG,
-"Added a relation with id '%s' and predicate '%s' connecting %s"
-% (relation_name, str(relation), list(relation))
+"Added a relation '%s'; '%s'" % (relation_name, repr(relation))
 )
 
 def remove(self, ids=[]):
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27944 - z3lab/cpsskins/branches/jmo-perspectives

[svn]

Author: jmorliaguet
Date: Wed Oct  5 00:10:03 2005
New Revision: 27944

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/INSTALL.txt
Log:

- updated installation instructions (cf. jsonserver / trunk)



Modified: z3lab/cpsskins/branches/jmo-perspectives/INSTALL.txt
==
--- z3lab/cpsskins/branches/jmo-perspectives/INSTALL.txt(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/INSTALL.txtWed Oct  5 
00:10:03 2005
@@ -2,7 +2,20 @@
 INSTALLATION INSTRUCTIONS
 =
 
-Last changed: 2005-09-09
+Last changed: 2005-10-05
+
+
+LAST MINUTE INFORMATION
+---
+
+jsonserver as of 2005-10-05 is out of sync with the zope3 trunk:
+
+run:
+
+$ cd ~Zope3/src
+$ svn up -r 38722 src/zope/app/server/wsgi.py
+
+until jsonserver is in sync again.
 
 
 PREREQUISITES
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27945 - z3lab/Zope3Benchs/trunk

[svn]

Author: janguenot
Date: Wed Oct  5 00:21:44 2005
New Revision: 27945

Modified:
   z3lab/Zope3Benchs/trunk/Zope3.conf
Log:
Update

Modified: z3lab/Zope3Benchs/trunk/Zope3.conf
==
--- z3lab/Zope3Benchs/trunk/Zope3.conf  (original)
+++ z3lab/Zope3Benchs/trunk/Zope3.conf  Wed Oct  5 00:21:44 2005
@@ -47,7 +47,7 @@
 # Monitoring configuration
 #
 [monitor]
-#hosts=localhost
+hosts=localhost
 
 # Each host in [monitor]hosts should have a section
 # with a 'port' and 'description' keys
@@ -90,10 +90,10 @@
 [bench]
 
 # cycles = list of cycles with their number of concurrent users
-cycles =  1:2:3
+cycles =  1:10:100
 
 # duration = duration of a cycle in seconds
-duration = 250
+duration = 50
 
 # startup_delay = time to wait between starting-up threads in seconds
 startup_delay = 0.2
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27946 - z3lab/Zope3Benchs/trunk/shoots

[svn]

Author: janguenot
Date: Wed Oct  5 00:47:00 2005
New Revision: 27946

Removed:
   z3lab/Zope3Benchs/trunk/shoots/
Log:
remove this
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27947 - z3lab/cpsskins/branches/jmo-perspectives/browser/authoring

[svn]

Author: jmorliaguet
Date: Wed Oct  5 10:55:31 2005
New Revision: 27947

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt
Log:

- fix if the edited element has not display of its own.



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/edit_menu.pt 
Wed Oct  5 10:55:31 2005
@@ -9,7 +9,7 @@
 displayable context/displayable:this;
 actual_display python: displayable.getDisplay(perspective);
 display python: displayable.getEffectiveDisplay(perspective);
-formattable display/formattable:this;
+formattable display/formattable:this|nothing;
 edited formattable/?format_name|context;
 edit_url string:${edited/@@absolute_url}/@@edit.html;
 main_url request/form/main_url|edit_url"
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27948 - z3lab/cpsskins/branches/jmo-perspectives/elements

[svn]

Author: jmorliaguet
Date: Wed Oct  5 10:56:41 2005
New Revision: 27948

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py
Log:

- removed deprecation warning



Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py Wed Oct 
 5 10:56:41 2005
@@ -20,7 +20,7 @@
 from zope.app.annotation.interfaces import IAttributeAnnotatable
 from zope.app.container.constraints import contains, containers
 from zope.app.container.interfaces import IContained
-from zope.app.container.interfaces import IOrderedContainer, IContentContainer
+from zope.app.container.interfaces import IOrderedContainer, IContainer
 from zope.i18nmessageid import MessageIDFactory
 from zope.interface import Interface
 from zope.interface.interfaces import IInterface
@@ -220,7 +220,7 @@
 def getDisplayData(info):
 """ """
 
-class ISlot(ICanvas, IContentContainer):
+class ISlot(ICanvas, IContainer):
 """A slot.
 """
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27949 - z3lab/cpsskins/branches/jmo-perspectives/elements

[svn]

Author: jmorliaguet
Date: Wed Oct  5 11:16:36 2005
New Revision: 27949

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py
Log:

- ISlot is an item container



Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py Wed Oct 
 5 11:16:36 2005
@@ -20,7 +20,7 @@
 from zope.app.annotation.interfaces import IAttributeAnnotatable
 from zope.app.container.constraints import contains, containers
 from zope.app.container.interfaces import IContained
-from zope.app.container.interfaces import IOrderedContainer, IContainer
+from zope.app.container.interfaces import IOrderedContainer, IItemContainer
 from zope.i18nmessageid import MessageIDFactory
 from zope.interface import Interface
 from zope.interface.interfaces import IInterface
@@ -220,7 +220,7 @@
 def getDisplayData(info):
 """ """
 
-class ISlot(ICanvas, IContainer):
+class ISlot(ICanvas, IItemContainer):
 """A slot.
 """
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27950 - in z3lab/cpsskins/branches/jmo-perspectives: browser/authoring elements

[svn]

Author: jmorliaguet
Date: Wed Oct  5 11:17:28 2005
New Revision: 27950

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt
   z3lab/cpsskins/branches/jmo-perspectives/elements/views.py
Log:

- some view manager fixes for objects that inherit the display of other elements



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/view_editor.pt   
Wed Oct  5 11:17:28 2005
@@ -1,15 +1,22 @@
 
   
-
-  View editor
-  The views associated to this element are listed in the table 
below:
-  
-
+
+  View editor
+
+  No view is directly associated with 
this element.
+
+  
+
+The views associated to this element are listed in the table 
below:
+
   
 View
 Display
@@ -18,6 +25,7 @@
   
 
   
+
   
 http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27951 - z3lab/cpsskins/branches/jmo-perspectives/elements/displays

[svn]

Author: jmorliaguet
Date: Wed Oct  5 11:36:12 2005
New Revision: 27951

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/elements/displays/interfaces.py
Log:

- permission fixes



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/elements/displays/interfaces.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/elements/displays/interfaces.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/displays/interfaces.py
Wed Oct  5 11:36:12 2005
@@ -33,3 +33,10 @@
 
 def remove(item):
 """ """
+
+def __contains__(value):
+"""Return whether the value is contained in the box group"""
+
+def index(value):
+"""Return the position of a value in the box group"""
+
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27958 - z3lab/Zope3Benchs/trunk

[svn]

Author: janguenot
Date: Wed Oct  5 12:56:28 2005
New Revision: 27958

Modified:
   z3lab/Zope3Benchs/trunk/test_Zope3.py
Log:
Extract the cleanup of buddy folders outside of the tearDown to avoid side 
effects on the metrics

Modified: z3lab/Zope3Benchs/trunk/test_Zope3.py
==
--- z3lab/Zope3Benchs/trunk/test_Zope3.py   (original)
+++ z3lab/Zope3Benchs/trunk/test_Zope3.py   Wed Oct  5 12:56:28 2005
@@ -197,10 +197,8 @@
 self.get("%s/%s" %(server_url, id_),
  description="View a buddy folder")
 
-def tearDown(self):
-"""Setting down test.
-
-Remove the buddy folders created during the test
+def test_ZZZ_RemoveBuddyFolders(self):
+"""Remove all the created buddy folders
 """
 server_url = self.zope_url
 self.setBasicAuth(self.admin_id, self.admin_pwd)
@@ -211,7 +209,12 @@
 self.post("%s/@@contents.html" % server_url,
   params=params,
   description="Delete several buddy folders")
-
+
+def tearDown(self):
+"""Setting down test.
+
+Remove the buddy folders created during the test
+"""
 self.logd("tearDown.")
 
 if __name__ in ('main', '__main__'):
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27959 - z3lab/Zope3Benchs/trunk

[svn]

Author: janguenot
Date: Wed Oct  5 13:02:31 2005
New Revision: 27959

Modified:
   z3lab/Zope3Benchs/trunk/test_Zope3.py
Log:
Fix test

Modified: z3lab/Zope3Benchs/trunk/test_Zope3.py
==
--- z3lab/Zope3Benchs/trunk/test_Zope3.py   (original)
+++ z3lab/Zope3Benchs/trunk/test_Zope3.py   Wed Oct  5 13:02:31 2005
@@ -69,7 +69,7 @@
 This request the default Zope3 page
 """
 server_url = self.zope_url
-self.setBasicAuth(self.admin_id, self.admin_pwd)
+self.setBasicAuth(self.member_id, self.member_pwd)
 self.get("%s/" % server_url, description="Zope3 default page")
 
 def test_00_BuddyDemoApp_RW(self):
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27966 - z3lab/Zope3Benchs/trunk

[svn]

Author: janguenot
Date: Wed Oct  5 15:15:42 2005
New Revision: 27966

Modified:
   z3lab/Zope3Benchs/trunk/Zope3.conf
Log:
Change cycles

Modified: z3lab/Zope3Benchs/trunk/Zope3.conf
==
--- z3lab/Zope3Benchs/trunk/Zope3.conf  (original)
+++ z3lab/Zope3Benchs/trunk/Zope3.conf  Wed Oct  5 15:15:42 2005
@@ -90,7 +90,7 @@
 [bench]
 
 # cycles = list of cycles with their number of concurrent users
-cycles =  1:10:100
+cycles =  1:10:20:30:40:50:60
 
 # duration = duration of a cycle in seconds
 duration = 50
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27967 - z3lab/Zope3Benchs/trunk

[svn]

Author: janguenot
Date: Wed Oct  5 15:16:57 2005
New Revision: 27967

Modified:
   z3lab/Zope3Benchs/trunk/test_Zope3.py
Log:
Fix read tests by fetching a buddy folder randomly and viewing the contents

Modified: z3lab/Zope3Benchs/trunk/test_Zope3.py
==
--- z3lab/Zope3Benchs/trunk/test_Zope3.py   (original)
+++ z3lab/Zope3Benchs/trunk/test_Zope3.py   Wed Oct  5 15:16:57 2005
@@ -20,7 +20,8 @@
 $Id$
 """
 import unittest
-from random import random
+import random
+
 from funkload.FunkLoadTestCase import FunkLoadTestCase
 from funkload.Lipsum import Lipsum
 
@@ -72,6 +73,11 @@
 self.setBasicAuth(self.member_id, self.member_pwd)
 self.get("%s/" % server_url, description="Zope3 default page")
 
+def _genBuddyFolderId(self):
+"""Generate an id for a buddy folder
+"""
+return 'buddy_folder_' + self._lipsum.getUniqWord()
+
 def test_00_BuddyDemoApp_RW(self):
 """Test the buddy demo application.
 
@@ -95,7 +101,7 @@
 while j < int(nb_buddies_folder):
 
 # Create the buddies folder
-buddies_folder_id = self._lipsum.getUniqWord()
+buddies_folder_id = self._genBuddyFolderId()
 params = [
 ['type_name', 'BrowserAdd__buddydemo.buddy.BuddyFolder'],
 ['id', buddies_folder_id],
@@ -177,25 +183,34 @@
 
 j += 1
 
+def _test_BuddyDemoApp_READ_As(self):
+
+server_url = self.zope_url
+
+# Request the @@contents.html at the root of Zope3
+self.get("%s" %(server_url),
+ description="View the buddy folders")
+
+# Find randomly one of the buddy folders created and try to
+# view it
+links = self.listHref(pattern='buddy_folder_')
+if links:
+index = random.randrange(len(links)-1)
+url = links[index]
+self.get("%s/%s" %(server_url, url),
+ description="View a buddy folder")
+
 def test_BuddyDemoApp_READ_As_Manager(self):
 """Tests read only tests 
 """
 self.setBasicAuth(self.admin_id, self.admin_pwd)
-
-# Display the contents of each buddy folders
-for id_ in self._buddies_folder_ids:
-self.get("%s/%s" %(server_url, id_),
- description="View a buddy folder")
+self._test_BuddyDemoApp_READ_As()
 
 def test_BuddyDemoApp_READ_As_Member(self):
 """Tests read only tests 
 """
 self.setBasicAuth(self.member_id, self.member_pwd)
-
-# Display the contents of each buddy folders
-for id_ in self._buddies_folder_ids:
-self.get("%s/%s" %(server_url, id_),
- description="View a buddy folder")
+self._test_BuddyDemoApp_READ_As()
 
 def test_ZZZ_RemoveBuddyFolders(self):
 """Remove all the created buddy folders
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27970 - z3lab/Zope3Benchs/trunk

[svn]

Author: janguenot
Date: Wed Oct  5 16:26:46 2005
New Revision: 27970

Modified:
   z3lab/Zope3Benchs/trunk/test_Zope3.py
Log:
test_00_BuddyDemoApp_RW was too big 

 Split it in 2 tests:

  - one that creates the buddy folders at the root of Zope3
  - one that find randomly a container and create the buddies
  
This way you will have a readable report (not with 165 pages) and you
can run a bench faster as you can use a short cycle duration



Modified: z3lab/Zope3Benchs/trunk/test_Zope3.py
==
--- z3lab/Zope3Benchs/trunk/test_Zope3.py   (original)
+++ z3lab/Zope3Benchs/trunk/test_Zope3.py   Wed Oct  5 16:26:46 2005
@@ -31,6 +31,8 @@
 This test use a configuration file Zope3.conf.
 """
 
+_buddies_folder_ids = []
+
 def setUp(self):
 """Setting up test.
 """
@@ -44,8 +46,19 @@
 # To generate words
 self._lipsum = Lipsum()
 
-# For cleaning up at the end
-self._buddies_folder_ids = []
+def _genBuddyFolderId(self):
+"""Generate an id for a buddy folder
+"""
+return 'funk_buddy_folder_' + self._lipsum.getUniqWord()
+
+def _genBuddyId(self):
+"""Generate an id for a buddy
+"""
+return 'funk_buddy_' + self._lipsum.getUniqWord()
+
+#
+# Default page tests (READ ONLY)
+#
 
 def test_EmptyInstance_As_Anonymous(self):
 """Test an empty instance as anonymous user
@@ -73,10 +86,49 @@
 self.setBasicAuth(self.member_id, self.member_pwd)
 self.get("%s/" % server_url, description="Zope3 default page")
 
-def _genBuddyFolderId(self):
-"""Generate an id for a buddy folder
+#
+# buddydemo app tests. (READ ONLY)
+#
+
+def _getAllBuddyFolderLinksAtRoot(self):
+server_url = self.zope_url
+self.get("%s" %server_url, description="View the buddy folders")
+return self.listHref(pattern='funk_buddy_folder_')
+
+def _getOneBuddyFolderURL(self):
+server_url = self.zope_url
+links = self._getAllBuddyFolderLinksAtRoot()
+if links:
+index = random.randrange(len(links)-1)
+url = links[index]
+return server_url + '/' + url
+return server_url
+
+def _test_BuddyDemoApp_READ_As(self):
+server_url = self.zope_url
+url = self._getOneBuddyFolderURL()
+self.get(url, description="View a buddy folder")
+
+def test_BuddyDemoApp_READ_As_Manager(self):
+"""Tests read only tests
+"""
+self.setBasicAuth(self.admin_id, self.admin_pwd)
+self._test_BuddyDemoApp_READ_As()
+
+def test_BuddyDemoApp_READ_As_Member(self):
+"""Tests read only tests
+"""
+self.setBasicAuth(self.member_id, self.member_pwd)
+self._test_BuddyDemoApp_READ_As()
+
+def test_BuddyDemoApp_READ_As_Anonymous(self):
+"""Tests read only tests
 """
-return 'buddy_folder_' + self._lipsum.getUniqWord()
+self._test_BuddyDemoApp_READ_As()
+
+#
+# buddydemo tests (READ/WRITE)
+#
 
 def test_00_BuddyDemoApp_RW(self):
 """Test the buddy demo application.
@@ -88,10 +140,9 @@
 
 nb_buddies_folder = self.conf_get(
 'test_00_BuddyDemoApp_RW', 'nb_buddies_folder')
-nb_buddies_per_folder = self.conf_get(
-'test_00_BuddyDemoApp_RW', 'nb_buddies_per_folder')
 
 self.setBasicAuth(self.admin_id, self.admin_pwd)
+
 self.get("%s/" % server_url, description="Zope3 default page")
 self.get("%s/@@+" % server_url,
  description="Zope3 `add content page` "
@@ -110,120 +161,97 @@
 self.post("%s/@@+/action.html" % server_url,
   params=params, description="Add a buddy")
 
-# Create 500 buddies
-
-self.get("%s/%s/@@contents.html" %(server_url, buddies_folder_id),
- description="View the Zope3 root content items")
-
-i = 0
-while i < int(nb_buddies_per_folder):
-self.get("%s/%s/@@+" %(server_url, buddies_folder_id),
- description="Buddy folder `add content`page")
-
-# Create the buddies folder
-# Step1 : Ask for the creation given an id
-buddy_id = self._lipsum.getUniqWord()
-params = [
-['type_name', 'AddBuddy.html'],
-['id', buddy_id],
-['add', ' Add '],
-]
-self.post("%s/@@+/action.html" % server_url, params,
-  description="Request to add a buddy")
-
-# Give informations and create the buddy
-params = [
-['type_name', 'AddBuddy.html'],
-['field.first', self._lipsum.getWord()],
-['field.last', self._lipsum.getWord(

[Z3lab-checkins] r27973 - z3lab/Zope3Benchs/trunk

[svn]

Author: janguenot
Date: Wed Oct  5 17:07:23 2005
New Revision: 27973

Modified:
   z3lab/Zope3Benchs/trunk/test_Zope3.py
Log:
Cleanups

Modified: z3lab/Zope3Benchs/trunk/test_Zope3.py
==
--- z3lab/Zope3Benchs/trunk/test_Zope3.py   (original)
+++ z3lab/Zope3Benchs/trunk/test_Zope3.py   Wed Oct  5 17:07:23 2005
@@ -15,16 +15,38 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 #
-"""Simple funkload zope3 tests
+"""Funkload Zope3 tests
+
+The aims of this test case is to be able to get bench out of this
+tests using Funkload.
+
+Run this against the Zope3 trunk (3.2)
+
+Note, you'll need the buddydemo component
 
 $Id$
 """
+
 import unittest
 import random
 
 from funkload.FunkLoadTestCase import FunkLoadTestCase
 from funkload.Lipsum import Lipsum
 
+DEFAULT_PAGE_DESCRIPTION = "Zope3 default page"
+ROOT_ADD_CONTENT_PAGE = "Zope3 root `add content` form"
+
+BUDDY_FOLDER_VIEW = "View a buddy folder"
+BUBDDY_FOLDER_ADD_CONTENT_PAGE = "Buddy folder `add content` form"
+
+BUDDY_ADD_FORM = "Form to add a buddy"
+BUDDY_ADD = "Add a buddy"
+BUDDY_EDIT_FORM = "Form to edit a buddy"
+BUDDY_EDIT = "Edit a buddy"
+
+BUDDY_FOLDER_PREFIX = 'funk_buddy_folder_'
+BUDDY_PREFIX = 'funk_buddy_folder_'
+
 class Zope3(FunkLoadTestCase):
 """Testing Zope3
 
@@ -46,107 +68,71 @@
 # To generate words
 self._lipsum = Lipsum()
 
-def _genBuddyFolderId(self):
-"""Generate an id for a buddy folder
-"""
-return 'funk_buddy_folder_' + self._lipsum.getUniqWord()
-
-def _genBuddyId(self):
-"""Generate an id for a buddy
-"""
-return 'funk_buddy_' + self._lipsum.getUniqWord()
-
 #
-# Default page tests (READ ONLY)
+# Default Zope3 page tests (READ ONLY)
 #
 
-def test_EmptyInstance_As_Anonymous(self):
-"""Test an empty instance as anonymous user
-
-This request the default Zope3 page
+def test_DefaultZ3Page_As_Anonymous(self):
+"""This requests the default Zope3 page as anonymous
 """
-server_url = self.zope_url
-self.get("%s/" % server_url, description="Zope3 default page")
-
-def test_EmptyInstance_As_Manager(self):
-"""Test an ampty instance as Manager
+self.get(self.zope_url, description=DEFAULT_PAGE_DESCRIPTION)
 
-This request the default Zope3 page
+def test_DefaultZ3Page_As_Manager(self):
+"""This requests the default Zope3 page as a Manager
 """
-server_url = self.zope_url
 self.setBasicAuth(self.admin_id, self.admin_pwd)
-self.get("%s/" % server_url, description="Zope3 default page")
+self.get(self.zope_url, description=DEFAULT_PAGE_DESCRIPTION)
 
 def test_EmptyInstance_As_Member(self):
-"""Test an ampty instance as Member
-
-This request the default Zope3 page
+"""This requests the default Zope3 page as a Member
 """
-server_url = self.zope_url
 self.setBasicAuth(self.member_id, self.member_pwd)
-self.get("%s/" % server_url, description="Zope3 default page")
+self.get(self.zope_url, description=DEFAULT_PAGE_DESCRIPTION)
 
 #
 # buddydemo app tests. (READ ONLY)
 #
 
-def _getAllBuddyFolderLinksAtRoot(self):
-server_url = self.zope_url
-self.get("%s" %server_url, description="View the buddy folders")
-return self.listHref(pattern='funk_buddy_folder_')
-
-def _getOneBuddyFolderURL(self):
-server_url = self.zope_url
-links = self._getAllBuddyFolderLinksAtRoot()
-if links:
-index = random.randrange(len(links)-1)
-url = links[index]
-return server_url + '/' + url
-return server_url
-
-def _test_BuddyDemoApp_READ_As(self):
-server_url = self.zope_url
-url = self._getOneBuddyFolderURL()
-self.get(url, description="View a buddy folder")
-
 def test_BuddyDemoApp_READ_As_Manager(self):
-"""Tests read only tests
+"""As Manager, Request randomly the view of one of the buddy
+folders created
 """
 self.setBasicAuth(self.admin_id, self.admin_pwd)
-self._test_BuddyDemoApp_READ_As()
+self._viewOneBuddyFolder()
 
 def test_BuddyDemoApp_READ_As_Member(self):
-"""Tests read only tests
+"""As Member, Request randomly the view of one of the buddy
+folders created
 """
 self.setBasicAuth(self.member_id, self.member_pwd)
-self._test_BuddyDemoApp_READ_As()
+self._viewOneBuddyFolder()
 
 def test_BuddyDemoApp_READ_As_Anonymous(self):
-"""Tests read only tests
+"""As Anonymous user, Request randomly the view of one of the
+buddy folders created
 """
-self._test_BuddyDemoApp_READ_As()
+self._viewOneBuddyFolder()
 
 #
 # buddydemo tests

[Z3lab-checkins] r27975 - z3lab/Zope3Benchs/trunk

[svn]

Author: janguenot
Date: Wed Oct  5 17:27:19 2005
New Revision: 27975

Modified:
   z3lab/Zope3Benchs/trunk/test_Zope3.py
Log:
Rename

Modified: z3lab/Zope3Benchs/trunk/test_Zope3.py
==
--- z3lab/Zope3Benchs/trunk/test_Zope3.py   (original)
+++ z3lab/Zope3Benchs/trunk/test_Zope3.py   Wed Oct  5 17:27:19 2005
@@ -83,7 +83,7 @@
 self.setBasicAuth(self.admin_id, self.admin_pwd)
 self.get(self.zope_url, description=DEFAULT_PAGE_DESCRIPTION)
 
-def test_EmptyInstance_As_Member(self):
+def test_DefaultZ3Page_As_Member(self):
 """This requests the default Zope3 page as a Member
 """
 self.setBasicAuth(self.member_id, self.member_pwd)
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27977 - z3lab/Zope3Benchs/trunk

[svn]

Author: janguenot
Date: Wed Oct  5 18:13:08 2005
New Revision: 27977

Modified:
   z3lab/Zope3Benchs/trunk/Makefile
Log:
Makefile taking care of the test and the bench

Modified: z3lab/Zope3Benchs/trunk/Makefile
==
--- z3lab/Zope3Benchs/trunk/Makefile(original)
+++ z3lab/Zope3Benchs/trunk/MakefileWed Oct  5 18:13:08 2005
@@ -1,8 +1,81 @@
-.PHONY: clean check
+# Makefile of FunkLoad Zope3 tests
+.PHONY: clean all start stop restart status
+.PHONY:test bench
+.PHONY:start_monitor stop_monitor restart_monitor
 
-check:
-   pychecker2 *.py
+FLRUNTEST := fl-run-test -vv
+FLRUNBENCH := fl-run-bench
+FLBUILDREPORT :=  fl-build-report --html -o reports
+MONCTL := fl-monitor-ctl monitor.conf
 
-clean:
-   find . "(" -name "*~" -or  -name ".#*" -or -name "*.pyc" ")" -print0 | 
xargs -0 rm -f
+ifdef URL
+# FunkLoad options
+   FLOPS = -u $(URL)
+else
+   FLOPS =
+endif
+
+all: test
+
+# testing
+test:
+   $(MONCTL) start
+
+   $(FLRUNTEST) test_Zope3.py
+
+   $(MONCTL) stop
+
+bench:
+   $(MONCTL) start
+
+   $(FLRUNBENCH) -d5 test_Zope3.py Zope3.test_DefaultZ3Page_As_Anonymous
+   $(FLBUILDREPORT) zope3-bench.xml
+
+   $(FLRUNBENCH) -d5 test_Zope3.py Zope3.test_DefaultZ3Page_As_Member
+   $(FLBUILDREPORT) zope3-bench.xml
+
+   $(FLRUNBENCH) -d5 test_Zope3.py Zope3.test_DefaultZ3Page_As_Manager
+   $(FLBUILDREPORT) zope3-bench.xml
+
+   $(FLRUNBENCH) -d5 test_Zope3.py 
Zope3.test_BuddyDemoApp_READ_As_Anonymous
+   $(FLBUILDREPORT) zope3-bench.xml
+
+   $(FLRUNBENCH) -d5 test_Zope3.py Zope3.test_BuddyDemoApp_READ_As_Member
+   $(FLBUILDREPORT) zope3-bench.xml
+
+   $(FLRUNBENCH) -d5 test_Zope3.py Zope3.test_BuddyDemoApp_READ_As_Manager
+   $(FLBUILDREPORT) zope3-bench.xml
+
+   $(FLRUNBENCH) -d50 test_Zope3.py Zope3.test_00_BuddyDemoApp_RW
+   $(FLBUILDREPORT) zope3-bench.xml
 
+   $(FLRUNBENCH) -d50 test_Zope3.py Zope3.test_01_BuddyDemoApp_RW
+   $(FLBUILDREPORT) zope3-bench.xml
+
+   $(MONCTL) stop
+
+
+# Benching
+
+# monitor ctl
+start_monitor:
+   $(MONCTL) start
+
+stop_monitor:
+   -$(MONCTL) stop
+
+restart_monitor:
+   -$(MONCTL) restart
+
+# misc
+status:
+   -$(MONCTL) status;
+
+stop: stop_monitor
+
+start: start_monitor
+
+restart: restart_monitor
+
+clean:
+   -find . "(" -name "*~" -or  -name ".#*" -or -name "*.log" -or -name 
"*.pyc" -or -name "*.xml" -or -name "*bak*" ")" -print0 | xargs -0 rm -f
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27978 - z3lab/Zope3Benchs/trunk

[svn]

Author: janguenot
Date: Wed Oct  5 18:16:05 2005
New Revision: 27978

Added:
   z3lab/Zope3Benchs/trunk/principals.zcml   (contents, props changed)
Log:
sample Zope3 principals for tests

Added: z3lab/Zope3Benchs/trunk/principals.zcml
==
--- (empty file)
+++ z3lab/Zope3Benchs/trunk/principals.zcml Wed Oct  5 18:16:05 2005
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27979 - z3lab/Zope3Benchs/trunk

[svn]

Author: janguenot
Date: Wed Oct  5 18:16:18 2005
New Revision: 27979

Modified:
   z3lab/Zope3Benchs/trunk/README.txt
Log:
Update

Modified: z3lab/Zope3Benchs/trunk/README.txt
==
--- z3lab/Zope3Benchs/trunk/README.txt  (original)
+++ z3lab/Zope3Benchs/trunk/README.txt  Wed Oct  5 18:16:18 2005
@@ -30,39 +30,22 @@
 How to run the functional tests : 
 --
 
- First edit the Zope3.conf file. Eventually, change the server url and
- the credentials.
+1. Start your Zope3 instance on the 8080 port
+   Use the principals.zcml within this directory
 
- - with verbose output :
+2. $ make test
 
-   $ fl-run-test -v test_Zope3.py
+How to run the benchs and the reports: 
+---
 
- - with firefox views : 
+1. Start your Zope3 instance on the 8080 port
+   Use the principals.zcml within this directory
 
-   $ fl-run-test --firefox-view test_Zope3.py
-
-How to run the benchs : 
--
-
- $ fl-run-bench test_Zope3.py Zope3.test_BuddyDemoAp
-
-How to generate the bench reports :
-
-
-Screen output :
-
- $ fl-build-report zope3-bench.xml
-
-Html output : 
- 
- $ fl-build-report --html -o report zope3-bench.xml
- 
+2. $ make bench
 
 *IMPORTANT*
 
-DO NOT RUN THIS ON PRODUCTION INSTANCES  IT WILL CREATE LOTS OF
-OBJECTS WITHIN YOUR DATA.FS AND IT'S NOT CLEANUP UP FOR THE MOMENT
-
+DO NOT RUN THIS ON PRODUCTION INSTANCES  
 
 ... _[1] : http://funkload.nuxeo.org/
 ... _[2] : http://svn.zope.org/Zope3/trunk/src/buddydemo/
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27980 - z3lab/Zope3Benchs/trunk

[svn]

Author: janguenot
Date: Wed Oct  5 18:17:16 2005
New Revision: 27980

Modified:
   z3lab/Zope3Benchs/trunk/Zope3.conf
Log:
Change cycles since 10 users is already too much

Modified: z3lab/Zope3Benchs/trunk/Zope3.conf
==
--- z3lab/Zope3Benchs/trunk/Zope3.conf  (original)
+++ z3lab/Zope3Benchs/trunk/Zope3.conf  Wed Oct  5 18:17:16 2005
@@ -90,7 +90,7 @@
 [bench]
 
 # cycles = list of cycles with their number of concurrent users
-cycles =  1:10:20:30:40:50:60
+cycles =  1:2:4:8
 
 # duration = duration of a cycle in seconds
 duration = 50
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27983 - z3lab/Zope3Benchs/trunk

[svn]

Author: janguenot
Date: Wed Oct  5 19:50:00 2005
New Revision: 27983

Modified:
   z3lab/Zope3Benchs/trunk/Zope3.conf
Log:
Update description

Modified: z3lab/Zope3Benchs/trunk/Zope3.conf
==
--- z3lab/Zope3Benchs/trunk/Zope3.conf  (original)
+++ z3lab/Zope3Benchs/trunk/Zope3.conf  Wed Oct  5 19:50:00 2005
@@ -22,26 +22,31 @@
 # 
 # Tests description and configuration
 #
+[test_DefaultZ3Page_As_Anonymous]
+description=This requests the default Zope3 page as anonymous
 
-[test_EmptyInstance_As_Anonymous]
-description=Render default page as anonymous user
+[test_DefaultZ3Page_As_Manager]
+description=This requests the default Zope3 page as a Manager
 
-[test_EmptyInstance_As_Manager]
-description=Render default page as Manager
+[test_DefaultZ3Page_As_Member]
+description=This requests the default Zope3 page as a Member
 
-[test_EmptyInstance_As_Member]
-description=Render default page as Member
+[test_BuddyDemoApp_READ_As_Manager]
+description=As Manager, Request randomly the view of one of the buddy folders 
created
+
+[test_BuddyDemoApp_READ_As_Member]
+description=As Member, Request randomly the view of one of the buddy folders 
created
+
+[test_BuddyDemoApp_READ_As_Anonymous]
+description=As Anonymous user, Request randomly the view of one of the buddy 
folders created
 
 [test_00_BuddyDemoApp_RW]
-description=Read / write tests on the buddy demo app
+description=As Manager, create buddy folders
 nb_buddies_folder=5
 nb_buddies_per_folder=5
 
-[test_BuddyDemoApp_READ_As_Manager]
-description=Read tests on the buddy demo app as Manager
-
-[test_BuddyDemoApp_READ_As_Member]
-description=Read tests on the buddy demo app as Member
+[test_01_BuddyDemoApp_RW]
+description=As Manager, create buddies
 
 # 
 # Monitoring configuration
@@ -90,7 +95,7 @@
 [bench]
 
 # cycles = list of cycles with their number of concurrent users
-cycles =  1:2:4:8
+cycles =  1:2
 
 # duration = duration of a cycle in seconds
 duration = 50
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27986 - z3lab/cpsskins/branches/jmo-perspectives

[svn]

Author: jmorliaguet
Date: Wed Oct  5 23:19:11 2005
New Revision: 27986

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/INSTALL.txt
Log:

- jsonserver is sync with the zope3 trunk again



Modified: z3lab/cpsskins/branches/jmo-perspectives/INSTALL.txt
==
--- z3lab/cpsskins/branches/jmo-perspectives/INSTALL.txt(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/INSTALL.txtWed Oct  5 
23:19:11 2005
@@ -5,19 +5,6 @@
 Last changed: 2005-10-05
 
 
-LAST MINUTE INFORMATION

-
-jsonserver as of 2005-10-05 is out of sync with the zope3 trunk:
-
-run:
-
-$ cd ~Zope3/src
-$ svn up -r 38722 src/zope/app/server/wsgi.py
-
-until jsonserver is in sync again.
-
-
 PREREQUISITES
 -
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r27987 - in z3lab/cpsskins/branches/jmo-perspectives/browser: authoring/filters renderers

[svn]

Author: jmorliaguet
Date: Wed Oct  5 23:33:57 2005
New Revision: 27987

Modified:
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/cell_edit_layout.pt
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/pageblock_edit_layout.pt
   z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/__init__.py
Log:

- optimization / removed unused 'nodes' variable



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/cell_edit_layout.pt
==
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/cell_edit_layout.pt
  (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/cell_edit_layout.pt
  Wed Oct  5 23:33:57 2005
@@ -2,7 +2,6 @@
   tal:define="
 info options/info;
 perspective info/perspective;
-nodes options/nodes;
 rendered options/rendered;
 display info/display;
 actual_display info/actual_display;

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/pageblock_edit_layout.pt
==
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/pageblock_edit_layout.pt
 (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/pageblock_edit_layout.pt
 Wed Oct  5 23:33:57 2005
@@ -9,7 +9,6 @@
 mode_is_layout python:canvas_mode == 'layout';
 title context/title;
 layout nocall:options/layout;
-nodes options/nodes;
 this_id view/getId;
 layout_id layout/getIdentifier;
 width layout/width">

Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/__init__.py  
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/__init__.py  
Wed Oct  5 23:33:57 2005
@@ -197,10 +197,7 @@
 if element.isLeaf():
 data = element.getDisplayData(info=info)
 else:
-nodes = element.getChildNodes(info=info)
-# XXX avoid inserting kw arguments here
-kw['nodes'] = nodes
-for node in nodes:
+for node in element.getChildNodes(info=info):
 renderer = getMultiAdapter((node, request), IRenderer)
 data.append(renderer(**kw))
 data = ''.join(data)
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r28040 - in z3lab/cpsskins/branches/jmo-perspectives: . controllers

[svn]

Author: jmorliaguet
Date: Thu Oct  6 22:09:29 2005
New Revision: 28040

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/configure.zcml
   z3lab/cpsskins/branches/jmo-perspectives/controllers/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/controllers/cell.py
   z3lab/cpsskins/branches/jmo-perspectives/controllers/configure.zcml
   z3lab/cpsskins/branches/jmo-perspectives/controllers/interfaces.py
   z3lab/cpsskins/branches/jmo-perspectives/controllers/pageblock.py
   z3lab/cpsskins/branches/jmo-perspectives/controllers/portlet.py
   z3lab/cpsskins/branches/jmo-perspectives/controllers/slot.py
   z3lab/cpsskins/branches/jmo-perspectives/controllers/theme.py
   z3lab/cpsskins/branches/jmo-perspectives/controllers/themepage.py
Log:

- controller / event updates

  added an ObjectModified handler

  => slots can be renamed (modified) and still have a view.



Modified: z3lab/cpsskins/branches/jmo-perspectives/configure.zcml
==
--- z3lab/cpsskins/branches/jmo-perspectives/configure.zcml (original)
+++ z3lab/cpsskins/branches/jmo-perspectives/configure.zcml Thu Oct  6 
22:09:29 2005
@@ -73,21 +73,4 @@
 
   
 
-
-  
-
-  
-
-  
-
 

Modified: z3lab/cpsskins/branches/jmo-perspectives/controllers/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/controllers/__init__.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/controllers/__init__.pyThu Oct 
 6 22:09:29 2005
@@ -18,10 +18,30 @@
 __docformat__ = "reStructuredText"
 
 from zope.app.copypastemove import dispatchToSublocations
+from zope.interface import implements
 
 from cpsskins.thememanager import getThemeManager
 from interfaces import IController
 
+class Controller(object):
+"""Event handler
+"""
+implements(IController)
+
+def __init__(self, element):
+self.element = element
+
+def added(self):
+"""What to do when an element has been added."""
+
+def removed(self):
+"""What to do when an element has been added."""
+
+def modified(self):
+"""What to do when an element has been added."""
+
+
+
 # Event handlers
 def elementAdded(element, event):
 """This suscriber is called when an element has been added.
@@ -54,3 +74,11 @@
 # unregister the element
 tmutil.unregisterElement(element)
 
+def elementModified(element, event):
+"""This suscriber is called when an element has been modified.
+"""
+# get the object's controller
+controller = IController(element, None)
+if controller is not None:
+controller.modified()
+

Modified: z3lab/cpsskins/branches/jmo-perspectives/controllers/cell.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/controllers/cell.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/controllers/cell.pyThu Oct 
 6 22:09:29 2005
@@ -19,18 +19,16 @@
 
 from zope.interface import implements
 
+from cpsskins.controllers import Controller
 from cpsskins.elements.interfaces import IViewable
 from cpsskins.thememanager import getThemeManager
 from interfaces import IController
 
-class CellController:
+class CellController(Controller):
 """Event handler for cells.
-""" 
+"""
 implements(IController)
 
-def __init__(self, element):
-self.element = element
-
 def added(self):
 """What to do when the element has been added.
 """
@@ -41,3 +39,4 @@
 """
 tmutil = getThemeManager()
 tmutil.removeDisplays(self.element)
+

Modified: z3lab/cpsskins/branches/jmo-perspectives/controllers/configure.zcml
==
--- z3lab/cpsskins/branches/jmo-perspectives/controllers/configure.zcml 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/controllers/configure.zcml Thu Oct 
 6 22:09:29 2005
@@ -1,6 +1,31 @@
 http://namespaces.zope.org/zope";>
 
+
+  
+
+  
+
+  
+
+  
+
+
   
   http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r28041 - z3lab/cpsskins/branches/jmo-perspectives/storage

[svn]

Author: jmorliaguet
Date: Thu Oct  6 22:24:50 2005
New Revision: 28041

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/storage/relations.py
Log:

- removed second condition already tested 2 lines above



Modified: z3lab/cpsskins/branches/jmo-perspectives/storage/relations.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/storage/relations.py   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/storage/relations.py   Thu Oct 
 6 22:24:50 2005
@@ -220,8 +220,7 @@
 if not IRelation.providedBy(object):
 raise ValueError, "Only objects implementing IRelation are allowed"
 self.__btree__setitem__(key, object)
-if IRelation.providedBy(object):
-self._indexRelates(relation=object, id=key)
+self._indexRelates(relation=object, id=key)
 self._p_changed = True
 
 def __delitem__(self, key):
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r28086 - z3lab/cpsskins/branches/jmo-perspectives

[svn]

Author: jmorliaguet
Date: Sun Oct  9 18:28:00 2005
New Revision: 28086

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/INSTALL.txt
Log:

- info update about using jsonserver / zope trunk. (the current trunk is not
  working anyway)



Modified: z3lab/cpsskins/branches/jmo-perspectives/INSTALL.txt
==
--- z3lab/cpsskins/branches/jmo-perspectives/INSTALL.txt(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/INSTALL.txtSun Oct  9 
18:28:00 2005
@@ -2,7 +2,18 @@
 INSTALLATION INSTRUCTIONS
 =
 
-Last changed: 2005-10-05
+Last changed: 2005-10-09
+
+
+LAST MINUTE INFORMATION
+---
+
+The last Zope3 snapshot known to work before the merge of the 'twisted'
+ZServer integration is 38965
+
+run:
+
+$ cd Zope3 && svn up -r 38965
 
 
 PREREQUISITES
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r28087 - in z3lab/cpsskins/branches/jmo-perspectives: . browser/authoring browser/elements elements

[svn]

Author: jmorliaguet
Date: Sun Oct  9 19:05:32 2005
New Revision: 28087

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/browser/elements/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/browser/elements/configure.zcml
   z3lab/cpsskins/branches/jmo-perspectives/browser/elements/interfaces.py
   z3lab/cpsskins/branches/jmo-perspectives/browser/elements/slot.py
   z3lab/cpsskins/branches/jmo-perspectives/elements/slot.py
   z3lab/cpsskins/branches/jmo-perspectives/thememanager.py
Log:

- saving work:

  - added an element mover adapter INodeMoving
(working for theme elements, not yet working with portlets in slots)



Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py  
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py  
Sun Oct  9 19:05:32 2005
@@ -19,8 +19,7 @@
 
 from zope.app import zapi
 from zope.app.container.browser.contents import Contents
-from zope.app.copypastemove.interfaces import IObjectMover, IObjectCopier
-from zope.app.event.objectevent import ObjectCreatedEvent
+from zope.app.copypastemove.interfaces import IObjectCopier
 from zope.app.location.traversing import LocationPhysicallyLocatable
 from zope.app.publisher.browser import BrowserView
 from zope.app.session.interfaces import ISession
@@ -28,7 +27,6 @@
 from zope.app.zapi import queryMultiAdapter, getMultiAdapter
 from zope.component import adapts
 from zope.component.interfaces import IFactory
-from zope.event import notify
 from zope.interface import implements
 from zope.security.proxy import removeSecurityProxy
 
@@ -38,7 +36,7 @@
 from cpsskins.elements.interfaces import IElement
 from cpsskins.elements.interfaces import IViewable, IDisplayable, IFormattable
 from cpsskins.browser.elements.interfaces import INodeAdding, INodeRemoving
-from cpsskins.browser.elements.interfaces import INodeOrdering
+from cpsskins.browser.elements.interfaces import INodeMoving, INodeOrdering
 from cpsskins.browser.renderers.interfaces import IRenderer
 from cpsskins.thememanager import getThemeManager
 
@@ -234,7 +232,6 @@
 factory = zapi.getUtility(IFactory, type_name)
 content = factory()
 
-notify(ObjectCreatedEvent(content))
 adding = getMultiAdapter((container, request), INodeAdding)
 
 added = adding.add(content)
@@ -246,16 +243,13 @@
 """Move an element to another destination element.
 return the id of the moved element.
 """
+request = self.request
 element = self._getElementById(src_id)
 dest_container = self._getElementById(dest_id)
 # move the element to the destination container
-if dest_container == getParent(element):
-moved = element
-moved_name = src_id
-else:
-mover = IObjectMover(element)
-moved_name = mover.moveTo(dest_container)
-moved = dest_container[moved_name]
+moving = getMultiAdapter((dest_container, request), INodeMoving)
+moved = moving.move(element)
+
 # move the element to the specified order
 moved_id = moved.getIdentifier()
 self.reorderElement(moved_id, int(order))

Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/elements/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/elements/__init__.py   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/elements/__init__.py   
Sun Oct  9 19:05:32 2005
@@ -19,15 +19,30 @@
 
 from zope.app.publisher.browser import BrowserView
 from zope.app.container.browser.adding import Adding
+from zope.app.copypastemove.interfaces import IObjectMover
+from zope.app.traversing.api import getParent
 from zope.interface import implements
 
-from interfaces import INodeAdding, INodeRemoving, INodeOrdering
+from interfaces import INodeAdding, INodeRemoving, INodeOrdering, INodeMoving
 
 class NodeAdding(Adding):
 """A view for adding element into nodes
 """
 implements(INodeAdding)
 
+class NodeMoving(BrowserView):
+"""A view for moving elements between nodes
+"""
+implements(INodeMoving)
+
+def move(self, content):
+container = self.context
+if container == getParent(content):
+return content
+mover = IObjectMover(content)
+moved_name = mover.moveTo(container)
+return container[moved_name]
+
 class NodeRemoving(BrowserView):
 """A view for removing elements from nodes
 """

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/elements/configure.zcml
==
--- z3lab/cpsskins/branches/jm

[Z3lab-checkins] r28088 - z3lab/cpsskins/branches/jmo-perspectives/browser/authoring

[svn]

Author: jmorliaguet
Date: Sun Oct  9 19:24:43 2005
New Revision: 28088

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.css
Log:

- cosmetics



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.css
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.css
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.css
Sun Oct  9 19:24:43 2005
@@ -324,10 +324,10 @@
 .mainContentAreaFrame {
   font: 14px Trebuchet MS, Verdana, Arial, Sans-Serif;
   text-align: center;
-  background-color: #ffc;
+  background-color: #ffe;
   padding: 0.5em;
   height: 100px;
-  border: 1px solid #999;
+  border: 1px dotted #666;
 }
 
 .container {
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r28089 - in z3lab/cpsskins/branches/jmo-perspectives: . browser/elements

[svn]

Author: jmorliaguet
Date: Sun Oct  9 19:57:26 2005
New Revision: 28089

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/elements/slot.py
   z3lab/cpsskins/branches/jmo-perspectives/thememanager.py
Log:

- functional INodeMoving between slots (more code cleanup to come)



Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/elements/slot.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/elements/slot.py   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/elements/slot.py   Sun Oct 
 9 19:57:26 2005
@@ -81,11 +81,14 @@
 
 tmutil = getThemeManager()
 
+# the element is not physically moved but slot -> portlet relations
+# need to be updated.
 tmutil.movePortlet(
 src_slot=src_container,
 dest_slot=dest_container,
 portlet=content,
 )
+
 return content
 
 class SlotRemoving(BrowserView):
@@ -121,7 +124,7 @@
 display.remove(content)
 
 class SlotOrdering(BrowserView):
-"""A view for removing elements from slots
+"""A view for reordering elements in slots
 """
 implements(INodeOrdering)
 

Modified: z3lab/cpsskins/branches/jmo-perspectives/thememanager.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/thememanager.py(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/thememanager.pySun Oct  9 
19:57:26 2005
@@ -179,10 +179,10 @@
 def movePortlet(self, src_slot, dest_slot, portlet):
 """Move a portlet between slots.
 """
-
 reltool = RelationTool(portlet)
 
-relations = reltool.search(
+# TODO: let compound predicates support predicates of different arities
+old_relations = reltool.search(
 predicate=hasPortlet,
 first=src_slot,
 second=portlet,
@@ -191,69 +191,46 @@
 first=src_slot,
 second=portlet,
 )
-
-rel = relations[0]
+rel = reltool.get(old_relations[0])
 perspective = len(rel) == 3 and rel.third or None
-
-if perspective is not None:
-relation = TriadicRelation(
-predicate=hasPortletFromPerspective,
-first=dest_slot,
-second=portlet,
-third=perspective,
-)
-ids = reltool.search(
-predicate=hasPortletFromPerspective,
-first=src_slot,
-second=portlet,
-third=perspective,
-)
-else:
-relation = DyadicRelation(
-predicate=hasPortlet,
-first=dest_slot,
-second=portlet,
-)
-ids = reltool.search(
-predicate=hasPortlet,
-first=src_slot,
-second=portlet,
-)
-
-theme = self.getThemeInContext(src_slot)
-relations = theme.getStorage(IRelationStorage)
-relations.add(relation)
-
-reltool.remove(ids)
-
+# set the dest_slot -> portlet relation
+self.setPortlet(dest_slot, portlet, perspective)
+# remove old src_slot -> portlet relations
+reltool.remove(old_relations)
+# set the portlet's parent explicitly
 portlet.__parent__ = dest_slot
 
-def setPortlet(self, slot, portlet, perspective):
-"""Set a portlet in a slot
+def addPortlet(self, slot, portlet, perspective):
+"""Add a portlet to a slot
 """
 theme = self.getThemeInContext(slot)
 portlets = theme.getStorage(IPortletStorage)
 portlets.add(portlet)
 
-if perspective is not None:
-relation = TriadicRelation(
-predicate=hasPortletFromPerspective,
+self.setPortlet(slot, portlet, perspective)
+return portlet
+
+def setPortlet(self, slot, portlet, perspective):
+"""Set a portlet in a slot
+"""
+if perspective is None:
+relation = DyadicRelation(
+predicate=hasPortlet,
 first=slot,
 second=portlet,
-third=perspective,
 )
 else:
-relation = DyadicRelation(
-predicate=hasPortlet,
+relation = TriadicRelation(
+predicate=hasPortletFromPerspective,
 first=slot,
 second=portlet,
+third=perspective,
 )
 
+theme = self.getThemeInContext(slot)
 relations = theme.getStorage(IRelationStorage)
 relations.add(relation)
 
-return portlet
-
 def removePortlet(self, slot, portlet, perspective=None):
 """Remove a portlet
 """
@@ -261,35 +238,23 @@
 portlets = theme.getStorage(IPortletStorage)
 
   

[Z3lab-checkins] r28090 - in z3lab/cpsskins/branches/jmo-perspectives: . doc

[svn]

Author: jmorliaguet
Date: Sun Oct  9 20:13:42 2005
New Revision: 28090

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt
   z3lab/cpsskins/branches/jmo-perspectives/interfaces.py
Log:

- test / interface updates



Modified: z3lab/cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt
==
--- z3lab/cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt  
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt  Sun Oct 
 9 20:13:42 2005
@@ -119,7 +119,7 @@
 ...return widget_filter(data)
 
 >>> test_render(widget, data)
-'Test of HTML'
+'Test of HTML'
 
 Available widgets:
 ==
@@ -172,7 +172,7 @@
 
 >>> widget = Widget('frame_box')
 >>> test_render(widget, data)
-'Example frame boxTest of 
HTML'
+'Example frame boxTest of 
HTML'
 
 b) horizontal scrollbar
 ---

Modified: z3lab/cpsskins/branches/jmo-perspectives/interfaces.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/interfaces.py  (original)
+++ z3lab/cpsskins/branches/jmo-perspectives/interfaces.py  Sun Oct  9 
20:13:42 2005
@@ -76,10 +76,9 @@
 """Set a portlet in the a slot
 """
 
-def setFormat(object, format, predicate):
-"""Set a format
+def addPortlet(slot, portlet, perspective):
+"""Add a portlet to a slot
 """
-
 def removeDisplays(object):
 """Remove the display of an element
 """
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r28091 - z3lab/cpsskins/branches/jmo-perspectives/browser/elements

[svn]

Author: jmorliaguet
Date: Sun Oct  9 20:47:31 2005
New Revision: 28091

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/elements/slot.py
Log:

- API updates



Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/elements/slot.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/elements/slot.py   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/elements/slot.py   Sun Oct 
 9 20:47:31 2005
@@ -50,7 +50,7 @@
 # a slot is not a container, it is a collection of references to
 # portlets that are physically stored in a portlet folder.
 tmutil = getThemeManager()
-portlet = tmutil.setPortlet(
+portlet = tmutil.addPortlet(
 slot=container,
 portlet=content,
 perspective=perspective,
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r28092 - z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters

[svn]

Author: jmorliaguet
Date: Sun Oct  9 20:48:25 2005
New Revision: 28092

Modified:
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/pageblock_edit_layout.pt
Log:

- code simplification and more WYSIWYG rendering of pageblocks



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/pageblock_edit_layout.pt
==
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/pageblock_edit_layout.pt
 (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/pageblock_edit_layout.pt
 Sun Oct  9 20:48:25 2005
@@ -12,7 +12,13 @@
 this_id view/getId;
 layout_id layout/getIdentifier;
 width layout/width">
-  
+
+  
+
+  
 
-  
+  
 
   
   
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r28093 - in z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters: . content page

[svn]

Author: jmorliaguet
Date: Sun Oct  9 20:58:17 2005
New Revision: 28093

Modified:
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/cell_edit_layout.pt
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/content/slot_edit.pt
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/page/slot_edit.pt
Log:

- added a :hover effect on page blocks to make it easy to locate target areas
  when doing drag-and-drop



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/cell_edit_layout.pt
==
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/cell_edit_layout.pt
  (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/cell_edit_layout.pt
  Sun Oct  9 20:58:17 2005
@@ -39,7 +39,6 @@
 view_id id" />
   
 
-  
+  
 
 

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/content/slot_edit.pt
==
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/content/slot_edit.pt
 (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/content/slot_edit.pt
 Sun Oct  9 20:58:17 2005
@@ -6,9 +6,10 @@
   icon view/getIcon">
 
   
+   tal:attributes="id id">
 
-
+
   
 
 

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/page/slot_edit.pt
==
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/page/slot_edit.pt
(original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/page/slot_edit.pt
Sun Oct  9 20:58:17 2005
@@ -1,15 +1,14 @@
-
+
 
   http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r28094 - in z3lab/cpsskins/branches/jmo-perspectives: . browser/elements elements

[svn]

Author: jmorliaguet
Date: Sun Oct  9 22:32:41 2005
New Revision: 28094

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/elements/slot.py
   z3lab/cpsskins/branches/jmo-perspectives/elements/slot.py
   z3lab/cpsskins/branches/jmo-perspectives/interfaces.py
   z3lab/cpsskins/branches/jmo-perspectives/thememanager.py
Log:

- docstring updates

- moved slot specific methods from thememanager.py to browser/elements/slot.py



Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/elements/slot.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/elements/slot.py   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/elements/slot.py   Sun Oct 
 9 22:32:41 2005
@@ -26,8 +26,12 @@
 from cpsskins.browser.negociation.interfaces import INegociation
 from cpsskins.elements.interfaces import IDisplayable
 from cpsskins.elements.interfaces import IPortlet
+from cpsskins.ontology import hasPortlet, hasPortletFromPerspective
+from cpsskins.relations import DyadicRelation, TriadicRelation
+from cpsskins.relations.tool import RelationTool
 from cpsskins.thememanager import getThemeManager
 from interfaces import INodeAdding, INodeRemoving, INodeOrdering, INodeMoving
+from cpsskins.storage.interfaces import IPortletStorage, IRelationStorage
 
 class SlotAdding(Adding):
 """A view for adding elements into slots
@@ -50,22 +54,35 @@
 # a slot is not a container, it is a collection of references to
 # portlets that are physically stored in a portlet folder.
 tmutil = getThemeManager()
-portlet = tmutil.addPortlet(
-slot=container,
-portlet=content,
-perspective=perspective,
-)
+theme = tmutil.getThemeInContext(container)
+portlets = theme.getStorage(IPortletStorage)
+portlets.add(content)
+
+if perspective is None:
+relation = DyadicRelation(
+predicate=hasPortlet,
+first=container,
+second=content,
+)
+else:
+relation = TriadicRelation(
+predicate=hasPortletFromPerspective,
+first=container,
+second=content,
+third=perspective,
+)
+
+relations = theme.getStorage(IRelationStorage)
+relations.add(relation)
 
-portlet.__parent__ = container
+content.__parent__ = container
 
 # store the portlet's order in the slot's "BoxGroup" display
 # XXX to refactor
-getDisplay = IDisplayable(container).getDisplay
-default = getDisplay()
-display = getDisplay(perspective, default)
-display.append(portlet)
+display = IDisplayable(container).getDisplay(perspective)
+display.append(content)
 
-return portlet
+return content
 
 class SlotMoving(BrowserView):
 """A view for moving elements between slots
@@ -79,16 +96,49 @@
 if dest_container == src_container:
 return content
 
-tmutil = getThemeManager()
-
 # the element is not physically moved but slot -> portlet relations
 # need to be updated.
-tmutil.movePortlet(
-src_slot=src_container,
-dest_slot=dest_container,
-portlet=content,
+
+reltool = RelationTool(content)
+
+# TODO: let compound predicates support predicates of different arities
+old_relations = reltool.search(
+predicate=hasPortlet,
+first=src_container,
+second=content,
+) + reltool.search(
+predicate=hasPortletFromPerspective,
+first=src_container,
+second=content,
 )
 
+rel = reltool.get(old_relations[0])
+perspective = len(rel) == 3 and rel.third or None
+
+# set the dest_slot -> portlet relation
+if perspective is None:
+relation = DyadicRelation(
+predicate=hasPortlet,
+first=dest_container,
+second=content,
+)
+else:
+relation = TriadicRelation(
+predicate=hasPortletFromPerspective,
+first=dest_container,
+second=content,
+third=perspective,
+)
+
+theme = getThemeManager().getThemeInContext(dest_container)
+relations = theme.getStorage(IRelationStorage)
+relations.add(relation)
+
+# remove old src_slot -> portlet relations
+reltool.remove(old_relations)
+# set the portlet's parent explicitly
+content.__parent__ = dest_container
+
 return content
 
 class SlotRemoving(BrowserView):
@@ -109,18 +159,29 @@
 interface=INegociation,
 ).getPerspective()
 
-tmutil = getThemeManager()
-tmutil.removePortlet(
- 

[Z3lab-checkins] r28095 - z3lab/cpsskins/branches/jmo-perspectives/browser/elements

[svn]

Author: jmorliaguet
Date: Sun Oct  9 22:38:22 2005
New Revision: 28095

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/elements/slot.py
Log:

- the portlet must be appended to the effective display.



Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/elements/slot.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/elements/slot.py   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/elements/slot.py   Sun Oct 
 9 22:38:22 2005
@@ -78,8 +78,7 @@
 content.__parent__ = container
 
 # store the portlet's order in the slot's "BoxGroup" display
-# XXX to refactor
-display = IDisplayable(container).getDisplay(perspective)
+display = IDisplayable(container).getEffectiveDisplay(perspective)
 display.append(content)
 
 return content
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r28096 - z3lab/cpsskins/branches/jmo-perspectives

[svn]

Author: jmorliaguet
Date: Mon Oct 10 00:22:35 2005
New Revision: 28096

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/INSTALL.txt
Log:

- jsonserver is in sync with the trunk again.



Modified: z3lab/cpsskins/branches/jmo-perspectives/INSTALL.txt
==
--- z3lab/cpsskins/branches/jmo-perspectives/INSTALL.txt(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/INSTALL.txtMon Oct 10 
00:22:35 2005
@@ -1,21 +1,9 @@
 
+$Id $
+
 INSTALLATION INSTRUCTIONS
 =
 
-Last changed: 2005-10-09
-
-
-LAST MINUTE INFORMATION

-
-The last Zope3 snapshot known to work before the merge of the 'twisted'
-ZServer integration is 38965
-
-run:
-
-$ cd Zope3 && svn up -r 38965
-
-
 PREREQUISITES
 -
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r28097 - z3lab/cpsskins/branches/jmo-perspectives/browser/authoring

[svn]

Author: jmorliaguet
Date: Mon Oct 10 00:51:27 2005
New Revision: 28097

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.css
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.js
Log:

- more cross-browser focus / defocus effect



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.css
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.css
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.css
Mon Oct 10 00:51:27 2005
@@ -335,10 +335,6 @@
   height: expression('40px'); /* for IE 'height' is 'min-height' */
 }
 
-.hover:hover {
-  background-color: #ff6;
-}
-
 #drag-feedback-box {
   position: absolute;
   filter: alpha(opacity=75);

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.js
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.js 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.js 
Mon Oct 10 00:51:27 2005
@@ -18,6 +18,7 @@
 
 function Element(node) {
   this.node = node;
+  this.bg = node.style.background;
   this.container = node.parentNode;
   this.order = getElementOrder(node);
   this.xpos = null;
@@ -133,6 +134,15 @@
   selection_box.style.display = "none";
 }
 
+function focus(node) {
+  node.bg = node.style.background;
+  node.style.backgroundColor = '#f9f6f6';
+}
+
+function defocus(node) {
+  node.style.background = node.bg;
+}
+
 function setCursor(cursor) {
   edit_space.style.cursor = cursor;
 }
@@ -459,6 +469,10 @@
   mo.onmouseover = function(e) {
 move_to_container(mo, e);
 pd_stopEvent(e);
+focus(mo);
+  }
+  mo.onmouseout = function(e) {
+defocus(mo);
   }
   mo.onmouseup = function(e) {
 if (factory) {
@@ -473,6 +487,7 @@
 }
 factory = null;
   }
+  defocus(mo);
 }
 
 function setupEditable(mo) {
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r28098 - in z3lab/cpsskins/branches/jmo-perspectives/browser/authoring: . filters

[svn]

Author: jmorliaguet
Date: Mon Oct 10 01:47:10 2005
New Revision: 28098

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.js
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/cell_edit_layout.pt
Log:

- more robust focus / defocus



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.js
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.js 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.js 
Mon Oct 10 01:47:10 2005
@@ -410,6 +410,7 @@
 drag_element(mo, e);
   }
   mo.onmouseover = function(e) {
+if (!moved) return;
 set_dragbox_dimensions(mo);
   }
   mo.onmouseup = function(e) {
@@ -469,10 +470,10 @@
   mo.onmouseover = function(e) {
 move_to_container(mo, e);
 pd_stopEvent(e);
-focus(mo);
+if (mo.getAttribute("focus")) focus(mo);
   }
   mo.onmouseout = function(e) {
-defocus(mo);
+if (mo.getAttribute("focus")) defocus(mo);
   }
   mo.onmouseup = function(e) {
 if (factory) {
@@ -486,10 +487,11 @@
   add_element(mo, el, type_name);
 }
 factory = null;
+if (mo.getAttribute("focus")) defocus(mo);
   }
-  defocus(mo);
 }
 
+
 function setupEditable(mo) {
   mo.onmousedown = function(e) {
 var target = getEventTarget(e);
@@ -507,7 +509,7 @@
 if (className.indexOf('editable') >= 0 || !moved) {
   return pd_stopEvent(e);
 } else {
-  highlight(mo, '2000');
+  highlight(mo);
   return pd_itemOnContextMenu(mo, e, "choice-context-menu");
 }
   }

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/cell_edit_layout.pt
==
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/cell_edit_layout.pt
  (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/cell_edit_layout.pt
  Mon Oct 10 01:47:10 2005
@@ -39,6 +39,7 @@
 view_id id" />
   
 
-  
+  
+
 
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r28099 - in z3lab/cpsskins/branches/jmo-perspectives/browser/authoring: . filters

[svn]

Author: jmorliaguet
Date: Mon Oct 10 02:05:35 2005
New Revision: 28099

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.js
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/cell_edit_layout.pt
Log:

- only empty nodes can get a focus



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.js
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.js 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring.js 
Mon Oct 10 02:05:35 2005
@@ -135,11 +135,14 @@
 }
 
 function focus(node) {
+  if (!node.getAttribute("focus")) return;
+  if (node.innerHTML) return;
   node.bg = node.style.background;
   node.style.backgroundColor = '#f9f6f6';
 }
 
 function defocus(node) {
+  if (!node.getAttribute("focus")) return;
   node.style.background = node.bg;
 }
 
@@ -470,10 +473,10 @@
   mo.onmouseover = function(e) {
 move_to_container(mo, e);
 pd_stopEvent(e);
-if (mo.getAttribute("focus")) focus(mo);
+focus(mo);
   }
   mo.onmouseout = function(e) {
-if (mo.getAttribute("focus")) defocus(mo);
+defocus(mo);
   }
   mo.onmouseup = function(e) {
 if (factory) {
@@ -487,7 +490,7 @@
   add_element(mo, el, type_name);
 }
 factory = null;
-if (mo.getAttribute("focus")) defocus(mo);
+defocus(mo);
   }
 }
 

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/cell_edit_layout.pt
==
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/cell_edit_layout.pt
  (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/cell_edit_layout.pt
  Mon Oct 10 02:05:35 2005
@@ -39,7 +39,7 @@
 view_id id" />
   
 
-  
-
+  
 
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r28100 - in z3lab/cpsskins/branches/jmo-perspectives/browser/authoring: . filters/content

[svn]

Author: jmorliaguet
Date: Mon Oct 10 02:29:38 2005
New Revision: 28100

Modified:
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring_macros.pt
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/content/portlet_edit.pt
Log:

- minor fixes



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring_macros.pt
==
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring_macros.pt  
(original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/authoring_macros.pt  
Mon Oct 10 02:29:38 2005
@@ -96,7 +96,7 @@
 
 
 
-
+
   menu-format
   

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/content/portlet_edit.pt
==
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/content/portlet_edit.pt
  (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/content/portlet_edit.pt
  Mon Oct 10 02:29:38 2005
@@ -5,9 +5,9 @@
 perspective info/perspective;
 display info/display;
 actual_display info/actual_display;
-formats display/formattable:getFormatNames;
+formats action_display/formattable:getFormatNames|python:[];
 parent_type parent/elementtype;
-editable python: str(parent_type) == 'ISlot';
+editable python: str(parent_type) == 'ISlot' and 1 or 0;
 title context/title;
 id view/getId;"
   tal:attributes="
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r28115 - in z3lab/cpsskins/branches/jmo-perspectives/browser: authoring elements

[svn]

Author: jmorliaguet
Date: Tue Oct 11 00:08:53 2005
New Revision: 28115

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/browser/elements/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/browser/elements/configure.zcml
   z3lab/cpsskins/branches/jmo-perspectives/browser/elements/interfaces.py
   z3lab/cpsskins/branches/jmo-perspectives/browser/elements/slot.py
Log:

- saving work in progress

  - added a NodeDuplicating view for duplicating nodes.

(working for everything except for portlets in slots)



Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py  
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py  
Tue Oct 11 00:08:53 2005
@@ -37,6 +37,7 @@
 from cpsskins.elements.interfaces import IViewable, IDisplayable, IFormattable
 from cpsskins.browser.elements.interfaces import INodeAdding, INodeRemoving
 from cpsskins.browser.elements.interfaces import INodeMoving, INodeOrdering
+from cpsskins.browser.elements.interfaces import INodeDuplicating
 from cpsskins.browser.renderers.interfaces import IRenderer
 from cpsskins.thememanager import getThemeManager
 
@@ -276,19 +277,11 @@
 """Duplicate an element specified by its id.
 Return the id of the duplicated element.
 """
+request = self.request
 element = self._getElementById(id)
 container = getParent(element)
-# save the element's order
-order = list(container.keys())
-element_order = order.index(element.name())
-# duplicate the element
-copier = IObjectCopier(element)
-copied_name = copier.copyTo(container)
-copied = container[copied_name]
-# move the copied element just below the original element
-copied_id = copied.getIdentifier()
-self.reorderElement(copied_id, int(element_order)+1)
-return copied_id
+duplicating = getMultiAdapter((container, request), INodeDuplicating)
+return duplicating.duplicate(element)
 
 def getCanvasMode(self):
 """Get the canvas view mode

Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/elements/__init__.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/elements/__init__.py   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/elements/__init__.py   
Tue Oct 11 00:08:53 2005
@@ -19,11 +19,13 @@
 
 from zope.app.publisher.browser import BrowserView
 from zope.app.container.browser.adding import Adding
-from zope.app.copypastemove.interfaces import IObjectMover
+from zope.app.copypastemove.interfaces import IObjectCopier, IObjectMover
 from zope.app.traversing.api import getParent
+from zope.app.zapi import queryMultiAdapter, getMultiAdapter
 from zope.interface import implements
 
 from interfaces import INodeAdding, INodeRemoving, INodeOrdering, INodeMoving
+from interfaces import INodeDuplicating
 
 class NodeAdding(Adding):
 """A view for adding element into nodes
@@ -65,3 +67,23 @@
 contents.insert(order, item)
 container.updateOrder(contents)
 
+class NodeDuplicating(BrowserView):
+"""A view for duplicating elements in nodes
+"""
+implements(INodeDuplicating)
+
+def duplicate(self, content):
+request = self.request
+container = self.context
+# save the element's order
+order = list(container.keys())
+content_order = order.index(content.name())
+# duplicate the element
+copier = IObjectCopier(content)
+copied_name = copier.copyTo(container)
+copied = container[copied_name]
+# move the copied element just below the original element
+reordering = getMultiAdapter((container, request), INodeOrdering)
+reordering.reorder(copied, int(content_order)+1)
+return copied.getIdentifier()
+

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/elements/configure.zcml
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/elements/configure.zcml
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/elements/configure.zcml
Tue Oct 11 00:08:53 2005
@@ -34,6 +34,13 @@
   provides=".interfaces.INodeMoving"
   />
 
+  
+
   
 
   
 
+  
+
   
 
   
 
+  
+
   
 
   
 
+  
+
   
 
   
 
+  
+
 

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/elements/interfaces.py
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/elements/interfaces.py 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/elements/interface

[Z3lab-checkins] r28150 - in z3lab/xpdlcore/trunk: . tests

[svn]

Author: janguenot
Date: Tue Oct 11 20:41:55 2005
New Revision: 28150

Added:
   z3lab/xpdlcore/trunk/tests/test_xpdl.py   (contents, props changed)
   z3lab/xpdlcore/trunk/tests/xpdl.txt   (contents, props changed)
   z3lab/xpdlcore/trunk/xpdl.py   (contents, props changed)
Modified:
   z3lab/xpdlcore/trunk/DEPENDENCIES.txt
Log:
Add the xpdl reader generation zope.wfmc objects directly here avoiding having 
to maintain a local zope.wfmc before the lxml proposal acceptation on the Zope3 
trunk

Modified: z3lab/xpdlcore/trunk/DEPENDENCIES.txt
==
--- z3lab/xpdlcore/trunk/DEPENDENCIES.txt   (original)
+++ z3lab/xpdlcore/trunk/DEPENDENCIES.txt   Tue Oct 11 20:41:55 2005
@@ -3,5 +3,6 @@
 - lxml >= 0.7
   http://codespeak.net/lxml/
 
-- Zope3 schema
-- Zope3 interface
+- zope.schema
+- zope.interface
+- zope.wfmc

Added: z3lab/xpdlcore/trunk/tests/test_xpdl.py
==
--- (empty file)
+++ z3lab/xpdlcore/trunk/tests/test_xpdl.py Tue Oct 11 20:41:55 2005
@@ -0,0 +1,42 @@
+##
+#
+# Copyright (c) 2005 Nuxeo and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##
+"""Tests the xpdl facilities generating zope.wfmc objects
+
+$Id$
+"""
+
+import os
+import unittest
+
+import zope.event
+from zope.testing import doctest
+from zope.component import testing
+
+def tearDown(test):
+testing.tearDown(test)
+zope.event.subscribers.pop()
+
+def setUp(test):
+test.globs['this_directory'] = os.path.dirname(__file__)
+testing.setUp(test)
+
+def test_suite():
+suite = unittest.TestSuite()
+suite.addTest(doctest.DocFileSuite(
+'xpdl.txt', tearDown=tearDown, setUp=setUp,
+optionflags=doctest.NORMALIZE_WHITESPACE))
+return suite
+
+if __name__ == '__main__':
+unittest.main(defaultTest='test_suite')

Added: z3lab/xpdlcore/trunk/tests/xpdl.txt
==
--- (empty file)
+++ z3lab/xpdlcore/trunk/tests/xpdl.txt Tue Oct 11 20:41:55 2005
@@ -0,0 +1,357 @@
+XPDL Import
+===
+
+We can import process definitions from files in the XML Process
+Definition Language (XPDL) format. An XPDL file contains multiple
+process definitions arranged in a package. When we load the file, we
+get a package containing some numner of process definitions.
+
+Let's look at an example.  The file `publication.xpdl`
+contains a definition for the publication example developed in the
+"README.txt" file.  We can read it using the xpdl module:
+
+>>> from zope.wfmc import xpdl
+>>> import os
+>>> package = xpdl.read(open(os.path.join(this_directory, 
+...   'examples/publication.xpdl')))
+
+This package contains a single definition:
+
+>>> package
+{u'Publication': ProcessDefinition(u'Publication')}
+
+>>> pd = package[u'Publication']
+>>> from zope.wfmc.attributeintegration import AttributeIntegration
+>>> integration = AttributeIntegration()
+>>> pd.integration = integration
+
+Now, having read the process definition, we can use it as we did
+before (in "README.txt").  As before, we'll create an event subscriber
+so that we can see what's going on:
+
+>>> def log_workflow(event):
+... print event
+
+>>> import zope.event
+>>> zope.event.subscribers.append(log_workflow)
+
+and we'll register the process definition as a utility:
+
+>>> import zope.component
+>>> zope.component.provideUtility(pd, name=pd.id)
+
+and we'll define and register participant and application adapters:
+
+>>> import zope.interface
+>>> from zope.wfmc import interfaces
+
+>>> class Participant(object):
+... zope.component.adapts(interfaces.IActivity)
+... zope.interface.implements(interfaces.IParticipant)
+...
+... def __init__(self, activity):
+... self.activity = activity
+
+>>> class User:
+... def __init__(self):
+... self.work_list = []
+
+>>> authors = {'bob': User(), 'ted': User(), 'sally': User()}
+
+>>> reviewer = User()
+>>> tech1 = User()
+>>> tech2 = User()
+
+>>> class Author(Participant):
+... def __init__(self, activity):
+... Participant.__init__(self, activity)
+... author_name = activity.process.workflowRelevantData.author
+...   

[Z3lab-checkins] r28151 - z3lab/zope/wfmc

[svn]

Author: janguenot
Date: Tue Oct 11 20:44:52 2005
New Revision: 28151

Removed:
   z3lab/zope/wfmc/
Log:
Remove this local version using xpdlcore from here as the lxml proposal 
acceptation could be longer than expected
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r28152 - in z3lab: Zope3Benchs zope3bench

[svn]

Author: janguenot
Date: Tue Oct 11 21:01:04 2005
New Revision: 28152

Added:
   z3lab/zope3bench/
  - copied from r28151, z3lab/Zope3Benchs/
Removed:
   z3lab/Zope3Benchs/
Log:
rename
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r28153 - in z3lab: xpdlcore z3ecm/trunk/src/xpdlcore z3ecm/trunk/src/xpdlcore/doc z3ecm/trunk/src/xpdlcore/interfaces z3ecm/trunk/src/xpdlcore/tests

[svn]

Author: janguenot
Date: Tue Oct 11 21:20:20 2005
New Revision: 28153

Added:
   z3lab/z3ecm/trunk/src/xpdlcore/
  - copied from r28152, z3lab/xpdlcore/trunk/
Removed:
   z3lab/xpdlcore/
   z3lab/z3ecm/trunk/src/xpdlcore/DEPENDENCIES.txt
   z3lab/z3ecm/trunk/src/xpdlcore/Makefile
   z3lab/z3ecm/trunk/src/xpdlcore/README.txt
   z3lab/z3ecm/trunk/src/xpdlcore/ZPL.txt
   z3lab/z3ecm/trunk/src/xpdlcore/__init__.py
   z3lab/z3ecm/trunk/src/xpdlcore/definitions.py
   z3lab/z3ecm/trunk/src/xpdlcore/doc/
   z3lab/z3ecm/trunk/src/xpdlcore/interfaces/
   z3lab/z3ecm/trunk/src/xpdlcore/parser.py
   z3lab/z3ecm/trunk/src/xpdlcore/tests/
   z3lab/z3ecm/trunk/src/xpdlcore/xpdl.py
Log:
Move xpdlcore within z3ecm area
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r28154 - in z3lab/cpsskins/branches/jmo-perspectives: . browser/authoring browser/negociation browser/renderers browser/renderers/filters browser/skin configuration/engines settings/e

[svn]

Author: jmorliaguet
Date: Tue Oct 11 23:00:21 2005
New Revision: 28154

Added:
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/jsr168_authoring.css 
  (contents, props changed)
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/jsr168_authoring.pt  
 (contents, props changed)
   z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/jsr168.py 
  (contents, props changed)
   z3lab/cpsskins/branches/jmo-perspectives/configuration/engines/
   z3lab/cpsskins/branches/jmo-perspectives/configuration/engines/__init__.py   
(contents, props changed)
   
z3lab/cpsskins/branches/jmo-perspectives/configuration/engines/configure.zcml   
(contents, props changed)
   z3lab/cpsskins/branches/jmo-perspectives/configuration/engines/interfaces.py 
  (contents, props changed)
   z3lab/cpsskins/branches/jmo-perspectives/configuration/engines/meta.zcml   
(contents, props changed)
   
z3lab/cpsskins/branches/jmo-perspectives/configuration/engines/metaconfigure.py 
  (contents, props changed)
   
z3lab/cpsskins/branches/jmo-perspectives/configuration/engines/metadirectives.py
   (contents, props changed)
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/authoring/content/interfaces.py
   (contents, props changed)
   z3lab/cpsskins/branches/jmo-perspectives/settings/engines/authoring/jsr168/
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/authoring/jsr168/__init__.py
   (contents, props changed)
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/authoring/jsr168/configure.zcml
   (contents, props changed)
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/authoring/jsr168/interfaces.py
   (contents, props changed)
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/authoring/page/interfaces.py
   (contents, props changed)
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/default/interfaces.py 
  (contents, props changed)
   z3lab/cpsskins/branches/jmo-perspectives/settings/engines/jsr168/
   z3lab/cpsskins/branches/jmo-perspectives/settings/engines/jsr168/__init__.py 
  (contents, props changed)
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/jsr168/configure.zcml 
  (contents, props changed)
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/jsr168/interfaces.py  
 (contents, props changed)
Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/configure.zcml
   z3lab/cpsskins/branches/jmo-perspectives/browser/negociation/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/browser/negociation/configure.zcml
   z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/__init__.py
   
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/configure.zcml
   
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/widgets.css
   z3lab/cpsskins/branches/jmo-perspectives/browser/skin/template.pt
   z3lab/cpsskins/branches/jmo-perspectives/configure.zcml
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/authoring/configure.zcml
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/authoring/content/configure.zcml
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/authoring/page/configure.zcml
   z3lab/cpsskins/branches/jmo-perspectives/settings/engines/configure.zcml
   
z3lab/cpsskins/branches/jmo-perspectives/settings/engines/default/configure.zcml
Log:

- added a ++engine++ namespace traverser for specifying the engine to use

- added JSR-168 like rendering engines



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/configure.zcml
==
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/configure.zcml   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/configure.zcml   
Tue Oct 11 23:00:21 2005
@@ -21,6 +21,10 @@
   name="page_authoring.css" file="page_authoring.css"
   layer="cpsskins" />
 
+  
+
   
 
+
+
   
 
   
 
+
+
   
 
   
 
   
+
+  

Added: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/jsr168_authoring.css
==
--- (empty file)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/jsr168_authoring.css 
Tue Oct 11 23:00:21 2005
@@ -0,0 +1,158 @@
+
+
+/* Page blocks */
+.pageBlockEdit {
+  margin-top: 30px; 
+  margin-bottom: 1px; 
+  margin-left: 1px; 
+  margin-right: 1px; 
+}
+
+.pageBlockEditHeader a, .pageBlockEditHeaderSelected a {
+  text-decoration: none;
+}
+
+.pageBlockEditHeader, .pageBlockEditHeaderSelected {
+  background-color: #e9ff30;
+  text-align: center; 
+  border-style: solid; 
+  border-width: 2px;
+  border-color: #bbe #669 #669 #bbe;
+  padding: 4px;
+  vertical-align: middle;
+  color: #000;
+}
+
+.pageBlockEditHeader label, .pageBlockEditHeaderSelected label {
+  padding-left: 1em;
+}
+
+.pageBlockEditHeader form, .pageBlockEditHeaderSele

[Z3lab-checkins] r28157 - z3lab/z3ecm/trunk/src/xpdlcore

[svn]

Author: janguenot
Date: Tue Oct 11 23:05:09 2005
New Revision: 28157

Removed:
   z3lab/z3ecm/trunk/src/xpdlcore/
Log:
Fix my mess
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r28158 - z3lab/z3ecm/trunk/src/trunk

[svn]

Author: janguenot
Date: Tue Oct 11 23:20:28 2005
New Revision: 28158

Added:
   z3lab/z3ecm/trunk/src/trunk/
  - copied from r28150, z3lab/xpdlcore/trunk/
Log:
moved in here
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r28159 - in z3lab/z3ecm/trunk/src: trunk xpdlcore

[svn]

Author: janguenot
Date: Tue Oct 11 23:20:50 2005
New Revision: 28159

Added:
   z3lab/z3ecm/trunk/src/xpdlcore/
  - copied from r28158, z3lab/z3ecm/trunk/src/trunk/
Removed:
   z3lab/z3ecm/trunk/src/trunk/
Log:
Fix my mess
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r28160 - z3lab/cpsskins/branches/jmo-perspectives/configuration

[svn]

Author: jmorliaguet
Date: Tue Oct 11 23:43:08 2005
New Revision: 28160

Modified:
   z3lab/cpsskins/branches/jmo-perspectives/configuration/meta.zcml
Log:

- added missing file



Modified: z3lab/cpsskins/branches/jmo-perspectives/configuration/meta.zcml
==
--- z3lab/cpsskins/branches/jmo-perspectives/configuration/meta.zcml
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/configuration/meta.zcmlTue Oct 
11 23:43:08 2005
@@ -4,6 +4,8 @@
 
   
 
+  
+
   
 
   
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins