Index: openacs-4/packages/calendar/www/cal-item-delete-confirm-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-delete-confirm-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar/www/cal-item-delete-confirm-postgresql.xql	28 Apr 2002 21:03:43 -0000	1.1
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="get_item_data">      
+      <querytext>
+       
+	select   to_char(start_date, 'HH24:MI') as start_time,
+                 start_date as raw_start_date,
+		 to_char(start_date, 'MM/DD/YYYY') as start_date,
+	         to_char(end_date, 'HH:MIpm') as end_time,
+	         coalesce(a. name, e.name) as name,
+	         coalesce(e.description, a.description) as description,
+                 recurrence_id,
+                 cal_item_types.type as item_type,
+                 on_which_calendar as calendar_id
+	from     acs_activities a,
+	         acs_events e,
+	         timespans s,
+	         time_intervals t,
+                 cal_items,
+                 cal_item_types
+	where    e.timespan_id = s.timespan_id
+	and      s.interval_id = t.interval_id
+	and      e.activity_id = a.activity_id
+	and      e.event_id = :cal_item_id
+        and      cal_items.cal_item_id= :cal_item_id
+        and      cal_item_types.item_type_id= cal_items.item_type_id
+    
+      </querytext>
+</fullquery>
+ 
+</queryset>
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	28 Apr 2002 21:03:43 -0000	1.1
@@ -0,0 +1,47 @@
+<!--	
+	Displays the basic UI for the calendar
+	
+	@author Gary Jin (gjin@arsidigta.com)
+     	@creation-date Dec 14, 2000
+     	@cvs-id $Id: cal-item-delete-confirm.adp,v 1.1 2002/04/28 21:03:43 ben Exp $
+-->
+
+
+<master src="master">
+<property name="title">Calendar Item Delete: @item_data.name@</property>
+<property name="context_bar">Delete</property>
+
+<table>
+
+  <tr>
+    <td valign=top>
+      <p>
+	<if @show_cal_nav@ eq 1><include src="cal-nav"></if>
+    </td>	
+
+    <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>
+    <tr><th align=right>Type:</th><td>@item_data.item_type@</td></tr>
+    </table>
+    <p>
+    </td>
+  </tr>
+</table>
+
+<if @item_data.recurrence_data@ not nil>
+<b>This is a repeating event</b>. You may choose to:
+<ul>
+<li> <a href="cal-item-edit?action=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>
+</ul>
+</if>
+<else>
+Are you sure you want to delete this event?
+<ul>
+<li> <a href="cal-item-edit?action=delete&cal_item_id=@cal_item_id@&confirm_p=1">yes, delete it</a>
+<li> <a href="cal-item-view?show_cal_nav=@show_cal_nav@&cal_item_id=@cal_item_id@">no, keep it</a>
+</ul>
+</else>
Index: openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl	28 Apr 2002 21:03:43 -0000	1.1
@@ -0,0 +1,54 @@
+
+#
+# A script that assumes
+#
+# cal_item_id
+#
+# This will pull out information about the event and 
+# display it with some options.
+#
+
+ad_page_contract {
+    Confirm Deletion
+} {
+    cal_item_id
+    {show_cal_nav 1}
+}
+
+# Select information about the calendar item
+db_1row get_item_data { 
+    select   to_char(start_date,'HH:MIpm')as start_time,
+    start_date as raw_start_date,
+    to_char(start_date, 'MM/DD/YYYY') as start_date,
+    to_char(end_date, 'HH:MIpm') as end_time,
+    nvl(a. name, e.name) as name,
+    nvl(e.description, a.description) as description,
+    recurrence_id,
+    cal_item_types.type as item_type,
+    on_which_calendar as calendar_id
+    from     acs_activities a,
+    acs_events e,
+    timespans s,
+    time_intervals t,
+    cal_items,
+    cal_item_types
+    where    e.timespan_id = s.timespan_id
+    and      s.interval_id = t.interval_id
+    and      e.activity_id = a.activity_id
+    and      e.event_id = :cal_item_id
+    and      cal_items.cal_item_id= :cal_item_id
+    and      cal_item_types.item_type_id(+)= cal_items.item_type_id
+}
+
+set item_data(start_time) $start_time
+set item_data(start_date) $start_date
+set item_data(end_time) $end_time
+set item_data(name) $name
+set item_data(description) $description
+set item_data(item_type) $item_type
+set item_data(recurrence_id) $recurrence_id
+
+# no time?
+set item_data(no_time_p) [dt_no_time_p -start_time $start_time -end_time $end_time]
+
+ad_return_template
Index: openacs-4/packages/calendar/www/cal-item-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-edit.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/calendar/www/cal-item-edit.tcl	26 Apr 2002 15:59:07 -0000	1.8
+++ openacs-4/packages/calendar/www/cal-item-edit.tcl	28 Apr 2002 21:03:43 -0000	1.9
@@ -19,6 +19,7 @@
     {description ""}
     {return_url ""}
     {item_type_id ""}
+    {confirm_p 0}
 } 
 
 # Fix up the return URL
@@ -37,7 +38,12 @@
 
 if { $action == "delete" } {
 
- cal_item_delete $cal_item_id
+    if {!$confirm_p} {
+        ad_returnredirect "cal-item-delete-confirm?cal_item_id=$cal_item_id&show_cal_nav=0"
+        return
+    }
+    
+    cal_item_delete $cal_item_id
 
     ad_returnredirect $return_url
 
Index: openacs-4/packages/calendar/www/cal-item-view-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-view-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/calendar/www/cal-item-view-postgresql.xql	28 Apr 2002 21:03:43 -0000	1.1
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<queryset>
+   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="get_item_data">      
+      <querytext>
+       
+	select   to_char(start_date, 'HH24:MI') as start_time,
+                 start_date as raw_start_date,
+		 to_char(start_date, 'MM/DD/YYYY') as start_date,
+	         to_char(end_date, 'HH:MIpm') as end_time,
+	         coalesce(a. name, e.name) as name,
+	         coalesce(e.description, a.description) as description,
+                 recurrence_id,
+                 cal_item_types.type as item_type,
+                 on_which_calendar as calendar_id
+	from     acs_activities a,
+	         acs_events e,
+	         timespans s,
+	         time_intervals t,
+                 cal_items,
+                 cal_item_types
+	where    e.timespan_id = s.timespan_id
+	and      s.interval_id = t.interval_id
+	and      e.activity_id = a.activity_id
+	and      e.event_id = :cal_item_id
+        and      cal_items.cal_item_id= :cal_item_id
+        and      cal_item_types.item_type_id= cal_items.item_type_id
+    
+      </querytext>
+</fullquery>
+ 
+</queryset>