Mise à jour du profil de configuration par défaut qui ne fonctionnait plus depuis...

diff --git a/profiles/default/componentregistry.xml b/profiles/default/componentregistry.xml
index 3aa9107..d3fab0b 100644 (file)
--- a/profiles/default/componentregistry.xml
+++ b/profiles/default/componentregistry.xml
@@ -2,6 +2,26 @@
 <componentregistry>
  <adapters/>
  <utilities>
 <componentregistry>
  <adapters/>
  <utilities>

+   <utility interface="Products.CMFCore.interfaces.IActionsTool"
+      object="portal_actions"/>
+  <utility interface="Products.CMFCore.interfaces.ICachingPolicyManager"
+     object="caching_policy_manager"/>
+  <utility interface="Products.CMFCore.interfaces.IContentTypeRegistry"
+    object="content_type_registry"/>
+  <utility interface="Products.CMFCore.interfaces.ICookieCrumbler"
+     object="cookie_authentication"/>
+  <utility interface="Products.CMFCore.interfaces.IMemberDataTool"
+    object="portal_memberdata"/>
+  <utility interface="Products.CMFCore.interfaces.IMembershipTool"
+     object="portal_membership"/>
+  <utility interface="Products.CMFCore.interfaces.IRegistrationTool"
+    object="portal_registration"/>
+  <utility interface="Products.CMFCore.interfaces.ITypesTool"
+     object="portal_types"/>
+  <utility interface="Products.CMFCore.interfaces.IURLTool"
+    object="portal_url"/>
+  <utility interface="Products.CMFCore.interfaces.IWorkflowTool"
+     object="portal_workflow"/>

   <utility interface="Products.CMFCore.interfaces.IDiscussionTool"
      object="portal_discussion"/>
   <utility interface="Products.CMFCore.interfaces.IMetadataTool"
   <utility interface="Products.CMFCore.interfaces.IDiscussionTool"
      object="portal_discussion"/>
   <utility interface="Products.CMFCore.interfaces.IMetadataTool"


@@ -23,7 +43,13 @@
   <utility
      interface="Products.CMFUid.interfaces.IUniqueIdAnnotationManagement"
      object="portal_uidannotation"/>
   <utility
      interface="Products.CMFUid.interfaces.IUniqueIdAnnotationManagement"
      object="portal_uidannotation"/>

+  <utility
+     interface="Products.CMFUid.interfaces.IUniqueIdHandler"
+     object="portal_uidhandler"/>

   <utility interface="Products.CMFCore.interfaces.ICatalogTool"
      object="portal_catalog"/>
   <utility interface="Products.CMFCore.interfaces.ICatalogTool"
      object="portal_catalog"/>

+  <utility interface="Products.CMFCore.interfaces.ISkinsTool"
+     object="portal_skins"/>
+

  </utilities>
 </componentregistry>
  </utilities>
 </componentregistry>

diff --git a/profiles/default/contenttyperegistry.xml b/profiles/default/contenttyperegistry.xml
index 5306349..3cc2552 100644 (file)
--- a/profiles/default/contenttyperegistry.xml
+++ b/profiles/default/contenttyperegistry.xml
@@ -17,6 +17,10 @@
   <argument value="image"/>
   <argument value=""/>
  </predicate>
   <argument value="image"/>
   <argument value=""/>
  </predicate>

+ <predicate name="photo_extensions" content_type_name="Photo"
+    predicate_type="extension">
+  <argument value="jpg,jpeg,JPG,JPEG"/>
+ </predicate>

  <predicate name="file" content_type_name="File" predicate_type="major_minor">
   <argument value="application"/>
   <argument value=""/>
  <predicate name="file" content_type_name="File" predicate_type="major_minor">
   <argument value="application"/>
   <argument value=""/>

diff --git a/profiles/default/export_steps.xml b/profiles/default/export_steps.xml
deleted file mode 100644 (file)
index 98969f3..0000000
--- a/profiles/default/export_steps.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0"?>
-<export-steps>
- <export-step id="actions"
-              handler="Products.CMFCore.exportimport.actions.exportActionProviders"
-              title="Action Providers">
-  
-  
-  Export actions tool's action providers and their actions.
- 
- 
- </export-step>
- <export-step id="caching_policy_mgr"
-              handler="Products.CMFCore.exportimport.cachingpolicymgr.exportCachingPolicyManager"
-              title="Caching Policies">
-  
-  
-  Export caching policy manager's policies.
- 
- 
- </export-step>
- <export-step id="catalog"
-              handler="Products.CMFCore.exportimport.catalog.exportCatalogTool"
-              title="Catalog Tool">
-  
-  
-  Export catalog tool's sub-objects, indexes and columns.
- 
- 
- </export-step>
- <export-step id="componentregistry"
-              handler="Products.GenericSetup.components.exportComponentRegistry"
-              title="Local Component Registry">
-  
-  
-    Export local component registry configuration.
- 
- 
- </export-step>
- <export-step id="content_type_registry"
-              handler="Products.CMFCore.exportimport.contenttyperegistry.exportContentTypeRegistry"
-              title="Content Type Registry">
-  
-  
-  Export content type registry's predicates / bindings.
- 
- 
- </export-step>
- <export-step id="cookieauth"
-              handler="Products.CMFCore.exportimport.cookieauth.exportCookieCrumbler"
-              title="Cookie Authentication">
-  
-  
-  Export cookie crumbler settings
- 
- 
- </export-step>
- <export-step id="mailhost"
-              handler="Products.CMFCore.exportimport.mailhost.exportMailHost"
-              title="MailHost">
-  
-  
-  Export the mailhost's settings and properties
- 
- 
- </export-step>
- <export-step id="properties"
-              handler="Products.CMFCore.exportimport.properties.exportSiteProperties"
-              title="Site Properties">
-  
-  
-  Export site properties.
- 
- 
- </export-step>
- <export-step id="rolemap"
-              handler="Products.GenericSetup.rolemap.exportRolemap"
-              title="Role / Permission Map">
-  
-  
-  Export custom roles and non-default role-permission mappings.
- 
- 
- </export-step>
- <export-step id="skins"
-              handler="Products.CMFCore.exportimport.skins.exportSkinsTool"
-              title="Skins Tool">
-  
-  
-  Export skins tool's filesystem directory views and skin path definitions.
- 
- 
- </export-step>
- <export-step id="step_registries"
-              handler="Products.GenericSetup.tool.exportStepRegistries"
-              title="Step Registries">
-  
-  
-  Export current contents of import step registry and export step registry.
- 
- 
- </export-step>
- <export-step id="toolset"
-              handler="Products.GenericSetup.tool.exportToolset"
-              title="Required Tools">
-  
-  
-  Export required / forbidden tools.
- 
- 
- </export-step>
- <export-step id="typeinfo"
-              handler="Products.CMFCore.exportimport.typeinfo.exportTypesTool"
-              title="Types Tool">
-  
-  
-  Export types tool's type information objects.
- 
- 
- </export-step>
- <export-step id="various-plinn-settings"
-              handler="Products.Plinn.setuphandlers.exportVarious"
-              title="Various Plinn settings">
-  
-  
-  Export various plinn settings as python script.
- 
- 
- </export-step>
- <export-step id="workflows"
-              handler="Products.CMFCore.exportimport.workflow.exportWorkflowTool"
-              title="Workflow Tool">
-  
-  
-  Export workflow tool's workflow definitions and supporting scripts.
- 
- 
- </export-step>
-</export-steps>

diff --git a/profiles/default/import_steps.xml b/profiles/default/import_steps.xml
deleted file mode 100644 (file)
index 98d585a..0000000
--- a/profiles/default/import_steps.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0"?>
-<import-steps>
- <import-step id="actions" version="20071112-01"
-              handler="Products.CMFCore.exportimport.actions.importActionProviders"
-              title="Action Providers">
-  <dependency step="componentregistry"/>
-  
-  
-  
-  
-  Import actions tool's action providers and their actions.
- 
- 
- </import-step>
- <import-step id="caching_policy_mgr" version="20051011-01"
-              handler="Products.CMFCore.exportimport.cachingpolicymgr.importCachingPolicyManager"
-              title="Caching Policies">
-  <dependency step="toolset"/>
-  
-  
-  
-  
-  Import caching policy manager's policies.
- 
- 
- </import-step>
- <import-step id="catalog" version="20071112-01"
-              handler="Products.CMFCore.exportimport.catalog.importCatalogTool"
-              title="Catalog Tool">
-  <dependency step="toolset"/>
-  
-  
-  
-  
-  Import catalog tool's sub-objects, indexes and columns.
- 
- 
- </import-step>
- <import-step id="componentregistry" version="20061025-01"
-              handler="Products.GenericSetup.components.importComponentRegistry"
-              title="Local Component Registry">
-  
-  
-  
-  Import local component registry configuration.
- 
- 
- </import-step>
- <import-step id="content_type_registry"
-              version="20071112-01"
-              handler="Products.CMFCore.exportimport.contenttyperegistry.importContentTypeRegistry"
-              title="Content Type Registry">
-  <dependency step="componentregistry"/>
-  
-  
-  
-  
-  Import content type registry's predicates and bindings.
- 
- 
- </import-step>
- <import-step id="cookie_authentication"
-              version="20071112-01"
-              handler="Products.CMFCore.exportimport.cookieauth.importCookieCrumbler"
-              title="Cookie Authentication">
-  <dependency step="toolset"/>
-  
-  
-  
-  
-  Import cookie crumbler settings
- 
- 
- </import-step>
- <import-step id="mailhost" version="20071112-01"
-              handler="Products.CMFCore.exportimport.mailhost.importMailHost"
-              title="MailHost">
-  <dependency step="componentregistry"/>
-  <dependency step="toolset"/>
-  
-  
-  
-  
-  
-  
-  Import mailhost settings
- 
- 
- </import-step>
- <import-step id="properties" version="20071112-01"
-              handler="Products.CMFCore.exportimport.properties.importSiteProperties"
-              title="Site Properties">
-  
-  
-  Import site properties.
- 
- 
- </import-step>
- <import-step id="rolemap" version="20071112-01"
-              handler="Products.GenericSetup.rolemap.importRolemap"
-              title="Role / Permission Map">
-  
-  
-  Import custom roles and non-default role-permission mappings.
- 
- 
- </import-step>
- <import-step id="skins" version="20071112-01"
-              handler="Products.CMFCore.exportimport.skins.importSkinsTool"
-              title="Skins Tool">
-  <dependency step="componentregistry"/>
-  
-  
-  
-  
-  Import skins tool's filesystem directory views and skin path definitions.
- 
- 
- </import-step>
- <import-step id="toolset" version="20071112-01"
-              handler="Products.GenericSetup.tool.importToolset"
-              title="Required tools">
-  
-  
-  Create required tools, replacing any of the wrong class, and remove
-  forbidden ones.
- 
- 
- </import-step>
- <import-step id="typeinfo" version="20071112-01"
-              handler="Products.CMFCore.exportimport.typeinfo.importTypesTool"
-              title="Types Tool">
-  <dependency step="toolset"/>
-  
-  
-  
-  
-  Import types tool's type information objects.
- 
- 
- </import-step>
- <import-step id="various-calendar" version="20050316-01"
-              handler="Products.CMFCalendar.setuphandlers.importVarious"
-              title="Various Calendar Settings">
-  <dependency step="componentregistry"/>
-  <dependency step="toolset"/>
-  
-  
-  
-  
-  
-  Import various settings for CMF Calendar.
-  
- 
- </import-step>
- <import-step id="various-plinn-settings"
-              version="20060112-01"
-              handler="Products.Plinn.setuphandlers.importVarious"
-              title="Various Plinn settings">
-  <dependency step="skins"/>
-  <dependency step="toolset"/>
-  <dependency step="typeinfo"/>
-  <dependency step="workflow"/>
-  
-  
-  
-  
-  
-  
-  Import various settings from Plinn products.
-  
- 
- </import-step>
- <import-step id="workflow" version="20071112-01"
-              handler="Products.CMFCore.exportimport.workflow.importWorkflowTool"
-              title="Workflow Tool">
-  <dependency step="toolset"/>
-  
-  
-  
-  
-  Import workflow tool's workflow definitions and supporting scripts.
- 
- 
- </import-step>
-</import-steps>

diff --git a/profiles/default/mosaic_tool/types.xml b/profiles/default/mosaic_tool/types.xml
deleted file mode 100644 (file)
index 9ae3830..0000000
--- a/profiles/default/mosaic_tool/types.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<object name="mosaic_tool" meta_type="Mosaic Tool">
- <property name="title"></property>
- <object name="Action Box Block" meta_type="Mosaic Block Information"/>
- <object name="Container Block" meta_type="Mosaic Block Information"/>
- <object name="File Block" meta_type="Mosaic Block Information"/>
- <object name="Image Block" meta_type="Mosaic Block Information"/>
- <object name="Mosaic Document" meta_type="Mosaic Block Information"/>
- <object name="Section Block" meta_type="Mosaic Block Information"/>
- <object name="Spacer Block" meta_type="Mosaic Block Information"/>
- <object name="Text Block" meta_type="Mosaic Block Information"/>
- <object name="Tree Box Block" meta_type="Mosaic Block Information"/>
- <object name="Two Images Block" meta_type="Mosaic Block Information"/>
-</object>

diff --git a/profiles/default/mosaic_tool/types/Action_Box_Block.xml b/profiles/default/mosaic_tool/types/Action_Box_Block.xml
deleted file mode 100644 (file)
index 01dda2d..0000000
--- a/profiles/default/mosaic_tool/types/Action_Box_Block.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<object name="Action Box Block" meta_type="Mosaic Block Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">Action Box Block</property>
- <property name="description"></property>
- <property name="content_icon">mosaic_tool/action_block_icon.gif</property>
- <property name="content_meta_type">Action Box Block</property>
- <property name="template">mosaic_tool/action_block_template</property>
- <property name="notify_wf">False</property>
- <property name="product">MosaicDocument</property>
- <property name="factory">addMosaicBlock</property>
- <property name="immediate_view">view</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <action title="view" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/view" visible="True">
-  <permission value="View"/>
- </action>
-</object>

diff --git a/profiles/default/mosaic_tool/types/Container_Block.xml b/profiles/default/mosaic_tool/types/Container_Block.xml
deleted file mode 100644 (file)
index 45d87d3..0000000
--- a/profiles/default/mosaic_tool/types/Container_Block.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<object name="Container Block" meta_type="Mosaic Block Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">Container block</property>
- <property name="description"></property>
- <property name="content_icon">mosaic_tool/image_block_icon.gif</property>
- <property name="content_meta_type">Container Block</property>
- <property name="template">mosaic_tool/block_container_template</property>
- <property name="notify_wf">True</property>
- <property name="product">MosaicDocument</property>
- <property name="factory">addMosaicBlock</property>
- <property name="immediate_view">view</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <action title="view" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/view" visible="True">
-  <permission value="View"/>
- </action>
-</object>

diff --git a/profiles/default/mosaic_tool/types/File_Block.xml b/profiles/default/mosaic_tool/types/File_Block.xml
deleted file mode 100644 (file)
index 525734c..0000000
--- a/profiles/default/mosaic_tool/types/File_Block.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<object name="File Block" meta_type="Mosaic Block Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">File Block</property>
- <property name="description"></property>
- <property name="content_icon">mosaic_tool/image_block_icon.gif</property>
- <property name="content_meta_type">File Block</property>
- <property name="template">mosaic_tool/block_file_template</property>
- <property name="notify_wf">False</property>
- <property name="product">MosaicDocument</property>
- <property name="factory">addMosaicBlock</property>
- <property name="immediate_view">view</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <action title="view" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/view" visible="True">
-  <permission value="View"/>
- </action>
-</object>

diff --git a/profiles/default/mosaic_tool/types/Image_Block.xml b/profiles/default/mosaic_tool/types/Image_Block.xml
deleted file mode 100644 (file)
index 204db1d..0000000
--- a/profiles/default/mosaic_tool/types/Image_Block.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<object name="Image Block" meta_type="Mosaic Block Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">Image block</property>
- <property name="description"></property>
- <property name="content_icon">mosaic_tool/image_block_icon.gif</property>
- <property name="content_meta_type">Image Block</property>
- <property name="template">mosaic_tool/block_image_template</property>
- <property name="notify_wf">False</property>
- <property name="product">MosaicDocument</property>
- <property name="factory">addMosaicBlock</property>
- <property name="immediate_view">view</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <action title="view" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/view" visible="True">
-  <permission value="View"/>
- </action>
-</object>

