Index: openacs-4/packages/calendar/calendar.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/calendar.info,v diff -u -r1.31.2.1 -r1.31.2.2 --- openacs-4/packages/calendar/calendar.info 19 Jun 2005 07:49:35 -0000 1.31.2.1 +++ openacs-4/packages/calendar/calendar.info 23 Jun 2005 16:44:04 -0000 1.31.2.2 @@ -7,26 +7,29 @@ f f - + Dirk Gomez Personal and shared event calendars. - 2005-06-03 + 2004-03-04 OpenACS Manage group and shared calendars with download. - + - + + + + + - 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.26.2.1 -r1.26.2.2 --- openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml 19 Jun 2005 07:49:35 -0000 1.26.2.1 +++ openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml 23 Jun 2005 16:44:05 -0000 1.26.2.2 @@ -1,12 +1,14 @@ - + . You may choose to: Add add Add a new Audience 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 @@ -53,6 +55,9 @@ Events over a Friday from + Go to %months.name% + Go to year %next_year% + Go to year %prev_year% Grant Grant Permissions Item is recurring. @@ -75,6 +80,29 @@ Edit your Calendar Preferences everyone have read permission, and can see the items, registered and un-reg-ed users alike. + Go to %month_name% %days.day_number%, %year% + Go to %months.name% %curr_year% + Go to %months.name% %curr_year%>%months.name%</a></td> + </else> + </multiple> + </if> + + <else> + <tr class="days"> + <multiple name="days_of_week"> + <td>%days_of_week.day_short%</td> + </multiple> + </tr> + + <multiple name="days"> + <if %days.beginning_of_week_p% true> + <tr> + </if> + + <if %days.active_p% true> + <if %days.today_p% true> + <td class="today" onclick="javascript:location.href='%days.url%';"> + <a href="%days.url%" title="<#_ Go to %month_name% %days.day_number%, %year% Hide Selected Calendars Manage Calendar Audiences no parties exist. contact your system admin @@ -114,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/tcl/cal-item-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/cal-item-procs-oracle.xql,v diff -u -r1.11.2.1 -r1.11.2.2 --- openacs-4/packages/calendar/tcl/cal-item-procs-oracle.xql 19 Jun 2005 07:49:35 -0000 1.11.2.1 +++ openacs-4/packages/calendar/tcl/cal-item-procs-oracle.xql 23 Jun 2005 16:44:06 -0000 1.11.2.2 @@ -29,7 +29,8 @@ cal_item_types.type as item_type, on_which_calendar as calendar_id, c.calendar_name, - o.creation_user + o.creation_user, + c.package_id as calendar_package_id from acs_activities a, acs_events e, timespans s, @@ -63,7 +64,8 @@ cal_item_types.type as item_type, on_which_calendar as calendar_id, c.calendar_name, - o.creation_user + o.creation_user, + c.package_id as calendar_package_id from acs_activities a, acs_events e, timespans s, @@ -137,6 +139,7 @@ begin :1 := cal_item.new( on_which_calendar => :calendar_id, + name => :name, activity_id => :activity_id, timespan_id => :timespan_id, item_type_id => :item_type_id, Index: openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql,v diff -u -r1.18.2.1 -r1.18.2.2 --- openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql 19 Jun 2005 07:49:35 -0000 1.18.2.1 +++ openacs-4/packages/calendar/tcl/cal-item-procs-postgresql.xql 23 Jun 2005 16:44:06 -0000 1.18.2.2 @@ -25,7 +25,8 @@ it.type as item_type, on_which_calendar as calendar_id, c.calendar_name, - o.creation_user + o.creation_user, + c.package_id as calendar_package_id from acs_events e join timespans s on (e.timespan_id = s.timespan_id) @@ -53,14 +54,15 @@ (select count(*) from attachments where object_id = cal_item_id) as n_attachments, to_char(start_date, 'YYYY-MM-DD HH24:MI:SS') as start_date_ansi, to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as end_date_ansi, - coalesce(e.name, a.name) as name, + coalesce(a.name, e.name) as name, coalesce(e.description, a.description) as description, recurrence_id, i.item_type_id, it.type as item_type, on_which_calendar as calendar_id, c.calendar_name, - o.creation_user + o.creation_user, + c.package_id as calendar_package_id from acs_events e join timespans s on (e.timespan_id = s.timespan_id) @@ -132,8 +134,8 @@ select cal_item__new ( null, :calendar_id, + :name, null, - null, null, null, :timespan_id, Index: openacs-4/packages/calendar/tcl/calendar-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-procs.xql,v diff -u -r1.6.6.2 -r1.6.6.3 --- openacs-4/packages/calendar/tcl/calendar-procs.xql 19 Jun 2005 07:49:35 -0000 1.6.6.2 +++ openacs-4/packages/calendar/tcl/calendar-procs.xql 23 Jun 2005 16:44:06 -0000 1.6.6.3 @@ -82,4 +82,63 @@ + + + select calendar_name + from calendars + where owner_id = :user_id + + + + + + select calendar_id,package_id + from calendars + where owner_id = :from_user_id + + + + + + select count(*) + from calendars + where owner_id = :to_user_id + and package_id = :l_pkg_id + + + + + + update calendars + set owner_id = :to_user_id + where owner_id = :from_user_id + and calendar_id = :l_cal_id + + + + + + select calendar_id + from calendars + where package_id = :l_pkg_id + and owner_id = :to_user_id + + + + + + update cal_items + set on_which_calendar = :to_cal_id + where on_which_calendar = :l_cal_id + + + + + + delete + from calendars + where calendar_id = :l_cal_id + + + Index: openacs-4/packages/calendar/www/cal-item-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-delete.tcl,v diff -u -r1.5.2.1 -r1.5.2.2 --- openacs-4/packages/calendar/www/cal-item-delete.tcl 19 Jun 2005 07:49:35 -0000 1.5.2.1 +++ openacs-4/packages/calendar/www/cal-item-delete.tcl 23 Jun 2005 16:44:06 -0000 1.5.2.2 @@ -9,13 +9,13 @@ {confirm_p 0} } +permission::require_permission -object_id $cal_item_id -privilege delete + if {!$confirm_p} { ad_returnredirect "cal-item-delete-confirm?cal_item_id=$cal_item_id" ad_script_abort } -auth::require_login - calendar::item::delete -cal_item_id $cal_item_id ad_returnredirect $return_url Index: openacs-4/packages/calendar/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/index.tcl,v diff -u -r1.6.2.1 -r1.6.2.2 --- openacs-4/packages/calendar/www/admin/index.tcl 19 Jun 2005 07:49:35 -0000 1.6.2.1 +++ openacs-4/packages/calendar/www/admin/index.tcl 23 Jun 2005 16:44:07 -0000 1.6.2.2 @@ -9,7 +9,7 @@ } # find out the user_id -set user_id [ad_verify_and_get_user_id] +set user_id [ad_conn user_id] set package_id [ad_conn package_id] set page_title [_ calendar.lt_Calendar_Administrati]