Index: openacs-4/packages/calendar/calendar.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/calendar.info,v diff -u -r1.33 -r1.33.2.1 --- openacs-4/packages/calendar/calendar.info 15 Dec 2006 22:45:19 -0000 1.33 +++ openacs-4/packages/calendar/calendar.info 3 Mar 2007 18:51:21 -0000 1.33.2.1 @@ -7,28 +7,29 @@ f f - + Dirk Gomez Personal and shared event calendars. 2004-03-04 OpenACS Manage group and shared calendars with download. - + - + - + 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 -r1.8.10.1 --- openacs-4/packages/calendar/www/cal-options.adp 25 Feb 2004 13:07:08 -0000 1.8 +++ openacs-4/packages/calendar/www/cal-options.adp 3 Mar 2007 18:51:22 -0000 1.8.10.1 @@ -6,7 +6,8 @@ @calendars.calendar_name@ - [Manage Types] + [ + #calendar-portlet.Manage_Item_Types#] Index: openacs-4/packages/calendar/www/calendar-item-types.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/calendar-item-types.tcl,v diff -u -r1.3 -r1.3.16.1 --- openacs-4/packages/calendar/www/calendar-item-types.tcl 10 Sep 2002 22:22:31 -0000 1.3 +++ openacs-4/packages/calendar/www/calendar-item-types.tcl 3 Mar 2007 18:51:22 -0000 1.3.16.1 @@ -16,6 +16,3 @@ # List the item types and allow addition of a new one set item_types [calendar::get_item_types -calendar_id $calendar_id] set context [list "Item Types"] - - - 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.1 -r1.18.2.2 --- openacs-4/packages/calendar/www/mini-calendar.adp 9 Feb 2007 16:07:38 -0000 1.18.2.1 +++ openacs-4/packages/calendar/www/mini-calendar.adp 3 Mar 2007 18:51:22 -0000 1.18.2.2 @@ -84,4 +84,31 @@ + + + + + + + + + #acs-datetime.Today# + + + #acs-datetime.Today# + + + #acs-datetime.is# <%=[dt_ansi_to_pretty]%> + + + + + + #acs-datetime.Date_as_YYYYMMDD# + + @form_vars;noquote@ + @page_num_formvar;noquote@ + + + Index: openacs-4/packages/calendar/www/navbar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/navbar.tcl,v diff -u -r1.1.2.3 -r1.1.2.4 --- openacs-4/packages/calendar/www/navbar.tcl 27 Feb 2007 15:53:17 -0000 1.1.2.3 +++ openacs-4/packages/calendar/www/navbar.tcl 3 Mar 2007 18:51:22 -0000 1.1.2.4 @@ -64,6 +64,15 @@ "" multirow append views \ + " Calendar" \ + "calendar" \ + "[export_vars -base $base_url {date {view month}}]${page_num}\#calendar" \ + "/resources/calendar/images/calendar-icon.gif" \ + " | " \ + f \ + "" + +multirow append views \ " List" \ "list" \ "[export_vars -base $base_url {date {view list}}]${page_num}${url_stub_period_days}\#calendar" \ @@ -75,7 +84,7 @@ multirow append views \ " Print" \ "print" \ - $link \ + "[export_vars -url -base $base_url -entire_form -exclude {export}]&export=print" \ "/resources/calendar/images/print-icon.gif" \ "" \ f \ 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.1 -r1.11.2.2 --- openacs-4/packages/calendar/www/view-list-display.adp 9 Feb 2007 16:07:38 -0000 1.11.2.1 +++ openacs-4/packages/calendar/www/view-list-display.adp 3 Mar 2007 18:51:22 -0000 1.11.2.2 @@ -7,7 +7,7 @@ 21 30 60 - + days @form_vars;noquote@ 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.1 -r1.27.2.2 --- openacs-4/packages/calendar/www/view-list-display.tcl 9 Feb 2007 16:07:38 -0000 1.27.2.1 +++ openacs-4/packages/calendar/www/view-list-display.tcl 3 Mar 2007 18:51:22 -0000 1.27.2.2 @@ -1,3 +1,13 @@ +if { ![info exists period_days] } { + ad_page_contract { + Some documentation. + @author Sven Schmitt (s.lrn@gmx.net) + @cvs-id $Id$ + } { + {period_days:integer {[parameter::get -parameter ListView_DefaultPeriodDays -default 31]}} + } +} + if {[info exists url_stub_callback]} { # This parameter is only set if this file is called from .LRN. # This way I make sure that for the time being this adp/tcl @@ -45,11 +55,12 @@ set calendars_clause [db_map dbqd.calendar.www.views.openacs_calendar] } -if { ![exists_and_not_null period_days] } { - set period_days [parameter::get -parameter ListView_DefaultPeriodDays -default 31] -} else { - set end_date [clock format [clock scan "+${period_days} days" -base [clock scan $start_date]] -format "%Y-%m-%d 00:00"] -} +#if { ![exists_and_not_null period_days] } { +# set period_days [parameter::get -parameter ListView_DefaultPeriodDays -default 31] +#} else { +# set end_date [clock format [clock scan "+${period_days} days" -base [clock scan $start_date]] -format "%Y-%m-%d 00:00"] +#} +set end_date [clock format [clock scan "+${period_days} days" -base [clock scan $start_date]] -format "%Y-%m-%d 00:00"] if {[exists_and_not_null page_num]} { set page_num_formvar [export_form_vars page_num]
+ + #acs-datetime.Today# + + + #acs-datetime.Today# + + + #acs-datetime.is# <%=[dt_ansi_to_pretty]%> +