diff --git a/profiles/default/mosaic_tool/types/Mosaic_Document.xml b/profiles/default/mosaic_tool/types/Mosaic_Document.xml
deleted file mode 100644 (file)
index d855369..0000000
--- a/profiles/default/mosaic_tool/types/Mosaic_Document.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<object name="Mosaic Document" meta_type="Mosaic Block Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">Mosaic Document</property>
- <property name="description"></property>
- <property name="content_icon">mosaic_icon.png</property>
- <property name="content_meta_type">Mosaic Document</property>
- <property name="template"></property>
- <property name="notify_wf">True</property>
- <property name="product">MosaicDocument</property>
- <property name="factory">addMosaicDocument</property>
- <property name="immediate_view">metadata_edit_form</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">True</property>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/mosaicdocument_view" visible="True">
-  <permission value="View"/>
- </action>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
-    url_expr="string:${object_url}/mosaicdocument_edit_form" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="Metadata" action_id="metadata" category="object"
-    condition_expr="" url_expr="string:${object_url}/metadata_edit_form"
-    visible="True"/>
-</object>

diff --git a/profiles/default/mosaic_tool/types/Section_Block.xml b/profiles/default/mosaic_tool/types/Section_Block.xml
deleted file mode 100644 (file)
index 64e49b4..0000000
--- a/profiles/default/mosaic_tool/types/Section_Block.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<object name="Section Block" meta_type="Mosaic Block Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">Section block</property>
- <property name="description"></property>
- <property name="content_icon">mosaic_tool/image_block_icon.gif</property>
- <property name="content_meta_type">Section Block</property>
- <property name="template">mosaic_tool/block_section_template</property>
- <property name="notify_wf">False</property>
- <property name="product">MosaicDocument</property>
- <property name="factory">addMosaicBlock</property>
- <property name="immediate_view">view</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <action title="view" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/view" visible="True">
-  <permission value="View"/>
- </action>
-</object>

diff --git a/profiles/default/mosaic_tool/types/Spacer_Block.xml b/profiles/default/mosaic_tool/types/Spacer_Block.xml
deleted file mode 100644 (file)
index 6610d7d..0000000
--- a/profiles/default/mosaic_tool/types/Spacer_Block.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<object name="Spacer Block" meta_type="Mosaic Block Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">Spacer block</property>
- <property name="description"></property>
- <property name="content_icon">mosaic_tool/image_block_icon.gif</property>
- <property name="content_meta_type">Spacer Block</property>
- <property name="template">mosaic_tool/block_spacer_template</property>
- <property name="notify_wf">False</property>
- <property name="product">MosaicDocument</property>
- <property name="factory">addMosaicBlock</property>
- <property name="immediate_view">view</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <action title="view" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/view" visible="True">
-  <permission value="View"/>
- </action>
-</object>

diff --git a/profiles/default/mosaic_tool/types/Text_Block.xml b/profiles/default/mosaic_tool/types/Text_Block.xml
deleted file mode 100644 (file)
index 3b11b85..0000000
--- a/profiles/default/mosaic_tool/types/Text_Block.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<object name="Text Block" meta_type="Mosaic Block Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">Text block</property>
- <property name="description"></property>
- <property name="content_icon">mosaic_tool/image_block_icon.gif</property>
- <property name="content_meta_type">Text Block</property>
- <property name="template">mosaic_tool/block_text_template</property>
- <property name="notify_wf">False</property>
- <property name="product">MosaicDocument</property>
- <property name="factory">addMosaicBlock</property>
- <property name="immediate_view">view</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <action title="view" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/view" visible="True">
-  <permission value="View"/>
- </action>
-</object>

diff --git a/profiles/default/mosaic_tool/types/Tree_Box_Block.xml b/profiles/default/mosaic_tool/types/Tree_Box_Block.xml
deleted file mode 100644 (file)
index 787cc87..0000000
--- a/profiles/default/mosaic_tool/types/Tree_Box_Block.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<object name="Tree Box Block" meta_type="Mosaic Block Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">Tree Box Block</property>
- <property name="description"></property>
- <property name="content_icon">mosaic_tool/tree_block_icon.gif</property>
- <property name="content_meta_type">Tree Box Block</property>
- <property name="template">mosaic_tool/tree_block_template</property>
- <property name="notify_wf">False</property>
- <property name="product">MosaicDocument</property>
- <property name="factory">addMosaicBlock</property>
- <property name="immediate_view">view</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <action title="view" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/view" visible="True">
-  <permission value="View"/>
- </action>
-</object>

diff --git a/profiles/default/mosaic_tool/types/Two_Images_Block.xml b/profiles/default/mosaic_tool/types/Two_Images_Block.xml
deleted file mode 100644 (file)
index 878da55..0000000
--- a/profiles/default/mosaic_tool/types/Two_Images_Block.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<object name="Two Images Block" meta_type="Mosaic Block Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">Two images block</property>
- <property name="description"></property>
- <property name="content_icon">mosaic_tool/image_block_icon.gif</property>
- <property name="content_meta_type">Two Images Block</property>
- <property name="template">mosaic_tool/block_two_images_template</property>
- <property name="notify_wf">False</property>
- <property name="product">MosaicDocument</property>
- <property name="factory">addMosaicBlock</property>
- <property name="immediate_view">view</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <action title="view" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/view" visible="True">
-  <permission value="View"/>
- </action>
-</object>

diff --git a/profiles/default/properties.xml b/profiles/default/properties.xml
index 97a20f5..f63d5d7 100644 (file)
--- a/profiles/default/properties.xml
+++ b/profiles/default/properties.xml
@@ -16,8 +16,8 @@
  <property name="enable_permalink" type="boolean">True</property>
  <property name="default_language" type="string">fr</property>
  <property name="validate_email" type="boolean">False</property>
  <property name="enable_permalink" type="boolean">True</property>
  <property name="default_language" type="string">fr</property>
  <property name="validate_email" type="boolean">False</property>

- <property name="slide_size" type="int">245</property>
- <property name="untitled_content_name" type="string">Untitled-</property>
+ <property name="slide_size" type="int">222</property>
+ <property name="untitled_content_form" type="string">Untitled-</property>

  <property name="default_charset" type="string">utf-8</property>
  <property name="management_page_charset" type="string">utf-8</property>
  <property name="unused_topic_fields" type="lines">
  <property name="default_charset" type="string">utf-8</property>
  <property name="management_page_charset" type="string">utf-8</property>
  <property name="unused_topic_fields" type="lines">


@@ -31,7 +31,13 @@
   <element value="start"/>
  </property>
  <property name="keywords" type="lines">
   <element value="start"/>
  </property>
  <property name="keywords" type="lines">

-  <element value=""/>

  </property>
  </property>

- <property name="ajax_config" type="int">3</property>
+ <property name="ajax_config" type="int">2</property>
+ <property name="copyright_notice"
+    type="string"></property>
+ <property name="tiles_background_color" type="string">#ffffff</property>
+ <property name="tiles_min_zoom" type="int">25</property>
+ <property name="tiles_max_zoom" type="int">100</property>
+ <property name="tiles_step_zoom" type="int">25</property>
+ <property name="default_batch_size" type="int">50</property>

 </site>
 </site>

diff --git a/profiles/default/rolemap.xml b/profiles/default/rolemap.xml
index b1dd68a..0a5096b 100644 (file)
--- a/profiles/default/rolemap.xml
+++ b/profiles/default/rolemap.xml
@@ -4,6 +4,7 @@
     <role name="Anonymous"/>
     <role name="Authenticated"/>
     <role name="Contributor"/>
     <role name="Anonymous"/>
     <role name="Authenticated"/>
     <role name="Contributor"/>

+    <role name="Downloader"/>

     <role name="Manager"/>
     <role name="Member"/>
     <role name="Owner"/>
     <role name="Manager"/>
     <role name="Member"/>
     <role name="Owner"/>


@@ -15,6 +16,9 @@
     <permission name="Add Groups" acquire="True">
       <role name="UserManager"/>
     </permission>
     <permission name="Add Groups" acquire="True">
       <role name="UserManager"/>
     </permission>

+    <permission name="Add Lightbox" acquire="True">
+      <role name="Owner"/>
+    </permission>

     <permission name="Add portal content" acquire="True">
       <role name="Contributor"/>
       <role name="Manager"/>
     <permission name="Add portal content" acquire="True">
       <role name="Contributor"/>
       <role name="Manager"/>


@@ -30,8 +34,8 @@
       <role name="Owner"/>
     </permission>
     <permission name="Add portal member" acquire="False">
       <role name="Owner"/>
     </permission>
     <permission name="Add portal member" acquire="False">

-      <role name="Anonymous"/>

       <role name="Manager"/>
       <role name="Manager"/>

+      <role name="UserManager"/>

     </permission>
     <permission name="Change Images and Files"
                 acquire="True">
     </permission>
     <permission name="Change Images and Files"
                 acquire="True">


@@ -59,6 +63,7 @@
     <permission name="List folder contents" acquire="True">
       <role name="Anonymous"/>
       <role name="Contributor"/>
     <permission name="List folder contents" acquire="True">
       <role name="Anonymous"/>
       <role name="Contributor"/>

+      <role name="Downloader"/>

       <role name="Reader"/>
     </permission>
     <permission name="List portal members" acquire="True">
       <role name="Reader"/>
     </permission>
     <permission name="List portal members" acquire="True">


@@ -115,15 +120,13 @@
       <role name="Manager"/>
       <role name="Owner"/>
     </permission>
       <role name="Manager"/>
       <role name="Owner"/>
     </permission>

-    <permission name="Use Factories" acquire="True">
-      <role name="Manager"/>
-    </permission>

     <permission name="Use mailhost services" acquire="True">
       <role name="Manager"/>
       <role name="Member"/>
     </permission>
     <permission name="View" acquire="True">
       <role name="Contributor"/>
     <permission name="Use mailhost services" acquire="True">
       <role name="Manager"/>
       <role name="Member"/>
     </permission>
     <permission name="View" acquire="True">
       <role name="Contributor"/>

+      <role name="Downloader"/>

       <role name="Owner"/>
       <role name="Reader"/>
     </permission>
       <role name="Owner"/>
       <role name="Reader"/>
     </permission>


@@ -138,5 +141,12 @@
       <role name="Manager"/>
       <role name="Owner"/>
     </permission>
       <role name="Manager"/>
       <role name="Owner"/>
     </permission>

+    <permission name="View raw image" acquire="True">
+      <role name="Downloader"/>
+    </permission>
+    <permission name="WebDAV access" acquire="False">
+      <role name="Downloader"/>
+      <role name="Manager"/>
+    </permission>

   </permissions>
 </rolemap>
   </permissions>
 </rolemap>

diff --git a/profiles/default/skins.xml b/profiles/default/skins.xml
index 9a02b84..451f7c3 100644 (file)
--- a/profiles/default/skins.xml
+++ b/profiles/default/skins.xml
@@ -29,6 +29,8 @@
     directory="Products.MosaicDocument:skins"/>
  <object name="mosaic_slots" meta_type="Filesystem Directory View"
     directory="Products.MosaicDocument:default_slots"/>
     directory="Products.MosaicDocument:skins"/>
  <object name="mosaic_slots" meta_type="Filesystem Directory View"
     directory="Products.MosaicDocument:default_slots"/>

+ <object name="photoprint" meta_type="Filesystem Directory View"
+    directory="Products.photoprint:skins"/>

  <object name="plinn_ajax" meta_type="Filesystem Directory View"
     directory="Products.Plinn:skins/ajax_scripts"/>
  <object name="plinn_content" meta_type="Filesystem Directory View"
  <object name="plinn_ajax" meta_type="Filesystem Directory View"
     directory="Products.Plinn:skins/ajax_scripts"/>
  <object name="plinn_content" meta_type="Filesystem Directory View"


@@ -55,6 +57,7 @@
     directory="Products.CMFCalendar:skins/zpt_calendar"/>
  <skin-path name="Plinn Basic">
   <layer name="custom"/>
     directory="Products.CMFCalendar:skins/zpt_calendar"/>
  <skin-path name="Plinn Basic">
   <layer name="custom"/>

+  <layer name="photoprint"/>

   <layer name="plinn_content"/>
   <layer name="plinn_control"/>
   <layer name="plinn_generic"/>
   <layer name="plinn_content"/>
   <layer name="plinn_control"/>
   <layer name="plinn_generic"/>

diff --git a/profiles/default/toolset.xml b/profiles/default/toolset.xml
index 6686275..1320220 100644 (file)
--- a/profiles/default/toolset.xml
+++ b/profiles/default/toolset.xml
@@ -26,12 +26,16 @@
            class="Products.Plinn.GroupDataTool.GroupDataTool"/>
  <required tool_id="portal_groups"
            class="Products.Plinn.GroupsTool.GroupsTool"/>
            class="Products.Plinn.GroupDataTool.GroupDataTool"/>
  <required tool_id="portal_groups"
            class="Products.Plinn.GroupsTool.GroupsTool"/>

+ <required tool_id="portal_image_manipulation"
+           class="Products.Portfolio.ImageManipulationTool.ImageManipulationTool"/>

  <required tool_id="portal_memberdata"
            class="Products.Plinn.MemberDataTool.MemberDataTool"/>
  <required tool_id="portal_membership"
            class="Products.Plinn.MembershipTool.MembershipTool"/>
  <required tool_id="portal_metadata"
            class="Products.CMFDefault.MetadataTool.MetadataTool"/>
  <required tool_id="portal_memberdata"
            class="Products.Plinn.MemberDataTool.MemberDataTool"/>
  <required tool_id="portal_membership"
            class="Products.Plinn.MembershipTool.MembershipTool"/>
  <required tool_id="portal_metadata"
            class="Products.CMFDefault.MetadataTool.MetadataTool"/>

+ <required tool_id="portal_photo_print"
+           class="Products.photoprint.tool.PhotoPrintTool"/>

  <required tool_id="portal_properties"
            class="Products.CMFDefault.PropertiesTool.PropertiesTool"/>
  <required tool_id="portal_registration"
  <required tool_id="portal_properties"
            class="Products.CMFDefault.PropertiesTool.PropertiesTool"/>
  <required tool_id="portal_registration"

diff --git a/profiles/default/types.xml b/profiles/default/types.xml
index f80c39b..d15d20c 100755 (executable)
--- a/profiles/default/types.xml
+++ b/profiles/default/types.xml
@@ -11,10 +11,13 @@
  <object name="File Slot" meta_type="Factory-based Type Information"/>
  <object name="Huge Plinn Folder" meta_type="Factory-based Type Information"/>
  <object name="Image Slot" meta_type="Factory-based Type Information"/>
  <object name="File Slot" meta_type="Factory-based Type Information"/>
  <object name="Huge Plinn Folder" meta_type="Factory-based Type Information"/>
  <object name="Image Slot" meta_type="Factory-based Type Information"/>

+ <object name="Lightbox" meta_type="Factory-based Type Information"/>

  <object name="Link" meta_type="Factory-based Type Information"/>
  <object name="List Slot" meta_type="Factory-based Type Information"/>
  <object name="Mosaic Document" meta_type="Factory-based Type Information"/>
  <object name="News Item" meta_type="Factory-based Type Information"/>
  <object name="Link" meta_type="Factory-based Type Information"/>
  <object name="List Slot" meta_type="Factory-based Type Information"/>
  <object name="Mosaic Document" meta_type="Factory-based Type Information"/>
  <object name="News Item" meta_type="Factory-based Type Information"/>

+ <object name="Order" meta_type="Factory-based Type Information"/>
+ <object name="Order Folder" meta_type="Factory-based Type Information"/>

  <object name="Photo" meta_type="Factory-based Type Information"/>
  <object name="Plinn Document" meta_type="Factory-based Type Information"/>
  <object name="Plinn Folder" meta_type="Factory-based Type Information"/>
  <object name="Photo" meta_type="Factory-based Type Information"/>
  <object name="Plinn Document" meta_type="Factory-based Type Information"/>
  <object name="Plinn Folder" meta_type="Factory-based Type Information"/>

