[CMF-checkins] CVS: CMF/CMFSetup/profiles/default/types - Discussion_Item.xml:1.2 Document.xml:1.2 Favorite.xml:1.2 File.xml:1.2 Folder.xml:1.2 Image.xml:1.2 Link.xml:1.2 News_Item.xml:1.2 Topic.xml:1.2

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFSetup/profiles/default/types
In directory cvs.zope.org:/tmp/cvs-serv10833/CMFSetup/profiles/default/types

Modified Files:
	Discussion_Item.xml Document.xml Favorite.xml File.xml 
	Folder.xml Image.xml Link.xml News_Item.xml Topic.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/types/Discussion_Item.xml 1.1 => 1.2 ===
--- CMF/CMFSetup/profiles/default/types/Discussion_Item.xml:1.1	Sun May 30 16:00:56 2004
+++ CMF/CMFSetup/profiles/default/types/Discussion_Item.xml	Mon Jul 19 14:11:36 2004
@@ -4,18 +4,18 @@
            title="Discussion Item"
            meta_type="Discussion Item"
            icon="discussionitem_icon.gif" immediate_view=""
-           filter_content_types="1" allowed_content_types=""
-           allow_discussion="0" global_allow="1" product=""
-           factory="">
+           filter_content_types="True"
+           allow_discussion="False" global_allow="True"
+           product="" factory="">
   <description>Discussion Items are documents which reply to other content.
-They should *not* be addable through the standard 'folder_factories' interface.
-</description>
+They should *not* be addable through the standard 'folder_factories' interface.</description>
   <aliases>
    <alias from="(Default)" to="discussionitem_view"/>
    <alias from="view" to="discussionitem_view"/>
   </aliases>
-  <action action_id="view" title="View" condition=""
-          action_expr="string:${object_url}/discussionitem_view"
-          permissions="View" category="object"
-          visible="True"/>
+  <action action_id="view" title="View" condition_expr=""
+          url_expr="string:${object_url}/discussionitem_view"
+          category="object" visible="True">
+   <permission>View</permission>
+  </action>
 </type-info>


=== CMF/CMFSetup/profiles/default/types/Document.xml 1.1 => 1.2 ===
--- CMF/CMFSetup/profiles/default/types/Document.xml:1.1	Sun May 30 16:00:56 2004
+++ CMF/CMFSetup/profiles/default/types/Document.xml	Mon Jul 19 14:11:36 2004
@@ -4,27 +4,30 @@
            title="Document" meta_type="Document"
            icon="document_icon.gif"
            immediate_view="metadata_edit_form"
-           filter_content_types="1" allowed_content_types=""
-           allow_discussion="0" global_allow="1"
+           filter_content_types="True"
+           allow_discussion="False" global_allow="True"
            product="CMFDefault" factory="addDocument">
   <description>Documents contain text that can be formatted using 'Structured Text.'
-They may also contain HTML, or "plain" text.
-</description>
+They may also contain HTML, or "plain" text.</description>
   <aliases>
    <alias from="gethtml" to="source_html"/>
    <alias from="(Default)" to="document_view"/>
    <alias from="view" to="document_view"/>
   </aliases>
-  <action action_id="view" title="View" condition=""
-          action_expr="string:${object_url}/document_view"
-          permissions="View" category="object"
-          visible="True"/>
-  <action action_id="edit" title="Edit" condition=""
-          action_expr="string:${object_url}/document_edit_form"
-          permissions="Modify portal content"
-          category="object" visible="True"/>
-  <action action_id="metadata" title="Metadata" condition=""
-          action_expr="string:${object_url}/metadata_edit_form"
-          permissions="Modify portal content"
-          category="object" visible="True"/>
+  <action action_id="view" title="View" condition_expr=""
+          url_expr="string:${object_url}/document_view"
+          category="object" visible="True">
+   <permission>View</permission>
+  </action>
+  <action action_id="edit" title="Edit" condition_expr=""
+          url_expr="string:${object_url}/document_edit_form"
+          category="object" visible="True">
+   <permission>Modify portal content</permission>
+  </action>
+  <action action_id="metadata" title="Metadata"
+          condition_expr=""
+          url_expr="string:${object_url}/metadata_edit_form"
+          category="object" visible="True">
+   <permission>Modify portal content</permission>
+  </action>
 </type-info>


