Index: openacs-4/packages/calendar/www/cal-dayview.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-dayview.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/calendar/www/cal-dayview.tcl 9 Jan 2002 23:55:04 -0000 1.9 +++ openacs-4/packages/calendar/www/cal-dayview.tcl 10 Apr 2002 00:54:09 -0000 1.10 @@ -54,7 +54,7 @@ } db_foreach get_day_items "" { - ns_set put $set_id $start_hour " + ns_set put $set_id $start_hour " $pretty_start_date - $pretty_end_date $name ($calendar_name)
" Index: openacs-4/packages/calendar/www/cal-item-create.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-create.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/calendar/www/cal-item-create.tcl 5 Apr 2002 19:12:25 -0000 1.12 +++ openacs-4/packages/calendar/www/cal-item-create.tcl 10 Apr 2002 00:54:09 -0000 1.13 @@ -23,11 +23,6 @@ {item_type_id ""} } -# Fix up the return URL -if {[empty_string_p $return_url]} { - set return_url "?[export_url_vars date action view]" -} - if { $date == "now" } { set date [dt_sysdate] } @@ -126,6 +121,11 @@ $item_type_id] } +# Fix up the return URL +if {[empty_string_p $return_url]} { + set return_url "cal-item-view?[export_url_vars date action view cal_item_id]" +} + if {$recurrence_p} { # We must ask for recurrence information ad_returnredirect "cal-item-create-recurrence?cal_item_id=$cal_item_id&return_url=$return_url" 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 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/calendar/www/cal-item-view.adp 10 Apr 2002 00:54:09 -0000 1.1 @@ -0,0 +1,33 @@ + + + + +Calendar Item +One Item + + + + + + + + +
+

+ +

+ + + + +
Date and Time:@item_data.start_date@, from @item_data.start_time@ to @item_data.end_time@
Title:@item_data.name@
Type:@item_data.item_type@
+

+ edit | delete +

+ Index: openacs-4/packages/calendar/www/cal-item-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-view.tcl,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/calendar/www/cal-item-view.tcl 10 Apr 2002 00:54:09 -0000 1.1 @@ -0,0 +1,62 @@ +# /packages/calendar/www/index.tcl + +ad_page_contract { + View one event + + @author Ben Adida (ben@openforce) + @creation-date April 09, 2002 + @cvs-id $Id: cal-item-view.tcl,v 1.1 2002/04/10 00:54:09 ben Exp $ +} { + cal_item_id + {return_url ""} + {show_cal_nav 1} +} + +# find out the user_id +set user_id [ad_verify_and_get_user_id] + +set package_id [ad_conn package_id] + +# write permission +set edit_p [ad_permission_p $cal_item_id cal_item_write] + +# delete permission +set delete_p [ad_permission_p $cal_item_id cal_item_delete] + +# admin permission +set admin_p [ad_permission_p $cal_item_id calendar_admin] + +# Select information about the calendar item +db_1row get_item_data { + select to_char(start_date,'HH:MIpm')as start_time, + 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 + + +ad_return_template + Index: openacs-4/packages/calendar/www/cal-monthview.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-monthview.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/calendar/www/cal-monthview.tcl 23 Sep 2001 14:40:55 -0000 1.5 +++ openacs-4/packages/calendar/www/cal-monthview.tcl 10 Apr 2002 00:54:09 -0000 1.6 @@ -47,7 +47,7 @@ db_foreach get_monthly_items "" { - ns_set put $set_id $start_date " + ns_set put $set_id $start_date " $name ($calendar_name)
" } Index: openacs-4/packages/calendar/www/cal-nav.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-nav.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/calendar/www/cal-nav.tcl 23 Apr 2001 23:09:38 -0000 1.1 +++ openacs-4/packages/calendar/www/cal-nav.tcl 10 Apr 2002 00:54:09 -0000 1.2 @@ -42,7 +42,7 @@ } # set the html -set html [dt_widget_calendar_navigation "" $view $date $pass_in_vars] +set html [dt_widget_calendar_navigation "./" $view $date $pass_in_vars] ad_return_template Index: openacs-4/packages/calendar/www/cal-weekview.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-weekview.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/calendar/www/cal-weekview.tcl 23 Sep 2001 15:12:41 -0000 1.5 +++ openacs-4/packages/calendar/www/cal-weekview.tcl 10 Apr 2002 00:54:09 -0000 1.6 @@ -95,7 +95,7 @@ where on_which_calendar = :calendar_id ) } { - ns_set put $set_id $start_date "
  • + ns_set put $set_id $start_date "
  • $pretty_start_date - $pretty_end_date $name ($calendar_name) " append items "