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

[Martijn Pieters]

Update of /cvs-repository/CMF/CMFSetup/profiles/default/types
In directory cvs.zope.org:/tmp/cvs-serv8974/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:
CMF-1.4 compatible version of CMFSetup.


=== CMF/CMFSetup/profiles/default/types/Discussion_Item.xml 1.2 => 1.3 ===
--- CMF/CMFSetup/profiles/default/types/Discussion_Item.xml:1.2	Mon Jul 19 14:11:36 2004
+++ CMF/CMFSetup/profiles/default/types/Discussion_Item.xml	Wed Nov 10 08:05:48 2004
@@ -9,10 +9,6 @@
            product="" factory="">
   <description>Discussion Items are documents which reply to other content.
 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_expr=""
           url_expr="string:${object_url}/discussionitem_view"
           category="object" visible="True">


=== CMF/CMFSetup/profiles/default/types/Document.xml 1.2 => 1.3 ===
--- CMF/CMFSetup/profiles/default/types/Document.xml:1.2	Mon Jul 19 14:11:36 2004
+++ CMF/CMFSetup/profiles/default/types/Document.xml	Wed Nov 10 08:05:48 2004
@@ -9,11 +9,6 @@
            product="CMFDefault" factory="addDocument">
   <description>Documents contain text that can be formatted using 'Structured Text.'
 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_expr=""
           url_expr="string:${object_url}/document_view"
           category="object" visible="True">


=== CMF/CMFSetup/profiles/default/types/Favorite.xml 1.2 => 1.3 ===
--- CMF/CMFSetup/profiles/default/types/Favorite.xml:1.2	Mon Jul 19 14:11:36 2004
+++ CMF/CMFSetup/profiles/default/types/Favorite.xml	Wed Nov 10 08:05:48 2004
@@ -8,10 +8,6 @@
            allow_discussion="False" global_allow="True"
            product="CMFDefault" factory="addFavorite">
   <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_expr=""
           url_expr="string:${object_url}/favorite_view"
           category="object" visible="True">


=== CMF/CMFSetup/profiles/default/types/File.xml 1.2 => 1.3 ===
--- CMF/CMFSetup/profiles/default/types/File.xml:1.2	Mon Jul 19 14:11:36 2004
+++ CMF/CMFSetup/profiles/default/types/File.xml	Wed Nov 10 08:05:48 2004
@@ -7,10 +7,6 @@
            allow_discussion="False" global_allow="True"
            product="CMFDefault" factory="addFile">
   <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_expr=""
           url_expr="string:${object_url}/file_view"
           category="object" visible="True">


=== CMF/CMFSetup/profiles/default/types/Folder.xml 1.2 => 1.3 ===
--- CMF/CMFSetup/profiles/default/types/Folder.xml:1.2	Mon Jul 19 14:11:36 2004
+++ CMF/CMFSetup/profiles/default/types/Folder.xml	Wed Nov 10 08:05:48 2004
@@ -8,42 +8,20 @@
            product="CMFCore"
            factory="manage_addPortalFolder">
   <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_expr=""
-          url_expr="string:${object_url}" category="object"
+          url_expr="string:${object_url}" category="folder"
           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">
+          category="folder" visible="True">
    <permission>Manage properties</permission>
   </action>
   <action action_id="localroles" title="Local Roles"
           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>
+          category="folder" visible="True">
+   <permission>Manage properties</permission>
   </action>
 </type-info>


=== CMF/CMFSetup/profiles/default/types/Image.xml 1.2 => 1.3 ===
--- CMF/CMFSetup/profiles/default/types/Image.xml:1.2	Mon Jul 19 14:11:36 2004
+++ CMF/CMFSetup/profiles/default/types/Image.xml	Wed Nov 10 08:05:48 2004
@@ -7,10 +7,6 @@
            allow_discussion="False" global_allow="True"
            product="CMFDefault" factory="addImage">
   <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_expr=""
           url_expr="string:${object_url}/image_view"
           category="object" visible="True">


=== CMF/CMFSetup/profiles/default/types/Link.xml 1.2 => 1.3 ===
--- CMF/CMFSetup/profiles/default/types/Link.xml:1.2	Mon Jul 19 14:11:36 2004
+++ CMF/CMFSetup/profiles/default/types/Link.xml	Wed Nov 10 08:05:48 2004
@@ -7,10 +7,6 @@
            allow_discussion="False" global_allow="True"
            product="CMFDefault" factory="addLink">
   <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_expr=""
           url_expr="string:${object_url}/link_view"
           category="object" visible="True">


=== CMF/CMFSetup/profiles/default/types/News_Item.xml 1.2 => 1.3 ===
--- CMF/CMFSetup/profiles/default/types/News_Item.xml:1.2	Mon Jul 19 14:11:36 2004
+++ CMF/CMFSetup/profiles/default/types/News_Item.xml	Wed Nov 10 08:05:48 2004
@@ -9,11 +9,6 @@
            product="CMFDefault" factory="addNewsItem">
   <description>News Items contain short text articles and carry a title as well as
 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_expr=""
           url_expr="string:${object_url}/newsitem_view"
           category="object" visible="True">


=== CMF/CMFSetup/profiles/default/types/Topic.xml 1.2 => 1.3 ===
--- CMF/CMFSetup/profiles/default/types/Topic.xml:1.2	Mon Jul 19 14:11:36 2004
+++ CMF/CMFSetup/profiles/default/types/Topic.xml	Wed Nov 10 08:05:48 2004
@@ -7,11 +7,6 @@
            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_expr=""
           url_expr="string:${object_url}/topic_view"
           category="object" visible="True">
@@ -28,21 +23,10 @@
           category="object" visible="True">
    <permission>Change portal topics</permission>
   </action>
-  <action action_id="folderContents" title="Subtopics"
+  <action action_id="subtopics" title="Subtopics"
           condition_expr=""
-          url_expr="string:${object_url}/folder_contents"
+          url_expr="string:${object_url}/topic_subtopics_form"
           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>
+   <permission>Change portal topics</permission>
   </action>
 </type-info>