=== CMF/CMFSetup/profiles/default/types/Favorite.xml 1.1 => 1.2 ===
--- CMF/CMFSetup/profiles/default/types/Favorite.xml:1.1	Sun May 30 16:00:56 2004
+++ CMF/CMFSetup/profiles/default/types/Favorite.xml	Mon Jul 19 14:11:36 2004
@@ -4,25 +4,28 @@
            title="Favorite" meta_type="Favorite"
            icon="link_icon.gif"
            immediate_view="metadata_edit_form"
-           filter_content_types="1" allowed_content_types=""
-           allow_discussion="0" global_allow="1"
+           filter_content_types="True"
+           allow_discussion="False" global_allow="True"
            product="CMFDefault" factory="addFavorite">
-  <description>A Favorite is a Link to an intra-portal resource.
-</description>
+  <description>A Favorite is a Link to an intra-portal resource.</description>
   <aliases>
    <alias from="(Default)" to="favorite_view"/>
    <alias from="view" to="favorite_view"/>
   </aliases>
-  <action action_id="view" title="View" condition=""
-          action_expr="string:${object_url}/favorite_view"
-          permissions="View" category="object"
-          visible="True"/>
-  <action action_id="edit" title="Edit" condition=""
-          action_expr="string:${object_url}/link_edit_form"
-          permissions="Modify portal content"
-          category="object" visible="True"/>
-  <action action_id="metadata" title="Metadata" condition=""
-          action_expr="string:${object_url}/metadata_edit_form"
-          permissions="Modify portal content"
-          category="object" visible="True"/>
+  <action action_id="view" title="View" condition_expr=""
+          url_expr="string:${object_url}/favorite_view"
+          category="object" visible="True">
+   <permission>View</permission>
+  </action>
+  <action action_id="edit" title="Edit" condition_expr=""
+          url_expr="string:${object_url}/link_edit_form"
+          category="object" visible="True">
+   <permission>Modify portal content</permission>
+  </action>
+  <action action_id="metadata" title="Metadata"
+          condition_expr=""
+          url_expr="string:${object_url}/metadata_edit_form"
+          category="object" visible="True">
+   <permission>Modify portal content</permission>
+  </action>
 </type-info>


=== CMF/CMFSetup/profiles/default/types/File.xml 1.1 => 1.2 ===
--- CMF/CMFSetup/profiles/default/types/File.xml:1.1	Sun May 30 16:00:56 2004
+++ CMF/CMFSetup/profiles/default/types/File.xml	Mon Jul 19 14:11:36 2004
@@ -3,29 +3,33 @@
            title="File" meta_type="Portal File"
            icon="file_icon.gif"
            immediate_view="metadata_edit_form"
-           filter_content_types="1" allowed_content_types=""
-           allow_discussion="0" global_allow="1"
+           filter_content_types="True"
+           allow_discussion="False" global_allow="True"
            product="CMFDefault" factory="addFile">
-  <description>File objects can contain arbitrary downloadable files.
-</description>
+  <description>File objects can contain arbitrary downloadable files.</description>
   <aliases>
    <alias from="(Default)" to="index_html"/>
    <alias from="view" to="file_view"/>
   </aliases>
-  <action action_id="view" title="View" condition=""
-          action_expr="string:${object_url}/file_view"
-          permissions="View" category="object"
-          visible="True"/>
-  <action action_id="download" title="Download" condition=""
-          action_expr="string:${object_url}"
-          permissions="View" category="object"
-          visible="True"/>
-  <action action_id="edit" title="Edit" condition=""
-          action_expr="string:${object_url}/file_edit_form"
-          permissions="Modify portal content"
-          category="object" visible="True"/>
-  <action action_id="metadata" title="Metadata" condition=""
-          action_expr="string:${object_url}/metadata_edit_form"
-          permissions="Modify portal content"
-          category="object" visible="True"/>
+  <action action_id="view" title="View" condition_expr=""
+          url_expr="string:${object_url}/file_view"
+          category="object" visible="True">
+   <permission>View</permission>
+  </action>
+  <action action_id="download" title="Download"
+          condition_expr="" url_expr="string:${object_url}"
+          category="object" visible="True">
+   <permission>View</permission>
+  </action>
+  <action action_id="edit" title="Edit" condition_expr=""
+          url_expr="string:${object_url}/file_edit_form"
+          category="object" visible="True">
+   <permission>Modify portal content</permission>
+  </action>
+  <action action_id="metadata" title="Metadata"
+          condition_expr=""
+          url_expr="string:${object_url}/metadata_edit_form"
+          category="object" visible="True">
+   <permission>Modify portal content</permission>
+  </action>
 </type-info>