diff --git a/profiles/default/types/CMF_Site.xml b/profiles/default/types/CMF_Site.xml
old mode 100755 (executable)
new mode 100644 (file)
index 34ce652..d36c06c
--- a/profiles/default/types/CMF_Site.xml
+++ b/profiles/default/types/CMF_Site.xml
@@ -3,10 +3,12 @@
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title"></property>
  <property name="description">Portal portal_type</property>
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title"></property>
  <property name="description">Portal portal_type</property>

- <property name="content_icon">plinn_icon.gif</property>
+ <property name="icon_expr">string:${portal_url}/plinn_icon.gif</property>

  <property name="content_meta_type"></property>
  <property name="product"></property>
  <property name="factory"></property>
  <property name="content_meta_type"></property>
  <property name="product"></property>
  <property name="factory"></property>

+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>

  <property name="immediate_view"></property>
  <property name="global_allow">False</property>
  <property name="filter_content_types">True</property>
  <property name="immediate_view"></property>
  <property name="global_allow">False</property>
  <property name="filter_content_types">True</property>


@@ -14,7 +16,9 @@
   <element value="Calendar"/>
   <element value="Document"/>
   <element value="File"/>
   <element value="Calendar"/>
   <element value="Document"/>
   <element value="File"/>

+  <element value="Huge Plinn Folder"/>

   <element value="News Item"/>
   <element value="News Item"/>

+  <element value="Order Folder"/>

   <element value="Plinn Document"/>
   <element value="Huge Plinn Folder"/>
   <element value="Portfolio"/>
   <element value="Plinn Document"/>
   <element value="Huge Plinn Folder"/>
   <element value="Portfolio"/>


@@ -25,21 +29,23 @@
  <alias from="mkdir" to="createPlinnFolder"/>
  <alias from="view" to="index_html"/>
  <action title="View" action_id="view" category="object" condition_expr=""
  <alias from="mkdir" to="createPlinnFolder"/>
  <alias from="view" to="index_html"/>
  <action title="View" action_id="view" category="object" condition_expr=""

-    url_expr="string:${object_url}/index_html" visible="True">
+    icon_expr="" link_target="" url_expr="string:${object_url}/index_html"
+    visible="True">

   <permission value="View"/>
  </action>
  <action title="List" action_id="folderContents" category="object"
   <permission value="View"/>
  </action>
  <action title="List" action_id="folderContents" category="object"

-    condition_expr="" url_expr="string:${object_url}/folder_contents"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_contents" visible="True">

   <permission value="List folder contents"/>
  </action>
  <action title="New..." action_id="new" category="object" condition_expr=""
   <permission value="List folder contents"/>
  </action>
  <action title="New..." action_id="new" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/folder_factories" visible="False">
   <permission value="Add portal content"/>
  </action>
  <action title="Rename items" action_id="rename_items" category="object"
     url_expr="string:${object_url}/folder_factories" visible="False">
   <permission value="Add portal content"/>
  </action>
  <action title="Rename items" action_id="rename_items" category="object"

-    condition_expr="" url_expr="string:${object_url}/folder_rename_form"
-    visible="False">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_rename_form" visible="False">

   <permission value="Add portal content"/>
  </action>
 </object>
   <permission value="Add portal content"/>
  </action>
 </object>

diff --git a/profiles/default/types/Calendar.xml b/profiles/default/types/Calendar.xml
old mode 100755 (executable)
new mode 100644 (file)
index 1e70767..94f37c9
--- a/profiles/default/types/Calendar.xml
+++ b/profiles/default/types/Calendar.xml
@@ -3,35 +3,39 @@
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">Agenda</property>
  <property name="description">Calendar contains events.</property>
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">Agenda</property>
  <property name="description">Calendar contains events.</property>

- <property name="content_icon">calendar_icon.gif</property>
+ <property name="icon_expr">string:${portal_url}/calendar_icon.gif</property>

  <property name="content_meta_type">Plinn Calendar</property>
  <property name="product">Plinn</property>
  <property name="factory">manage_addPlinnFolder</property>
  <property name="content_meta_type">Plinn Calendar</property>
  <property name="product">Plinn</property>
  <property name="factory">manage_addPlinnFolder</property>

+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>

  <property name="immediate_view">object/view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types">
   <element value="Event"/>
  </property>
  <property name="immediate_view">object/view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types">
   <element value="Event"/>
  </property>

- <property name="allow_discussion">True</property>
+ <property name="allow_discussion">False</property>

  <alias from="(Default)" to="cal_calendar_view"/>
  <alias from="view" to="cal_calendar_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
  <alias from="(Default)" to="cal_calendar_view"/>
  <alias from="view" to="cal_calendar_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/cal_calendar_view" visible="True">
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
     url_expr="string:${object_url}/cal_calendar_view" visible="True">
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/folder_edit_form" visible="False">
   <permission value="Manage properties"/>
  </action>
  <action title="Share" action_id="localroles" category="object"
     url_expr="string:${object_url}/folder_edit_form" visible="False">
   <permission value="Manage properties"/>
  </action>
  <action title="Share" action_id="localroles" category="object"

-    condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_localrole_form" visible="True">

   <permission value="Manage properties"/>
  </action>
  <action title="Status history" action_id="history" category="object"
   <permission value="Manage properties"/>
  </action>
  <action title="Status history" action_id="history" category="object"

-    condition_expr="" url_expr="string:${object_url}/content_status_history"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/content_status_history" visible="True">

   <permission value="Request review"/>
   <permission value="Review portal content"/>
  </action>
   <permission value="Request review"/>
   <permission value="Review portal content"/>
  </action>

diff --git a/profiles/default/types/Discussion_Item.xml b/profiles/default/types/Discussion_Item.xml
old mode 100755 (executable)
new mode 100644 (file)
index a15bd46..0df543a
--- a/profiles/default/types/Discussion_Item.xml
+++ b/profiles/default/types/Discussion_Item.xml
@@ -5,10 +5,13 @@
  <property
     name="description">Discussion Items are documents which reply to other content.
   They should *not* be addable through the standard 'folder_factories' interface.</property>
  <property
     name="description">Discussion Items are documents which reply to other content.
   They should *not* be addable through the standard 'folder_factories' interface.</property>

- <property name="content_icon">discussionitem_icon.gif</property>
+ <property
+    name="icon_expr">string:${portal_url}/discussionitem_icon.gif</property>

  <property name="content_meta_type">Discussion Item</property>
  <property name="product"></property>
  <property name="factory"></property>
  <property name="content_meta_type">Discussion Item</property>
  <property name="product"></property>
  <property name="factory"></property>

+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>

  <property name="immediate_view"></property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="immediate_view"></property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>


@@ -17,17 +20,18 @@
  <alias from="(Default)" to="discussionitem_view"/>
  <alias from="view" to="discussionitem_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
  <alias from="(Default)" to="discussionitem_view"/>
  <alias from="view" to="discussionitem_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/discussionitem_view" visible="False">
   <permission value="View"/>
  </action>
  <action title="Reply..." action_id="reply" category="discussion"
     url_expr="string:${object_url}/discussionitem_view" visible="False">
   <permission value="View"/>
  </action>
  <action title="Reply..." action_id="reply" category="discussion"

-    condition_expr="" url_expr="string:${object_url}/discussion_reply_form"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/discussion_reply_form" visible="True">

   <permission value="Reply to item"/>
  </action>
  <action title="Delete" action_id="del" category="discussion"
   <permission value="Reply to item"/>
  </action>
  <action title="Delete" action_id="del" category="discussion"

-    condition_expr="" url_expr="string:${object_url}/discussionItemDelete"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/discussionItemDelete" visible="True">

   <permission value="Manage portal"/>
  </action>
 </object>
   <permission value="Manage portal"/>
  </action>
 </object>

diff --git a/profiles/default/types/Document.xml b/profiles/default/types/Document.xml
old mode 100755 (executable)
new mode 100644 (file)
index 7f9ead9..dedc32f
--- a/profiles/default/types/Document.xml
+++ b/profiles/default/types/Document.xml
@@ -4,40 +4,39 @@
  <property name="title">Document</property>
  <property
     name="description">Contain text that can be formatted using 'Structured Text.' It may also contain HTML, or "plain" text.</property>
  <property name="title">Document</property>
  <property
     name="description">Contain text that can be formatted using 'Structured Text.' It may also contain HTML, or "plain" text.</property>

- <property name="content_icon">text.gif</property>
+ <property name="icon_expr">string:${portal_url}/text.gif</property>

  <property name="content_meta_type">Document</property>
  <property name="product">CMFDefault</property>
  <property name="factory">addDocument</property>
  <property name="content_meta_type">Document</property>
  <property name="product">CMFDefault</property>
  <property name="factory">addDocument</property>

+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>

  <property name="immediate_view">object/edit</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types"/>
  <property name="immediate_view">object/edit</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types"/>

- <property name="allow_discussion">True</property>
+ <property name="allow_discussion">False</property>

  <alias from="(Default)" to="document_view"/>
  <alias from="gethtml" to="source_html"/>
  <alias from="info" to="content_info"/>
  <alias from="view" to="document_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
  <alias from="(Default)" to="document_view"/>
  <alias from="gethtml" to="source_html"/>
  <alias from="info" to="content_info"/>
  <alias from="view" to="document_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""

-    url_expr="string:${object_url}/document_view" visible="True">
+    icon_expr="" link_target="" url_expr="string:${object_url}/document_view"
+    visible="True">

   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/document_edit_form" visible="True">
   <permission value="Modify portal content"/>
  </action>
  <action title="Share" action_id="localroles" category="object"
     url_expr="string:${object_url}/document_edit_form" visible="True">
   <permission value="Modify portal content"/>
  </action>
  <action title="Share" action_id="localroles" category="object"

-    condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_localrole_form" visible="True">

   <permission value="Set Local Roles"/>
  </action>
  <action title="History" action_id="changes" category="object"
   <permission value="Set Local Roles"/>
  </action>
  <action title="History" action_id="changes" category="object"

-    condition_expr="" url_expr="string:${object_url}/changes_history"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/changes_history" visible="True">

   <permission value="View History"/>
  </action>
   <permission value="View History"/>
  </action>

- <action title="Status history" action_id="history" category="workflow"
-    condition_expr="" url_expr="string:${object_url}/content_status_history"
-    visible="True">
-  <permission value="Request review"/>
- </action>

 </object>
 </object>

diff --git a/profiles/default/types/Event.xml b/profiles/default/types/Event.xml
old mode 100755 (executable)
new mode 100644 (file)
index 61a7eeb..293f8be
--- a/profiles/default/types/Event.xml
+++ b/profiles/default/types/Event.xml
@@ -4,37 +4,42 @@
  <property name="title">Event</property>
  <property
     name="description">Events are objects for use in Calendar topical queries on the catalog.</property>
  <property name="title">Event</property>
  <property
     name="description">Events are objects for use in Calendar topical queries on the catalog.</property>

- <property name="content_icon">event_icon.gif</property>
+ <property name="icon_expr">string:${portal_url}/event_icon.gif</property>

  <property name="content_meta_type">CMF Event</property>
  <property name="product">CMFCalendar</property>
  <property name="factory">addEvent</property>
  <property name="content_meta_type">CMF Event</property>
  <property name="product">CMFCalendar</property>
  <property name="factory">addEvent</property>

+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>

  <property name="immediate_view">object/edit</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types"/>
  <property name="immediate_view">object/edit</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types"/>

- <property name="allow_discussion">True</property>
+ <property name="allow_discussion">False</property>

  <alias from="(Default)" to="event_view"/>
  <alias from="view" to="event_view"/>
  <action title="Agenda" action_id="calendar_view" category="object"
  <alias from="(Default)" to="event_view"/>
  <alias from="view" to="event_view"/>
  <action title="Agenda" action_id="calendar_view" category="object"

-    condition_expr="" url_expr="string:${folder_url}" visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${folder_url}" visible="True">

   <permission value="View"/>
  </action>
  <action title="View" action_id="view" category="object" condition_expr=""
   <permission value="View"/>
  </action>
  <action title="View" action_id="view" category="object" condition_expr=""

-    url_expr="string:${object_url}/event_view" visible="True">
+    icon_expr="" link_target="" url_expr="string:${object_url}/event_view"
+    visible="True">

   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/event_edit_form" visible="True">
   <permission value="Change portal events"/>
  </action>
  <action title="Share" action_id="localroles" category="object"
     url_expr="string:${object_url}/event_edit_form" visible="True">
   <permission value="Change portal events"/>
  </action>
  <action title="Share" action_id="localroles" category="object"

-    condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_localrole_form" visible="True">

   <permission value="Set Local Roles"/>
  </action>
  <action title="Status history" action_id="history" category="object"
   <permission value="Set Local Roles"/>
  </action>
  <action title="Status history" action_id="history" category="object"

-    condition_expr="" url_expr="string:${object_url}/content_status_history"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/content_status_history" visible="True">

   <permission value="Request review"/>
   <permission value="Review portal content"/>
  </action>
   <permission value="Request review"/>
   <permission value="Review portal content"/>
  </action>

diff --git a/profiles/default/types/Favorite.xml b/profiles/default/types/Favorite.xml
old mode 100755 (executable)
new mode 100644 (file)
index d64d98a..f93a817
--- a/profiles/default/types/Favorite.xml
+++ b/profiles/default/types/Favorite.xml
@@ -3,10 +3,12 @@
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">Favorite</property>
  <property name="description">Link to an intra-portal resource.</property>
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">Favorite</property>
  <property name="description">Link to an intra-portal resource.</property>

- <property name="content_icon">link_icon.gif</property>
+ <property name="icon_expr">string:${portal_url}/link_icon.gif</property>

  <property name="content_meta_type">Favorite</property>
  <property name="product">CMFDefault</property>
  <property name="factory">addFavorite</property>
  <property name="content_meta_type">Favorite</property>
  <property name="product">CMFDefault</property>
  <property name="factory">addFavorite</property>

+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>

  <property name="immediate_view">object/edit</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="immediate_view">object/edit</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>


@@ -15,11 +17,13 @@
  <alias from="(Default)" to="favorite_view"/>
  <alias from="view" to="favorite_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
  <alias from="(Default)" to="favorite_view"/>
  <alias from="view" to="favorite_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""

-    url_expr="string:${object_url}/favorite_view" visible="True">
+    icon_expr="" link_target="" url_expr="string:${object_url}/favorite_view"
+    visible="True">

   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""

-    url_expr="string:${object_url}/link_edit_form" visible="True">
+    icon_expr="" link_target="" url_expr="string:${object_url}/link_edit_form"
+    visible="True">

   <permission value="Modify portal content"/>
  </action>
 </object>
   <permission value="Modify portal content"/>
  </action>
 </object>

diff --git a/profiles/default/types/File.xml b/profiles/default/types/File.xml
old mode 100755 (executable)
new mode 100644 (file)
index da76059..1cc4cec
--- a/profiles/default/types/File.xml
+++ b/profiles/default/types/File.xml
@@ -3,42 +3,48 @@
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">File</property>
  <property name="description">Contain arbitrary downloadable files.</property>
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">File</property>
  <property name="description">Contain arbitrary downloadable files.</property>

- <property name="content_icon">application.png</property>
+ <property name="icon_expr">string:${portal_url}/application.png</property>

  <property name="content_meta_type">Plinn File</property>
  <property name="content_meta_type">Plinn File</property>

- <property name="product"></property>
- <property name="factory">plinn.file</property>
+ <property name="product">Plinn</property>
+ <property name="factory">addFile</property>
+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>

  <property name="immediate_view">object/edit</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types"/>
  <property name="immediate_view">object/edit</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types"/>

- <property name="allow_discussion">True</property>
- <alias from="(Default)" to="file_view"/>
+ <property name="allow_discussion">False</property>
+ <alias from="(Default)" to="index_html"/>

  <alias from="info" to="file_info"/>
  <alias from="view" to="file_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
  <alias from="info" to="file_info"/>
  <alias from="view" to="file_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""

-    url_expr="string:${object_url}/file_view" visible="True">
+    icon_expr="" link_target="" url_expr="string:${object_url}/file_view"
+    visible="True">

   <permission value="View"/>
  </action>
  <action title="Web preview" action_id="preview" category="object"
   <permission value="View"/>
  </action>
  <action title="Web preview" action_id="preview" category="object"

