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.25 -r1.26 --- openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml 11 May 2005 13:13:03 -0000 1.25 +++ openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml 11 May 2005 17:53:44 -0000 1.26 @@ -8,6 +8,7 @@ add an event Add an item Add Item + Add an item beginning at %localized_day_current_hour% on %localized_date_current% Add Recurrence All Day Event all events @@ -54,6 +55,7 @@ Events over a Friday from + Go to %months.name% Go to year %next_year% Go to year %prev_year% Grant @@ -65,9 +67,6 @@ deleted as well. Are you sure you want to delete this event? Audiences for calendar - back one day"></a> - %dates% - <a href="%next_week_url%"><img border=0 src="<%=[dt_right_arrow]%>" alt="<#_ forward one day Calendar Administration Calendar Administration for User Calendar: Choose Calendar @@ -143,6 +142,8 @@ Saturday Select Calendars Sharing + Skip day calendar + Skip month calendar Start Time Start time is before end time Submit query 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.15 -r1.16 --- openacs-4/packages/calendar/www/mini-calendar.adp 11 May 2005 16:29:09 -0000 1.15 +++ openacs-4/packages/calendar/www/mini-calendar.adp 11 May 2005 17:53:44 -0000 1.16 @@ -29,6 +29,7 @@ + @curr_month@ @@ -120,6 +121,7 @@ @form_vars;noquote@ @page_num_formvar;noquote@ + Index: openacs-4/packages/calendar/www/view-one-day-display.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.adp,v diff -u -r1.16 -r1.17 --- openacs-4/packages/calendar/www/view-one-day-display.adp 13 Jan 2005 13:56:30 -0000 1.16 +++ openacs-4/packages/calendar/www/view-one-day-display.adp 11 May 2005 17:53:44 -0000 1.17 @@ -1,6 +1,7 @@ - +
+ back one day @dates@ forward one day @@ -14,7 +15,7 @@
No TimeNo Time @@ -37,7 +38,7 @@ @@ -59,3 +60,4 @@
- @items.localized_current_hour@ + @items.localized_current_hour@
+ Index: openacs-4/packages/calendar/www/view-one-day-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.tcl,v diff -u -r1.31 -r1.32 --- openacs-4/packages/calendar/www/view-one-day-display.tcl 13 Jan 2005 13:56:30 -0000 1.31 +++ openacs-4/packages/calendar/www/view-one-day-display.tcl 11 May 2005 17:53:44 -0000 1.32 @@ -85,6 +85,7 @@ set day_current_hour 0 set localized_day_current_hour "" +set localized_date_current "" set item_add_without_time [subst $hour_template] # Now items with time @@ -94,6 +95,7 @@ calendar_name \ status_summary \ add_url \ + add_title \ localized_current_hour \ current_hour \ start_time \ @@ -159,23 +161,26 @@ for { } { $day_current_hour < $item_start_hour } { incr day_current_hour } { set localized_day_current_hour [lc_time_fmt "$current_date $day_current_hour:00:00" "%X"] + set localized_date_current [lc_time_fmt "$current_date $day_current_hour:00:00" "%x"] multirow append items \ "" \ "" \ "" \ "" \ [subst $hour_template] \ + "[_ calendar.Add_item_beginning_at]" \ $localized_day_current_hour \ $day_current_hour \ 0 \ 0 \ "" \ - "" + "" } } set day_current_hour [lindex $this_item 0] set localized_day_current_hour [lc_time_fmt "$current_date $day_current_hour:00:00" "%X"] + set localized_date_current [lc_time_fmt "$current_date $day_current_hour:00:00" "%x"] # reset url stub set url_stub "" @@ -203,6 +208,7 @@ [lindex $this_item 3] \ [lindex $this_item 4] \ $current_hour_link \ + "[_ calendar.Add_item_beginning_at]" \ $localized_day_current_hour \ $day_current_hour \ [lindex $this_item 7] \ @@ -217,12 +223,14 @@ # need to add dummy entries to show all hours for { } { $day_current_hour < $end_display_hour } { incr day_current_hour } { set localized_day_current_hour [lc_time_fmt "$current_date $day_current_hour:00:00" "%X" [ad_conn locale]] + set localized_date_current [lc_time_fmt "$current_date $day_current_hour:00:00" "%x" [ad_conn locale]] multirow append items \ "" \ "" \ "" \ "" \ "[subst $hour_template]" \ + "[_ calendar.Add_item_beginning_at]" \ $localized_day_current_hour \ $day_current_hour \ "" \