=== CMF/CMFSetup/profiles/default/types/Folder.xml 1.1 => 1.2 ===
--- CMF/CMFSetup/profiles/default/types/Folder.xml:1.1	Sun May 30 16:00:56 2004
+++ CMF/CMFSetup/profiles/default/types/Folder.xml	Mon Jul 19 14:11:36 2004
@@ -3,26 +3,47 @@
            title="Folder" meta_type="Portal Folder"
            icon="folder_icon.gif"
            immediate_view="folder_edit_form"
-           filter_content_types="0" allowed_content_types=""
-           allow_discussion="0" global_allow="1"
+           filter_content_types="False"
+           allow_discussion="False" global_allow="True"
            product="CMFCore"
            factory="manage_addPortalFolder">
-  <description> Use folders to put content in categories.</description>
+  <description>Use folders to put content in categories.</description>
   <aliases>
+   <alias from="index.html" to="index_html"/>
    <alias from="(Default)" to="index_html"/>
    <alias from="view" to="index_html"/>
   </aliases>
-  <action action_id="view" title="View" condition=""
-          action_expr="string:${object_url}"
-          permissions="View" category="folder"
-          visible="True"/>
-  <action action_id="edit" title="Edit" condition=""
-          action_expr="string:${object_url}/folder_edit_form"
-          permissions="Manage properties" category="folder"
-          visible="True"/>
+  <action action_id="view" title="View" condition_expr=""
+          url_expr="string:${object_url}" category="object"
+          visible="True">
+   <permission>View</permission>
+  </action>
+  <action action_id="edit" title="Edit" condition_expr=""
+          url_expr="string:${object_url}/folder_edit_form"
+          category="object" visible="True">
+   <permission>Manage properties</permission>
+  </action>
   <action action_id="localroles" title="Local Roles"
-          condition=""
-          action_expr="string:${object_url}/folder_localrole_form"
-          permissions="Manage properties" category="folder"
-          visible="True"/>
+          condition_expr=""
+          url_expr="string:${object_url}/folder_localrole_form"
+          category="object" visible="True">
+   <permission>Change local roles</permission>
+  </action>
+  <action action_id="folderContents" title="Folder contents"
+          condition_expr=""
+          url_expr="string:${object_url}/folder_contents"
+          category="object" visible="True">
+   <permission>List folder contents</permission>
+  </action>
+  <action action_id="new" title="New..." condition_expr=""
+          url_expr="string:${object_url}/folder_factories"
+          category="object" visible="False">
+   <permission>Add portal content</permission>
+  </action>
+  <action action_id="rename_items" title="Rename items"
+          condition_expr=""
+          url_expr="string:${object_url}/folder_rename_form"
+          category="object" visible="False">
+   <permission>Add portal content</permission>
+  </action>
 </type-info>


=== CMF/CMFSetup/profiles/default/types/Image.xml 1.1 => 1.2 ===
--- CMF/CMFSetup/profiles/default/types/Image.xml:1.1	Sun May 30 16:00:56 2004
+++ CMF/CMFSetup/profiles/default/types/Image.xml	Mon Jul 19 14:11:36 2004
@@ -3,25 +3,28 @@
            title="Image" meta_type="Portal Image"
            icon="image_icon.gif"
            immediate_view="metadata_edit_form"
-           filter_content_types="1" allowed_content_types=""
-           allow_discussion="0" global_allow="1"
+           filter_content_types="True"
+           allow_discussion="False" global_allow="True"
            product="CMFDefault" factory="addImage">
-  <description>Image objects can be embedded in Portal documents.
-</description>
+  <description>Image objects can be embedded in Portal documents.</description>
   <aliases>
    <alias from="(Default)" to="index_html"/>
    <alias from="view" to="image_view"/>
   </aliases>