-    condition_expr="" url_expr="string:${object_url}/preview" visible="False">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/preview" visible="False">

   <permission value="View"/>
  </action>
  <action title="Download" action_id="download" category="object"
   <permission value="View"/>
  </action>
  <action title="Download" action_id="download" category="object"

-    condition_expr="" url_expr="string:${object_url}" visible="False">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}" visible="False">

   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""

-    url_expr="string:${object_url}/file_edit_form" visible="True">
+    icon_expr="" link_target="" url_expr="string:${object_url}/file_edit_form"
+    visible="True">

   <permission value="Modify portal content"/>
  </action>
  <action title="Share" action_id="localroles" category="object"
   <permission value="Modify portal content"/>
  </action>
  <action title="Share" action_id="localroles" category="object"

-    condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_localrole_form" visible="True">

   <permission value="Set Local Roles"/>
  </action>
  <action title="Status history" action_id="history" category="object"
   <permission value="Set Local Roles"/>
  </action>
  <action title="Status history" action_id="history" category="object"

-    condition_expr="" url_expr="string:${object_url}/content_status_history"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/content_status_history" visible="True">

   <permission value="Request review"/>
   <permission value="Review portal content"/>
  </action>
   <permission value="Request review"/>
   <permission value="Review portal content"/>
  </action>

diff --git a/profiles/default/types/File_Slot.xml b/profiles/default/types/File_Slot.xml
old mode 100755 (executable)
new mode 100644 (file)
index 6c10a47..8782cbe
--- a/profiles/default/types/File_Slot.xml
+++ b/profiles/default/types/File_Slot.xml
@@ -3,10 +3,13 @@
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">File Slot</property>
  <property name="description">File Slot for Mosaic Document</property>
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">File Slot</property>
  <property name="description">File Slot for Mosaic Document</property>

- <property name="content_icon">mosaic_tool/bin_icon.gif</property>
+ <property
+    name="icon_expr">string:${portal_url}/mosaic_tool/bin_icon.gif</property>

  <property name="content_meta_type">File Slot</property>
  <property name="product">MosaicDocument</property>
  <property name="factory">addFileSlot</property>
  <property name="content_meta_type">File Slot</property>
  <property name="product">MosaicDocument</property>
  <property name="factory">addFileSlot</property>

+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>

  <property name="immediate_view">view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="immediate_view">view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>


@@ -15,11 +18,13 @@
  <alias from="(Default)" to="slot_file_view"/>
  <alias from="view" to="slot_file_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
  <alias from="(Default)" to="slot_file_view"/>
  <alias from="view" to="slot_file_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""

-    url_expr="string:slot_file_view" visible="True">
+    icon_expr="" link_target="" url_expr="string:slot_file_view"
+    visible="True">

   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""

-    url_expr="string:slot_file_form" visible="True">
+    icon_expr="" link_target="" url_expr="string:slot_file_form"
+    visible="True">

   <permission value="Modify portal content"/>
  </action>
 </object>
   <permission value="Modify portal content"/>
  </action>
 </object>

diff --git a/profiles/default/types/Huge_Plinn_Folder.xml b/profiles/default/types/Huge_Plinn_Folder.xml
index 15616ad..38799ea 100644 (file)
--- a/profiles/default/types/Huge_Plinn_Folder.xml
+++ b/profiles/default/types/Huge_Plinn_Folder.xml
@@ -4,10 +4,12 @@
  <property name="title">Huge Folder</property>
  <property
     name="description">Container to put content in categories.</property>
  <property name="title">Huge Folder</property>
  <property
     name="description">Container to put content in categories.</property>

- <property name="content_icon">folder_icon.gif</property>
+ <property name="icon_expr">string:${portal_url}/folder_icon.gif</property>

  <property name="content_meta_type">Huge Plinn Folder</property>
  <property name="product"></property>
  <property name="factory">plinn.folder.huge</property>
  <property name="content_meta_type">Huge Plinn Folder</property>
  <property name="product"></property>
  <property name="factory">plinn.folder.huge</property>

+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>

  <property name="immediate_view">object/folderContents</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="immediate_view">object/folderContents</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>


@@ -29,26 +31,28 @@
  <alias from="mkdir" to="createHugePlinnFolder"/>
  <alias from="view" to="folder_contents"/>
  <action title="View" action_id="view" category="object" condition_expr=""
  <alias from="mkdir" to="createHugePlinnFolder"/>
  <alias from="view" to="folder_contents"/>
  <action title="View" action_id="view" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/folder_contents" visible="False">
   <permission value="View"/>
  </action>
  <action title="List" action_id="folderContents" category="object"
     url_expr="string:${object_url}/folder_contents" visible="False">
   <permission value="View"/>
  </action>
  <action title="List" action_id="folderContents" category="object"

-    condition_expr="" url_expr="string:${object_url}/folder_contents"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_contents" visible="True">

   <permission value="List folder contents"/>
  </action>
  <action title="Share" action_id="localroles" category="object"
   <permission value="List folder contents"/>
  </action>
  <action title="Share" action_id="localroles" category="object"

-    condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_localrole_form" visible="True">

   <permission value="Set Local Roles"/>
  </action>
  <action title="New..." action_id="new" category="object" condition_expr=""
   <permission value="Set Local Roles"/>
  </action>
  <action title="New..." action_id="new" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/folder_factories" visible="False">
   <permission value="Add portal content"/>
  </action>
  <action title="Rename items" action_id="rename_items" category="object"
     url_expr="string:${object_url}/folder_factories" visible="False">
   <permission value="Add portal content"/>
  </action>
  <action title="Rename items" action_id="rename_items" category="object"

-    condition_expr="" url_expr="string:${object_url}/folder_rename_form"
-    visible="False">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_rename_form" visible="False">

   <permission value="Add portal content"/>
  </action>
 </object>
   <permission value="Add portal content"/>
  </action>
 </object>

diff --git a/profiles/default/types/Image_Slot.xml b/profiles/default/types/Image_Slot.xml
old mode 100755 (executable)
new mode 100644 (file)
index 5b0111d..c82d822
--- a/profiles/default/types/Image_Slot.xml
+++ b/profiles/default/types/Image_Slot.xml
@@ -3,10 +3,13 @@
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">Image Slot</property>
  <property name="description">Image Slot for Mosaic Document</property>
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">Image Slot</property>
  <property name="description">Image Slot for Mosaic Document</property>

- <property name="content_icon">mosaic_tool/photo_icon.gif</property>
+ <property
+    name="icon_expr">string:${portal_url}/mosaic_tool/photo_icon.gif</property>

  <property name="content_meta_type">Image Slot</property>
  <property name="product">MosaicDocument</property>
  <property name="factory">addImageSlot</property>
  <property name="content_meta_type">Image Slot</property>
  <property name="product">MosaicDocument</property>
  <property name="factory">addImageSlot</property>

+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>

  <property name="immediate_view">view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="immediate_view">view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>


@@ -15,11 +18,13 @@
  <alias from="(Default)" to="slot_image_view"/>
  <alias from="view" to="slot_image_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
  <alias from="(Default)" to="slot_image_view"/>
  <alias from="view" to="slot_image_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""

-    url_expr="string:slot_image_view" visible="True">
+    icon_expr="" link_target="" url_expr="string:slot_image_view"
+    visible="True">

   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""

-    url_expr="string:slot_image_form" visible="True">
+    icon_expr="" link_target="" url_expr="string:slot_image_form"
+    visible="True">

   <permission value="Modify portal content"/>
  </action>
 </object>
   <permission value="Modify portal content"/>
  </action>
 </object>

diff --git a/profiles/default/types/Lightbox.xml b/profiles/default/types/Lightbox.xml
new file mode 100644 (file)
index 0000000..def8f7e
--- /dev/null
+++ b/profiles/default/types/Lightbox.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<object name="Lightbox" meta_type="Factory-based Type Information"
+   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+ <property name="title">Lightbox</property>
+ <property name="description">lightbox holds references to photos</property>
+ <property name="icon_expr">string:${portal_url}/lightbox_icon.png</property>
+ <property name="content_meta_type">Lightbox</property>
+ <property name="product"></property>
+ <property name="factory">portfolio.lightbox</property>
+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>
+ <property name="immediate_view">object/view</property>
+ <property name="global_allow">True</property>
+ <property name="filter_content_types">True</property>
+ <property name="allowed_content_types"/>
+ <property name="allow_discussion">False</property>
+ <alias from="(Default)" to="lightbox_view"/>
+ <alias from="view" to="lightbox_view"/>
+ <action title="View" action_id="view" category="object" condition_expr=""
+    icon_expr="" link_target="" url_expr="string:${object_url}/lightbox_view"
+    visible="True">
+  <permission value="View"/>
+ </action>
+</object>

diff --git a/profiles/default/types/Link.xml b/profiles/default/types/Link.xml
old mode 100755 (executable)
new mode 100644 (file)
index be4a2c2..0172f76
--- a/profiles/default/types/Link.xml
+++ b/profiles/default/types/Link.xml
@@ -3,10 +3,12 @@
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">Link</property>
  <property name="description">Annotated URL.</property>
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">Link</property>
  <property name="description">Annotated URL.</property>

- <property name="content_icon">link_icon.gif</property>
+ <property name="icon_expr">string:${portal_url}/link_icon.gif</property>

  <property name="content_meta_type">Link</property>
  <property name="product">CMFDefault</property>
  <property name="factory">addLink</property>
  <property name="content_meta_type">Link</property>
  <property name="product">CMFDefault</property>
  <property name="factory">addLink</property>

+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>

  <property name="immediate_view">object/edit</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="immediate_view">object/edit</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>


@@ -16,21 +18,23 @@
  <alias from="info" to="content_info"/>
  <alias from="view" to="link_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
  <alias from="info" to="content_info"/>
  <alias from="view" to="link_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""

-    url_expr="string:${object_url}/link_view" visible="True">
+    icon_expr="" link_target="" url_expr="string:${object_url}/link_view"
+    visible="True">

   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""

-    url_expr="string:${object_url}/link_edit_form" visible="True">
+    icon_expr="" link_target="" url_expr="string:${object_url}/link_edit_form"
+    visible="True">

   <permission value="Modify portal content"/>
  </action>
  <action title="Share" action_id="localroles" category="object"
   <permission value="Modify portal content"/>
  </action>
  <action title="Share" action_id="localroles" category="object"

-    condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_localrole_form" visible="True">

   <permission value="Set Local Roles"/>
  </action>
  <action title="Status history" action_id="history" category="object"
   <permission value="Set Local Roles"/>
  </action>
  <action title="Status history" action_id="history" category="object"

-    condition_expr="" url_expr="string:${object_url}/content_status_history"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/content_status_history" visible="True">

   <permission value="Request review"/>
   <permission value="Review portal content"/>
  </action>
   <permission value="Request review"/>
   <permission value="Review portal content"/>
  </action>

diff --git a/profiles/default/types/List_Slot.xml b/profiles/default/types/List_Slot.xml
old mode 100755 (executable)
new mode 100644 (file)
index 64c4930..0d8c207
--- a/profiles/default/types/List_Slot.xml
+++ b/profiles/default/types/List_Slot.xml
@@ -3,10 +3,13 @@
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">List Slot</property>
  <property name="description">List Slot for Mosaic Document</property>
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">List Slot</property>
  <property name="description">List Slot for Mosaic Document</property>

- <property name="content_icon">mosaic_tool/str_icon.gif</property>
+ <property
+    name="icon_expr">string:${portal_url}/mosaic_tool/str_icon.gif</property>

  <property name="content_meta_type">List Slot</property>
  <property name="product">MosaicDocument</property>
  <property name="factory">addStringSlot</property>
  <property name="content_meta_type">List Slot</property>
  <property name="product">MosaicDocument</property>
  <property name="factory">addStringSlot</property>

+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>

  <property name="immediate_view">view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="immediate_view">view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>


@@ -15,11 +18,13 @@
  <alias from="(Default)" to="slot_list_view"/>
  <alias from="view" to="slot_list_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
  <alias from="(Default)" to="slot_list_view"/>
  <alias from="view" to="slot_list_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""

-    url_expr="string:slot_list_view" visible="True">
+    icon_expr="" link_target="" url_expr="string:slot_list_view"
+    visible="True">

   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""

-    url_expr="string:slot_text_form" visible="True">
+    icon_expr="" link_target="" url_expr="string:slot_text_form"
+    visible="True">

   <permission value="Modify portal content"/>
  </action>
 </object>
   <permission value="Modify portal content"/>
  </action>
 </object>

diff --git a/profiles/default/types/Mosaic_Document.xml b/profiles/default/types/Mosaic_Document.xml
old mode 100755 (executable)
new mode 100644 (file)
index 1b7e308..23bc637
--- a/profiles/default/types/Mosaic_Document.xml
+++ b/profiles/default/types/Mosaic_Document.xml
@@ -3,34 +3,38 @@
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">Mosaic Document</property>
  <property name="description"></property>
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">Mosaic Document</property>
  <property name="description"></property>

- <property name="content_icon">mosaic_icon.gif</property>
+ <property name="icon_expr">string:${portal_url}/mosaic_icon.gif</property>

  <property name="content_meta_type">Mosaic Document</property>
  <property name="product">MosaicDocument</property>
  <property name="factory">addMosaicDocument</property>
  <property name="content_meta_type">Mosaic Document</property>
  <property name="product">MosaicDocument</property>
  <property name="factory">addMosaicDocument</property>

+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>

  <property name="immediate_view">object/edit</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">False</property>
  <property name="allowed_content_types"/>
  <property name="immediate_view">object/edit</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">False</property>
  <property name="allowed_content_types"/>

- <property name="allow_discussion">True</property>
+ <property name="allow_discussion">False</property>

  <alias from="(Default)" to="mosaicdocument_view"/>
  <alias from="info" to="content_info"/>
  <alias from="view" to="mosaicdocument_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
  <alias from="(Default)" to="mosaicdocument_view"/>
  <alias from="info" to="content_info"/>
  <alias from="view" to="mosaicdocument_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/mosaicdocument_view" visible="True">
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
     url_expr="string:${object_url}/mosaicdocument_view" visible="True">
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/mosaicdocument_edit_form" visible="True">
   <permission value="Modify portal content"/>
  </action>
  <action title="Share" action_id="localroles" category="object"
     url_expr="string:${object_url}/mosaicdocument_edit_form" visible="True">
   <permission value="Modify portal content"/>
  </action>
  <action title="Share" action_id="localroles" category="object"

-    condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_localrole_form" visible="True">

   <permission value="Set Local Roles"/>
  </action>
  <action title="Status history" action_id="history" category="object"
   <permission value="Set Local Roles"/>
  </action>
  <action title="Status history" action_id="history" category="object"

-    condition_expr="" url_expr="string:${object_url}/content_status_history"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/content_status_history" visible="True">

   <permission value="Request review"/>
   <permission value="Review portal content"/>
  </action>
   <permission value="Request review"/>
   <permission value="Review portal content"/>
  </action>

diff --git a/profiles/default/types/News_Item.xml b/profiles/default/types/News_Item.xml
old mode 100755 (executable)
new mode 100644 (file)
index 3ab73b9..68f1717
--- a/profiles/default/types/News_Item.xml
+++ b/profiles/default/types/News_Item.xml
@@ -4,35 +4,39 @@
  <property name="title">News Item</property>
  <property
     name="description">Short text article with a title and an optional lead-in.</property>
  <property name="title">News Item</property>
  <property
     name="description">Short text article with a title and an optional lead-in.</property>

- <property name="content_icon">newsitem_icon.gif</property>
+ <property name="icon_expr">string:${portal_url}/newsitem_icon.gif</property>

  <property name="content_meta_type">News Item</property>
  <property name="product">CMFDefault</property>
  <property name="factory">addNewsItem</property>
  <property name="content_meta_type">News Item</property>
  <property name="product">CMFDefault</property>
  <property name="factory">addNewsItem</property>

+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>

  <property name="immediate_view">object/edit</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types"/>
  <property name="immediate_view">object/edit</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types"/>

- <property name="allow_discussion">True</property>
+ <property name="allow_discussion">False</property>

  <alias from="(Default)" to="newsitem_view"/>
  <alias from="gethtml" to="source_html"/>
  <alias from="info" to="content_info"/>
  <alias from="view" to="newsitem_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
  <alias from="(Default)" to="newsitem_view"/>
  <alias from="gethtml" to="source_html"/>
  <alias from="info" to="content_info"/>
  <alias from="view" to="newsitem_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""

