Index: openacs-4/packages/calendar/www/cal-item-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-view.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/calendar/www/cal-item-view.adp	10 May 2002 20:27:17 -0000	1.7
+++ openacs-4/packages/calendar/www/cal-item-view.adp	3 Jun 2002 04:08:17 -0000	1.8
@@ -8,26 +8,26 @@
 
 
 <master src="master">
-<property name="title">Calendar Item: @item_data.name@</property>
+<property name="title">Calendar Item: @cal_item.name@</property>
 <property name="context_bar">Item</property>
 
 <table>
 
   <tr>
     <td valign=top>
       <p>
-	<if @show_cal_nav@ eq 1><include src="cal-nav"></if>
+      @cal_nav@
     </td>	
 
     <td valign=top> 
     <table>
-    <tr><td colspan=2><blockquote>@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>
-    <tr><th align=right>Type:</th><td>@item_data.item_type@</td></tr>
+    <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 @edit_p@ eq 1><a href="./?action=edit&cal_item_id=@cal_item_id@&show_cal_nav=@show_cal_nav@&return_url=@return_url@">edit</a> | <a href="./cal-item-edit?action=delete&cal_item_id=@cal_item_id@&show_cal_nav=@show_cal_nav@&return_url=@return_url@">delete</a>
+    <if @edit_p@ eq 1><a href="cal-item-edit?cal_item_id=@cal_item_id@&return_url=@return_url@">edit</a> | <a href="./cal-item-delete?cal_item_id=@cal_item_id@&return_url=@return_url@">delete</a>
 </if>
     </td>
   </tr>