-  <action action_id="view" title="View" condition=""
-          action_expr="string:${object_url}/image_view"
-          permissions="View" category="object"
-          visible="True"/>
-  <action action_id="edit" title="Edit" condition=""
-          action_expr="string:${object_url}/image_edit_form"
-          permissions="Modify portal content"
-          category="object" visible="True"/>
-  <action action_id="metadata" title="Metadata" condition=""
-          action_expr="string:${object_url}/metadata_edit_form"
-          permissions="Modify portal content"
-          category="object" visible="True"/>
+  <action action_id="view" title="View" condition_expr=""
+          url_expr="string:${object_url}/image_view"
+          category="object" visible="True">
+   <permission>View</permission>
+  </action>
+  <action action_id="edit" title="Edit" condition_expr=""
+          url_expr="string:${object_url}/image_edit_form"
+          category="object" visible="True">
+   <permission>Modify portal content</permission>
+  </action>
+  <action action_id="metadata" title="Metadata"
+          condition_expr=""
+          url_expr="string:${object_url}/metadata_edit_form"
+          category="object" visible="True">
+   <permission>Modify portal content</permission>
+  </action>
 </type-info>


=== CMF/CMFSetup/profiles/default/types/Link.xml 1.1 => 1.2 ===
--- CMF/CMFSetup/profiles/default/types/Link.xml:1.1	Sun May 30 16:00:56 2004
+++ CMF/CMFSetup/profiles/default/types/Link.xml	Mon Jul 19 14:11:36 2004
@@ -3,25 +3,28 @@
            title="Link" meta_type="Link"
            icon="link_icon.gif"
            immediate_view="metadata_edit_form"
-           filter_content_types="1" allowed_content_types=""
-           allow_discussion="0" global_allow="1"
+           filter_content_types="True"
+           allow_discussion="False" global_allow="True"
            product="CMFDefault" factory="addLink">
-  <description>Link items are annotated URLs.
-</description>
+  <description>Link items are annotated URLs.</description>
   <aliases>
    <alias from="(Default)" to="link_view"/>
    <alias from="view" to="link_view"/>
   </aliases>
-  <action action_id="view" title="View" condition=""
-          action_expr="string:${object_url}/link_view"
-          permissions="View" category="object"
-          visible="True"/>
-  <action action_id="edit" title="Edit" condition=""
-          action_expr="string:${object_url}/link_edit_form"
-          permissions="Modify portal content"
-          category="object" visible="True"/>
-  <action action_id="metadata" title="Metadata" condition=""
-          action_expr="string:${object_url}/metadata_edit_form"
-          permissions="Modify portal content"
-          category="object" visible="True"/>
+  <action action_id="view" title="View" condition_expr=""
+          url_expr="string:${object_url}/link_view"
+          category="object" visible="True">
+   <permission>View</permission>
+  </action>
+  <action action_id="edit" title="Edit" condition_expr=""
+          url_expr="string:${object_url}/link_edit_form"
+          category="object" visible="True">
+   <permission>Modify portal content</permission>
+  </action>
+  <action action_id="metadata" title="Metadata"
+          condition_expr=""
+          url_expr="string:${object_url}/metadata_edit_form"
+          category="object" visible="True">
+   <permission>Modify portal content</permission>
+  </action>
 </type-info>


=== CMF/CMFSetup/profiles/default/types/News_Item.xml 1.1 => 1.2 ===
--- CMF/CMFSetup/profiles/default/types/News_Item.xml:1.1	Sun May 30 16:00:56 2004
+++ CMF/CMFSetup/profiles/default/types/News_Item.xml	Mon Jul 19 14:11:36 2004
@@ -4,27 +4,30 @@
            title="News Item" meta_type="News Item"
            icon="newsitem_icon.gif"
            immediate_view="metadata_edit_form"
-           filter_content_types="1" allowed_content_types=""
-           allow_discussion="0" global_allow="1"
+           filter_content_types="True"
+           allow_discussion="False" global_allow="True"
            product="CMFDefault" factory="addNewsItem">
   <description>News Items contain short text articles and carry a title as well as
-an optional description.
-</description>
+an optional description.</description>
   <aliases>
    <alias from="gethtml" to="source_html"/>
    <alias from="(Default)" to="newsitem_view"/>
    <alias from="view" to="newsitem_view"/>
   </aliases>