-    url_expr="string:${object_url}/newsitem_view" visible="True">
+    icon_expr="" link_target="" url_expr="string:${object_url}/newsitem_view"
+    visible="True">

   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/newsitem_edit_form" visible="True">
   <permission value="Modify portal content"/>
  </action>
  <action title="Share" action_id="localroles" category="object"
     url_expr="string:${object_url}/newsitem_edit_form" visible="True">
   <permission value="Modify portal content"/>
  </action>
  <action title="Share" action_id="localroles" category="object"

-    condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_localrole_form" visible="True">

   <permission value="Set Local Roles"/>
  </action>
  <action title="Status history" action_id="history" category="object"
   <permission value="Set Local Roles"/>
  </action>
  <action title="Status history" action_id="history" category="object"

-    condition_expr="" url_expr="string:${object_url}/content_status_history"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/content_status_history" visible="True">

   <permission value="Request review"/>
   <permission value="Review portal content"/>
  </action>
   <permission value="Request review"/>
   <permission value="Review portal content"/>
  </action>

diff --git a/profiles/default/types/Order.xml b/profiles/default/types/Order.xml
new file mode 100644 (file)
index 0000000..c5c021d
--- /dev/null
+++ b/profiles/default/types/Order.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<object name="Order" meta_type="Factory-based Type Information"
+   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+ <property name="title">Order</property>
+ <property name="description"></property>
+ <property name="icon_expr">string:${portal_url}/text.gif</property>
+ <property name="content_meta_type">Print order</property>
+ <property name="product"></property>
+ <property name="factory">photoprint.order</property>
+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>
+ <property name="immediate_view">object/edit</property>
+ <property name="global_allow">True</property>
+ <property name="filter_content_types">True</property>
+ <property name="allowed_content_types"/>
+ <property name="allow_discussion">False</property>
+ <alias from="(Default)" to="order_view"/>
+ <action title="View" action_id="view" category="object" condition_expr=""
+    icon_expr="" link_target="" url_expr="string:${object_url}/order_view"
+    visible="True">
+  <permission value="View"/>
+ </action>
+</object>

diff --git a/profiles/default/types/Order_Folder.xml b/profiles/default/types/Order_Folder.xml
new file mode 100644 (file)
index 0000000..4378dbb
--- /dev/null
+++ b/profiles/default/types/Order_Folder.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<object name="Order Folder" meta_type="Factory-based Type Information"
+   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+ <property name="title">Order Folder</property>
+ <property name="description"></property>
+ <property name="icon_expr">string:${portal_url}/folder_icon.gif</property>
+ <property name="content_meta_type">Huge Plinn Folder</property>
+ <property name="product"></property>
+ <property name="factory">plinn.folder.huge</property>
+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>
+ <property name="immediate_view">object/folderContents</property>
+ <property name="global_allow">True</property>
+ <property name="filter_content_types">True</property>
+ <property name="allowed_content_types">
+  <element value="Order"/>
+  <element value="Order Folder"/>
+ </property>
+ <property name="allow_discussion">False</property>
+ <alias from="(Default)" to="order_list"/>
+ <alias from="mkdir" to="createHugePlinnFolder"/>
+ <alias from="view" to="folder_contents"/>
+ <action title="View" action_id="view" category="object" condition_expr=""
+    icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_contents" visible="False">
+  <permission value="View"/>
+ </action>
+ <action title="List" action_id="orderlist" category="object"
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/order_list" visible="True">
+  <permission value="List print orders"/>
+ </action>
+ <action title="Share" action_id="localroles" category="object"
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_localrole_form" visible="True">
+  <permission value="Set Local Roles"/>
+ </action>
+ <action title="New..." action_id="new" category="object" condition_expr=""
+    icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_factories" visible="False">
+  <permission value="Add portal content"/>
+ </action>
+ <action title="Rename items" action_id="rename_items" category="object"
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_rename_form" visible="False">
+  <permission value="Add portal content"/>
+ </action>
+</object>

diff --git a/profiles/default/types/Photo.xml b/profiles/default/types/Photo.xml
old mode 100755 (executable)
new mode 100644 (file)
index 2eb1e27..9ab28d1
--- a/profiles/default/types/Photo.xml
+++ b/profiles/default/types/Photo.xml
@@ -3,29 +3,39 @@
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">Photo</property>
  <property name="description">Photo</property>
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">Photo</property>
  <property name="description">Photo</property>

- <property name="content_icon">photo_icon.gif</property>
+ <property name="icon_expr">string:${portal_url}/photo_icon.gif</property>

  <property name="content_meta_type">Photo</property>
  <property name="content_meta_type">Photo</property>

- <property name="product">Portfolio</property>
- <property name="factory">addPhoto</property>
+ <property name="product"></property>
+ <property name="factory">portfolio.photo</property>
+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>

  <property name="immediate_view">object/edit</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types"/>
  <property name="immediate_view">object/edit</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types"/>

- <property name="allow_discussion">True</property>
+ <property name="allow_discussion">False</property>

  <alias from="(Default)" to="photo_view"/>
  <alias from="info" to="photo_info"/>
  <alias from="view" to="photo_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
  <alias from="(Default)" to="photo_view"/>
  <alias from="info" to="photo_info"/>
  <alias from="view" to="photo_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""

-    url_expr="string:${object_url}/photo_view" visible="True">
+    icon_expr="" link_target="" url_expr="string:${object_url}/photo_view"
+    visible="True">

   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/photo_edit_form" visible="True">
   <permission value="Manage properties"/>
  </action>
  <action title="Share" action_id="localroles" category="object"
     url_expr="string:${object_url}/photo_edit_form" visible="True">
   <permission value="Manage properties"/>
  </action>
  <action title="Share" action_id="localroles" category="object"

-    condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_localrole_form" visible="True">

   <permission value="Set Local Roles"/>
  </action>
   <permission value="Set Local Roles"/>
  </action>

+ <action title="Printing settings" action_id="printing_settings"
+    category="object" condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/photoprint_templates_edit_form"
+    visible="True">
+  <permission value="Manage print order template"/>
+ </action>

 </object>
 </object>

diff --git a/profiles/default/types/Plinn_Document.xml b/profiles/default/types/Plinn_Document.xml
index 8b11871..ff2f692 100644 (file)
--- a/profiles/default/types/Plinn_Document.xml
+++ b/profiles/default/types/Plinn_Document.xml
@@ -4,40 +4,40 @@
  <property name="title">Plinn Document</property>
  <property
     name="description">Plinn Documents contain text and images that can be layout with  WYSIWYG and drag&amp;drop editor.</property>
  <property name="title">Plinn Document</property>
  <property
     name="description">Plinn Documents contain text and images that can be layout with  WYSIWYG and drag&amp;drop editor.</property>

- <property name="content_icon">plinn_doc.gif</property>
+ <property name="icon_expr">string:${portal_url}/plinn_doc.gif</property>

  <property name="content_meta_type">Plinn Document</property>
  <property name="product"></property>
  <property name="factory">plinndocument</property>
  <property name="content_meta_type">Plinn Document</property>
  <property name="product"></property>
  <property name="factory">plinndocument</property>

+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>

  <property name="immediate_view">object/edit</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types"/>
  <property name="immediate_view">object/edit</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types"/>

- <property name="allow_discussion">True</property>
+ <property name="allow_discussion">False</property>

  <alias from="(Default)" to="plinndocument_view"/>
  <alias from="gethtml" to="source_html"/>
  <alias from="info" to="content_info"/>
  <alias from="view" to="plinndocument_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
  <alias from="(Default)" to="plinndocument_view"/>
  <alias from="gethtml" to="source_html"/>
  <alias from="info" to="content_info"/>
  <alias from="view" to="plinndocument_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/plinndocument_view" visible="True">
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
     url_expr="string:${object_url}/plinndocument_view" visible="True">
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/plinndocument_edit_form" visible="True">
   <permission value="Modify portal content"/>
  </action>
  <action title="Share" action_id="localroles" category="object"
     url_expr="string:${object_url}/plinndocument_edit_form" visible="True">
   <permission value="Modify portal content"/>
  </action>
  <action title="Share" action_id="localroles" category="object"

-    condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_localrole_form" visible="True">

   <permission value="Set Local Roles"/>
  </action>
   <permission value="Set Local Roles"/>
  </action>

- <action title="History" action_id="changes" category="object"
-    condition_expr="" url_expr="string:${object_url}/changes_history"
-    visible="True">
-  <permission value="View History"/>
- </action>
- <action title="Status history" action_id="history" category="workflow"
-    condition_expr="" url_expr="string:${object_url}/content_status_history"
-    visible="True">
+ <action title="Status history" action_id="history" category="object"
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/content_status_history" visible="True">

   <permission value="Request review"/>
   <permission value="Request review"/>

+  <permission value="Review portal content"/>

  </action>
 </object>
  </action>
 </object>

diff --git a/profiles/default/types/Plinn_Folder.xml b/profiles/default/types/Plinn_Folder.xml
old mode 100755 (executable)
new mode 100644 (file)
index df009a9..c33863b
--- a/profiles/default/types/Plinn_Folder.xml
+++ b/profiles/default/types/Plinn_Folder.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0"?>
 <?xml version="1.0"?>

-<object name="Plinn Folder" meta_type="Factory-based Type Information"
+<object name="Huge Plinn Folder" meta_type="Factory-based Type Information"

    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">Folder</property>
  <property
     name="description">Container to put content in categories.</property>
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">Folder</property>
  <property
     name="description">Container to put content in categories.</property>

- <property name="content_icon">folder_icon.gif</property>
+ <property name="icon_expr">string:${portal_url}/folder_icon.gif</property>

  <property name="content_meta_type">Plinn Folder</property>
  <property name="product"></property>
  <property name="factory">plinn.folder.normal</property>
  <property name="content_meta_type">Plinn Folder</property>
  <property name="product"></property>
  <property name="factory">plinn.folder.normal</property>

+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>

  <property name="immediate_view">object/folderContents</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="immediate_view">object/folderContents</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>


@@ -17,7 +19,7 @@
   <element value="File"/>
   <element value="News Item"/>
   <element value="Plinn Document"/>
   <element value="File"/>
   <element value="News Item"/>
   <element value="Plinn Document"/>

-  <element value="Plinn Folder"/>
+  <element value="Huge Plinn Folder"/>

   <element value="Portfolio"/>
   <element value="Topic"/>
  </property>
   <element value="Portfolio"/>
   <element value="Topic"/>
  </property>


@@ -26,44 +28,33 @@
  <alias from="mkdir" to="createPlinnFolder"/>
  <alias from="view" to="folder_contents"/>
  <action title="View" action_id="view" category="object" condition_expr=""
  <alias from="mkdir" to="createPlinnFolder"/>
  <alias from="view" to="folder_contents"/>
  <action title="View" action_id="view" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/folder_contents" visible="False">
   <permission value="View"/>
  </action>
  <action title="List" action_id="folderContents" category="object"
     url_expr="string:${object_url}/folder_contents" visible="False">
   <permission value="View"/>
  </action>
  <action title="List" action_id="folderContents" category="object"

-    condition_expr="" url_expr="string:${object_url}/folder_contents"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_contents" visible="True">

   <permission value="List folder contents"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
   <permission value="List folder contents"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/folder_contents" visible="False">
   <permission value="Manage properties"/>
  </action>
     url_expr="string:${object_url}/folder_contents" visible="False">
   <permission value="Manage properties"/>
  </action>

- <action title="Import" action_id="import" category="object" condition_expr=""
-    url_expr="string:${object_url}/massupload" visible="True">
-  <permission value="Add portal content"/>
- </action>

  <action title="Share" action_id="localroles" category="object"
  <action title="Share" action_id="localroles" category="object"

-    condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_localrole_form" visible="True">

   <permission value="Set Local Roles"/>
  </action>
   <permission value="Set Local Roles"/>
  </action>

- <action title="Notifications" action_id="folder_notifications"
-    category="object" condition_expr=""
-    url_expr="string:${object_url}/folder_notifications_form" visible="True">
-  <permission value="Subscribe Notification"/>
- </action>
- <action title="History" action_id="changes" category="object"
-    condition_expr="" url_expr="string:${object_url}/changes_history"
-    visible="True">
-  <permission value="View History"/>
- </action>

  <action title="New..." action_id="new" category="object" condition_expr=""
  <action title="New..." action_id="new" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/folder_factories" visible="False">
   <permission value="Add portal content"/>
  </action>
  <action title="Rename items" action_id="rename_items" category="object"
     url_expr="string:${object_url}/folder_factories" visible="False">
   <permission value="Add portal content"/>
  </action>
  <action title="Rename items" action_id="rename_items" category="object"

-    condition_expr="" url_expr="string:${object_url}/folder_rename_form"
-    visible="False">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_rename_form" visible="False">

   <permission value="Add portal content"/>
  </action>
 </object>
   <permission value="Add portal content"/>
  </action>
 </object>

diff --git a/profiles/default/types/Portfolio.xml b/profiles/default/types/Portfolio.xml
old mode 100755 (executable)
new mode 100644 (file)
index 1c1a5d8..3be7ccb
--- a/profiles/default/types/Portfolio.xml
+++ b/profiles/default/types/Portfolio.xml
@@ -1,61 +1,81 @@
 <?xml version="1.0"?>
 <object name="Portfolio" meta_type="Factory-based Type Information"
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
 <?xml version="1.0"?>
 <object name="Portfolio" meta_type="Factory-based Type Information"
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">

- <property name="title">Album photo</property>
+ <property name="title">Collection</property>

  <property name="description">Folder for photo storage</property>
  <property name="description">Folder for photo storage</property>

- <property name="content_icon">portfolio_icon.gif</property>
+ <property name="icon_expr">string:${portal_url}/portfolio_icon.gif</property>

  <property name="content_meta_type">Portfolio</property>
  <property name="content_meta_type">Portfolio</property>

- <property name="product">Portfolio</property>
- <property name="factory">addPortfolio</property>
- <property name="immediate_view">portfolio_view</property>
+ <property name="product"></property>
+ <property name="factory">portfolio.portfolio</property>
+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>
+ <property name="immediate_view">object/view</property>

  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types">
   <element value="Photo"/>
   <element value="Portfolio"/>
  </property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types">
   <element value="Photo"/>
   <element value="Portfolio"/>
  </property>

- <property name="allow_discussion">True</property>
+ <property name="allow_discussion">False</property>

  <alias from="(Default)" to="portfolio_view"/>
  <alias from="mkdir" to="createPortfolio"/>
  <alias from="view" to="portfolio_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
  <alias from="(Default)" to="portfolio_view"/>
  <alias from="mkdir" to="createPortfolio"/>
  <alias from="view" to="portfolio_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""

-    url_expr="string:${object_url}/portfolio_view" visible="True">
+    icon_expr="" link_target="" url_expr="string:${object_url}/portfolio_view"
+    visible="True">

   <permission value="View"/>
  </action>
   <permission value="View"/>
  </action>

- <action title="Export as zip" action_id="noajax" category="object"
+ <action title="Slide show" action_id="noajax" category="object"

     condition_expr="python:object.listNearestFolderContents(contentFilter={'portal_type' : 'Photo'})"
     condition_expr="python:object.listNearestFolderContents(contentFilter={'portal_type' : 'Photo'})"

-    url_expr="string:${object_url}/exportAsZipFile" visible="True">
+    icon_expr="" link_target="" url_expr="string:${object_url}/slide_show"
+    visible="True">

   <permission value="View"/>
  </action>
   <permission value="View"/>
  </action>

- <action title="List" action_id="folderContents" category="object"
-    condition_expr="" url_expr="string:${object_url}/folder_contents"
+ <action title="Presentation" action_id="presentation" category="object"
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/portfolio_presentation_form"

     visible="True">
     visible="True">

-  <permission value="Manage properties"/>
+  <permission value="Modify portal content"/>
+ </action>
+ <action title="List" action_id="folderContents" category="object"
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_contents" visible="True">
+  <permission value="List folder contents"/>

  </action>
  <action title="Import" action_id="import" category="object" condition_expr=""
  </action>
  <action title="Import" action_id="import" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/portfolio_edit_form" visible="True">
   <permission value="Add portal content"/>
  </action>
  <action title="Share" action_id="localroles" category="object"
     url_expr="string:${object_url}/portfolio_edit_form" visible="True">
   <permission value="Add portal content"/>
  </action>
  <action title="Share" action_id="localroles" category="object"

