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

[Yvo Schubbe]

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

Changed:
  U   Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt
  U   Products.CMFTopic/trunk/Products/CMFTopic/profiles/default/types/Topic.xml
  U   Products.CMFTopic/trunk/Products/CMFTopic/profiles/skins_support/types/Topic.xml

-=-
Modified: Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt	2013-05-17 06:48:37 UTC (rev 130242)
+++ Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt	2013-05-17 06:49:56 UTC (rev 130243)
@@ -4,6 +4,8 @@
 2.3.0 (unreleased)
 ------------------
 
+- profiles: Modified Method Aliases used in type Actions.
+
 - Browser views are now used by default. An additional setup profile allows you
   to hook up the oldstyle skins and to make customizations TTW.
 

Modified: Products.CMFTopic/trunk/Products/CMFTopic/profiles/default/types/Topic.xml
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/profiles/default/types/Topic.xml	2013-05-17 06:48:37 UTC (rev 130242)
+++ Products.CMFTopic/trunk/Products/CMFTopic/profiles/default/types/Topic.xml	2013-05-17 06:49:56 UTC (rev 130243)
@@ -11,7 +11,7 @@
  <property name="factory">cmf.topic</property>
  <property name="add_view_expr">string:${folder_url}/++add++Topic</property>
  <property name="link_target"></property>
- <property name="immediate_view">properties.html</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">
@@ -19,7 +19,10 @@
  </property>
  <property name="allow_discussion">False</property>
  <alias from="(Default)" to="@@view.html"/>
+ <alias from="criteria" to="@@criteria.html"/>
+ <alias from="folder_contents" to="@@edit.html"/>
  <alias from="index.html" to="@@view.html"/>
+ <alias from="properties" to="@@properties.html"/>
  <alias from="view" to="@@view.html"/>
  <action title="View" action_id="view" category="object" condition_expr=""
     icon_expr="string:${portal_url}/preview_icon.png" link_target=""
@@ -28,18 +31,18 @@
  </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}/properties.html" visible="True">
+    url_expr="string:${object_url}/properties" visible="True">
   <permission value="Change portal topics"/>
  </action>
  <action title="Criteria" action_id="criteria" category="object"
     condition_expr="" icon_expr="string:${portal_url}/criteria_icon.png"
-    link_target="" url_expr="string:${object_url}/criteria.html"
-    visible="True">
+    link_target="" url_expr="string:${object_url}/criteria" visible="True">
   <permission value="Change portal topics"/>
  </action>
  <action title="Subtopics" action_id="folderContents" category="object"
     condition_expr="" icon_expr="string:${portal_url}/folder_icon.png"
-    link_target="" url_expr="string:${object_url}/edit.html" visible="True">
+    link_target="" url_expr="string:${object_url}/folder_contents"
+    visible="True">
   <permission value="List folder contents"/>
  </action>
  <action title="New..." action_id="new" category="object" condition_expr=""

Modified: Products.CMFTopic/trunk/Products/CMFTopic/profiles/skins_support/types/Topic.xml
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/profiles/skins_support/types/Topic.xml	2013-05-17 06:48:37 UTC (rev 130242)
+++ Products.CMFTopic/trunk/Products/CMFTopic/profiles/skins_support/types/Topic.xml	2013-05-17 06:49:56 UTC (rev 130243)
@@ -1,10 +1,9 @@
 <?xml version="1.0"?>
 <object name="Topic">
  <alias from="(Default)" to="topic_view"/>
- <alias from="criteria.html" to="topic_criteria_form"/>
- <alias from="edit.html" to="folder_contents"/>
+ <alias from="criteria" to="topic_criteria_form"/>
+ <alias from="folder_contents" to=""/>
  <alias from="index.html" to="topic_view"/>
- <alias from="properties.html" to="topic_edit_form"/>
- <alias from="view.html" to="topic_view"/>
+ <alias from="properties" to="topic_edit_form"/>
  <alias from="view" to="topic_view"/>
 </object>