-  <action action_id="view" title="View" condition=""
-          action_expr="string:${object_url}/newsitem_view"
-          permissions="View" category="object"
-          visible="True"/>
-  <action action_id="edit" title="Edit" condition=""
-          action_expr="string:${object_url}/newsitem_edit_form"
-          permissions="Modify portal content"
-          category="object" visible="True"/>
-  <action action_id="metadata" title="Metadata" condition=""
-          action_expr="string:${object_url}/metadata_edit_form"
-          permissions="Modify portal content"
-          category="object" visible="True"/>
+  <action action_id="view" title="View" condition_expr=""
+          url_expr="string:${object_url}/newsitem_view"
+          category="object" visible="True">
+   <permission>View</permission>
+  </action>
+  <action action_id="edit" title="Edit" condition_expr=""
+          url_expr="string:${object_url}/newsitem_edit_form"
+          category="object" visible="True">
+   <permission>Modify portal content</permission>
+  </action>
+  <action action_id="metadata" title="Metadata"
+          condition_expr=""
+          url_expr="string:${object_url}/metadata_edit_form"
+          category="object" visible="True">
+   <permission>Modify portal content</permission>
+  </action>
 </type-info>


=== CMF/CMFSetup/profiles/default/types/Topic.xml 1.1 => 1.2 ===
--- CMF/CMFSetup/profiles/default/types/Topic.xml:1.1	Sun May 30 16:00:56 2004
+++ CMF/CMFSetup/profiles/default/types/Topic.xml	Mon Jul 19 14:11:36 2004
@@ -3,29 +3,46 @@
            title="Topic" meta_type="Portal Topic"
            icon="topic_icon.gif"
            immediate_view="topic_edit_form"
-           filter_content_types="1" allowed_content_types=""
-           allow_discussion="0" global_allow="1"
+           filter_content_types="True"
+           allow_discussion="False" global_allow="True"
            product="CMFTopic" factory="addTopic">
   <description>Topics are canned queries for organizing content with up to date queries into the catalog.</description>
+  <allowed_content_type>Topic</allowed_content_type>
   <aliases>
    <alias from="(Default)" to="topic_view"/>
    <alias from="view" to="topic_view"/>
   </aliases>
-  <action action_id="view" title="View" condition=""
-          action_expr="string:${object_url}/topic_view"
-          permissions="View" category="object"
-          visible="True"/>
-  <action action_id="edit" title="Edit" condition=""
-          action_expr="string:${object_url}/topic_edit_form"
-          permissions="Change portal topics"
-          category="object" visible="True"/>
-  <action action_id="criteria" title="Criteria" condition=""
-          action_expr="string:${object_url}/topic_criteria_form"
-          permissions="Change portal topics"
-          category="object" visible="True"/>
-  <action action_id="subtopics" title="Subtopics"
-          condition=""
-          action_expr="string:${object_url}/topic_subtopics_form"
-          permissions="Change portal topics"
-          category="object" visible="True"/>
+  <action action_id="view" title="View" condition_expr=""
+          url_expr="string:${object_url}/topic_view"
+          category="object" visible="True">
+   <permission>View</permission>
+  </action>
+  <action action_id="edit" title="Edit" condition_expr=""
+          url_expr="string:${object_url}/topic_edit_form"
+          category="object" visible="True">
+   <permission>Change portal topics</permission>
+  </action>
+  <action action_id="criteria" title="Criteria"
+          condition_expr=""
+          url_expr="string:${object_url}/topic_criteria_form"
+          category="object" visible="True">
+   <permission>Change portal topics</permission>
+  </action>
+  <action action_id="folderContents" title="Subtopics"
+          condition_expr=""
+          url_expr="string:${object_url}/folder_contents"
+          category="object" visible="True">
+   <permission>List folder contents</permission>
+  </action>
+  <action action_id="new" title="New..." condition_expr=""
+          url_expr="string:${object_url}/folder_factories"
+          category="object" visible="False">
+   <permission>Add portal topics</permission>
+  </action>
+  <action action_id="rename_items" title="Rename items"
+          condition_expr=""
+          url_expr="string:${object_url}/folder_rename_form"
+          category="object" visible="False">
+   <permission>Add portal topics</permission>
+  </action>
 </type-info>