-    condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_localrole_form" visible="True">

   <permission value="Set Local Roles"/>
  </action>
   <permission value="Set Local Roles"/>
  </action>

+ <action title="Printing settings" action_id="printing_settings"
+    category="object" condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/photoprint_templates_edit_form"
+    visible="True">
+  <permission value="Manage print order template"/>
+ </action>

  <action title="Edit" action_id="edit" category="object" condition_expr=""
  <action title="Edit" action_id="edit" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/folder_contents" visible="False">
   <permission value="Manage properties"/>
  </action>
  <action title="New..." action_id="new" category="object" condition_expr=""
     url_expr="string:${object_url}/folder_contents" visible="False">
   <permission value="Manage properties"/>
  </action>
  <action title="New..." action_id="new" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/folder_factories" visible="False">
   <permission value="Add portal content"/>
  </action>
  <action title="Rename items" action_id="rename_items" category="object"
     url_expr="string:${object_url}/folder_factories" visible="False">
   <permission value="Add portal content"/>
  </action>
  <action title="Rename items" action_id="rename_items" category="object"

-    condition_expr="" url_expr="string:${object_url}/folder_rename_form"
-    visible="False">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_rename_form" visible="False">

   <permission value="Add portal content"/>
  </action>
  <action title="mkdir" action_id="mkdir" category="object" condition_expr=""
   <permission value="Add portal content"/>
  </action>
  <action title="mkdir" action_id="mkdir" category="object" condition_expr=""

-    url_expr="string:createPortfolio" visible="False">
+    icon_expr="" link_target="" url_expr="string:createPortfolio"
+    visible="False">

   <permission value="Add portal content"/>
  </action>
 </object>
   <permission value="Add portal content"/>
  </action>
 </object>

diff --git a/profiles/default/types/Spacer_Slot.xml b/profiles/default/types/Spacer_Slot.xml
old mode 100755 (executable)
new mode 100644 (file)
index 9f1a826..2b0a14c
--- a/profiles/default/types/Spacer_Slot.xml
+++ b/profiles/default/types/Spacer_Slot.xml
@@ -3,10 +3,13 @@
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">Spacer Slot</property>
  <property name="description">Spacer Slot for Mosaic Document</property>
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">Spacer Slot</property>
  <property name="description">Spacer Slot for Mosaic Document</property>

- <property name="content_icon">mosaic_tool/spacer_icon.gif</property>
+ <property
+    name="icon_expr">string:${portal_url}/mosaic_tool/spacer_icon.gif</property>

  <property name="content_meta_type">Spacer Slot</property>
  <property name="product">MosaicDocument</property>
  <property name="factory">addSpacerSlot</property>
  <property name="content_meta_type">Spacer Slot</property>
  <property name="product">MosaicDocument</property>
  <property name="factory">addSpacerSlot</property>

+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>

  <property name="immediate_view">view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="immediate_view">view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>


@@ -15,11 +18,13 @@
  <alias from="(Default)" to="slot_spacer_view"/>
  <alias from="view" to="slot_spacer_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
  <alias from="(Default)" to="slot_spacer_view"/>
  <alias from="view" to="slot_spacer_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""

-    url_expr="string:slot_spacer_view" visible="True">
+    icon_expr="" link_target="" url_expr="string:slot_spacer_view"
+    visible="True">

   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""

-    url_expr="string:slot_spacer_form" visible="True">
+    icon_expr="" link_target="" url_expr="string:slot_spacer_form"
+    visible="True">

   <permission value="Modify portal content"/>
  </action>
 </object>
   <permission value="Modify portal content"/>
  </action>
 </object>

diff --git a/profiles/default/types/String_Slot.xml b/profiles/default/types/String_Slot.xml
old mode 100755 (executable)
new mode 100644 (file)
index 6142898..eadc06e
--- a/profiles/default/types/String_Slot.xml
+++ b/profiles/default/types/String_Slot.xml
@@ -3,10 +3,13 @@
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">String Slot</property>
  <property name="description">String Slot for Mosaic Document</property>
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">String Slot</property>
  <property name="description">String Slot for Mosaic Document</property>

- <property name="content_icon">mosaic_tool/str_icon.gif</property>
+ <property
+    name="icon_expr">string:${portal_url}/mosaic_tool/str_icon.gif</property>

  <property name="content_meta_type">String Slot</property>
  <property name="product">MosaicDocument</property>
  <property name="factory">addStringSlot</property>
  <property name="content_meta_type">String Slot</property>
  <property name="product">MosaicDocument</property>
  <property name="factory">addStringSlot</property>

+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>

  <property name="immediate_view">view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="immediate_view">view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>


@@ -15,11 +18,13 @@
  <alias from="(Default)" to="slot_string_view"/>
  <alias from="view" to="slot_string_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
  <alias from="(Default)" to="slot_string_view"/>
  <alias from="view" to="slot_string_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""

-    url_expr="string:slot_string_view" visible="True">
+    icon_expr="" link_target="" url_expr="string:slot_string_view"
+    visible="True">

   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""

-    url_expr="string:slot_string_form" visible="True">
+    icon_expr="" link_target="" url_expr="string:slot_string_form"
+    visible="True">

   <permission value="Modify portal content"/>
  </action>
 </object>
   <permission value="Modify portal content"/>
  </action>
 </object>

diff --git a/profiles/default/types/Text_Slot.xml b/profiles/default/types/Text_Slot.xml
old mode 100755 (executable)
new mode 100644 (file)
index c2c58ee..1066247
--- a/profiles/default/types/Text_Slot.xml
+++ b/profiles/default/types/Text_Slot.xml
@@ -3,10 +3,13 @@
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">Text Slot</property>
  <property name="description">Text Slot for Mosaic Document</property>
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">Text Slot</property>
  <property name="description">Text Slot for Mosaic Document</property>

- <property name="content_icon">mosaic_tool/txt_icon.gif</property>
+ <property
+    name="icon_expr">string:${portal_url}/mosaic_tool/txt_icon.gif</property>

  <property name="content_meta_type">Text Slot</property>
  <property name="product">MosaicDocument</property>
  <property name="factory">addStringSlot</property>
  <property name="content_meta_type">Text Slot</property>
  <property name="product">MosaicDocument</property>
  <property name="factory">addStringSlot</property>

+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>

  <property name="immediate_view">view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="immediate_view">view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>


@@ -15,11 +18,13 @@
  <alias from="(Default)" to="slot_text_view"/>
  <alias from="view" to="slot_text_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
  <alias from="(Default)" to="slot_text_view"/>
  <alias from="view" to="slot_text_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""

-    url_expr="string:slot_text_view" visible="True">
+    icon_expr="" link_target="" url_expr="string:slot_text_view"
+    visible="True">

   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""

-    url_expr="string:slot_text_form" visible="True">
+    icon_expr="" link_target="" url_expr="string:slot_text_form"
+    visible="True">

   <permission value="Modify portal content"/>
  </action>
 </object>
   <permission value="Modify portal content"/>
  </action>
 </object>

diff --git a/profiles/default/types/Topic.xml b/profiles/default/types/Topic.xml
old mode 100755 (executable)
new mode 100644 (file)
index 3f45edf..8c62c8d
--- a/profiles/default/types/Topic.xml
+++ b/profiles/default/types/Topic.xml
@@ -4,10 +4,12 @@
  <property name="title"></property>
  <property
     name="description">Topics are canned queries for organizing content with up to date queries into the catalog.</property>
  <property name="title"></property>
  <property
     name="description">Topics are canned queries for organizing content with up to date queries into the catalog.</property>

- <property name="content_icon">topic_icon.gif</property>
+ <property name="icon_expr">string:${portal_url}/topic_icon.gif</property>

  <property name="content_meta_type">Plinn Topic</property>
  <property name="product"></property>
  <property name="factory">plinn.topic</property>
  <property name="content_meta_type">Plinn Topic</property>
  <property name="product"></property>
  <property name="factory">plinn.topic</property>

+ <property name="add_view_expr"></property>
+ <property name="link_target"></property>

  <property name="immediate_view">object/edit</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="immediate_view">object/edit</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>


@@ -18,30 +20,33 @@
  <alias from="(Default)" to="topic_view"/>
  <alias from="view" to="topic_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
  <alias from="(Default)" to="topic_view"/>
  <alias from="view" to="topic_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""

-    url_expr="string:${object_url}/topic_view" visible="True">
+    icon_expr="" link_target="" url_expr="string:${object_url}/topic_view"
+    visible="True">

   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/topic_edit_form" visible="True">
   <permission value="Change portal topics"/>
  </action>
  <action title="Subtopics" action_id="folderContents" category="object"
     url_expr="string:${object_url}/topic_edit_form" visible="True">
   <permission value="Change portal topics"/>
  </action>
  <action title="Subtopics" action_id="folderContents" category="object"

-    condition_expr="" url_expr="string:${object_url}/folder_contents"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_contents" visible="True">

   <permission value="View"/>
  </action>
  <action title="New..." action_id="new" category="object" condition_expr=""
   <permission value="View"/>
  </action>
  <action title="New..." action_id="new" category="object" condition_expr=""

+    icon_expr="" link_target=""

     url_expr="string:${object_url}/folder_factories" visible="False">
   <permission value="Add portal topics"/>
  </action>
  <action title="Rename items" action_id="rename_items" category="object"
     url_expr="string:${object_url}/folder_factories" visible="False">
   <permission value="Add portal topics"/>
  </action>
  <action title="Rename items" action_id="rename_items" category="object"

-    condition_expr="" url_expr="string:${object_url}/folder_rename_form"
-    visible="False">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/folder_rename_form" visible="False">

   <permission value="Add portal topics"/>
  </action>
  <action title="Status history" action_id="history" category="object"
   <permission value="Add portal topics"/>
  </action>
  <action title="Status history" action_id="history" category="object"

-    condition_expr="" url_expr="string:${object_url}/content_status_history"
-    visible="True">
+    condition_expr="" icon_expr="" link_target=""
+    url_expr="string:${object_url}/content_status_history" visible="True">

   <permission value="Request review"/>
   <permission value="Review portal content"/>
  </action>
   <permission value="Request review"/>
   <permission value="Review portal content"/>
  </action>

diff --git a/profiles/default/typestool.xml b/profiles/default/typestool.xml
new file mode 100644 (file)
index 0000000..dcedfbf
--- /dev/null
+++ b/profiles/default/typestool.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<types-tool>
+ <type id="CMF Site" filename="types/CMF_Site.xml"/>
+ <type id="Calendar"/>
+ <type id="Discussion Item"
+       filename="types/Discussion_Item.xml"/>
+ <type id="Document"/>
+ <type id="Event"/>
+ <type id="Favorite"/>
+ <type id="File"/>
+ <type id="File Slot" filename="types/File_Slot.xml"/>
+ <type id="Huge Plinn Folder"
+       filename="types/Huge_Plinn_Folder.xml"/>
+ <type id="Image Slot" filename="types/Image_Slot.xml"/>
+ <type id="Lightbox"/>
+ <type id="Link"/>
+ <type id="List Slot" filename="types/List_Slot.xml"/>
+ <type id="Mosaic Document"
+       filename="types/Mosaic_Document.xml"/>
+ <type id="News Item" filename="types/News_Item.xml"/>
+ <type id="Photo"/>
+ <type id="Plinn Document"
+       filename="types/Plinn_Document.xml"/>
+ <type id="Plinn Folder" filename="types/Plinn_Folder.xml"/>
+ <type id="Portfolio"/>
+ <type id="Spacer Slot" filename="types/Spacer_Slot.xml"/>
+ <type id="String Slot" filename="types/String_Slot.xml"/>
+ <type id="Text Slot" filename="types/Text_Slot.xml"/>
+ <type id="Topic"/>
+</types-tool>

diff --git a/profiles/default/workflows.xml b/profiles/default/workflows.xml
index 2c0d652..5686c60 100644 (file)
--- a/profiles/default/workflows.xml
+++ b/profiles/default/workflows.xml
@@ -4,6 +4,7 @@
  <object name="default_workflow" meta_type="Workflow"/>
  <object name="folder_workflow" meta_type="Workflow"/>
  <object name="member_workflow" meta_type="Workflow"/>
  <object name="default_workflow" meta_type="Workflow"/>
  <object name="folder_workflow" meta_type="Workflow"/>
  <object name="member_workflow" meta_type="Workflow"/>

+ <object name="order_workflow" meta_type="Workflow"/>

  <object name="portfolio_workflow" meta_type="Workflow"/>
  <bindings>
   <default>
  <object name="portfolio_workflow" meta_type="Workflow"/>
  <bindings>
   <default>


@@ -15,8 +16,15 @@
   </type>
   <type type_id="Discussion Item"/>
   <type type_id="File Slot"/>
   </type>
   <type type_id="Discussion Item"/>
   <type type_id="File Slot"/>

+  <type type_id="Huge Plinn Folder">
+   <bound-workflow workflow_id="folder_workflow"/>
+  </type>

   <type type_id="Image Slot"/>
   <type type_id="List Slot"/>
   <type type_id="Image Slot"/>
   <type type_id="List Slot"/>

+  <type type_id="Order">
+   <bound-workflow workflow_id="order_workflow"/>
+  </type>
+  <type type_id="Order Folder"/>

   <type type_id="Photo"/>
   <type type_id="Huge Plinn Folder">
    <bound-workflow workflow_id="folder_workflow"/>
   <type type_id="Photo"/>
   <type type_id="Huge Plinn Folder">
    <bound-workflow workflow_id="folder_workflow"/>

diff --git a/profiles/default/workflows/default_workflow/definition.xml b/profiles/default/workflows/default_workflow/definition.xml
index 4ece941..3300f09 100644 (file)
--- a/profiles/default/workflows/default_workflow/definition.xml
+++ b/profiles/default/workflows/default_workflow/definition.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>

 <dc-workflow workflow_id="default_workflow"
              title="Plinn default workflow" description=""
              state_variable="review_state"
              initial_state="private" manager_bypass="False">
 <dc-workflow workflow_id="default_workflow"
              title="Plinn default workflow" description=""
              state_variable="review_state"
              initial_state="private" manager_bypass="False">

- 

  <permission>Access contents information</permission>
  <permission>Change portal events</permission>
  <permission>Change portal topics</permission>
  <permission>Access contents information</permission>
  <permission>Change portal events</permission>
  <permission>Change portal topics</permission>


@@ -15,14 +14,9 @@
   <exit-transition transition_id="publish"/>
   <exit-transition transition_id="reject"/>
   <exit-transition transition_id="retract"/>
   <exit-transition transition_id="publish"/>
   <exit-transition transition_id="reject"/>
   <exit-transition transition_id="retract"/>

-  <exit-transition transition_id="send_email"/>

   <permission-map name="Access contents information"
   <permission-map name="Access contents information"

-                  acquired="False">
-   <permission-role>Contributor</permission-role>
+                  acquired="True">

    <permission-role>Manager</permission-role>
    <permission-role>Manager</permission-role>

-   <permission-role>Owner</permission-role>
-   <permission-role>Reader</permission-role>
-   <permission-role>Reviewer</permission-role>

   </permission-map>
   <permission-map name="Change portal events"
                   acquired="False">
   </permission-map>
   <permission-map name="Change portal events"
                   acquired="False">


@@ -58,14 +52,12 @@
  <state state_id="private"
         title="Non-visible and editable only by owner">
   <exit-transition transition_id="direct_publish"/>
  <state state_id="private"
         title="Non-visible and editable only by owner">
   <exit-transition transition_id="direct_publish"/>

-  <exit-transition transition_id="send_email"/>

   <exit-transition transition_id="submit"/>
   <permission-map name="Access contents information"
                   acquired="False">
    <permission-role>Contributor</permission-role>
    <permission-role>Manager</permission-role>
    <permission-role>Owner</permission-role>
   <exit-transition transition_id="submit"/>
   <permission-map name="Access contents information"
                   acquired="False">
    <permission-role>Contributor</permission-role>
    <permission-role>Manager</permission-role>
    <permission-role>Owner</permission-role>

