Index: openacs-4/packages/calendar/www/cal-item-delete-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-delete-confirm.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	3 Jun 2002 04:08:17 -0000	1.4
+++ openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	3 Jun 2002 07:26:55 -0000	1.5
@@ -8,7 +8,7 @@
 
 
 <master src="master">
-<property name="title">Calendar Item Delete: @item_data.name@</property>
+<property name="title">Calendar Item Delete: @cal_item.name@</property>
 <property name="context_bar">Delete</property>
 
 <table>
@@ -21,17 +21,17 @@
 
     <td valign=top> 
     <table>
-    <tr><td colspan=2><blockquote>@item_data.description@</blockquote></td></tr>
-    <tr><th align=right>Date<if @item_data.no_time_p@ eq 0> and Time</if>:</th><td><a href="./?calendar_id=@calendar_id@&view=day&show_cal_nav=@show_cal_nav@&date=@raw_start_date@">@item_data.start_date@</a><if @item_data.no_time_p@ eq 0>, from @item_data.start_time@ to @item_data.end_time@</if></td></tr>
-    <tr><th align=right>Title:</th><td>@item_data.name@</td></tr>
-    <if @item_data.item_type@ not nil><tr><th align=right>Type:</th><td>@item_data.item_type@</td></tr></if>
+    <tr><td colspan=2><blockquote>@cal_item.description@</blockquote></td></tr>
+    <tr><th align=right>Date<if @cal_item.no_time_p@ eq 0> and Time</if>:</th><td><a href="./view?view=day&date=@cal_item.start_date@">@cal_item.pretty_short_start_date@</a><if @cal_item.no_time_p@ eq 0>, from @cal_item.start_time@ to @cal_item.end_time@</if></td></tr>
+    <tr><th align=right>Title:</th><td>@cal_item.name@</td></tr>
+    <if @cal_item.item_type@ not nil><tr><th align=right>Type:</th><td>@cal_item.item_type@</td></tr></if>
     </table>
     <p>
-<if @item_data.recurrence_id@ not nil>
+<if @cal_item.recurrence_id@ not nil>
 <b>This is a repeating event</b>. You may choose to:
 <ul>
 <li> <a href="cal-item-delete?cal_item_id=@cal_item_id@&confirm_p=1">delete only this instance</a>
-<li> <a href="cal-item-delete-all-occurrences?recurrence_id=@item_data.recurrence_id@">delete all occurrences</a>
+<li> <a href="cal-item-delete-all-occurrences?recurrence_id=@cal_item.recurrence_id@">delete all occurrences</a>
 </ul>
 </if>
 <else>