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.2 -r1.28.2.3 --- openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml 4 Mar 2007 19:01:35 -0000 1.28.2.2 +++ openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml 4 Mar 2007 20:11:34 -0000 1.28.2.3 @@ -192,4 +192,5 @@ Yes yes, delete it Yes, I am sure! + days Index: openacs-4/packages/calendar/www/calendar-item-types.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/calendar-item-types.adp,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/calendar/www/calendar-item-types.adp 8 Aug 2006 21:26:18 -0000 1.8 +++ openacs-4/packages/calendar/www/calendar-item-types.adp 4 Mar 2007 20:11:35 -0000 1.8.2.1 @@ -2,24 +2,6 @@ #calendar.Calendar_Item_Types# @context;noquote@ - -
- -#calendar.New_Type# - -
- - 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.16.1 -r1.3.16.2 --- openacs-4/packages/calendar/www/calendar-item-types.tcl 3 Mar 2007 18:51:22 -0000 1.3.16.1 +++ openacs-4/packages/calendar/www/calendar-item-types.tcl 4 Mar 2007 20:11:35 -0000 1.3.16.2 @@ -16,3 +16,44 @@ # 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"] + +ad_form -name add-new-item-type -action item-type-new -has_submit 1 -form { + {calendar_id:text(hidden) + {value $calendar_id} + } + {type:text,nospell + {label "[_ calendar.New_Type]"} + {html {size 20}} + } + {btn_ok:text(submit) + {label "[_ calendar.add]"} + } +} + + + template::list::create \ + -name item_types \ + -multirow item_types \ + -no_data "" \ + -elements { + col1 { + label "[_ calendar.Calendar_Item_Types]:" + } + col2 { + label "" + display_template { + @item_types.col2@ + } + } + } + + multirow create item_types col1 col2 col2_url + +foreach item_type $item_types { + set item_type_id [lindex $item_type 1] + set type [lindex $item_type 0] + if {[empty_string_p $item_type_id]} { + continue + } + multirow append item_types "$type" "[_ acs-kernel.common_delete]" "item-type-delete?calendar_id=$calendar_id&item_type_id=$item_type_id" +} \ No newline at end of file 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.4 -r1.18.2.5 --- openacs-4/packages/calendar/www/mini-calendar.adp 4 Mar 2007 19:01:36 -0000 1.18.2.4 +++ openacs-4/packages/calendar/www/mini-calendar.adp 4 Mar 2007 20:11:35 -0000 1.18.2.5 @@ -97,15 +97,9 @@ #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/mini-calendar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/mini-calendar.tcl,v diff -u -r1.16.2.1 -r1.16.2.2 --- openacs-4/packages/calendar/www/mini-calendar.tcl 9 Feb 2007 16:07:38 -0000 1.16.2.1 +++ openacs-4/packages/calendar/www/mini-calendar.tcl 4 Mar 2007 20:11:35 -0000 1.16.2.2 @@ -6,6 +6,22 @@ set date [dt_sysdate] } +ad_form -name go-to-date -method get -has_submit 1 -action $base_url -export [lappend list_of_vars page_num] -form { + {date:text,nospell,optional + {label ""} + {html {size 10}} + {after-html "
[_ acs-datetime.Date_as_YYYYMMDD]"} + } + {btn_ok:text(submit) + {label "[_ calendar.Go_to_date]"} + } + {view:text(hidden) + {label ""} + {value "day"} + } +} -on_submit { } + + if {[exists_and_not_null page_num]} { set page_num_formvar [export_form_vars page_num] set page_num "&page_num=$page_num" @@ -192,4 +208,4 @@ {new_date:date {label ""} {format {MM DD YYYY}}} -} +} \ No newline at end of file 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.2 -r1.11.2.3 --- openacs-4/packages/calendar/www/view-list-display.adp 3 Mar 2007 18:51:22 -0000 1.11.2.2 +++ openacs-4/packages/calendar/www/view-list-display.adp 4 Mar 2007 20:11:35 -0000 1.11.2.3 @@ -1,16 +1,12 @@ -
-
+
1 7 14 21 30 -60 - -days -@form_vars;noquote@ - +60
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.2 -r1.27.2.3 --- openacs-4/packages/calendar/www/view-list-display.tcl 3 Mar 2007 18:51:22 -0000 1.27.2.2 +++ openacs-4/packages/calendar/www/view-list-display.tcl 4 Mar 2007 20:11:35 -0000 1.27.2.3 @@ -221,3 +221,28 @@ ns_return 200 text/html $print_html ad_script_abort } + + +set noprocessing_vars [list] + + + set the_form [ns_getform] + if { ![empty_string_p $the_form] } { + for { set i 0 } { $i < [ns_set size $the_form] } { incr i } { + set varname [ns_set key $the_form $i] + set varvalue [ns_set value $the_form $i] + if {!($varname eq "period_days") && !([string match "__*" $varname]) && !([string match "form:*" $varname])} { + lappend noprocessing_vars [list $varname $varvalue] + } + } + } + + +ad_form -name frmdays -has_submit 1 -html {style float:right} -export $noprocessing_vars -form { + {period_days:integer,optional + {label ""} + {html {size 3} {maxlength 3} {class "cal-input-field"}} + {value "$period_days"} + {after_html "[_ calendar.days]"} + } +} -on_submit { } \ No newline at end of file