Index: openacs-4/packages/calendar/www/mini-calendar.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/mini-calendar.adp,v diff -u -r1.18.2.6 -r1.18.2.7 --- openacs-4/packages/calendar/www/mini-calendar.adp 9 Mar 2007 17:18:30 -0000 1.18.2.6 +++ openacs-4/packages/calendar/www/mini-calendar.adp 9 Mar 2007 19:29:16 -0000 1.18.2.7 @@ -84,23 +84,18 @@ - - - -
+ - - #acs-datetime.Today# - - - #acs-datetime.Today# - - - #acs-datetime.is# <%=[dt_ansi_to_pretty]%> +

+ + #acs-datetime.Today# + + + #acs-datetime.Today# + + #acs-datetime.is# <%=[dt_ansi_to_pretty]%> +

+ - - -
- Index: openacs-4/packages/calendar/www/view-month-display.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.adp,v diff -u -r1.16.2.2 -r1.16.2.3 --- openacs-4/packages/calendar/www/view-month-display.adp 5 Mar 2007 17:10:52 -0000 1.16.2.2 +++ openacs-4/packages/calendar/www/view-month-display.adp 9 Mar 2007 19:29:16 -0000 1.16.2.3 @@ -22,10 +22,14 @@ - + + + + +   @@ -56,12 +60,12 @@ - + - + Index: openacs-4/packages/calendar/www/view-month-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.tcl,v diff -u -r1.20.2.1 -r1.20.2.2 --- openacs-4/packages/calendar/www/view-month-display.tcl 9 Feb 2007 16:07:38 -0000 1.20.2.1 +++ openacs-4/packages/calendar/www/view-month-display.tcl 9 Mar 2007 19:29:16 -0000 1.20.2.2 @@ -80,7 +80,7 @@ set next_month_url "[subst $next_month_template]" set first_day_of_week [lc_get firstdayofweek] -set last_day_of_week [expr [expr $first_day_of_week + 7] % 7] +set last_day_of_week [expr [expr $first_day_of_week + 6] % 7] set week_days [lc_get day] multirow create weekday_names weekday_short Index: openacs-4/packages/calendar/www/view-week-display.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.adp,v diff -u -r1.13.2.2 -r1.13.2.3 --- openacs-4/packages/calendar/www/view-week-display.adp 4 Mar 2007 19:01:36 -0000 1.13.2.2 +++ openacs-4/packages/calendar/www/view-week-display.adp 9 Mar 2007 19:29:17 -0000 1.13.2.3 @@ -2,9 +2,9 @@

- #calendar.prev_week# + #calendar.prev_week#  #calendar.Week_of# @week_start_month@ @week_start_day@ @week_start_year@ – @week_end_month@ @week_end_day@ @week_end_year@  - #calendar.next_week# + #calendar.next_week#

@@ -13,7 +13,7 @@ - +

 

@days_of_week.day_short@ @days_of_week.monthday@@days_of_week.day_short@ @days_of_week.monthday@
@@ -67,13 +67,13 @@ - +
-
#acs-kernel.common_Go#   #calendar.prev_week#
+
#acs-kernel.common_Go#   #calendar.prev_week#
 -
#calendar.next_week#   #acs-kernel.common_Go#
+
#calendar.next_week#   #acs-kernel.common_Go#
Index: openacs-4/packages/calendar/www/view-week-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.tcl,v diff -u -r1.18.2.1 -r1.18.2.2 --- openacs-4/packages/calendar/www/view-week-display.tcl 9 Feb 2007 16:07:38 -0000 1.18.2.1 +++ openacs-4/packages/calendar/www/view-week-display.tcl 9 Mar 2007 19:29:17 -0000 1.18.2.2 @@ -292,11 +292,11 @@ # Navigation Bar set dates "[lc_time_fmt $first_weekday_date "%q"] - [lc_time_fmt $last_weekday_date "%q"]" if {$portlet_mode_p} { - set previous_week_url "?$page_num_urlvar&view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian - 7]]]" - set next_week_url "?$page_num_urlvar&view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian + 7]]]" + set previous_week_url "?$page_num_urlvar&view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian - 7]]]\#calendar" + set next_week_url "?$page_num_urlvar&view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian + 7]]]\#calendar" } else { - set previous_week_url "?view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian - 7]]]" - set next_week_url "?view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian + 7]]]" + set previous_week_url "?view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian - 7]]]\#calendar" + set next_week_url "?view=week&date=[ad_urlencode [dt_julian_to_ansi [expr $first_weekday_julian + 7]]]\#calendar" } #Calendar grid. @@ -323,26 +323,28 @@ set next_week [clock format [expr $first_weekday_date_secs + (7*86400)] -format "%Y-%m-%d"] set last_week [clock format [expr $first_weekday_date_secs - (7*86400)] -format "%Y-%m-%d"] -multirow create days_of_week width day_short monthday weekday_date +multirow create days_of_week width day_short monthday weekday_date weekday_url + +set nav_url_base [ad_conn url]?[export_vars -url -entire_form -exclude {date view}] + for {set i 0} {$i < 7} {incr i} { set weekday_secs [expr $first_weekday_date_secs + ($i*86400)] set trimmed_month \ [string trimleft [clock format $weekday_secs -format "%m"] 0] set trimmed_day \ [string trimleft [clock format $weekday_secs -format "%d"] 0] set weekday_date [clock format $weekday_secs -format "%Y-%m-%d"] + set weekday_url [export_vars -base [ad_conn url] -url -entire_form {{view day} {date $weekday_date}}] #TODO: localize_me set weekday_monthday "$trimmed_month/$trimmed_day" - multirow append days_of_week [set day_width_$i] [lindex $week_days [expr [expr $i + $first_day_of_week] % 7]] $weekday_monthday $weekday_date + multirow append days_of_week [set day_width_$i] [lindex $week_days [expr [expr $i + $first_day_of_week] % 7]] $weekday_monthday $weekday_date $weekday_url } set week_width $time_of_day_width for {set i 0} {$i < 7} {incr i} { incr week_width [set day_width_$i] } -set nav_url_base [ad_conn url]?[export_vars -url -entire_form -exclude {date view}] - if { [info exists export] && [string equal $export print] } { set print_html [template::adp_parse [acs_root_dir]/packages/calendar/www/view-print-display [list &items items show_calendar_name_p $show_calendar_name_p]] ns_return 200 text/html $print_html Index: openacs-4/packages/calendar/www/view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.adp,v diff -u -r1.29.2.1 -r1.29.2.2 --- openacs-4/packages/calendar/www/view.adp 27 Feb 2007 15:54:56 -0000 1.29.2.1 +++ openacs-4/packages/calendar/www/view.adp 9 Mar 2007 19:29:17 -0000 1.29.2.2 @@ -12,8 +12,7 @@

- - #calendar.Add_Item##calendar.Add_Item# + #calendar.Add_Item#

Index: openacs-4/packages/calendar/www/view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.tcl,v diff -u -r1.23.2.2 -r1.23.2.3 --- openacs-4/packages/calendar/www/view.tcl 3 Mar 2007 18:51:22 -0000 1.23.2.2 +++ openacs-4/packages/calendar/www/view.tcl 9 Mar 2007 19:29:17 -0000 1.23.2.3 @@ -33,8 +33,8 @@ set view "list" } -# HAM : try to create a return url back here after creating a new item set return_url [ad_urlencode [ad_return_url]] +set add_item_url [export_vars -base "cal-item-new" {{return_url [ad_return_url]} view date}] set admin_p [permission::permission_p -object_id $package_id -privilege calendar_admin]