From 3b944bb939d2bfffbfcd9dec2356ab284bd3dfae Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Mon, 21 Oct 2013 17:42:25 +0200 Subject: [PATCH] =?utf8?q?Mise=20=C3=A0=20jour=20du=20profil=20de=20config?= =?utf8?q?uration=20par=20d=C3=A9faut=20qui=20ne=20fonctionnait=20plus=20d?= =?utf8?q?epuis=20un=20moment=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- profiles/default/componentregistry.xml | 26 ++ profiles/default/contenttyperegistry.xml | 4 + profiles/default/export_steps.xml | 138 -------- profiles/default/import_steps.xml | 186 ----------- profiles/default/mosaic_tool/types.xml | 14 - .../mosaic_tool/types/Action_Box_Block.xml | 21 -- .../mosaic_tool/types/Container_Block.xml | 21 -- .../default/mosaic_tool/types/File_Block.xml | 21 -- .../default/mosaic_tool/types/Image_Block.xml | 21 -- .../mosaic_tool/types/Mosaic_Document.xml | 28 -- .../mosaic_tool/types/Section_Block.xml | 21 -- .../mosaic_tool/types/Spacer_Block.xml | 21 -- .../default/mosaic_tool/types/Text_Block.xml | 21 -- .../mosaic_tool/types/Tree_Box_Block.xml | 21 -- .../mosaic_tool/types/Two_Images_Block.xml | 21 -- profiles/default/properties.xml | 14 +- profiles/default/rolemap.xml | 18 +- profiles/default/skins.xml | 3 + profiles/default/toolset.xml | 4 + profiles/default/types.xml | 3 + profiles/default/types/CMF_Site.xml | 18 +- profiles/default/types/Calendar.xml | 16 +- profiles/default/types/Discussion_Item.xml | 14 +- profiles/default/types/Document.xml | 23 +- profiles/default/types/Event.xml | 21 +- profiles/default/types/Favorite.xml | 10 +- profiles/default/types/File.xml | 32 +- profiles/default/types/File_Slot.xml | 11 +- profiles/default/types/Huge_Plinn_Folder.xml | 18 +- profiles/default/types/Image_Slot.xml | 11 +- profiles/default/types/Lightbox.xml | 24 ++ profiles/default/types/Link.xml | 18 +- profiles/default/types/List_Slot.xml | 11 +- profiles/default/types/Mosaic_Document.xml | 16 +- profiles/default/types/News_Item.xml | 18 +- profiles/default/types/Order.xml | 23 ++ profiles/default/types/Order_Folder.xml | 48 +++ profiles/default/types/Photo.xml | 24 +- profiles/default/types/Plinn_Document.xml | 24 +- profiles/default/types/Plinn_Folder.xml | 37 +-- profiles/default/types/Portfolio.xml | 54 +++- profiles/default/types/Spacer_Slot.xml | 11 +- profiles/default/types/String_Slot.xml | 11 +- profiles/default/types/Text_Slot.xml | 11 +- profiles/default/types/Topic.xml | 21 +- profiles/default/typestool.xml | 30 ++ profiles/default/workflows.xml | 8 + .../workflows/default_workflow/definition.xml | 36 +-- .../scripts/sendNotificationEmail.py | 2 +- .../workflows/folder_workflow/definition.xml | 26 +- .../scripts/sendNotificationEmail.py | 2 +- .../workflows/member_workflow/definition.xml | 5 +- .../member_workflow/scripts/after_reject.py | 2 +- .../scripts/sendNotificationEmail.py | 2 +- .../workflows/order_workflow/definition.xml | 295 ++++++++++++++++++ .../order_workflow/scripts/relistCopies.py | 10 + .../scripts/sendNotificationEmail.py | 72 +++++ .../portfolio_workflow/definition.xml | 15 +- .../scripts/sendNotificationEmail.py | 2 +- 59 files changed, 868 insertions(+), 791 deletions(-) delete mode 100644 profiles/default/export_steps.xml delete mode 100644 profiles/default/import_steps.xml delete mode 100644 profiles/default/mosaic_tool/types.xml delete mode 100644 profiles/default/mosaic_tool/types/Action_Box_Block.xml delete mode 100644 profiles/default/mosaic_tool/types/Container_Block.xml delete mode 100644 profiles/default/mosaic_tool/types/File_Block.xml delete mode 100644 profiles/default/mosaic_tool/types/Image_Block.xml delete mode 100644 profiles/default/mosaic_tool/types/Mosaic_Document.xml delete mode 100644 profiles/default/mosaic_tool/types/Section_Block.xml delete mode 100644 profiles/default/mosaic_tool/types/Spacer_Block.xml delete mode 100644 profiles/default/mosaic_tool/types/Text_Block.xml delete mode 100644 profiles/default/mosaic_tool/types/Tree_Box_Block.xml delete mode 100644 profiles/default/mosaic_tool/types/Two_Images_Block.xml mode change 100755 => 100644 profiles/default/types/CMF_Site.xml mode change 100755 => 100644 profiles/default/types/Calendar.xml mode change 100755 => 100644 profiles/default/types/Discussion_Item.xml mode change 100755 => 100644 profiles/default/types/Document.xml mode change 100755 => 100644 profiles/default/types/Event.xml mode change 100755 => 100644 profiles/default/types/Favorite.xml mode change 100755 => 100644 profiles/default/types/File.xml mode change 100755 => 100644 profiles/default/types/File_Slot.xml mode change 100755 => 100644 profiles/default/types/Image_Slot.xml create mode 100644 profiles/default/types/Lightbox.xml mode change 100755 => 100644 profiles/default/types/Link.xml mode change 100755 => 100644 profiles/default/types/List_Slot.xml mode change 100755 => 100644 profiles/default/types/Mosaic_Document.xml mode change 100755 => 100644 profiles/default/types/News_Item.xml create mode 100644 profiles/default/types/Order.xml create mode 100644 profiles/default/types/Order_Folder.xml mode change 100755 => 100644 profiles/default/types/Photo.xml mode change 100755 => 100644 profiles/default/types/Plinn_Folder.xml mode change 100755 => 100644 profiles/default/types/Portfolio.xml mode change 100755 => 100644 profiles/default/types/Spacer_Slot.xml mode change 100755 => 100644 profiles/default/types/String_Slot.xml mode change 100755 => 100644 profiles/default/types/Text_Slot.xml mode change 100755 => 100644 profiles/default/types/Topic.xml create mode 100644 profiles/default/typestool.xml create mode 100644 profiles/default/workflows/order_workflow/definition.xml create mode 100755 profiles/default/workflows/order_workflow/scripts/relistCopies.py create mode 100755 profiles/default/workflows/order_workflow/scripts/sendNotificationEmail.py diff --git a/profiles/default/componentregistry.xml b/profiles/default/componentregistry.xml index 3aa9107..d3fab0b 100644 --- a/profiles/default/componentregistry.xml +++ b/profiles/default/componentregistry.xml @@ -2,6 +2,26 @@ + + + + + + + + + + + + + diff --git a/profiles/default/contenttyperegistry.xml b/profiles/default/contenttyperegistry.xml index 5306349..3cc2552 100644 --- a/profiles/default/contenttyperegistry.xml +++ b/profiles/default/contenttyperegistry.xml @@ -17,6 +17,10 @@ + + + diff --git a/profiles/default/export_steps.xml b/profiles/default/export_steps.xml deleted file mode 100644 index 98969f3..0000000 --- a/profiles/default/export_steps.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - Export actions tool's action providers and their actions. - - - - - - - Export caching policy manager's policies. - - - - - - - Export catalog tool's sub-objects, indexes and columns. - - - - - - - Export local component registry configuration. - - - - - - - Export content type registry's predicates / bindings. - - - - - - - Export cookie crumbler settings - - - - - - - Export the mailhost's settings and properties - - - - - - - Export site properties. - - - - - - - Export custom roles and non-default role-permission mappings. - - - - - - - Export skins tool's filesystem directory views and skin path definitions. - - - - - - - Export current contents of import step registry and export step registry. - - - - - - - Export required / forbidden tools. - - - - - - - Export types tool's type information objects. - - - - - - - Export various plinn settings as python script. - - - - - - - Export workflow tool's workflow definitions and supporting scripts. - - - - diff --git a/profiles/default/import_steps.xml b/profiles/default/import_steps.xml deleted file mode 100644 index 98d585a..0000000 --- a/profiles/default/import_steps.xml +++ /dev/null @@ -1,186 +0,0 @@ - - - - - - - - - Import actions tool's action providers and their actions. - - - - - - - - - - Import caching policy manager's policies. - - - - - - - - - - Import catalog tool's sub-objects, indexes and columns. - - - - - - - - Import local component registry configuration. - - - - - - - - - - Import content type registry's predicates and bindings. - - - - - - - - - - Import cookie crumbler settings - - - - - - - - - - - - - Import mailhost settings - - - - - - - Import site properties. - - - - - - - Import custom roles and non-default role-permission mappings. - - - - - - - - - - Import skins tool's filesystem directory views and skin path definitions. - - - - - - - Create required tools, replacing any of the wrong class, and remove - forbidden ones. - - - - - - - - - - Import types tool's type information objects. - - - - - - - - - - - - Import various settings for CMF Calendar. - - - - - - - - - - - - - - - Import various settings from Plinn products. - - - - - - - - - - Import workflow tool's workflow definitions and supporting scripts. - - - - diff --git a/profiles/default/mosaic_tool/types.xml b/profiles/default/mosaic_tool/types.xml deleted file mode 100644 index 9ae3830..0000000 --- a/profiles/default/mosaic_tool/types.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - 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 index 01dda2d..0000000 --- a/profiles/default/mosaic_tool/types/Action_Box_Block.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - Action Box Block - - mosaic_tool/action_block_icon.gif - Action Box Block - mosaic_tool/action_block_template - False - MosaicDocument - addMosaicBlock - view - True - True - - False - - - - diff --git a/profiles/default/mosaic_tool/types/Container_Block.xml b/profiles/default/mosaic_tool/types/Container_Block.xml deleted file mode 100644 index 45d87d3..0000000 --- a/profiles/default/mosaic_tool/types/Container_Block.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - Container block - - mosaic_tool/image_block_icon.gif - Container Block - mosaic_tool/block_container_template - True - MosaicDocument - addMosaicBlock - view - True - True - - False - - - - diff --git a/profiles/default/mosaic_tool/types/File_Block.xml b/profiles/default/mosaic_tool/types/File_Block.xml deleted file mode 100644 index 525734c..0000000 --- a/profiles/default/mosaic_tool/types/File_Block.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - File Block - - mosaic_tool/image_block_icon.gif - File Block - mosaic_tool/block_file_template - False - MosaicDocument - addMosaicBlock - view - True - True - - False - - - - diff --git a/profiles/default/mosaic_tool/types/Image_Block.xml b/profiles/default/mosaic_tool/types/Image_Block.xml deleted file mode 100644 index 204db1d..0000000 --- a/profiles/default/mosaic_tool/types/Image_Block.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - Image block - - mosaic_tool/image_block_icon.gif - Image Block - mosaic_tool/block_image_template - False - MosaicDocument - addMosaicBlock - view - True - True - - False - - - - diff --git a/profiles/default/mosaic_tool/types/Mosaic_Document.xml b/profiles/default/mosaic_tool/types/Mosaic_Document.xml deleted file mode 100644 index d855369..0000000 --- a/profiles/default/mosaic_tool/types/Mosaic_Document.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - Mosaic Document - - mosaic_icon.png - Mosaic Document - - True - MosaicDocument - addMosaicDocument - metadata_edit_form - True - False - - True - - - - - - - - diff --git a/profiles/default/mosaic_tool/types/Section_Block.xml b/profiles/default/mosaic_tool/types/Section_Block.xml deleted file mode 100644 index 64e49b4..0000000 --- a/profiles/default/mosaic_tool/types/Section_Block.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - Section block - - mosaic_tool/image_block_icon.gif - Section Block - mosaic_tool/block_section_template - False - MosaicDocument - addMosaicBlock - view - True - True - - False - - - - diff --git a/profiles/default/mosaic_tool/types/Spacer_Block.xml b/profiles/default/mosaic_tool/types/Spacer_Block.xml deleted file mode 100644 index 6610d7d..0000000 --- a/profiles/default/mosaic_tool/types/Spacer_Block.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - Spacer block - - mosaic_tool/image_block_icon.gif - Spacer Block - mosaic_tool/block_spacer_template - False - MosaicDocument - addMosaicBlock - view - True - True - - False - - - - diff --git a/profiles/default/mosaic_tool/types/Text_Block.xml b/profiles/default/mosaic_tool/types/Text_Block.xml deleted file mode 100644 index 3b11b85..0000000 --- a/profiles/default/mosaic_tool/types/Text_Block.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - Text block - - mosaic_tool/image_block_icon.gif - Text Block - mosaic_tool/block_text_template - False - MosaicDocument - addMosaicBlock - view - True - True - - False - - - - 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 index 787cc87..0000000 --- a/profiles/default/mosaic_tool/types/Tree_Box_Block.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - Tree Box Block - - mosaic_tool/tree_block_icon.gif - Tree Box Block - mosaic_tool/tree_block_template - False - MosaicDocument - addMosaicBlock - view - True - True - - False - - - - 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 index 878da55..0000000 --- a/profiles/default/mosaic_tool/types/Two_Images_Block.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - Two images block - - mosaic_tool/image_block_icon.gif - Two Images Block - mosaic_tool/block_two_images_template - False - MosaicDocument - addMosaicBlock - view - True - True - - False - - - - diff --git a/profiles/default/properties.xml b/profiles/default/properties.xml index 97a20f5..f63d5d7 100644 --- a/profiles/default/properties.xml +++ b/profiles/default/properties.xml @@ -16,8 +16,8 @@ True fr False - 245 - Untitled- + 222 + Untitled- utf-8 utf-8 @@ -31,7 +31,13 @@ - - 3 + 2 + + #ffffff + 25 + 100 + 25 + 50 diff --git a/profiles/default/rolemap.xml b/profiles/default/rolemap.xml index b1dd68a..0a5096b 100644 --- a/profiles/default/rolemap.xml +++ b/profiles/default/rolemap.xml @@ -4,6 +4,7 @@ + @@ -15,6 +16,9 @@ + + + @@ -30,8 +34,8 @@ - + @@ -59,6 +63,7 @@ + @@ -115,15 +120,13 @@ - - - + @@ -138,5 +141,12 @@ + + + + + + + diff --git a/profiles/default/skins.xml b/profiles/default/skins.xml index 9a02b84..451f7c3 100644 --- a/profiles/default/skins.xml +++ b/profiles/default/skins.xml @@ -29,6 +29,8 @@ directory="Products.MosaicDocument:skins"/> + + diff --git a/profiles/default/toolset.xml b/profiles/default/toolset.xml index 6686275..1320220 100644 --- a/profiles/default/toolset.xml +++ b/profiles/default/toolset.xml @@ -26,12 +26,16 @@ class="Products.Plinn.GroupDataTool.GroupDataTool"/> + + + + + diff --git a/profiles/default/types/CMF_Site.xml b/profiles/default/types/CMF_Site.xml old mode 100755 new mode 100644 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"> Portal portal_type - plinn_icon.gif + string:${portal_url}/plinn_icon.gif + + False True @@ -14,7 +16,9 @@ + + @@ -25,21 +29,23 @@ + icon_expr="" link_target="" url_expr="string:${object_url}/index_html" + visible="True"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/folder_contents" visible="True"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/folder_rename_form" visible="False"> diff --git a/profiles/default/types/Calendar.xml b/profiles/default/types/Calendar.xml old mode 100755 new mode 100644 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"> Agenda Calendar contains events. - calendar_icon.gif + string:${portal_url}/calendar_icon.gif Plinn Calendar Plinn manage_addPlinnFolder + + object/view True True - True + False + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/folder_localrole_form" visible="True"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/content_status_history" visible="True"> diff --git a/profiles/default/types/Discussion_Item.xml b/profiles/default/types/Discussion_Item.xml old mode 100755 new mode 100644 index a15bd46..0df543a --- a/profiles/default/types/Discussion_Item.xml +++ b/profiles/default/types/Discussion_Item.xml @@ -5,10 +5,13 @@ Discussion Items are documents which reply to other content. They should *not* be addable through the standard 'folder_factories' interface. - discussionitem_icon.gif + string:${portal_url}/discussionitem_icon.gif Discussion Item + + True True @@ -17,17 +20,18 @@ + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/discussion_reply_form" visible="True"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/discussionItemDelete" visible="True"> diff --git a/profiles/default/types/Document.xml b/profiles/default/types/Document.xml old mode 100755 new mode 100644 index 7f9ead9..dedc32f --- a/profiles/default/types/Document.xml +++ b/profiles/default/types/Document.xml @@ -4,40 +4,39 @@ Document Contain text that can be formatted using 'Structured Text.' It may also contain HTML, or "plain" text. - text.gif + string:${portal_url}/text.gif Document CMFDefault addDocument + + object/edit True True - True + False + icon_expr="" link_target="" url_expr="string:${object_url}/document_view" + visible="True"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/folder_localrole_form" visible="True"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/changes_history" visible="True"> - - - diff --git a/profiles/default/types/Event.xml b/profiles/default/types/Event.xml old mode 100755 new mode 100644 index 61a7eeb..293f8be --- a/profiles/default/types/Event.xml +++ b/profiles/default/types/Event.xml @@ -4,37 +4,42 @@ Event Events are objects for use in Calendar topical queries on the catalog. - event_icon.gif + string:${portal_url}/event_icon.gif CMF Event CMFCalendar addEvent + + object/edit True True - True + False + condition_expr="" icon_expr="" link_target="" + url_expr="string:${folder_url}" visible="True"> + icon_expr="" link_target="" url_expr="string:${object_url}/event_view" + visible="True"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/folder_localrole_form" visible="True"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/content_status_history" visible="True"> diff --git a/profiles/default/types/Favorite.xml b/profiles/default/types/Favorite.xml old mode 100755 new mode 100644 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"> Favorite Link to an intra-portal resource. - link_icon.gif + string:${portal_url}/link_icon.gif Favorite CMFDefault addFavorite + + object/edit True True @@ -15,11 +17,13 @@ + icon_expr="" link_target="" url_expr="string:${object_url}/favorite_view" + visible="True"> + icon_expr="" link_target="" url_expr="string:${object_url}/link_edit_form" + visible="True"> diff --git a/profiles/default/types/File.xml b/profiles/default/types/File.xml old mode 100755 new mode 100644 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"> File Contain arbitrary downloadable files. - application.png + string:${portal_url}/application.png Plinn File - - plinn.file + Plinn + addFile + + object/edit True True - True - + False + + icon_expr="" link_target="" url_expr="string:${object_url}/file_view" + visible="True"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/preview" visible="False"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}" visible="False"> + icon_expr="" link_target="" url_expr="string:${object_url}/file_edit_form" + visible="True"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/folder_localrole_form" visible="True"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/content_status_history" visible="True"> diff --git a/profiles/default/types/File_Slot.xml b/profiles/default/types/File_Slot.xml old mode 100755 new mode 100644 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"> File Slot File Slot for Mosaic Document - mosaic_tool/bin_icon.gif + string:${portal_url}/mosaic_tool/bin_icon.gif File Slot MosaicDocument addFileSlot + + view True True @@ -15,11 +18,13 @@ + icon_expr="" link_target="" url_expr="string:slot_file_view" + visible="True"> + icon_expr="" link_target="" url_expr="string:slot_file_form" + visible="True"> diff --git a/profiles/default/types/Huge_Plinn_Folder.xml b/profiles/default/types/Huge_Plinn_Folder.xml index 15616ad..38799ea 100644 --- a/profiles/default/types/Huge_Plinn_Folder.xml +++ b/profiles/default/types/Huge_Plinn_Folder.xml @@ -4,10 +4,12 @@ Huge Folder Container to put content in categories. - folder_icon.gif + string:${portal_url}/folder_icon.gif Huge Plinn Folder plinn.folder.huge + + object/folderContents True True @@ -29,26 +31,28 @@ + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/folder_contents" visible="True"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/folder_localrole_form" visible="True"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/folder_rename_form" visible="False"> diff --git a/profiles/default/types/Image_Slot.xml b/profiles/default/types/Image_Slot.xml old mode 100755 new mode 100644 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"> Image Slot Image Slot for Mosaic Document - mosaic_tool/photo_icon.gif + string:${portal_url}/mosaic_tool/photo_icon.gif Image Slot MosaicDocument addImageSlot + + view True True @@ -15,11 +18,13 @@ + icon_expr="" link_target="" url_expr="string:slot_image_view" + visible="True"> + icon_expr="" link_target="" url_expr="string:slot_image_form" + visible="True"> diff --git a/profiles/default/types/Lightbox.xml b/profiles/default/types/Lightbox.xml new file mode 100644 index 0000000..def8f7e --- /dev/null +++ b/profiles/default/types/Lightbox.xml @@ -0,0 +1,24 @@ + + + Lightbox + lightbox holds references to photos + string:${portal_url}/lightbox_icon.png + Lightbox + + portfolio.lightbox + + + object/view + True + True + + False + + + + + + diff --git a/profiles/default/types/Link.xml b/profiles/default/types/Link.xml old mode 100755 new mode 100644 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"> Link Annotated URL. - link_icon.gif + string:${portal_url}/link_icon.gif Link CMFDefault addLink + + object/edit True True @@ -16,21 +18,23 @@ + icon_expr="" link_target="" url_expr="string:${object_url}/link_view" + visible="True"> + icon_expr="" link_target="" url_expr="string:${object_url}/link_edit_form" + visible="True"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/folder_localrole_form" visible="True"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/content_status_history" visible="True"> diff --git a/profiles/default/types/List_Slot.xml b/profiles/default/types/List_Slot.xml old mode 100755 new mode 100644 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"> List Slot List Slot for Mosaic Document - mosaic_tool/str_icon.gif + string:${portal_url}/mosaic_tool/str_icon.gif List Slot MosaicDocument addStringSlot + + view True True @@ -15,11 +18,13 @@ + icon_expr="" link_target="" url_expr="string:slot_list_view" + visible="True"> + icon_expr="" link_target="" url_expr="string:slot_text_form" + visible="True"> diff --git a/profiles/default/types/Mosaic_Document.xml b/profiles/default/types/Mosaic_Document.xml old mode 100755 new mode 100644 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"> Mosaic Document - mosaic_icon.gif + string:${portal_url}/mosaic_icon.gif Mosaic Document MosaicDocument addMosaicDocument + + object/edit True False - True + False + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/folder_localrole_form" visible="True"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/content_status_history" visible="True"> diff --git a/profiles/default/types/News_Item.xml b/profiles/default/types/News_Item.xml old mode 100755 new mode 100644 index 3ab73b9..68f1717 --- a/profiles/default/types/News_Item.xml +++ b/profiles/default/types/News_Item.xml @@ -4,35 +4,39 @@ News Item Short text article with a title and an optional lead-in. - newsitem_icon.gif + string:${portal_url}/newsitem_icon.gif News Item CMFDefault addNewsItem + + object/edit True True - True + False + icon_expr="" link_target="" url_expr="string:${object_url}/newsitem_view" + visible="True"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/folder_localrole_form" visible="True"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/content_status_history" visible="True"> diff --git a/profiles/default/types/Order.xml b/profiles/default/types/Order.xml new file mode 100644 index 0000000..c5c021d --- /dev/null +++ b/profiles/default/types/Order.xml @@ -0,0 +1,23 @@ + + + Order + + string:${portal_url}/text.gif + Print order + + photoprint.order + + + object/edit + True + True + + False + + + + + diff --git a/profiles/default/types/Order_Folder.xml b/profiles/default/types/Order_Folder.xml new file mode 100644 index 0000000..4378dbb --- /dev/null +++ b/profiles/default/types/Order_Folder.xml @@ -0,0 +1,48 @@ + + + Order Folder + + string:${portal_url}/folder_icon.gif + Huge Plinn Folder + + plinn.folder.huge + + + object/folderContents + True + True + + + + + False + + + + + + + + + + + + + + + + + + + diff --git a/profiles/default/types/Photo.xml b/profiles/default/types/Photo.xml old mode 100755 new mode 100644 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"> Photo Photo - photo_icon.gif + string:${portal_url}/photo_icon.gif Photo - Portfolio - addPhoto + + portfolio.photo + + object/edit True True - True + False + icon_expr="" link_target="" url_expr="string:${object_url}/photo_view" + visible="True"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/folder_localrole_form" visible="True"> + + + diff --git a/profiles/default/types/Plinn_Document.xml b/profiles/default/types/Plinn_Document.xml index 8b11871..ff2f692 100644 --- a/profiles/default/types/Plinn_Document.xml +++ b/profiles/default/types/Plinn_Document.xml @@ -4,40 +4,40 @@ Plinn Document Plinn Documents contain text and images that can be layout with WYSIWYG and drag&drop editor. - plinn_doc.gif + string:${portal_url}/plinn_doc.gif Plinn Document plinndocument + + object/edit True True - True + False + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/folder_localrole_form" visible="True"> - - - - + + diff --git a/profiles/default/types/Plinn_Folder.xml b/profiles/default/types/Plinn_Folder.xml old mode 100755 new mode 100644 index df009a9..c33863b --- a/profiles/default/types/Plinn_Folder.xml +++ b/profiles/default/types/Plinn_Folder.xml @@ -1,13 +1,15 @@ - Folder Container to put content in categories. - folder_icon.gif + string:${portal_url}/folder_icon.gif Plinn Folder plinn.folder.normal + + object/folderContents True True @@ -17,7 +19,7 @@ - + @@ -26,44 +28,33 @@ + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/folder_contents" visible="True"> - - - + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/folder_localrole_form" visible="True"> - - - - - - + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/folder_rename_form" visible="False"> diff --git a/profiles/default/types/Portfolio.xml b/profiles/default/types/Portfolio.xml old mode 100755 new mode 100644 index 1c1a5d8..3be7ccb --- a/profiles/default/types/Portfolio.xml +++ b/profiles/default/types/Portfolio.xml @@ -1,61 +1,81 @@ - Album photo + Collection Folder for photo storage - portfolio_icon.gif + string:${portal_url}/portfolio_icon.gif Portfolio - Portfolio - addPortfolio - portfolio_view + + portfolio.portfolio + + + object/view True True - True + False + icon_expr="" link_target="" url_expr="string:${object_url}/portfolio_view" + visible="True"> - + icon_expr="" link_target="" url_expr="string:${object_url}/slide_show" + visible="True"> - - + + + + + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/folder_localrole_form" visible="True"> + + + + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/folder_rename_form" visible="False"> + icon_expr="" link_target="" url_expr="string:createPortfolio" + visible="False"> diff --git a/profiles/default/types/Spacer_Slot.xml b/profiles/default/types/Spacer_Slot.xml old mode 100755 new mode 100644 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"> Spacer Slot Spacer Slot for Mosaic Document - mosaic_tool/spacer_icon.gif + string:${portal_url}/mosaic_tool/spacer_icon.gif Spacer Slot MosaicDocument addSpacerSlot + + view True True @@ -15,11 +18,13 @@ + icon_expr="" link_target="" url_expr="string:slot_spacer_view" + visible="True"> + icon_expr="" link_target="" url_expr="string:slot_spacer_form" + visible="True"> diff --git a/profiles/default/types/String_Slot.xml b/profiles/default/types/String_Slot.xml old mode 100755 new mode 100644 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"> String Slot String Slot for Mosaic Document - mosaic_tool/str_icon.gif + string:${portal_url}/mosaic_tool/str_icon.gif String Slot MosaicDocument addStringSlot + + view True True @@ -15,11 +18,13 @@ + icon_expr="" link_target="" url_expr="string:slot_string_view" + visible="True"> + icon_expr="" link_target="" url_expr="string:slot_string_form" + visible="True"> diff --git a/profiles/default/types/Text_Slot.xml b/profiles/default/types/Text_Slot.xml old mode 100755 new mode 100644 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"> Text Slot Text Slot for Mosaic Document - mosaic_tool/txt_icon.gif + string:${portal_url}/mosaic_tool/txt_icon.gif Text Slot MosaicDocument addStringSlot + + view True True @@ -15,11 +18,13 @@ + icon_expr="" link_target="" url_expr="string:slot_text_view" + visible="True"> + icon_expr="" link_target="" url_expr="string:slot_text_form" + visible="True"> diff --git a/profiles/default/types/Topic.xml b/profiles/default/types/Topic.xml old mode 100755 new mode 100644 index 3f45edf..8c62c8d --- a/profiles/default/types/Topic.xml +++ b/profiles/default/types/Topic.xml @@ -4,10 +4,12 @@ Topics are canned queries for organizing content with up to date queries into the catalog. - topic_icon.gif + string:${portal_url}/topic_icon.gif Plinn Topic plinn.topic + + object/edit True True @@ -18,30 +20,33 @@ + icon_expr="" link_target="" url_expr="string:${object_url}/topic_view" + visible="True"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/folder_contents" visible="True"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/folder_rename_form" visible="False"> + condition_expr="" icon_expr="" link_target="" + url_expr="string:${object_url}/content_status_history" visible="True"> diff --git a/profiles/default/typestool.xml b/profiles/default/typestool.xml new file mode 100644 index 0000000..dcedfbf --- /dev/null +++ b/profiles/default/typestool.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/profiles/default/workflows.xml b/profiles/default/workflows.xml index 2c0d652..5686c60 100644 --- a/profiles/default/workflows.xml +++ b/profiles/default/workflows.xml @@ -4,6 +4,7 @@ + @@ -15,8 +16,15 @@ + + + + + + + diff --git a/profiles/default/workflows/default_workflow/definition.xml b/profiles/default/workflows/default_workflow/definition.xml index 4ece941..3300f09 100644 --- a/profiles/default/workflows/default_workflow/definition.xml +++ b/profiles/default/workflows/default_workflow/definition.xml @@ -1,9 +1,8 @@ - + - Access contents information Change portal events Change portal topics @@ -15,14 +14,9 @@ - - Contributor + acquired="True"> Manager - Owner - Reader - Reviewer @@ -58,14 +52,12 @@ - Contributor Manager Owner - Reader @@ -105,10 +97,8 @@ - - Anonymous Manager Reviewer can directly publish content if he have de Owner role (not necessarily ownership) Publish + category="workflow" icon="">Publish Review portal content python:user.allowed(here, ['Owner']) @@ -152,7 +142,7 @@ new_state="published" trigger="USER" before_script="" after_script=""> Publish + category="workflow" icon="">Publish Review portal content @@ -162,7 +152,7 @@ new_state="private" trigger="USER" before_script="" after_script=""> Reject + category="workflow" icon="">Reject Review portal content @@ -172,28 +162,18 @@ new_state="private" trigger="USER" before_script="" after_script=""> Retract + category="workflow" icon="">Retract Request review python:not(here.portal_membership.checkPermission('Review portal content', here)) - - Send an email - - View - Member - - Submit + category="workflow" icon="">Submit Request review @@ -201,7 +181,7 @@ Reviewer tasks Pending (%(count)d) + category="global" icon="">Pending (%(count)d) here/havePendingContents diff --git a/profiles/default/workflows/default_workflow/scripts/sendNotificationEmail.py b/profiles/default/workflows/default_workflow/scripts/sendNotificationEmail.py index 9b833b6..17dd864 100644 --- 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) -MailHost.send( message.encode('utf-8') ) +MailHost.send( message ) return recipients diff --git a/profiles/default/workflows/folder_workflow/definition.xml b/profiles/default/workflows/folder_workflow/definition.xml index a2f56bd..ab685f8 100644 --- a/profiles/default/workflows/folder_workflow/definition.xml +++ b/profiles/default/workflows/folder_workflow/definition.xml @@ -1,9 +1,8 @@ - + - Manage properties Modify portal content View @@ -11,7 +10,6 @@ - Manager Reviewer @@ -31,7 +29,6 @@ - Contributor @@ -54,7 +51,6 @@ - Manager @@ -72,7 +68,7 @@ before_script="" after_script=""> Reviewer can directly publish content if he have de Owner role (not necessarily ownership) Publish + category="workflow" icon="">Publish Review portal content python:user.allowed(here, ['Owner']) @@ -83,7 +79,7 @@ new_state="published" trigger="USER" before_script="" after_script=""> Publish + category="workflow" icon="">Publish Review portal content @@ -93,7 +89,7 @@ new_state="private" trigger="USER" before_script="" after_script=""> Reject + category="workflow" icon="">Reject Review portal content @@ -103,28 +99,18 @@ new_state="private" trigger="USER" before_script="" after_script=""> Retract + category="workflow" icon="">Retract Request review python:not(here.portal_membership.checkPermission('Review portal content', here)) - - Send an email - - View - Member - - Submit + category="workflow" icon="">Submit Request review diff --git a/profiles/default/workflows/folder_workflow/scripts/sendNotificationEmail.py b/profiles/default/workflows/folder_workflow/scripts/sendNotificationEmail.py index 9b833b6..17dd864 100644 --- 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) -MailHost.send( message.encode('utf-8') ) +MailHost.send( message ) return recipients diff --git a/profiles/default/workflows/member_workflow/definition.xml b/profiles/default/workflows/member_workflow/definition.xml index 4422350..a653b54 100644 --- a/profiles/default/workflows/member_workflow/definition.xml +++ b/profiles/default/workflows/member_workflow/definition.xml @@ -1,10 +1,9 @@ - + - @@ -59,7 +58,7 @@ Reviewer tasks Membres en attente (%(count)d) + category="global" icon="">Membres en attente (%(count)d) Set Member Properties 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 --- 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 ) -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 --- 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) diff --git a/profiles/default/workflows/order_workflow/definition.xml b/profiles/default/workflows/order_workflow/definition.xml new file mode 100644 index 0000000..c0e1b82 --- /dev/null +++ b/profiles/default/workflows/order_workflow/definition.xml @@ -0,0 +1,295 @@ + + + + + Authenticated + + + Access contents information + Delete Owned Objects + Manage properties + Modify portal content + View + + + Manager + Owner + + + Manager + + + Manager + + + Manager + + + Manager + Owner + + + + + + Manager + Owner + + + Manager + + + Manager + + + Manager + + + Manager + Owner + + + + + + + Manager + Owner + + + Manager + + + Manager + + + Manager + + + Manager + Owner + + + + + + + + Manager + Owner + + + Manager + + + Manager + Owner + + + Manager + Owner + + + Manager + Owner + + + + + Manager + Owner + + + Manager + + + Manager + + + Manager + + + Manager + Owner + + + + + Manager + Owner + + + Manager + + + Manager + + + Manager + + + Manager + Owner + + + + Cancel + + Manage print orders + + + + Printing list + + Manage print orders + + + + Manual payment + + Manage print orders + + + + Notify done + + Manage print orders + + + + Notify sent + + Manage print orders + + + + + + Owner + + + + The last transition + + + transition/getId|nothing + + + + + + The ID of the user who performed the last transition + + + user/getId + + + + + + Comments about the last transition + + + python:state_change.kwargs.get('comment', '') + + + + + + + + python:scripts.sendNotificationEmail(state_change) or state_change.kwargs.get('email_sent', []) + + + + + + Provides access to workflow history + + + state_change/getHistory + + + Request review + Review portal content + + + + Time of the last transition + + + state_change/getDateTime + + + + + + + + + + + + + + + + + + + + +