[Checkins] SVN: Products.CMFCalendar/trunk/Products/CMFCalendar/ - synced view names with the names used in type Actions

[Yvo Schubbe]

Log message for revision 130267:
  - synced view names with the names used in type Actions

Changed:
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/browser/configure.zcml
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.txt
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/browser/templates/calendar_widgets.pt
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/profiles/default/types/Event.xml

-=-
Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt	2013-07-11 19:56:11 UTC (rev 130266)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt	2013-07-11 19:56:29 UTC (rev 130267)
@@ -4,6 +4,8 @@
 2.3.0 (unreleased)
 ------------------
 
+- browser views: Synced view names with the names used in type Actions.
+
 - profiles: Modified Method Aliases used in type Actions.
 
 

Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/browser/configure.zcml
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/browser/configure.zcml	2013-07-11 19:56:11 UTC (rev 130266)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/browser/configure.zcml	2013-07-11 19:56:29 UTC (rev 130267)
@@ -12,7 +12,7 @@
   <browser:page
       for="Products.CMFCalendar.interfaces.IEvent"
       layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
-      name="view.html"
+      name="view"
       class=".event.EventView"
       permission="zope2.View"
       />
@@ -20,7 +20,7 @@
   <browser:page
       for="Products.CMFCalendar.interfaces.IMutableEvent"
       layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
-      name="edit.html"
+      name="edit"
       class=".event.EventEditView"
       permission="cmf.ModifyPortalContent"
       />
@@ -28,7 +28,7 @@
   <browser:page
       for="*"
       layer="Products.CMFDefault.interfaces.ICMFDefaultSkin"
-      name="calendar_day.html"
+      name="calendar_day"
       class=".calendartool.CalendarView"
       template="templates/calendar_day.pt"
       permission="zope2.View"

Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.txt
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.txt	2013-07-11 19:56:11 UTC (rev 130266)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/browser/event.txt	2013-07-11 19:56:29 UTC (rev 130267)
@@ -20,7 +20,7 @@
 
 Use the edit form without input.
 
-    >>> browser.open('http://localhost/site/myEvent/@@edit.html')
+    >>> browser.open('http://localhost/site/myEvent/@@edit')
     >>> '[[cmf_default][Edit [[cmf_calendar][Event]]]]' in browser.contents
     True
     >>> browser.getControl('[[cmf_default][Change]]').click()
@@ -29,7 +29,7 @@
 
 Use the edit form with invalid input.
 
-    >>> browser.open('http://localhost/site/myEvent/@@edit.html')
+    >>> browser.open('http://localhost/site/myEvent/@@edit')
     >>> browser.getControl('[[cmf_calendar][From]]').value = 'a'
     >>> browser.getControl('[[cmf_default][Change]]').click()
     >>> '[[zope][There were errors]]' in browser.contents
@@ -46,7 +46,7 @@
 
 Look at the result:
 
-    >>> browser.open('http://localhost/site/myEvent/@@view.html')
+    >>> browser.open('http://localhost/site/myEvent/@@view')
     >>> '2006 11 6  12:00:00 ' in browser.contents
     True
 

Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/browser/templates/calendar_widgets.pt
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/browser/templates/calendar_widgets.pt	2013-07-11 19:56:11 UTC (rev 130266)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/browser/templates/calendar_widgets.pt	2013-07-11 19:56:29 UTC (rev 130267)
@@ -52,7 +52,7 @@
                         datestring python:'%d/%0.2d/%0.2d' % (year, month, daynumber);"
             tal:attributes="class python: calendar_box_view.getDaysClass(daynumber, month, year, day['event'])">
           <a tal:omit-tag="not: day/event"
-             tal:attributes="href string:${portal_url}/calendar_day.html?date=${datestring}"
+             tal:attributes="href string:${portal_url}/calendar_day?date=${datestring}"
              tal:content="python:daynumber or default">  </a>
          </td></tal:loop>
         </tr>

Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/profiles/default/types/Event.xml
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/profiles/default/types/Event.xml	2013-07-11 19:56:11 UTC (rev 130266)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/profiles/default/types/Event.xml	2013-07-11 19:56:29 UTC (rev 130267)
@@ -17,9 +17,8 @@
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types"/>
  <property name="allow_discussion">False</property>
- <alias from="(Default)" to="@@view.html"/>
- <alias from="edit" to="@@edit.html"/>
- <alias from="view" to="@@view.html"/>
+ <alias from="(Default)" to="@@view"/>
+ <alias from="edit" to="@@edit"/>
  <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}" visible="True">