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

[Yvo Schubbe]

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

Modified Files:
      Tag: yuppie-actions-cleanup-branch
	Discussion_Item.xml Document.xml Favorite.xml File.xml 
	Folder.xml Image.xml Link.xml News_Item.xml Topic.xml 
Log Message:
- replaced 'allowed_content_types' attribute by 'allowed_content_type' elements


=== CMF/CMFSetup/profiles/default/types/Discussion_Item.xml 1.1.2.1 => 1.1.2.2 ===
--- CMF/CMFSetup/profiles/default/types/Discussion_Item.xml:1.1.2.1	Sun Jul 18 18:23:09 2004
+++ CMF/CMFSetup/profiles/default/types/Discussion_Item.xml	Mon Jul 19 13:56:16 2004
@@ -5,8 +5,8 @@
            meta_type="Discussion Item"
            icon="discussionitem_icon.gif" immediate_view=""
            filter_content_types="True"
-           allowed_content_types="" allow_discussion="False"
-           global_allow="True" product="" factory="">
+           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>
   <aliases>


=== CMF/CMFSetup/profiles/default/types/Document.xml 1.1.2.1 => 1.1.2.2 ===
--- CMF/CMFSetup/profiles/default/types/Document.xml:1.1.2.1	Sun Jul 18 18:23:09 2004
+++ CMF/CMFSetup/profiles/default/types/Document.xml	Mon Jul 19 13:56:16 2004
@@ -5,9 +5,8 @@
            icon="document_icon.gif"
            immediate_view="metadata_edit_form"
            filter_content_types="True"
-           allowed_content_types="" allow_discussion="False"
-           global_allow="True" product="CMFDefault"
-           factory="addDocument">
+           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>
   <aliases>


=== CMF/CMFSetup/profiles/default/types/Favorite.xml 1.1.2.1 => 1.1.2.2 ===
--- CMF/CMFSetup/profiles/default/types/Favorite.xml:1.1.2.1	Sun Jul 18 18:23:09 2004
+++ CMF/CMFSetup/profiles/default/types/Favorite.xml	Mon Jul 19 13:56:16 2004
@@ -5,9 +5,8 @@
            icon="link_icon.gif"
            immediate_view="metadata_edit_form"
            filter_content_types="True"
-           allowed_content_types="" allow_discussion="False"
-           global_allow="True" product="CMFDefault"
-           factory="addFavorite">
+           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"/>


=== CMF/CMFSetup/profiles/default/types/File.xml 1.1.2.1 => 1.1.2.2 ===
--- CMF/CMFSetup/profiles/default/types/File.xml:1.1.2.1	Sun Jul 18 18:23:09 2004
+++ CMF/CMFSetup/profiles/default/types/File.xml	Mon Jul 19 13:56:16 2004
@@ -4,9 +4,8 @@
            icon="file_icon.gif"
            immediate_view="metadata_edit_form"
            filter_content_types="True"
-           allowed_content_types="" allow_discussion="False"
-           global_allow="True" product="CMFDefault"
-           factory="addFile">
+           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"/>


=== CMF/CMFSetup/profiles/default/types/Folder.xml 1.1.2.1 => 1.1.2.2 ===
--- CMF/CMFSetup/profiles/default/types/Folder.xml:1.1.2.1	Sun Jul 18 18:23:09 2004
+++ CMF/CMFSetup/profiles/default/types/Folder.xml	Mon Jul 19 13:56:16 2004
@@ -4,8 +4,8 @@
            icon="folder_icon.gif"
            immediate_view="folder_edit_form"
            filter_content_types="False"
-           allowed_content_types="" allow_discussion="False"
-           global_allow="True" product="CMFCore"
+           allow_discussion="False" global_allow="True"
+           product="CMFCore"
            factory="manage_addPortalFolder">
   <description>Use folders to put content in categories.</description>
   <aliases>


=== CMF/CMFSetup/profiles/default/types/Image.xml 1.1.2.1 => 1.1.2.2 ===
--- CMF/CMFSetup/profiles/default/types/Image.xml:1.1.2.1	Sun Jul 18 18:23:09 2004
+++ CMF/CMFSetup/profiles/default/types/Image.xml	Mon Jul 19 13:56:16 2004
@@ -4,9 +4,8 @@
            icon="image_icon.gif"
            immediate_view="metadata_edit_form"
            filter_content_types="True"
-           allowed_content_types="" allow_discussion="False"
-           global_allow="True" product="CMFDefault"
-           factory="addImage">
+           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"/>


=== CMF/CMFSetup/profiles/default/types/Link.xml 1.1.2.1 => 1.1.2.2 ===
--- CMF/CMFSetup/profiles/default/types/Link.xml:1.1.2.1	Sun Jul 18 18:23:09 2004
+++ CMF/CMFSetup/profiles/default/types/Link.xml	Mon Jul 19 13:56:16 2004
@@ -4,9 +4,8 @@
            icon="link_icon.gif"
            immediate_view="metadata_edit_form"
            filter_content_types="True"
-           allowed_content_types="" allow_discussion="False"
-           global_allow="True" product="CMFDefault"
-           factory="addLink">
+           allow_discussion="False" global_allow="True"
+           product="CMFDefault" factory="addLink">
   <description>Link items are annotated URLs.</description>
   <aliases>
    <alias from="(Default)" to="link_view"/>


=== CMF/CMFSetup/profiles/default/types/News_Item.xml 1.1.2.1 => 1.1.2.2 ===
--- CMF/CMFSetup/profiles/default/types/News_Item.xml:1.1.2.1	Sun Jul 18 18:23:09 2004
+++ CMF/CMFSetup/profiles/default/types/News_Item.xml	Mon Jul 19 13:56:16 2004
@@ -5,9 +5,8 @@
            icon="newsitem_icon.gif"
            immediate_view="metadata_edit_form"
            filter_content_types="True"
-           allowed_content_types="" allow_discussion="False"
-           global_allow="True" product="CMFDefault"
-           factory="addNewsItem">
+           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>
   <aliases>


=== CMF/CMFSetup/profiles/default/types/Topic.xml 1.1.2.1 => 1.1.2.2 ===
--- CMF/CMFSetup/profiles/default/types/Topic.xml:1.1.2.1	Sun Jul 18 18:23:09 2004
+++ CMF/CMFSetup/profiles/default/types/Topic.xml	Mon Jul 19 13:56:16 2004
@@ -4,10 +4,10 @@
            icon="topic_icon.gif"
            immediate_view="topic_edit_form"
            filter_content_types="True"
-           allowed_content_types="Topic"
            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"/>