-   <permission-role>Reader</permission-role>

   </permission-map>
   <permission-map name="Change portal events"
                   acquired="False">
   </permission-map>
   <permission-map name="Change portal events"
                   acquired="False">


@@ -105,10 +97,8 @@
  <state state_id="published" title="Public">
   <exit-transition transition_id="reject"/>
   <exit-transition transition_id="retract"/>
  <state state_id="published" title="Public">
   <exit-transition transition_id="reject"/>
   <exit-transition transition_id="retract"/>

-  <exit-transition transition_id="send_email"/>

   <permission-map name="Access contents information"
                   acquired="True">
   <permission-map name="Access contents information"
                   acquired="True">

-   <permission-role>Anonymous</permission-role>

    <permission-role>Manager</permission-role>
   </permission-map>
   <permission-map name="Change portal events"
    <permission-role>Manager</permission-role>
   </permission-map>
   <permission-map name="Change portal events"


@@ -141,7 +131,7 @@
              before_script="" after_script="">
   <description>Reviewer can directly publish content  if he have de Owner role (not necessarily ownership)</description>
   <action url="%(content_url)s/content_publish_form?direct:boolean=True"
              before_script="" after_script="">
   <description>Reviewer can directly publish content  if he have de Owner role (not necessarily ownership)</description>
   <action url="%(content_url)s/content_publish_form?direct:boolean=True"

-          category="workflow">Publish</action>
+          category="workflow" icon="">Publish</action>

   <guard>
    <guard-permission>Review portal content</guard-permission>
    <guard-expression>python:user.allowed(here, ['Owner'])</guard-expression>
   <guard>
    <guard-permission>Review portal content</guard-permission>
    <guard-expression>python:user.allowed(here, ['Owner'])</guard-expression>


@@ -152,7 +142,7 @@
              new_state="published" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_publish_form"
              new_state="published" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_publish_form"

-          category="workflow">Publish</action>
+          category="workflow" icon="">Publish</action>

   <guard>
    <guard-permission>Review portal content</guard-permission>
   </guard>
   <guard>
    <guard-permission>Review portal content</guard-permission>
   </guard>


@@ -162,7 +152,7 @@
              new_state="private" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_reject_form"
              new_state="private" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_reject_form"

-          category="workflow">Reject</action>
+          category="workflow" icon="">Reject</action>

   <guard>
    <guard-permission>Review portal content</guard-permission>
   </guard>
   <guard>
    <guard-permission>Review portal content</guard-permission>
   </guard>


@@ -172,28 +162,18 @@
              new_state="private" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_retract_form"
              new_state="private" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_retract_form"

-          category="workflow">Retract</action>
+          category="workflow" icon="">Retract</action>

   <guard>
    <guard-permission>Request review</guard-permission>
    <guard-expression>python:not(here.portal_membership.checkPermission('Review portal content', here))</guard-expression>
   </guard>
  </transition>
   <guard>
    <guard-permission>Request review</guard-permission>
    <guard-expression>python:not(here.portal_membership.checkPermission('Review portal content', here))</guard-expression>
   </guard>
  </transition>

- <transition transition_id="send_email" title=""
-             new_state="" trigger="USER" before_script=""
-             after_script="">
-  <action url="%(content_url)s/send_email_form?wfid=default_workflow"
-          category="workflow">Send an email</action>
-  <guard>
-   <guard-permission>View</guard-permission>
-   <guard-role>Member</guard-role>
-  </guard>
- </transition>

  <transition transition_id="submit"
              title="Member requests publishing"
              new_state="pending" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_submit_form"
  <transition transition_id="submit"
              title="Member requests publishing"
              new_state="pending" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_submit_form"

-          category="workflow">Submit</action>
+          category="workflow" icon="">Submit</action>

   <guard>
    <guard-permission>Request review</guard-permission>
   </guard>
   <guard>
    <guard-permission>Request review</guard-permission>
   </guard>


@@ -201,7 +181,7 @@
  <worklist worklist_id="reviewer_queue" title="">
   <description>Reviewer tasks</description>
   <action url="%(portal_url)s/list_pending_contents"
  <worklist worklist_id="reviewer_queue" title="">
   <description>Reviewer tasks</description>
   <action url="%(portal_url)s/list_pending_contents"

-          category="global">Pending (%(count)d)</action>
+          category="global" icon="">Pending (%(count)d)</action>

   <guard>
    <guard-expression>here/havePendingContents</guard-expression>
   </guard>
   <guard>
    <guard-expression>here/havePendingContents</guard-expression>
   </guard>

diff --git a/profiles/default/workflows/default_workflow/scripts/sendNotificationEmail.py b/profiles/default/workflows/default_workflow/scripts/sendNotificationEmail.py
index 9b833b6..17dd864 100644 (file)
--- a/profiles/default/workflows/default_workflow/scripts/sendNotificationEmail.py
+++ b/profiles/default/workflows/default_workflow/scripts/sendNotificationEmail.py
@@ -56,6 +56,6 @@ message = context.echange_mail_template(  From = sender
                                                                                , footer=footer)
 
 
                                                                                , footer=footer)
 
 

-MailHost.send( message.encode('utf-8') )
+MailHost.send( message )

 
 return recipients
 
 return recipients

diff --git a/profiles/default/workflows/folder_workflow/definition.xml b/profiles/default/workflows/folder_workflow/definition.xml
index a2f56bd..ab685f8 100644 (file)
--- a/profiles/default/workflows/folder_workflow/definition.xml
+++ b/profiles/default/workflows/folder_workflow/definition.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>

 <dc-workflow workflow_id="folder_workflow"
              title="Plinn folder workflow" description=""
              state_variable="review_state"
              initial_state="private" manager_bypass="False">
 <dc-workflow workflow_id="folder_workflow"
              title="Plinn folder workflow" description=""
              state_variable="review_state"
              initial_state="private" manager_bypass="False">

- 

  <permission>Manage properties</permission>
  <permission>Modify portal content</permission>
  <permission>View</permission>
  <permission>Manage properties</permission>
  <permission>Modify portal content</permission>
  <permission>View</permission>


@@ -11,7 +10,6 @@
   <exit-transition transition_id="publish"/>
   <exit-transition transition_id="reject"/>
   <exit-transition transition_id="retract"/>
   <exit-transition transition_id="publish"/>
   <exit-transition transition_id="reject"/>
   <exit-transition transition_id="retract"/>

-  <exit-transition transition_id="send_email"/>

   <permission-map name="Manage properties" acquired="False">
    <permission-role>Manager</permission-role>
    <permission-role>Reviewer</permission-role>
   <permission-map name="Manage properties" acquired="False">
    <permission-role>Manager</permission-role>
    <permission-role>Reviewer</permission-role>


@@ -31,7 +29,6 @@
  </state>
  <state state_id="private" title="">
   <exit-transition transition_id="direct_publish"/>
  </state>
  <state state_id="private" title="">
   <exit-transition transition_id="direct_publish"/>

-  <exit-transition transition_id="send_email"/>

   <exit-transition transition_id="submit"/>
   <permission-map name="Manage properties" acquired="False">
    <permission-role>Contributor</permission-role>
   <exit-transition transition_id="submit"/>
   <permission-map name="Manage properties" acquired="False">
    <permission-role>Contributor</permission-role>


@@ -54,7 +51,6 @@
  <state state_id="published" title="">
   <exit-transition transition_id="reject"/>
   <exit-transition transition_id="retract"/>
  <state state_id="published" title="">
   <exit-transition transition_id="reject"/>
   <exit-transition transition_id="retract"/>

-  <exit-transition transition_id="send_email"/>

   <permission-map name="Manage properties" acquired="False">
    <permission-role>Manager</permission-role>
   </permission-map>
   <permission-map name="Manage properties" acquired="False">
    <permission-role>Manager</permission-role>
   </permission-map>


@@ -72,7 +68,7 @@
              before_script="" after_script="">
   <description>Reviewer can directly publish content  if he have de Owner role (not necessarily ownership)</description>
   <action url="%(content_url)s/content_publish_form?direct:boolean=True"
              before_script="" after_script="">
   <description>Reviewer can directly publish content  if he have de Owner role (not necessarily ownership)</description>
   <action url="%(content_url)s/content_publish_form?direct:boolean=True"

-          category="workflow">Publish</action>
+          category="workflow" icon="">Publish</action>

   <guard>
    <guard-permission>Review portal content</guard-permission>
    <guard-expression>python:user.allowed(here, ['Owner'])</guard-expression>
   <guard>
    <guard-permission>Review portal content</guard-permission>
    <guard-expression>python:user.allowed(here, ['Owner'])</guard-expression>


@@ -83,7 +79,7 @@
              new_state="published" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_publish_form"
              new_state="published" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_publish_form"

-          category="workflow">Publish</action>
+          category="workflow" icon="">Publish</action>

   <guard>
    <guard-permission>Review portal content</guard-permission>
   </guard>
   <guard>
    <guard-permission>Review portal content</guard-permission>
   </guard>


@@ -93,7 +89,7 @@
              new_state="private" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_reject_form"
              new_state="private" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_reject_form"

-          category="workflow">Reject</action>
+          category="workflow" icon="">Reject</action>

   <guard>
    <guard-permission>Review portal content</guard-permission>
   </guard>
   <guard>
    <guard-permission>Review portal content</guard-permission>
   </guard>


@@ -103,28 +99,18 @@
              new_state="private" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_retract_form"
              new_state="private" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_retract_form"

-          category="workflow">Retract</action>
+          category="workflow" icon="">Retract</action>

   <guard>
    <guard-permission>Request review</guard-permission>
    <guard-expression>python:not(here.portal_membership.checkPermission('Review portal content', here))</guard-expression>
   </guard>
  </transition>
   <guard>
    <guard-permission>Request review</guard-permission>
    <guard-expression>python:not(here.portal_membership.checkPermission('Review portal content', here))</guard-expression>
   </guard>
  </transition>

- <transition transition_id="send_email" title=""
-             new_state="" trigger="USER" before_script=""
-             after_script="">
-  <action url="%(content_url)s/send_email_form?wfid=folder_workflow"
-          category="workflow">Send an email</action>
-  <guard>
-   <guard-permission>View</guard-permission>
-   <guard-role>Member</guard-role>
-  </guard>
- </transition>

  <transition transition_id="submit"
              title="Member requests publishing"
              new_state="pending" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_submit_form"
  <transition transition_id="submit"
              title="Member requests publishing"
              new_state="pending" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_submit_form"

-          category="workflow">Submit</action>
+          category="workflow" icon="">Submit</action>

   <guard>
    <guard-permission>Request review</guard-permission>
   </guard>
   <guard>
    <guard-permission>Request review</guard-permission>
   </guard>

diff --git a/profiles/default/workflows/folder_workflow/scripts/sendNotificationEmail.py b/profiles/default/workflows/folder_workflow/scripts/sendNotificationEmail.py
index 9b833b6..17dd864 100644 (file)
--- a/profiles/default/workflows/folder_workflow/scripts/sendNotificationEmail.py
+++ b/profiles/default/workflows/folder_workflow/scripts/sendNotificationEmail.py
@@ -56,6 +56,6 @@ message = context.echange_mail_template(  From = sender
                                                                                , footer=footer)
 
 
                                                                                , footer=footer)
 
 

-MailHost.send( message.encode('utf-8') )
+MailHost.send( message )

 
 return recipients
 
 return recipients

diff --git a/profiles/default/workflows/member_workflow/definition.xml b/profiles/default/workflows/member_workflow/definition.xml
index 4422350..a653b54 100644 (file)
--- a/profiles/default/workflows/member_workflow/definition.xml
+++ b/profiles/default/workflows/member_workflow/definition.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>

 <dc-workflow workflow_id="member_workflow"
              title="Plinn member registration workflow"
              description="" state_variable="review_state"
              initial_state="m_initial"
              manager_bypass="False">
 <dc-workflow workflow_id="member_workflow"
              title="Plinn member registration workflow"
              description="" state_variable="review_state"
              initial_state="m_initial"
              manager_bypass="False">

- 

  <state state_id="m_initial" title="">
   <exit-transition transition_id="create"/>
   <exit-transition transition_id="silent_register"/>
  <state state_id="m_initial" title="">
   <exit-transition transition_id="create"/>
   <exit-transition transition_id="silent_register"/>


@@ -59,7 +58,7 @@
  <worklist worklist_id="reviewer_queue" title="">
   <description>Reviewer tasks</description>
   <action url="%(portal_url)s/pending_members"
  <worklist worklist_id="reviewer_queue" title="">
   <description>Reviewer tasks</description>
   <action url="%(portal_url)s/pending_members"

-          category="global">Membres en attente (%(count)d)</action>
+          category="global" icon="">Membres en attente (%(count)d)</action>

   <guard>
    <guard-permission>Set Member Properties</guard-permission>
   </guard>
   <guard>
    <guard-permission>Set Member Properties</guard-permission>
   </guard>

diff --git a/profiles/default/workflows/member_workflow/scripts/after_reject.py b/profiles/default/workflows/member_workflow/scripts/after_reject.py
index f9e7df1..4b2b2d0 100644 (file)
--- a/profiles/default/workflows/member_workflow/scripts/after_reject.py
+++ b/profiles/default/workflows/member_workflow/scripts/after_reject.py
@@ -42,4 +42,4 @@ message = context.echange_mail_template(  From = sender
                                                                                , body= body
                                                                                )
 
                                                                                , body= body
                                                                                )
 

-MailHost.send( message.encode('utf-8') )
+MailHost.send( message )

diff --git a/profiles/default/workflows/member_workflow/scripts/sendNotificationEmail.py b/profiles/default/workflows/member_workflow/scripts/sendNotificationEmail.py
index 69f1a2f..ce0e0da 100644 (file)
--- a/profiles/default/workflows/member_workflow/scripts/sendNotificationEmail.py
+++ b/profiles/default/workflows/member_workflow/scripts/sendNotificationEmail.py
@@ -59,6 +59,6 @@ message = context.echange_mail_template(  From = sender
                                                                                )
 
 
                                                                                )
 
 

-MailHost.send( message.encode('utf-8') )
+MailHost.send( message )

 if portal.getProperty('validate_email') :
        rtool.mailPassword(member.getId(), context.REQUEST)
 if portal.getProperty('validate_email') :
        rtool.mailPassword(member.getId(), context.REQUEST)

