Index: openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl 11 Mar 2002 16:42:00 -0000 1.9 +++ openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl 14 Mar 2002 04:58:41 -0000 1.10 @@ -208,12 +208,14 @@ # One ugly hack set end_time_lst [split [lindex $one_item_val 1] ":"] - if {[lindex $end_time_lst 1] == 0} { + if {[string range [lindex $end_time_lst 1] 0 1] == "00"} { set end_time [expr [string trimleft [lindex $end_time_lst 0] 0] - 1] } else { - set end_time [lindex $end_time_lst 1] + set end_time [lindex $end_time_lst 0] } + ns_log Notice "$end_time_lst / $end_time / $start_time" + set start_time $hour append return_html "[lindex $one_item_val 2]" } else { Index: openacs-4/packages/calendar/tcl/calendar-display-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-display-procs-oracle.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/calendar/tcl/calendar-display-procs-oracle.xql 11 Feb 2002 20:39:57 -0000 1.2 +++ openacs-4/packages/calendar/tcl/calendar-display-procs-oracle.xql 14 Mar 2002 04:58:29 -0000 1.3 @@ -44,8 +44,10 @@ select to_char(start_date, 'J') as start_date, - to_char(start_date, 'HH24:MI') as pretty_start_date, - to_char(end_date, 'HH24:MI') as pretty_end_date, + to_char(start_date, 'HH:MIpm') as pretty_start_date, + to_char(end_date, 'HH:MIpm') as pretty_end_date, + to_char(start_date,'HH24:MI') as start_date, + to_char(end_date,'HH24:MI') as end_date, nvl(e.name, a.name) as name, e.event_id as item_id from acs_activities a, @@ -70,8 +72,10 @@ select to_char(start_date, 'HH24') as start_hour, - to_char(start_date, 'HH24:MI') as pretty_start_date, - to_char(end_date, 'HH24:MI') as pretty_end_date, + to_char(start_date, 'HH:MIpm') as pretty_start_date, + to_char(end_date, 'HH:MIpm') as pretty_end_date, + to_char(start_date, 'HH24:MI') as start_date, + to_char(end_date, 'HH24:MI') as end_date, nvl(e.name, a.name) as name, e.event_id as item_id from acs_activities a, @@ -97,8 +101,8 @@ select to_char(start_date, 'HH24') as start_hour, - to_char(start_date, 'HH24:MI') as pretty_start_date, - to_char(end_date, 'HH24:MI') as pretty_end_date, + to_char(start_date, 'HH:MIpm') as pretty_start_date, + to_char(end_date, 'HH:MIpm') as pretty_end_date, nvl(e.name, a.name) as name, e.event_id as item_id from acs_activities a, Index: openacs-4/packages/calendar/tcl/calendar-display-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-display-procs.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/calendar/tcl/calendar-display-procs.tcl 11 Mar 2002 16:42:07 -0000 1.7 +++ openacs-4/packages/calendar/tcl/calendar-display-procs.tcl 14 Mar 2002 04:58:29 -0000 1.8 @@ -147,7 +147,7 @@ # ns_log Notice "bma: one calendar $calendar_name" db_foreach select_day_items {} { - if {$pretty_start_date == "00:00" && $pretty_end_date == "00:00"} { + if {$pretty_start_date == "00:00 AM" && $pretty_end_date == "00:00 AM"} { # Hack for no-time items set item "$name ($calendar_name)" set ns_set_pos "X" @@ -159,7 +159,7 @@ set item [subst $item_template] # ns_log Notice "bma-calendar: adding $item at $start_hour" - ns_set put $items $ns_set_pos [list $pretty_start_date $pretty_end_date $item] + ns_set put $items $ns_set_pos [list $start_date $end_date $item] } } Index: openacs-4/packages/calendar/www/cal-item-create-recurrence-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-create-recurrence-2.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/calendar/www/cal-item-create-recurrence-2.tcl 12 Mar 2002 06:08:59 -0000 1.1 +++ openacs-4/packages/calendar/www/cal-item-create-recurrence-2.tcl 14 Mar 2002 04:58:29 -0000 1.2 @@ -12,8 +12,9 @@ cal_item_id every_n interval_type - {days_of_week ""} recur_until:array + {days_of_week ""} + {return_url "./"} } # Verify permission @@ -22,4 +23,4 @@ # Set up the recurrence calendar_item_add_recurrence -cal_item_id $cal_item_id -interval_type $interval_type -every_n $every_n -days_of_week $days_of_week -recur_until [calendar_make_datetime [array get recur_until]] -ad_returnredirect "./" +ad_returnredirect $return_url Index: openacs-4/packages/calendar/www/cal-item-create-recurrence.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-create-recurrence.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/calendar/www/cal-item-create-recurrence.adp 12 Mar 2002 06:08:59 -0000 1.1 +++ openacs-4/packages/calendar/www/cal-item-create-recurrence.adp 14 Mar 2002 04:58:29 -0000 1.2 @@ -21,6 +21,8 @@
+ + Repeat every :
day (s)
@day_of_week@ (s) Index: openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl 12 Mar 2002 06:08:59 -0000 1.1 +++ openacs-4/packages/calendar/www/cal-item-create-recurrence.tcl 14 Mar 2002 04:58:29 -0000 1.2 @@ -10,6 +10,7 @@ @cvs-id $Id$ } { cal_item_id + {return_url "./"} } # Verify permission 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.9 -r1.10 --- openacs-4/packages/calendar/www/cal-item-create.tcl 13 Mar 2002 22:50:53 -0000 1.9 +++ openacs-4/packages/calendar/www/cal-item-create.tcl 14 Mar 2002 04:58:29 -0000 1.10 @@ -119,7 +119,7 @@ if {$recurrence_p} { # We must ask for recurrence information - ad_returnredirect "cal-item-create-recurrence?cal_item_id=$cal_item_id" + ad_returnredirect "cal-item-create-recurrence?cal_item_id=$cal_item_id&return_url=$return_url" return } Index: openacs-4/packages/calendar/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/index.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/calendar/www/index.adp 5 Mar 2002 23:55:42 -0000 1.5 +++ openacs-4/packages/calendar/www/index.adp 14 Mar 2002 04:58:29 -0000 1.6 @@ -16,7 +16,7 @@

- +

Index: openacs-4/packages/calendar/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/index.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/calendar/www/index.tcl 25 Feb 2002 22:14:20 -0000 1.5 +++ openacs-4/packages/calendar/www/index.tcl 14 Mar 2002 04:58:29 -0000 1.6 @@ -15,6 +15,7 @@ {calendar_list:multiple,optional {}} {return_url ""} {force_calendar_id ""} + {show_cal_nav 1} } -properties { package_id:onevalue user_id:onevalue