[Checkins] SVN: Products.CMFCalendar/trunk/Products/CMFCalendar/ merge chameleon compatibility changes from 2.2 branch

[Joshua LaPlace]

Log message for revision 117939:
  merge chameleon compatibility changes from 2.2 branch
  

Changed:
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/skins/zpt_calendar/calendarBox.pt
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/www/configureCalendarTool.zpt

-=-
Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/skins/zpt_calendar/calendarBox.pt
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/skins/zpt_calendar/calendarBox.pt	2010-10-26 21:33:39 UTC (rev 117938)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/skins/zpt_calendar/calendarBox.pt	2010-10-26 21:55:08 UTC (rev 117939)
@@ -50,7 +50,7 @@
             tal:define="daynumber day/day;
                         datestring python:'%d/%0.2d/%0.2d' % (year, month, daynumber);"
             tal:attributes="class python:context.getDaysClass(daynumber, month, year, day['event'])">
-          <a href
+          <a href="#"
              tal:omit-tag="not: day/event"
              tal:attributes="href string:${portal_url}/calendar_day_view?date=${datestring}"
              tal:content="python:daynumber or default"> &nbsp;</a>

Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/www/configureCalendarTool.zpt
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/www/configureCalendarTool.zpt	2010-10-26 21:33:39 UTC (rev 117938)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/www/configureCalendarTool.zpt	2010-10-26 21:55:08 UTC (rev 117939)
@@ -5,7 +5,7 @@
 <form action="edit_configuration" method="post">
 
  <h3>Portal Types to show in the calendar</h3>
- <select name="show_types:list" size="7" multiple>
+ <select name="show_types:list" size="7" multiple="multiple">
  
   <tal:types tal:repeat="type here/portal_types/objectIds">
   
@@ -14,7 +14,7 @@
            tal:content="type"
            tal:condition="python: type not in here.getCalendarTypes()">type</option>
 
-   <option value="#" selected
+   <option value="#" selected="selected"
            tal:attributes="value type"
            tal:content="type"
            tal:condition="python: type in here.getCalendarTypes()">type</option>
@@ -41,22 +41,22 @@
  </p>
 
  <h3>Preserve selected year and month</h3>
- <p>
-  <tal:define tal:define="use_session here/portal_calendar/getUseSession">
+<p>
+<tal:define tal:define="use_session here/portal_calendar/getUseSession">
 
     <tal:use_session tal:condition="python:use_session">
-      <input type="radio" name="use_session" value="True" checked />Use sessions to remember the calendars state<br />
+      <input type="radio" name="use_session" value="True" checked="checked" />Use sessions to remember the calendars state<br />
       <input type="radio" name="use_session" value="" />Don't use sessions to remember the calendars state<br />
     </tal:use_session>
       
     <tal:use_session tal:condition="python:not use_session">
       <input type="radio" name="use_session" value="True" />Use sessions to remember the calendars state<br />
-      <input type="radio" name="use_session" value="" checked />Don't use sessions to remember the calendars state<br />
+      <input type="radio" name="use_session" value="" checked="checked" />Don't use sessions to remember the calendars state<br />
     </tal:use_session>
 
   </tal:define>
-  <br>
-
+</p>
+  <br/>
   <h3>First day of week</h3>
   <p>
     <select name="firstweekday:int" 
@@ -72,7 +72,7 @@
   </p>
   <br/>
   
- <input type="submit" value="Submit">
+ <input type="submit" value="Submit"/>
 </form>
 
 <tal:footer tal:replace="structure here/manage_page_footer">footer</tal:footer>