[CMF-checkins] CVS: CMF/CMFSetup/profiles/default - actions.xml:1.3
export_steps.xml:1.6 import_steps.xml:1.7 rolemap.xml:1.3
skins.xml:1.3 toolset.xml:1.2 workflows.xml:1.2
Yvo Schubbe
y.2004_ at wcm-solutions.de
Mon Jul 19 14:12:07 EDT 2004
Update of /cvs-repository/CMF/CMFSetup/profiles/default
In directory cvs.zope.org:/tmp/cvs-serv10833/CMFSetup/profiles/default
Modified Files:
actions.xml export_steps.xml import_steps.xml rolemap.xml
skins.xml toolset.xml workflows.xml
Log Message:
merged yuppie-actions-cleanup-branch:
- enforced usage of 'title' instead of 'name', 'url' instead of 'action'
- enforced boolean type of 'visible'
- refactored CMFSetup actions and type-info handling
- updated default profile
=== CMF/CMFSetup/profiles/default/actions.xml 1.2 => 1.3 ===
--- CMF/CMFSetup/profiles/default/actions.xml:1.2 Mon May 24 18:51:49 2004
+++ CMF/CMFSetup/profiles/default/actions.xml Mon Jul 19 14:11:36 2004
@@ -1,86 +1,107 @@
<?xml version="1.0"?>
<actions-tool>
<action-provider id="portal_membership">
- <action action_id="login" title="Login" category="user"
- action_expr="string:${portal_url}/login_form"
- condition_expr="not: member" visible="1"
- permission="View"/>
+ <action action_id="login" title="Login"
+ condition_expr="not: member"
+ url_expr="string:${portal_url}/login_form"
+ category="user" visible="True">
+ <permission>View</permission>
+ </action>
<action action_id="preferences" title="Preferences"
- category="user"
- action_expr="string:${portal_url}/personalize_form"
- condition_expr="member" visible="1"
- permission="View"/>
- <action action_id="logout" title="Log out" category="user"
- action_expr="string:${portal_url}/logout"
- condition_expr="member" visible="1"
- permission="View"/>
+ condition_expr="member"
+ url_expr="string:${portal_url}/personalize_form"
+ category="user" visible="True">
+ <permission>View</permission>
+ </action>
+ <action action_id="logout" title="Log out"
+ condition_expr="member"
+ url_expr="string:${portal_url}/logout"
+ category="user" visible="True">
+ <permission>View</permission>
+ </action>
<action action_id="addFavorite" title="Add to favorites"
- category="user"
- action_expr="string:${object_url}/addtoFavorites"
condition_expr="portal/portal_membership/getHomeFolder"
- visible="1" permission="View"/>
+ url_expr="string:${object_url}/addtoFavorites"
+ category="user" visible="True">
+ <permission>View</permission>
+ </action>
<action action_id="mystuff" title="My stuff"
- category="user"
- action_expr="string:${portal/portal_membership/getHomeUrl}/folder_contents"
condition_expr="python: member and portal.portal_membership.getHomeFolder()"
- visible="1" permission="View"/>
+ url_expr="string:${portal/portal_membership/getHomeUrl}/folder_contents"
+ category="user" visible="True">
+ <permission>View</permission>
+ </action>
<action action_id="favorites" title="My favorites"
- category="user"
- action_expr="string:${portal/portal_membership/getHomeUrl}/Favorites/folder_contents"
condition_expr="python: member and hasattr(portal.portal_membership.getHomeFolder(), "Favorites")"
- visible="1" permission="View"/>
+ url_expr="string:${portal/portal_membership/getHomeUrl}/Favorites/folder_contents"
+ category="user" visible="True">
+ <permission>View</permission>
+ </action>
<action action_id="manage_members" title="Manage members"
- category="global"
- action_expr="string:${portal_url}/members_manage_form"
- condition_expr="" visible="1"
- permission="Manage users"/>
+ condition_expr=""
+ url_expr="string:${portal_url}/members_manage_form"
+ category="global" visible="True">
+ <permission>Manage users</permission>
+ </action>
<action action_id="logged_in" title="Logged in"
- category="user"
- action_expr="string:${portal_url}/logged_in"
- condition_expr="" visible="0" permission="View"/>
+ condition_expr=""
+ url_expr="string:${portal_url}/logged_in"
+ category="user" visible="False">
+ <permission>View</permission>
+ </action>
</action-provider>
<action-provider id="portal_actions">
<action action_id="folderContents" title="Folder contents"
- category="folder"
- action_expr="string:${folder_url}/folder_contents"
condition_expr="python: folder is not object"
- visible="1" permission="List folder contents"/>
+ url_expr="string:${folder_url}/folder_contents"
+ category="folder" visible="True">
+ <permission>List folder contents</permission>
+ </action>
</action-provider>
<action-provider id="portal_registration">
- <action action_id="join" title="Join" category="user"
- action_expr="string:${portal_url}/join_form"
- condition_expr="not: member" visible="1"
- permission="Add portal member"/>
+ <action action_id="join" title="Join"
+ condition_expr="not: member"
+ url_expr="string:${portal_url}/join_form"
+ category="user" visible="True">
+ <permission>Add portal member</permission>
+ </action>
</action-provider>
<action-provider id="portal_types">
+
</action-provider>
<action-provider id="portal_discussion">
- <action action_id="reply" title="Reply" category="object"
- action_expr="string:${object_url}/discussion_reply_form"
+ <action action_id="reply" title="Reply"
condition_expr="python: object is not None and portal.portal_discussion.isDiscussionAllowedFor(object)"
- visible="1" permission="Reply to item"/>
+ url_expr="string:${object_url}/discussion_reply_form"
+ category="object" visible="True">
+ <permission>Reply to item</permission>
+ </action>
</action-provider>
<action-provider id="portal_undo">
- <action action_id="undo" title="Undo" category="global"
- action_expr="string:${portal_url}/undo_form"
- condition_expr="member" visible="1"
- permission="List undoable changes"/>
+ <action action_id="undo" title="Undo"
+ condition_expr="member"
+ url_expr="string:${portal_url}/undo_form"
+ category="global" visible="True">
+ <permission>List undoable changes</permission>
+ </action>
</action-provider>
<action-provider id="portal_syndication">
<action action_id="syndication" title="Syndication"
- category="object"
- action_expr="string:${folder_url}/synPropertiesForm"
condition_expr="python: folder is object"
- visible="1" permission="Manage properties"/>
+ url_expr="string:${folder_url}/synPropertiesForm"
+ category="object" visible="True">
+ <permission>Manage properties</permission>
+ </action>
</action-provider>
<action-provider id="portal_workflow">
+
</action-provider>
<action-provider id="portal_properties">
<action action_id="configPortal"
- title="Reconfigure Portal" category="global"
- action_expr="string:${portal_url}/reconfig_form"
- condition_expr="" visible="1"
- permission="Manage portal"/>
+ title="Reconfigure Portal" condition_expr=""
+ url_expr="string:${portal_url}/reconfig_form"
+ category="global" visible="True">
+ <permission>Manage portal</permission>
+ </action>
</action-provider>
</actions-tool>
-
=== CMF/CMFSetup/profiles/default/export_steps.xml 1.5 => 1.6 ===
--- CMF/CMFSetup/profiles/default/export_steps.xml:1.5 Wed Jun 30 14:13:00 2004
+++ CMF/CMFSetup/profiles/default/export_steps.xml Mon Jul 19 14:11:36 2004
@@ -1,29 +1,24 @@
<?xml version="1.0"?>
<export-steps>
- <export-step id="rolemap"
- handler="Products.CMFSetup.rolemap.exportRolemap"
- title="Role / Permission Map">
+ <export-step id="actions"
+ handler="Products.CMFSetup.actions.exportActionProviders"
+ title="Action Providers">
- Export custom roles and non-default role-permission mappings.
-
-
- </export-step>
- <export-step id="toolset"
- handler="Products.CMFSetup.tool.exportToolset"
- title="Required Tools">
-
- Export required / forbidden tools.
+ Export actions tool's action providers and their actions.
+
</export-step>
- <export-step id="actions"
- handler="Products.CMFSetup.actions.exportActionProviders"
- title="Action Providers">
+ <export-step id="rolemap"
+ handler="Products.CMFSetup.rolemap.exportRolemap"
+ title="Role / Permission Map">
- Export actions tool's action providers and their actions.
+
+ Export custom roles and non-default role-permission mappings.
+
</export-step>
@@ -32,34 +27,53 @@
title="Skins Tool">
+
Export skins tool's filesystem directory views and skin path definitions.
+
</export-step>
<export-step id="step_registries"
handler="Products.CMFSetup.tool.exportStepRegistries"
title="Step Registries">
+
Export current contents of import step registry and export step registry.
+
+ </export-step>
+ <export-step id="toolset"
+ handler="Products.CMFSetup.tool.exportToolset"
+ title="Required Tools">
+
+
+
+ Export required / forbidden tools.
+
+
+
</export-step>
<export-step id="typeinfo"
handler="Products.CMFSetup.typeinfo.exportTypesTool"
title="Types Tool">
+
Export types tool's type information objects.
+
</export-step>
<export-step id="workflows"
handler="Products.CMFSetup.workflow.exportWorkflowTool"
title="Workflow Tool">
+
Export workflow tool's workflow definitions and supporting scripts.
+
</export-step>
=== CMF/CMFSetup/profiles/default/import_steps.xml 1.6 => 1.7 ===
--- CMF/CMFSetup/profiles/default/import_steps.xml:1.6 Wed Jun 30 14:58:51 2004
+++ CMF/CMFSetup/profiles/default/import_steps.xml Mon Jul 19 14:11:36 2004
@@ -1,61 +1,79 @@
<?xml version="1.0"?>
<import-steps>
- <import-step id="rolemap" version="20040523-01"
- handler="Products.CMFSetup.rolemap.importRolemap"
- title="Role / Permission Map">
+ <import-step id="actions" version="20040630-01"
+ handler="Products.CMFSetup.actions.importActionProviders"
+ title="Action Providers">
+ <dependency step="toolset"/>
- Import custom roles and non-default role-permission mappings.
+
+ Import actions tool's action providers and their actions.
- </import-step>
- <import-step id="toolset" version="20040630-01"
- handler="Products.CMFSetup.tool.importToolset"
- title="Required tools">
-
- Create required tools, replacing any of the wrong class, and remove
- forbidden ones.
</import-step>
- <import-step id="actions" version="20040630-01"
- handler="Products.CMFSetup.actions.importActionProviders"
- title="Action Providers">
+ <import-step id="rolemap" version="20040523-01"
+ handler="Products.CMFSetup.rolemap.importRolemap"
+ title="Role / Permission Map">
+
- Import actions tool's action providers and their actions.
+
+ Import custom roles and non-default role-permission mappings.
+
- <dependency step="toolset" />
</import-step>
<import-step id="skins" version="20040630-01"
handler="Products.CMFSetup.skins.importSkinsTool"
title="Skins Tool">
+ <dependency step="toolset"/>
+
Import skins tool's filesystem directory views and skin path definitions.
- <dependency step="toolset" />
+
+
+ </import-step>
+ <import-step id="toolset" version="20040630-01"
+ handler="Products.CMFSetup.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="20040630-01"
handler="Products.CMFSetup.typeinfo.importTypesTool"
title="Types Tool">
+ <dependency step="toolset"/>
+
Import types tool's type information objects.
- <dependency step="toolset" />
+
+
</import-step>
<import-step id="workflow" version="20040630-01"
handler="Products.CMFSetup.workflow.importWorkflowTool"
title="Workflow Tool">
+ <dependency step="toolset"/>
+
Import workflow tool's workflow definitions and supporting scripts.
- <dependency step="toolset" />
+
+
</import-step>
</import-steps>
=== CMF/CMFSetup/profiles/default/rolemap.xml 1.2 => 1.3 ===
--- CMF/CMFSetup/profiles/default/rolemap.xml:1.2 Sun May 30 16:00:55 2004
+++ CMF/CMFSetup/profiles/default/rolemap.xml Mon Jul 19 14:11:36 2004
@@ -1,11 +1,7 @@
<?xml version="1.0"?>
<rolemap>
<roles>
- <role name="Anonymous"/>
- <role name="Authenticated"/>
- <role name="Manager"/>
<role name="Member"/>
- <role name="Owner"/>
<role name="Reviewer"/>
</roles>
<permissions>
=== CMF/CMFSetup/profiles/default/skins.xml 1.2 => 1.3 ===
--- CMF/CMFSetup/profiles/default/skins.xml:1.2 Sun May 30 16:00:55 2004
+++ CMF/CMFSetup/profiles/default/skins.xml Mon Jul 19 14:11:36 2004
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<skins-tool default_skin="None"
+<skins-tool default_skin="Basic"
request_varname="portal_skin" allow_any="0"
cookie_persistence="0">
<skin-directory id="Images"
@@ -25,18 +25,24 @@
directory="CMFTopic/skins/zpt_topic"/>
<skin-path id="Basic">
<layer name="custom"/>
+ <layer name="zpt_topic"/>
+ <layer name="zpt_content"/>
+ <layer name="zpt_generic"/>
+ <layer name="zpt_control"/>
+ <layer name="Images"/>
+ </skin-path>
+ <skin-path id="No CSS">
+ <layer name="no_css"/>
+ <layer name="custom"/>
<layer name="topic"/>
<layer name="content"/>
<layer name="generic"/>
<layer name="control"/>
<layer name="Images"/>
</skin-path>
- <skin-path id="ZPT">
+ <skin-path id="Nouvelle">
+ <layer name="nouvelle"/>
<layer name="custom"/>
- <layer name="zpt_topic"/>
- <layer name="zpt_content"/>
- <layer name="zpt_generic"/>
- <layer name="zpt_control"/>
<layer name="topic"/>
<layer name="content"/>
<layer name="generic"/>
=== CMF/CMFSetup/profiles/default/toolset.xml 1.1 => 1.2 ===
--- CMF/CMFSetup/profiles/default/toolset.xml:1.1 Wed Jun 30 16:14:28 2004
+++ CMF/CMFSetup/profiles/default/toolset.xml Mon Jul 19 14:11:36 2004
@@ -1,45 +1,32 @@
<?xml version="1.0"?>
<tool-setup>
- <required
- tool_id="portal_actions"
- class="Products.CMFCore.ActionsTool.ActionsTool" />
- <required
- tool_id="portal_catalog"
- class="Products.CMFCore.CatalogTool.CatalogTool" />
- <required
- tool_id="portal_discussion"
- class="Products.CMFDefault.DiscussionTool.DiscussionTool" />
- <required
- tool_id="portal_memberdata"
- class="Products.CMFCore.MemberDataTool.MemberDataTool" />
- <required
- tool_id="portal_membership"
- class="Products.CMFDefault.MembershipTool.MembershipTool" />
- <required
- tool_id="portal_metadata"
- class="Products.CMFDefault.MetadataTool.MetadataTool" />
- <required
- tool_id="portal_properties"
- class="Products.CMFDefault.PropertiesTool.PropertiesTool" />
- <required
- tool_id="portal_registration"
- class="Products.CMFDefault.RegistrationTool.RegistrationTool" />
- <required
- tool_id="portal_skins"
- class="Products.CMFCore.SkinsTool.SkinsTool" />
- <required
- tool_id="portal_syndication"
- class="Products.CMFDefault.SyndicationTool.SyndicationTool" />
- <required
- tool_id="portal_types"
- class="Products.CMFCore.TypesTool.TypesTool" />
- <required
- tool_id="portal_undo"
- class="Products.CMFCore.UndoTool.UndoTool" />
- <required
- tool_id="portal_url"
- class="Products.CMFCore.URLTool.URLTool" />
- <required
- tool_id="portal_workflow"
- class="Products.CMFCore.WorkflowTool.WorkflowTool" />
+
+ <required tool_id="portal_actions"
+ class="Products.CMFCore.ActionsTool.ActionsTool"/>
+ <required tool_id="portal_catalog"
+ class="Products.CMFCore.CatalogTool.CatalogTool"/>
+ <required tool_id="portal_discussion"
+ class="Products.CMFDefault.DiscussionTool.DiscussionTool"/>
+ <required tool_id="portal_memberdata"
+ class="Products.CMFCore.MemberDataTool.MemberDataTool"/>
+ <required tool_id="portal_membership"
+ class="Products.CMFDefault.MembershipTool.MembershipTool"/>
+ <required tool_id="portal_metadata"
+ class="Products.CMFDefault.MetadataTool.MetadataTool"/>
+ <required tool_id="portal_properties"
+ class="Products.CMFDefault.PropertiesTool.PropertiesTool"/>
+ <required tool_id="portal_registration"
+ class="Products.CMFDefault.RegistrationTool.RegistrationTool"/>
+ <required tool_id="portal_skins"
+ class="Products.CMFCore.SkinsTool.SkinsTool"/>
+ <required tool_id="portal_syndication"
+ class="Products.CMFDefault.SyndicationTool.SyndicationTool"/>
+ <required tool_id="portal_types"
+ class="Products.CMFCore.TypesTool.TypesTool"/>
+ <required tool_id="portal_undo"
+ class="Products.CMFCore.UndoTool.UndoTool"/>
+ <required tool_id="portal_url"
+ class="Products.CMFCore.URLTool.URLTool"/>
+ <required tool_id="portal_workflow"
+ class="Products.CMFCore.WorkflowTool.WorkflowTool"/>
</tool-setup>
=== CMF/CMFSetup/profiles/default/workflows.xml 1.1 => 1.2 ===
--- CMF/CMFSetup/profiles/default/workflows.xml:1.1 Thu Jun 24 16:32:20 2004
+++ CMF/CMFSetup/profiles/default/workflows.xml Mon Jul 19 14:11:36 2004
@@ -8,8 +8,10 @@
<bound-workflow workflow_id="default_workflow"/>
</default>
<type type_id="Folder">
+
</type>
<type type_id="Topic">
+
</type>
</bindings>
</workflow-tool>
More information about the CMF-checkins
mailing list