[CMF-checkins] CVS: CMF/CMFCalendar/skins/zpt_calendar - event_edit_form.pt:1.1.34.1

[Christian Theune]

Update of /cvs-repository/CMF/CMFCalendar/skins/zpt_calendar
In directory cvs.zope.org:/tmp/cvs-serv11837/skins/zpt_calendar

Modified Files:
      Tag: ctheune-bug76-branch
	event_edit_form.pt 
Log Message:
Bugfix for cmf collector issue 76

=== CMF/CMFCalendar/skins/zpt_calendar/event_edit_form.pt 1.1 => 1.1.34.1 ===
--- CMF/CMFCalendar/skins/zpt_calendar/event_edit_form.pt:1.1	Wed Aug  1 14:50:39 2001
+++ CMF/CMFCalendar/skins/zpt_calendar/event_edit_form.pt	Sat Oct 19 11:29:09 2002
@@ -193,12 +193,15 @@
                             <td tal:define="stTimeString python:modules['string'].split(here.getStartTimeString());
                                 amSel python:(len(stTimeString) == 2 and stTimeString[1] == 'am') and 1 or 0;
                                 pmSel python:(len(stTimeString) == 2 and stTimeString[1] == 'pm') and 1 or 0">
-                                <select name="start_time">
-                                <option value=""
-        tal:repeat="bt here/buildTimes"
-        tal:attributes="value bt; selected python:bt == stTimeString[0]"
-        tal:content="bt">start time</option>
-                                </select>&nbsp;
+                     <select name="stop_time">
+                     <option value=""
+                       tal:define="bts here/buildTimes"
+                       tal:repeat="bt bts"
+                       tal:attributes="value bt;
+            selected python:(bt <= stTimeString[0]) and (not 
+            repeat['bt'].end and bts[repeat['bt'].index+1] >= stTimeString[0])"
+                       tal:content="bt">Start Time</option>
+                     </select>&nbsp;
                                 <input type="radio"
         name="startAMPM" value="am"
         tal:attributes="checked amSel" /> am
@@ -212,10 +215,13 @@
                                 amSel python:(len(stTimeString) == 2 and stTimeString[1] == 'am') and 1 or 0;
                                 pmSel python:(len(stTimeString) == 2 and stTimeString[1] == 'pm') and 1 or 0">
                                 <select name="stop_time">
-                                <option value=""
-        tal:repeat="bt here/buildTimes"
-        tal:attributes="value bt; selected python:bt == stTimeString[0]"
-        tal:content="bt">end time</option>
+                     <option value=""
+                       tal:define="bts here/buildTimes"
+                       tal:repeat="bt bts"
+                       tal:attributes="value bt;
+            selected python:(bt <= stTimeString[0]) and (not 
+            repeat['bt'].end and bts[repeat['bt'].index+1] >= stTimeString[0])"
+                       tal:content="bt">Start Time</option>
                                 </select>&nbsp;
                                 <input type="radio"
         name="stopAMPM" value="am"