[CMF-checkins] CVS: CMF/CMFSetup/profiles/default - actions.xml:1.3.10.1 skins.xml:1.4.6.1

[Martijn Pieters]

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

Modified Files:
      Tag: mj-cmf14-compat-branch
	actions.xml skins.xml 
Log Message:
CMF-1.4 compatible version of CMFSetup.


=== CMF/CMFSetup/profiles/default/actions.xml 1.3 => 1.3.10.1 ===
--- CMF/CMFSetup/profiles/default/actions.xml:1.3	Mon Jul 19 14:11:36 2004
+++ CMF/CMFSetup/profiles/default/actions.xml	Wed Nov 10 08:28:47 2004
@@ -37,23 +37,17 @@
           category="user" visible="True">
    <permission>View</permission>
   </action>
-  <action action_id="manage_members" title="Manage members"
-          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"
-          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"
           condition_expr="python: folder is not object"
           url_expr="string:${folder_url}/folder_contents"
+          category="object" visible="True">
+   <permission>List folder contents</permission>
+  </action>
+  <action action_id="folderContents" title="Folder contents"
+          condition_expr="python: folder is object"
+          url_expr="string:${folder_url}/folder_contents"
           category="folder" visible="True">
    <permission>List folder contents</permission>
   </action>
@@ -67,7 +61,6 @@
   </action>
  </action-provider>
  <action-provider id="portal_types">
-
  </action-provider>
  <action-provider id="portal_discussion">
   <action action_id="reply" title="Reply"
@@ -87,14 +80,13 @@
  </action-provider>
  <action-provider id="portal_syndication">
   <action action_id="syndication" title="Syndication"
-          condition_expr="python: folder is object"
+          condition_expr="python: folder is object and portal.portal_syndication.isSiteSyndicationAllowed()"
           url_expr="string:${folder_url}/synPropertiesForm"
-          category="object" visible="True">
+          category="folder" 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"


=== CMF/CMFSetup/profiles/default/skins.xml 1.4 => 1.4.6.1 ===
--- CMF/CMFSetup/profiles/default/skins.xml:1.4	Fri Sep 10 07:05:56 2004
+++ CMF/CMFSetup/profiles/default/skins.xml	Wed Nov 10 08:28:47 2004
@@ -4,6 +4,17 @@
             cookie_persistence="0">
  <skin-directory id="Images"
                  directory="CMFDefault/skins/Images"/>
+ <skin-directory id="content"
+                 directory="CMFDefault/skins/content"/>
+ <skin-directory id="control"
+                 directory="CMFDefault/skins/control"/>
+ <skin-directory id="generic"
+                 directory="CMFDefault/skins/generic"/>
+ <skin-directory id="no_css"
+                 directory="CMFDefault/skins/no_css"/>
+ <skin-directory id="nouvelle"
+                 directory="CMFDefault/skins/nouvelle"/>
+ <skin-directory id="topic" directory="CMFTopic/skins/topic"/>
  <skin-directory id="zpt_content"
                  directory="CMFDefault/skins/zpt_content"/>
  <skin-directory id="zpt_control"
@@ -18,6 +29,28 @@
   <layer name="zpt_content"/>
   <layer name="zpt_generic"/>
   <layer name="zpt_control"/>
+  <layer name="topic"/>
+  <layer name="content"/>
+  <layer name="generic"/>
+  <layer name="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="Nouvelle">
+  <layer name="nouvelle"/>
+  <layer name="custom"/>
+  <layer name="topic"/>
+  <layer name="content"/>
+  <layer name="generic"/>
+  <layer name="control"/>
   <layer name="Images"/>
  </skin-path>
 </skins-tool>