Index: openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml,v diff -u -r1.28.2.4 -r1.28.2.5 --- openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml 5 Mar 2007 17:10:52 -0000 1.28.2.4 +++ openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml 10 Mar 2007 19:44:45 -0000 1.28.2.5 @@ -140,6 +140,7 @@ than once in your calendar. The event's details are: You can manage the following calendars You have no party wide calendars + Manage Item Types Monday New Type: Next day Index: openacs-4/packages/calendar/tcl/calendar-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-procs.tcl,v diff -u -r1.29 -r1.29.2.1 --- openacs-4/packages/calendar/tcl/calendar-procs.tcl 15 Dec 2006 22:45:20 -0000 1.29 +++ openacs-4/packages/calendar/tcl/calendar-procs.tcl 10 Mar 2007 19:44:45 -0000 1.29.2.1 @@ -209,7 +209,8 @@ set today_p f } set day_number [expr $current_day - $first_julian_date_of_month +1] - set weekday [expr [expr $current_day % 7] +1] + set weekday [expr [expr $current_day % 7] + 1] + set weekday [ad_decode $weekday 7 0 $weekday] set beginning_of_week_p f set end_of_week_p f Index: openacs-4/packages/calendar/www/cal-options.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-options.adp,v diff -u -r1.8.10.2 -r1.8.10.3 --- openacs-4/packages/calendar/www/cal-options.adp 9 Mar 2007 17:02:51 -0000 1.8.10.2 +++ openacs-4/packages/calendar/www/cal-options.adp 10 Mar 2007 19:44:46 -0000 1.8.10.3 @@ -5,9 +5,7 @@
  • @calendars.calendar_name@ -
    - [ - #calendar-portlet.Manage_Item_Types#] + [#calendar.Manage_Item_Types#]     Index: openacs-4/packages/calendar/www/view-list-display.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-list-display.adp,v diff -u -r1.11.2.5 -r1.11.2.6 --- openacs-4/packages/calendar/www/view-list-display.adp 5 Mar 2007 17:10:52 -0000 1.11.2.5 +++ openacs-4/packages/calendar/www/view-list-display.adp 10 Mar 2007 19:44:46 -0000 1.11.2.6 @@ -1,16 +1,16 @@ @@ -51,7 +51,7 @@ #calendar.Description#none@items.description;noquote@ - #calendar.Print# + #calendar.Print# Index: openacs-4/packages/calendar/www/view-list-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-list-display.tcl,v diff -u -r1.27.2.3 -r1.27.2.4 --- openacs-4/packages/calendar/www/view-list-display.tcl 4 Mar 2007 20:11:35 -0000 1.27.2.3 +++ openacs-4/packages/calendar/www/view-list-display.tcl 10 Mar 2007 19:44:46 -0000 1.27.2.4 @@ -115,7 +115,8 @@ description \ name_style_class \ description_style_class \ - container_style_class + container_style_class \ + event_print_url set last_pretty_start_date "" # Loop through the events, and add them @@ -204,7 +205,8 @@ $description \ "calendar-ItemListName" \ "calendar-ItemListDescription" \ - "calendar-ItemListContainer" + "calendar-ItemListContainer" \ + "[subst $event_url_template]&export=print" } set start_year [lc_time_fmt $start_date "%Y"] @@ -216,6 +218,11 @@ set self_url [ad_conn url] +# URLs for period picker +foreach i {1 7 14 21 30 60} { + set period_url_$i "[export_vars -base $self_url -url -entire_form {{period_days $i}}]\#calendar" +} + 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.2 -r1.29.2.3 --- openacs-4/packages/calendar/www/view.adp 9 Mar 2007 19:29:17 -0000 1.29.2.2 +++ openacs-4/packages/calendar/www/view.adp 10 Mar 2007 19:44:46 -0000 1.29.2.3 @@ -3,8 +3,13 @@ + -
    + +
    -[ 1 +[ 1  |  -7 +7  |  -14 +14  |  -21 +21  |  -30 +30  |  -60 ] +60 ]
    + + -
    +
    + +
    + @@ -20,16 +25,18 @@

    - #calendar.lt_Calendar_Administrati# + #calendar.lt_Calendar_Administrati#

    - + +     		+ - - - + +
    Index: openacs-4/packages/notifications/catalog/notifications.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/catalog/notifications.en_US.ISO-8859-1.xml,v diff -u -r1.13.2.8.2.4 -r1.13.2.8.2.5 --- openacs-4/packages/notifications/catalog/notifications.en_US.ISO-8859-1.xml 4 Mar 2007 07:36:23 -0000 1.13.2.8.2.4 +++ openacs-4/packages/notifications/catalog/notifications.en_US.ISO-8859-1.xml 10 Mar 2007 19:40:59 -0000 1.13.2.8.2.5 @@ -1,5 +1,5 @@ - + Action Administer Notifications @@ -19,12 +19,12 @@ Notification Interval Notification Intervals Notification Requests - Request Email when something is added to %pretty_name% + Request Email notification when something is added to %pretty_name% [%system_name% - Batched Notification] Unsubscribe from %pretty_name% Email Notifications You have no notifications. - <a href="%sub_url%" title="Unsubscribe from %pretty_name% Email Notifications">Unsubscribe</a> - <a href="%sub_url%" title="Signup for %pretty_name% Email Notifications">Signup for Email</a> + Unsubscribe + Request notifications Manage Your Email Notifications Notification Notification Replies Index: openacs-4/packages/notifications/tcl/notification-display-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-display-procs.tcl,v diff -u -r1.14.2.2.2.2 -r1.14.2.2.2.3 --- openacs-4/packages/notifications/tcl/notification-display-procs.tcl 4 Mar 2007 20:47:10 -0000 1.14.2.2.2.2 +++ openacs-4/packages/notifications/tcl/notification-display-procs.tcl 10 Mar 2007 19:41:00 -0000 1.14.2.2.2.3 @@ -56,7 +56,7 @@ return "" } - return "\"$title\" $sub_chunk" + return "\"\" $sub_chunk" } ad_proc -public notification::display::subscribe_url {