diff --git a/profiles/default/workflows/order_workflow/definition.xml b/profiles/default/workflows/order_workflow/definition.xml
new file mode 100644 (file)
index 0000000..c0e1b82
--- /dev/null
+++ b/profiles/default/workflows/order_workflow/definition.xml
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dc-workflow workflow_id="order_workflow"
+             title="Order workflow" description=""
+             state_variable="review_state"
+             initial_state="recorded" manager_bypass="False">
+ <instance-creation-conditions>
+   <guard>
+    <guard-role>Authenticated</guard-role>
+   </guard>
+ </instance-creation-conditions>
+ <permission>Access contents information</permission>
+ <permission>Delete Owned Objects</permission>
+ <permission>Manage properties</permission>
+ <permission>Modify portal content</permission>
+ <permission>View</permission>
+ <state state_id="canceled" title="">
+  <permission-map name="Access contents information"
+                  acquired="False">
+   <permission-role>Manager</permission-role>
+   <permission-role>Owner</permission-role>
+  </permission-map>
+  <permission-map name="Delete Owned Objects"
+                  acquired="False">
+   <permission-role>Manager</permission-role>
+  </permission-map>
+  <permission-map name="Manage properties" acquired="False">
+   <permission-role>Manager</permission-role>
+  </permission-map>
+  <permission-map name="Modify portal content"
+                  acquired="False">
+   <permission-role>Manager</permission-role>
+  </permission-map>
+  <permission-map name="View" acquired="False">
+   <permission-role>Manager</permission-role>
+   <permission-role>Owner</permission-role>
+  </permission-map>
+ </state>
+ <state state_id="done" title="">
+  <exit-transition transition_id="notify_sent"/>
+  <permission-map name="Access contents information"
+                  acquired="False">
+   <permission-role>Manager</permission-role>
+   <permission-role>Owner</permission-role>
+  </permission-map>
+  <permission-map name="Delete Owned Objects"
+                  acquired="False">
+   <permission-role>Manager</permission-role>
+  </permission-map>
+  <permission-map name="Manage properties" acquired="False">
+   <permission-role>Manager</permission-role>
+  </permission-map>
+  <permission-map name="Modify portal content"
+                  acquired="False">
+   <permission-role>Manager</permission-role>
+  </permission-map>
+  <permission-map name="View" acquired="False">
+   <permission-role>Manager</permission-role>
+   <permission-role>Owner</permission-role>
+  </permission-map>
+ </state>
+ <state state_id="paid" title="">
+  <exit-transition transition_id="get_printing_list"/>
+  <exit-transition transition_id="notify_done"/>
+  <permission-map name="Access contents information"
+                  acquired="False">
+   <permission-role>Manager</permission-role>
+   <permission-role>Owner</permission-role>
+  </permission-map>
+  <permission-map name="Delete Owned Objects"
+                  acquired="False">
+   <permission-role>Manager</permission-role>
+  </permission-map>
+  <permission-map name="Manage properties" acquired="False">
+   <permission-role>Manager</permission-role>
+  </permission-map>
+  <permission-map name="Modify portal content"
+                  acquired="False">
+   <permission-role>Manager</permission-role>
+  </permission-map>
+  <permission-map name="View" acquired="False">
+   <permission-role>Manager</permission-role>
+   <permission-role>Owner</permission-role>
+  </permission-map>
+ </state>
+ <state state_id="recorded" title="">
+  <exit-transition transition_id="cancel"/>
+  <exit-transition transition_id="manual_payment"/>
+  <exit-transition transition_id="paypal_pay"/>
+  <permission-map name="Access contents information"
+                  acquired="False">
+   <permission-role>Manager</permission-role>
+   <permission-role>Owner</permission-role>
+  </permission-map>
+  <permission-map name="Delete Owned Objects"
+                  acquired="False">
+   <permission-role>Manager</permission-role>
+  </permission-map>
+  <permission-map name="Manage properties" acquired="False">
+   <permission-role>Manager</permission-role>
+   <permission-role>Owner</permission-role>
+  </permission-map>
+  <permission-map name="Modify portal content"
+                  acquired="False">
+   <permission-role>Manager</permission-role>
+   <permission-role>Owner</permission-role>
+  </permission-map>
+  <permission-map name="View" acquired="False">
+   <permission-role>Manager</permission-role>
+   <permission-role>Owner</permission-role>
+  </permission-map>
+ </state>
+ <state state_id="refused" title="">
+  <permission-map name="Access contents information"
+                  acquired="False">
+   <permission-role>Manager</permission-role>
+   <permission-role>Owner</permission-role>
+  </permission-map>
+  <permission-map name="Delete Owned Objects"
+                  acquired="False">
+   <permission-role>Manager</permission-role>
+  </permission-map>
+  <permission-map name="Manage properties" acquired="False">
+   <permission-role>Manager</permission-role>
+  </permission-map>
+  <permission-map name="Modify portal content"
+                  acquired="False">
+   <permission-role>Manager</permission-role>
+  </permission-map>
+  <permission-map name="View" acquired="False">
+   <permission-role>Manager</permission-role>
+   <permission-role>Owner</permission-role>
+  </permission-map>
+ </state>
+ <state state_id="sent" title="">
+  <permission-map name="Access contents information"
+                  acquired="False">
+   <permission-role>Manager</permission-role>
+   <permission-role>Owner</permission-role>
+  </permission-map>
+  <permission-map name="Delete Owned Objects"
+                  acquired="False">
+   <permission-role>Manager</permission-role>
+  </permission-map>
+  <permission-map name="Manage properties" acquired="False">
+   <permission-role>Manager</permission-role>
+  </permission-map>
+  <permission-map name="Modify portal content"
+                  acquired="False">
+   <permission-role>Manager</permission-role>
+  </permission-map>
+  <permission-map name="View" acquired="False">
+   <permission-role>Manager</permission-role>
+   <permission-role>Owner</permission-role>
+  </permission-map>
+ </state>
+ <transition transition_id="cancel" title=""
+             new_state="canceled" trigger="USER"
+             before_script="" after_script="relistCopies">
+  <action url="%(content_url)s/order_cancel_form"
+          category="workflow" icon="">Cancel</action>
+  <guard>
+   <guard-permission>Manage print orders</guard-permission>
+  </guard>
+ </transition>
+ <transition transition_id="get_printing_list" title=""
+             new_state="" trigger="USER" before_script=""
+             after_script="">
+  <action url="%(object_url)s/order_printing_list"
+          category="workflow" icon="">Printing list</action>
+  <guard>
+   <guard-permission>Manage print orders</guard-permission>
+  </guard>
+ </transition>
+ <transition transition_id="manual_payment" title=""
+             new_state="paid" trigger="USER"
+             before_script="" after_script="">
+  <action url="%(content_url)s/order_manual_payment_form"
+          category="workflow" icon="">Manual payment</action>
+  <guard>
+   <guard-permission>Manage print orders</guard-permission>
+  </guard>
+ </transition>
+ <transition transition_id="notify_done" title=""
+             new_state="done" trigger="USER"
+             before_script="" after_script="">
+  <action url="%(content_url)s/order_notify_done_form"
+          category="workflow" icon="">Notify done</action>
+  <guard>
+   <guard-permission>Manage print orders</guard-permission>
+  </guard>
+ </transition>
+ <transition transition_id="notify_sent" title=""
+             new_state="sent" trigger="USER"
+             before_script="" after_script="">
+  <action url="%(content_url)s/order_notify_sent_form"
+          category="workflow" icon="">Notify sent</action>
+  <guard>
+   <guard-permission>Manage print orders</guard-permission>
+  </guard>
+ </transition>
+ <transition transition_id="paypal_pay" title=""
+             new_state="paid" trigger="USER"
+             before_script="" after_script="">
+  
+  <guard>
+   <guard-role>Owner</guard-role>
+  </guard>
+ </transition>
+ <variable variable_id="action" for_catalog="False"
+           for_status="True" update_always="True">
+  <description>The last transition</description>
+  <default>
+   
+   <expression>transition/getId|nothing</expression>
+  </default>
+  <guard>
+  </guard>
+ </variable>
+ <variable variable_id="actor" for_catalog="False"
+           for_status="True" update_always="True">
+  <description>The ID of the user who performed the last transition</description>
+  <default>
+   
+   <expression>user/getId</expression>
+  </default>
+  <guard>
+  </guard>
+ </variable>
+ <variable variable_id="comments" for_catalog="False"
+           for_status="True" update_always="True">
+  <description>Comments about the last transition</description>
+  <default>
+   
+   <expression>python:state_change.kwargs.get('comment', '')</expression>
+  </default>
+  <guard>
+  </guard>
+ </variable>
+ <variable variable_id="email_sent" for_catalog="False"
+           for_status="True" update_always="True">
+  <default>
+   
+   <expression>python:scripts.sendNotificationEmail(state_change) or state_change.kwargs.get('email_sent', [])</expression>
+  </default>
+  <guard>
+  </guard>
+ </variable>
+ <variable variable_id="review_history" for_catalog="False"
+           for_status="False" update_always="False">
+  <description>Provides access to workflow history</description>
+  <default>
+   
+   <expression>state_change/getHistory</expression>
+  </default>
+  <guard>
+   <guard-permission>Request review</guard-permission>
+   <guard-permission>Review portal content</guard-permission>
+  </guard>
+ </variable>
+ <variable variable_id="time" for_catalog="False"
+           for_status="True" update_always="True">
+  <description>Time of the last transition</description>
+  <default>
+   
+   <expression>state_change/getDateTime</expression>
+  </default>
+  <guard>
+  </guard>
+ </variable>
+ <variable variable_id="tracking_number" for_catalog="False"
+           for_status="True" update_always="False">
+  <default>
+   
+   
+  </default>
+  <guard>
+  </guard>
+ </variable>
+ <variable variable_id="tracking_url" for_catalog="False"
+           for_status="True" update_always="False">
+  <default>
+   
+   
+  </default>
+  <guard>
+  </guard>
+ </variable>
+ <script script_id="relistCopies" type="Script (Python)"
+         filename="workflows/order_workflow/scripts/relistCopies.py"
+         module="" function=""/>
+ <script script_id="sendNotificationEmail"
+         type="Script (Python)"
+         filename="workflows/order_workflow/scripts/sendNotificationEmail.py"
+         module="" function=""/>
+</dc-workflow>

diff --git a/profiles/default/workflows/order_workflow/scripts/relistCopies.py b/profiles/default/workflows/order_workflow/scripts/relistCopies.py
new file mode 100755 (executable)
index 0000000..4778906
--- /dev/null
+++ b/profiles/default/workflows/order_workflow/scripts/relistCopies.py
@@ -0,0 +1,10 @@
+## Script (Python) "relistCopies"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind subpath=traverse_subpath
+##parameters=sci
+##title=
+##
+sci.object.resetCopiesCounters()

diff --git a/profiles/default/workflows/order_workflow/scripts/sendNotificationEmail.py b/profiles/default/workflows/order_workflow/scripts/sendNotificationEmail.py
new file mode 100755 (executable)
index 0000000..26ba76b
--- /dev/null
+++ b/profiles/default/workflows/order_workflow/scripts/sendNotificationEmail.py
@@ -0,0 +1,72 @@
+## Script (Python) "sendNotificationEmail"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind subpath=traverse_subpath
+##parameters=sci
+##title=
+##
+from Products.photoprint.utils import translate
+_ = lambda msg : translate(msg, context)
+portal = context.portal_url.getPortalObject()
+
+mtool = portal.portal_membership
+
+recipients = sci.kwargs.get('recipients', [])
+if not recipients :
+       return []
+
+
+MailHost = portal.MailHost
+from quopri import encodestring
+
+def encodeAdr(member) :
+       name = member.getMemberFullName(nameBefore=0)
+       email = member.getProperty('email')
+       qpName = encodestring(name).replace('=\n', '')
+       return '''"=?utf-8?q?%s?=" <%s>''' % (qpName, email)
+
+
+object = sci.object
+
+sender = mtool.getAuthenticatedMember()
+sender = encodeAdr(sender)
+
+recipientsFormated = map(encodeAdr, mtool.getMembers( recipients ))
+mto = ', '.join(recipientsFormated)
+if mto[-2:] == ', ' :
+       mto = mto[:-2]
+
+subject = sci.kwargs.get('subject', '')
+
+body = []
+pr = body.append
+pr(sci.kwargs.get('comment', ''))
+
+pr('')
+
+trNumber = sci.kwargs.get('tracking_number', '')
+if trNumber :
+       pr(_('Tracking number').encode('utf-8') + ' ' + trNumber)
+
+trUrl = sci.kwargs.get('tracking_url', '')
+if trUrl :
+       pr(_('Tracking url').encode('utf-8') + ' ' + trUrl)
+
+body = '\n'.join(body)
+
+
+
+message = context.echange_mail_template(  From = sender
+                                                                               , To = mto
+                                                                               , Subject = "=?utf-8?q?%s?=" % encodestring(subject).replace('=\n', '')
+                                                                               , ContentType = 'text/plain'
+                                                                               , charset = 'UTF-8'
+                                                                               , body=body
+                                                                               )
+
+
+MailHost.send( message.encode('utf-8') )
+
+return recipients

diff --git a/profiles/default/workflows/portfolio_workflow/definition.xml b/profiles/default/workflows/portfolio_workflow/definition.xml
index 798f1c8..951ad1c 100644 (file)
--- a/profiles/default/workflows/portfolio_workflow/definition.xml
+++ b/profiles/default/workflows/portfolio_workflow/definition.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>

 <dc-workflow workflow_id="portfolio_workflow"
              title="Plinn folder workflow" description=""
              state_variable="review_state"
              initial_state="private" manager_bypass="False">
 <dc-workflow workflow_id="portfolio_workflow"
              title="Plinn folder workflow" description=""
              state_variable="review_state"
              initial_state="private" manager_bypass="False">

- 

  <permission>Add portal content</permission>
  <permission>Change Images and Files</permission>
  <permission>Delete Owned Objects</permission>
  <permission>Add portal content</permission>
  <permission>Change Images and Files</permission>
  <permission>Delete Owned Objects</permission>


@@ -42,6 +41,7 @@
   </permission-map>
   <permission-map name="View" acquired="False">
    <permission-role>Contributor</permission-role>
   </permission-map>
   <permission-map name="View" acquired="False">
    <permission-role>Contributor</permission-role>

+   <permission-role>Downloader</permission-role>

    <permission-role>Manager</permission-role>
    <permission-role>Owner</permission-role>
    <permission-role>Reader</permission-role>
    <permission-role>Manager</permission-role>
    <permission-role>Owner</permission-role>
    <permission-role>Reader</permission-role>


@@ -85,6 +85,7 @@
   </permission-map>
   <permission-map name="View" acquired="False">
    <permission-role>Contributor</permission-role>
   </permission-map>
   <permission-map name="View" acquired="False">
    <permission-role>Contributor</permission-role>

+   <permission-role>Downloader</permission-role>

    <permission-role>Manager</permission-role>
    <permission-role>Owner</permission-role>
    <permission-role>Reader</permission-role>
    <permission-role>Manager</permission-role>
    <permission-role>Owner</permission-role>
    <permission-role>Reader</permission-role>


@@ -124,7 +125,7 @@
              before_script="" after_script="">
   <description>Reviewer can directly publish content  if he have de Owner role (not necessarily ownership)</description>
   <action url="%(content_url)s/content_publish_form?direct:boolean=True"
              before_script="" after_script="">
   <description>Reviewer can directly publish content  if he have de Owner role (not necessarily ownership)</description>
   <action url="%(content_url)s/content_publish_form?direct:boolean=True"

-          category="workflow">Publish</action>
+          category="workflow" icon="">Publish</action>

   <guard>
    <guard-permission>Review portal content</guard-permission>
    <guard-expression>python:user.allowed(here, ['Owner'])</guard-expression>
   <guard>
    <guard-permission>Review portal content</guard-permission>
    <guard-expression>python:user.allowed(here, ['Owner'])</guard-expression>


@@ -135,7 +136,7 @@
              new_state="published" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_publish_form"
              new_state="published" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_publish_form"

-          category="workflow">Publish</action>
+          category="workflow" icon="">Publish</action>

   <guard>
    <guard-permission>Review portal content</guard-permission>
   </guard>
   <guard>
    <guard-permission>Review portal content</guard-permission>
   </guard>


@@ -145,7 +146,7 @@
              new_state="private" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_reject_form"
              new_state="private" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_reject_form"

-          category="workflow">Reject</action>
+          category="workflow" icon="">Reject</action>

   <guard>
    <guard-permission>Review portal content</guard-permission>
   </guard>
   <guard>
    <guard-permission>Review portal content</guard-permission>
   </guard>


@@ -155,7 +156,7 @@
              new_state="private" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_retract_form"
              new_state="private" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_retract_form"

-          category="workflow">Retract</action>
+          category="workflow" icon="">Retract</action>

   <guard>
    <guard-permission>Request review</guard-permission>
    <guard-expression>python:not(here.portal_membership.checkPermission('Review portal content', here))</guard-expression>
   <guard>
    <guard-permission>Request review</guard-permission>
    <guard-expression>python:not(here.portal_membership.checkPermission('Review portal content', here))</guard-expression>


@@ -166,7 +167,7 @@
              new_state="pending" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_submit_form"
              new_state="pending" trigger="USER"
              before_script="" after_script="">
   <action url="%(content_url)s/content_submit_form"

-          category="workflow">Submit</action>
+          category="workflow" icon="">Submit</action>

   <guard>
    <guard-permission>Request review</guard-permission>
   </guard>
   <guard>
    <guard-permission>Request review</guard-permission>
   </guard>

diff --git a/profiles/default/workflows/portfolio_workflow/scripts/sendNotificationEmail.py b/profiles/default/workflows/portfolio_workflow/scripts/sendNotificationEmail.py
index 9b833b6..17dd864 100644 (file)
--- a/profiles/default/workflows/portfolio_workflow/scripts/sendNotificationEmail.py
+++ b/profiles/default/workflows/portfolio_workflow/scripts/sendNotificationEmail.py
@@ -56,6 +56,6 @@ message = context.echange_mail_template(  From = sender
                                                                                , footer=footer)
 
 
                                                                                , footer=footer)
 
 

-MailHost.send( message.encode('utf-8') )
+MailHost.send( message )

 
 return recipients
 
 return recipients