Index: openacs.org-dev/packages/calendar/www/cal-item-create-recurrence.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/calendar/www/cal-item-create-recurrence.adp,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/calendar/www/cal-item-create-recurrence.adp	9 Jul 2002 17:35:02 -0000	1.1.1.1
+++ openacs.org-dev/packages/calendar/www/cal-item-create-recurrence.adp	25 Jul 2002 18:47:00 -0000	1.1.1.2
@@ -7,28 +7,28 @@
 -->
 
 
-<master>
-<property name="title">Calendars: Recurrence</property>
-<property name="context_bar">Add Recurrence</property>
+<master src="master">
+<property name="title">Calendars: Repeating Event</property>
+<property name="context_bar">Repeat</property>
 
 You are choosing to make this event recurrent, so that it appears more
 than once in your calendar. The event's details are:
 <p>
-<b>Date:</b> @start_date@<br>
-<b>Time:</b> @start_time@ - @end_time@<br>
-<b>Details:</b> @description@
+<b>Date:</b> @cal_item.start_date@<br>
+<b>Time:</b> @cal_item.start_time@ - @cal_item.end_time@<br>
+<b>Details:</b> @cal_item.description@
 <p>
 
 <FORM method=post action=cal-item-create-recurrence-2>
-<INPUT TYPE=hidden name=cal_item_id value=@cal_item_id@>
+<INPUT TYPE=hidden name=cal_item_id value=@cal_item.cal_item_id@>
 <INPUT TYPE=hidden name=return_url value="@return_url@">
 
 Repeat every <INPUT TYPE=text name=every_n value=1 size=3>:<br>
 <INPUT TYPE=radio name=interval_type value=day> day (s)<br>
 <INPUT TYPE=radio name=interval_type value=week> 
 <%
 foreach dow {{Sunday 0} {Monday 1} {Tuesday 2} {Wednesday 3} {Thursday 4} {Friday 5} {Saturday 6}} {
-        if {[lindex $dow 1] == [expr "$day_of_week -1"]} {
+        if {[lindex $dow 1] == [expr "$cal_item(day_of_week) -1"]} {
                 set checked_html "CHECKED"
         } else {
                 set checked_html ""
@@ -39,8 +39,8 @@
 %>
 of the week <br>
 <INPUT TYPE=radio name=interval_type value=month_by_date> day
-@day_of_month@ of the month <br>
-<INPUT TYPE=radio name=interval_type value=month_by_day> same @pretty_day_of_week@ of
+@cal_item.day_of_month@ of the month <br>
+<INPUT TYPE=radio name=interval_type value=month_by_day> same @cal_item.pretty_day_of_week@ of
 the month <br>
 <INPUT TYPE=radio name=interval_type value=year> year<br>
 Repeat this event until: <%= [dt_widget_datetime -default [dt_systime] recur_until] %>