[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - modified Method Aliases used in type Actions

Fri May 17 06:47:56 UTC 2013

Log message for revision 130241:
  - modified Method Aliases used in type Actions

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/document.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/tests/discussion.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/CMF_BTree_Folder.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Discussion_Item.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Document.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Favorite.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/File.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Folder.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Image.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Link.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/News_Item.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/metadata.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/CMF_BTree_Folder.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Discussion_Item.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Document.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Favorite.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/File.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Folder.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Image.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Link.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/News_Item.xml

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================

--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2013-05-17 06:47:55 UTC (rev 130241)
@@ -4,6 +4,8 @@
 2.3.0 (unreleased)
 ------------------
 
+- profiles: Modified Method Aliases used in type Actions.
+
 - Actions: Added invisible 'global/search_form' and 'global/search' Actions.
   The URLs of the search form and the search results pages are no longer
   hard-wired in main_template, making it easier to switch to browser views.

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/document.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/document.txt	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/document.txt	2013-05-17 06:47:55 UTC (rev 130241)
@@ -6,7 +6,7 @@
     >>> from zope.component.hooks import setSite
     >>> setSite(app.site)
     >>> ti = app.site.portal_types.Document
-    >>> dummy = ti.setMethodAliases({'gethtml': '@@source.html'})
+    >>> dummy = ti.setMethodAliases({'edit': '@@edit.html', 'gethtml': '@@source.html'})
     >>> uf = app.site.acl_users
     >>> _ignored = uf._doAddUser('mgr', 'mgrpw', ['Manager'], [])
     >>> from Products.CMFDefault.Document import Document

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/tests/discussion.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/tests/discussion.txt	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/tests/discussion.txt	2013-05-17 06:47:55 UTC (rev 130241)
@@ -63,10 +63,7 @@
 
 Check deleting
 
-    >>> import urlparse
-    >>> parts = urlparse.urlparse(browser.url)
-    >>> path = "/".join(parts.path.split("/")[:-1])
-    >>> browser.open("http://localhost/{path}/@@delete.html".format(path=path))
+    >>> browser.open("{0}/@@delete.html".format(browser.url))
     >>> 'talkback' in browser.url
     False
     >>> '[[cmf_default][Reply deleted.]]' in browser.contents

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/CMF_BTree_Folder.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/CMF_BTree_Folder.xml	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/CMF_BTree_Folder.xml	2013-05-17 06:47:55 UTC (rev 130241)
@@ -11,13 +11,15 @@
  <property
     name="add_view_expr">string:${folder_url}/++add++CMF%20BTree%20Folder</property>
  <property name="link_target"></property>
- <property name="immediate_view">folder_edit_form</property>
+ <property name="immediate_view">properties</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">False</property>
  <property name="allowed_content_types"/>
  <property name="allow_discussion">False</property>
  <alias from="(Default)" to="index_html"/>
  <alias from="index.html" to="index_html"/>
+ <alias from="properties" to="folder_edit_form"/>
+ <alias from="sharing" to="folder_localrole_form"/>
  <alias from="view" to="index_html"/>
  <action title="View" action_id="view" category="object" condition_expr=""
     icon_expr="string:${portal_url}/preview_icon.png" link_target=""
@@ -26,13 +28,12 @@
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
     icon_expr="string:${portal_url}/edit_icon.png" link_target=""
-    url_expr="string:${object_url}/folder_edit_form" visible="True">
+    url_expr="string:${object_url}/properties" visible="True">
   <permission value="Manage properties"/>
  </action>
  <action title="Local Roles" action_id="localroles" category="object"
     condition_expr="" icon_expr="string:${portal_url}/localroles_icon.png"
-    link_target="" url_expr="string:${object_url}/folder_localrole_form"
-    visible="True">
+    link_target="" url_expr="string:${object_url}/sharing" visible="True">
   <permission value="Change local roles"/>
  </action>
  <action title="Folder contents" action_id="folderContents" category="object"

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Discussion_Item.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Discussion_Item.xml	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Discussion_Item.xml	2013-05-17 06:47:55 UTC (rev 130241)
@@ -21,7 +21,7 @@
  <alias from="view" to="discussionitem_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
     icon_expr="string:${portal_url}/preview_icon.png" link_target=""
-    url_expr="string:${object_url}/discussionitem_view" visible="True">
+    url_expr="string:${object_url}" visible="True">
   <permission value="View"/>
  </action>
 </object>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Document.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Document.xml	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Document.xml	2013-05-17 06:47:55 UTC (rev 130241)
@@ -12,28 +12,29 @@
  <property
     name="add_view_expr">string:${folder_url}/++add++Document</property>
  <property name="link_target"></property>
- <property name="immediate_view">metadata_edit_form</property>
+ <property name="immediate_view">properties</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types"/>
  <property name="allow_discussion">False</property>
  <alias from="(Default)" to="document_view"/>
+ <alias from="edit" to="document_edit_form"/>
  <alias from="gethtml" to="source_html"/>
+ <alias from="properties" to="metadata_edit_form"/>
  <alias from="view" to="document_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
     icon_expr="string:${portal_url}/preview_icon.png" link_target=""
-    url_expr="string:${object_url}/document_view" visible="True">
+    url_expr="string:${object_url}" visible="True">
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
     icon_expr="string:${portal_url}/edit_icon.png" link_target=""
-    url_expr="string:${object_url}/document_edit_form" visible="True">
+    url_expr="string:${object_url}/edit" visible="True">
   <permission value="Modify portal content"/>
  </action>
  <action title="Metadata" action_id="metadata" category="object"
     condition_expr="" icon_expr="string:${portal_url}/metadata_icon.png"
-    link_target="" url_expr="string:${object_url}/metadata_edit_form"
-    visible="True">
+    link_target="" url_expr="string:${object_url}/properties" visible="True">
   <permission value="Modify portal content"/>
  </action>
 </object>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Favorite.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Favorite.xml	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Favorite.xml	2013-05-17 06:47:55 UTC (rev 130241)
@@ -11,27 +11,28 @@
  <property
     name="add_view_expr">string:${folder_url}/++add++Favorite</property>
  <property name="link_target"></property>
- <property name="immediate_view">metadata_edit_form</property>
+ <property name="immediate_view">properties</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types"/>
  <property name="allow_discussion">False</property>
  <alias from="(Default)" to="favorite_view"/>
+ <alias from="edit" to="link_edit_form"/>
+ <alias from="properties" to="metadata_edit_form"/>
  <alias from="view" to="favorite_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
     icon_expr="string:${portal_url}/preview_icon.png" link_target=""
-    url_expr="string:${object_url}/favorite_view" visible="True">
+    url_expr="string:${object_url}" visible="True">
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
     icon_expr="string:${portal_url}/edit_icon.png" link_target=""
-    url_expr="string:${object_url}/link_edit_form" visible="True">
+    url_expr="string:${object_url}/edit" visible="True">
   <permission value="Modify portal content"/>
  </action>
  <action title="Metadata" action_id="metadata" category="object"
     condition_expr="" icon_expr="string:${portal_url}/metadata_icon.png"
-    link_target="" url_expr="string:${object_url}/metadata_edit_form"
-    visible="True">
+    link_target="" url_expr="string:${object_url}/properties" visible="True">
   <permission value="Modify portal content"/>
  </action>
 </object>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/File.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/File.xml	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/File.xml	2013-05-17 06:47:55 UTC (rev 130241)
@@ -10,16 +10,18 @@
  <property name="factory">cmf.file</property>
  <property name="add_view_expr">string:${folder_url}/++add++File</property>
  <property name="link_target"></property>
- <property name="immediate_view">metadata_edit_form</property>
+ <property name="immediate_view">properties</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types"/>
  <property name="allow_discussion">False</property>
  <alias from="(Default)" to="index_html"/>
+ <alias from="edit" to="file_edit_form"/>
+ <alias from="properties" to="metadata_edit_form"/>
  <alias from="view" to="file_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
     icon_expr="string:${portal_url}/preview_icon.png" link_target=""
-    url_expr="string:${object_url}/file_view" visible="True">
+    url_expr="string:${object_url}/view" visible="True">
   <permission value="View"/>
  </action>
  <action title="Download" action_id="download" category="object"
@@ -29,13 +31,12 @@
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
     icon_expr="string:${portal_url}/edit_icon.png" link_target=""
-    url_expr="string:${object_url}/file_edit_form" visible="True">
+    url_expr="string:${object_url}/edit" visible="True">
   <permission value="Modify portal content"/>
  </action>
  <action title="Metadata" action_id="metadata" category="object"
     condition_expr="" icon_expr="string:${portal_url}/metadata_icon.png"
-    link_target="" url_expr="string:${object_url}/metadata_edit_form"
-    visible="True">
+    link_target="" url_expr="string:${object_url}/properties" visible="True">
   <permission value="Modify portal content"/>
  </action>
 </object>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Folder.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Folder.xml	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Folder.xml	2013-05-17 06:47:55 UTC (rev 130241)
@@ -10,13 +10,15 @@
  <property name="factory">cmf.folder</property>
  <property name="add_view_expr">string:${folder_url}/++add++Folder</property>
  <property name="link_target"></property>
- <property name="immediate_view">folder_edit_form</property>
+ <property name="immediate_view">properties</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">False</property>
  <property name="allowed_content_types"/>
  <property name="allow_discussion">False</property>
  <alias from="(Default)" to="index_html"/>
  <alias from="index.html" to="index_html"/>
+ <alias from="properties" to="folder_edit_form"/>
+ <alias from="sharing" to="folder_localrole_form"/>
  <alias from="view" to="index_html"/>
  <action title="View" action_id="view" category="object" condition_expr=""
     icon_expr="string:${portal_url}/preview_icon.png" link_target=""
@@ -25,13 +27,12 @@
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
     icon_expr="string:${portal_url}/edit_icon.png" link_target=""
-    url_expr="string:${object_url}/folder_edit_form" visible="True">
+    url_expr="string:${object_url}/properties" visible="True">
   <permission value="Manage properties"/>
  </action>
  <action title="Local Roles" action_id="localroles" category="object"
     condition_expr="" icon_expr="string:${portal_url}/localroles_icon.png"
-    link_target="" url_expr="string:${object_url}/folder_localrole_form"
-    visible="True">
+    link_target="" url_expr="string:${object_url}/sharing" visible="True">
   <permission value="Change local roles"/>
  </action>
  <action title="Folder contents" action_id="folderContents" category="object"

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Image.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Image.xml	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Image.xml	2013-05-17 06:47:55 UTC (rev 130241)
@@ -10,27 +10,28 @@
  <property name="factory">cmf.image</property>
  <property name="add_view_expr">string:${folder_url}/++add++Image</property>
  <property name="link_target"></property>
- <property name="immediate_view">metadata_edit_form</property>
+ <property name="immediate_view">properties</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types"/>
  <property name="allow_discussion">False</property>
  <alias from="(Default)" to="index_html"/>
+ <alias from="edit" to="image_edit_form"/>
+ <alias from="properties" to="metadata_edit_form"/>
  <alias from="view" to="image_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
     icon_expr="string:${portal_url}/preview_icon.png" link_target=""
-    url_expr="string:${object_url}/image_view" visible="True">
+    url_expr="string:${object_url}/view" visible="True">
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
     icon_expr="string:${portal_url}/edit_icon.png" link_target=""
-    url_expr="string:${object_url}/image_edit_form" visible="True">
+    url_expr="string:${object_url}/edit" visible="True">
   <permission value="Modify portal content"/>
  </action>
  <action title="Metadata" action_id="metadata" category="object"
     condition_expr="" icon_expr="string:${portal_url}/metadata_icon.png"
-    link_target="" url_expr="string:${object_url}/metadata_edit_form"
-    visible="True">
+    link_target="" url_expr="string:${object_url}/properties" visible="True">
   <permission value="Modify portal content"/>
  </action>
 </object>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Link.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Link.xml	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/Link.xml	2013-05-17 06:47:55 UTC (rev 130241)
@@ -10,27 +10,28 @@
  <property name="factory">cmf.link</property>
  <property name="add_view_expr">string:${folder_url}/++add++Link</property>
  <property name="link_target"></property>
- <property name="immediate_view">metadata_edit_form</property>
+ <property name="immediate_view">properties</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types"/>
  <property name="allow_discussion">False</property>
  <alias from="(Default)" to="link_view"/>
+ <alias from="edit" to="link_edit_form"/>
+ <alias from="properties" to="metadata_edit_form"/>
  <alias from="view" to="link_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
     icon_expr="string:${portal_url}/preview_icon.png" link_target=""
-    url_expr="string:${object_url}/link_view" visible="True">
+    url_expr="string:${object_url}" visible="True">
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
     icon_expr="string:${portal_url}/edit_icon.png" link_target=""
-    url_expr="string:${object_url}/link_edit_form" visible="True">
+    url_expr="string:${object_url}/edit" visible="True">
   <permission value="Modify portal content"/>
  </action>
  <action title="Metadata" action_id="metadata" category="object"
     condition_expr="" icon_expr="string:${portal_url}/metadata_icon.png"
-    link_target="" url_expr="string:${object_url}/metadata_edit_form"
-    visible="True">
+    link_target="" url_expr="string:${object_url}/properties" visible="True">
   <permission value="Modify portal content"/>
  </action>
 </object>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/News_Item.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/News_Item.xml	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/types/News_Item.xml	2013-05-17 06:47:55 UTC (rev 130241)
@@ -12,28 +12,29 @@
  <property
     name="add_view_expr">string:${folder_url}/++add++News%20Item</property>
  <property name="link_target"></property>
- <property name="immediate_view">metadata_edit_form</property>
+ <property name="immediate_view">properties</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types"/>
  <property name="allow_discussion">False</property>
  <alias from="(Default)" to="newsitem_view"/>
+ <alias from="edit" to="newsitem_edit_form"/>
  <alias from="gethtml" to="source_html"/>
+ <alias from="properties" to="metadata_edit_form"/>
  <alias from="view" to="newsitem_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
     icon_expr="string:${portal_url}/preview_icon.png" link_target=""
-    url_expr="string:${object_url}/newsitem_view" visible="True">
+    url_expr="string:${object_url}" visible="True">
   <permission value="View"/>
  </action>
  <action title="Edit" action_id="edit" category="object" condition_expr=""
     icon_expr="string:${portal_url}/edit_icon.png" link_target=""
-    url_expr="string:${object_url}/newsitem_edit_form" visible="True">
+    url_expr="string:${object_url}/edit" visible="True">
   <permission value="Modify portal content"/>
  </action>
  <action title="Metadata" action_id="metadata" category="object"
     condition_expr="" icon_expr="string:${portal_url}/metadata_icon.png"
-    link_target="" url_expr="string:${object_url}/metadata_edit_form"
-    visible="True">
+    link_target="" url_expr="string:${object_url}/properties" visible="True">
   <permission value="Modify portal content"/>
  </action>
 </object>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/metadata.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/metadata.xml	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/metadata.xml	2013-05-17 06:47:55 UTC (rev 130241)
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>2.2</version>
+  <version>2.3</version>
 </metadata>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/CMF_BTree_Folder.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/CMF_BTree_Folder.xml	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/CMF_BTree_Folder.xml	2013-05-17 06:47:55 UTC (rev 130241)
@@ -2,8 +2,8 @@
 <object name="CMF BTree Folder">
  <alias from="(Default)" to="@@view.html"/>
  <alias from="folder_contents" to="@@edit.html"/>
- <alias from="folder_edit_form" to="@@properties.html"/>
- <alias from="folder_localrole_form" to="@@sharing.html"/>
  <alias from="index.html" to="@@view.html"/>
+ <alias from="properties" to="@@properties.html"/>
+ <alias from="sharing" to="@@sharing.html"/>
  <alias from="view" to="@@view.html"/>
 </object>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Discussion_Item.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Discussion_Item.xml	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Discussion_Item.xml	2013-05-17 06:47:55 UTC (rev 130241)
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <object name="Discussion Item">
  <alias from="(Default)" to="@@view.html"/>
- <alias from="discussionitem_view" to="@@view.html"/>
  <alias from="view" to="@@view.html"/>
 </object>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Document.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Document.xml	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Document.xml	2013-05-17 06:47:55 UTC (rev 130241)
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
 <object name="Document">
  <alias from="(Default)" to="@@view.html"/>
- <alias from="document_edit_form" to="@@edit.html"/>
- <alias from="document_view" to="@@view.html"/>
- <alias from="metadata_edit_form" to="@@properties.html"/>
+ <alias from="edit" to="@@edit.html"/>
  <alias from="gethtml" to="@@source.html"/>
+ <alias from="properties" to="@@properties.html"/>
  <alias from="view" to="@@view.html"/>
 </object>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Favorite.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Favorite.xml	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Favorite.xml	2013-05-17 06:47:55 UTC (rev 130241)
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <object name="Favorite">
  <alias from="(Default)" to="@@view.html"/>
- <alias from="favorite_view" to="@@view.html"/>
- <alias from="link_edit_form" to="@@edit.html"/>
- <alias from="metadata_edit_form" to="@@properties.html"/>
+ <alias from="edit" to="@@edit.html"/>
+ <alias from="properties" to="@@properties.html"/>
  <alias from="view" to="@@view.html"/>
 </object>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/File.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/File.xml	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/File.xml	2013-05-17 06:47:55 UTC (rev 130241)
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <object name="File">
- <alias from="file_edit_form" to="@@edit.html"/>
- <alias from="file_view" to="@@view.html"/>
- <alias from="metadata_edit_form" to="@@properties.html"/>
+ <alias from="edit" to="@@edit.html"/>
+ <alias from="properties" to="@@properties.html"/>
  <alias from="view" to="@@view.html"/>
 </object>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Folder.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Folder.xml	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Folder.xml	2013-05-17 06:47:55 UTC (rev 130241)
@@ -2,8 +2,8 @@
 <object name="Folder">
  <alias from="(Default)" to="@@view.html"/>
  <alias from="folder_contents" to="@@edit.html"/>
- <alias from="folder_edit_form" to="@@properties.html"/>
- <alias from="folder_localrole_form" to="@@sharing.html"/>
  <alias from="index.html" to="@@view.html"/>
+ <alias from="properties" to="@@properties.html"/>
+ <alias from="sharing" to="@@sharing.html"/>
  <alias from="view" to="@@view.html"/>
 </object>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Image.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Image.xml	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Image.xml	2013-05-17 06:47:55 UTC (rev 130241)
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <object name="Image">
- <alias from="image_edit_form" to="@@edit.html"/>
- <alias from="image_view" to="@@view.html"/>
- <alias from="metadata_edit_form" to="@@properties.html"/>
+ <alias from="edit" to="@@edit.html"/>
+ <alias from="properties" to="@@properties.html"/>
  <alias from="view" to="@@view.html"/>
 </object>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Link.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Link.xml	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/Link.xml	2013-05-17 06:47:55 UTC (rev 130241)
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <object name="Link">
  <alias from="(Default)" to="@@view.html"/>
- <alias from="link_edit_form" to="@@edit.html"/>
- <alias from="link_view" to="@@view.html"/>
- <alias from="metadata_edit_form" to="@@properties.html"/>
+ <alias from="edit" to="@@edit.html"/>
+ <alias from="properties" to="@@properties.html"/>
  <alias from="view" to="@@view.html"/>
 </object>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/News_Item.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/News_Item.xml	2013-05-15 02:51:35 UTC (rev 130240)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/types/News_Item.xml	2013-05-17 06:47:55 UTC (rev 130241)
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
 <object name="News Item">
  <alias from="(Default)" to="@@view.html"/>
- <alias from="metadata_edit_form" to="@@properties.html"/>
- <alias from="newsitem_edit_form" to="@@edit.html"/>
- <alias from="newsitem_view" to="@@view.html"/>
+ <alias from="edit" to="@@edit.html"/>
  <alias from="gethtml" to="@@source.html"/>
+ <alias from="properties" to="@@properties.html"/>
  <alias from="view" to="@@view.html"/>
 </object>

