+
+ When: @event_info.timespan@
+ (view other times and locations)
+
- You are already registered for @event_info.name@
-
- If you'd like, you may:
-
-
+
+ Where: @event_info.city@
+
+ (You'll get specifics after you register)
+
+
+
+ (You'll get specifics once your registration has been approved)
+
+
+
+
+
+
+ Address:
+
+ @venue_info.venue_name@
+
@venue_info.address1@
+
@venue_info.address2@
+
+
@venue_info.city@ @venue_info.usps_abbrev@
+
+
+
+
+
+ Directions:
+
+ @venue_info.description@
+
+
+
-About the Event
+
+ Registration:
+
+
+ Sorry, the deadline to register for this event was @event_info.reg_deadline@.
+
+
+ Deadline is @event_info.reg_deadline@.
+
+
+
+ Register now
+
+
+ You do not have permission to register for this event.
+
+
+
+ Login or sign up
+ to register for this event.
+
-
-
- | When |
- @event_info.timespan@
- ( view other times ) |
-
-
- | Where |
- @event_info.city@ (you'll get specifics after you register) |
-
+
+
+
+ You have already registered.
+ Check registration status.
+
+
-
-
- | Registration Deadline |
- The deadline to register for this event was @event_info.reg_deadline@ |
-
+
+
+ Organizers:
+
+
-
-
- | Registration Deadline |
- @event_info.reg_deadline@ |
-
-
-<% if { [llength $organizers] > 0 } { %>
-
- | Organizers |
-
-
-<%
- foreach organizer $organizers {
- if {![empty_string_p [lindex $organizer 4]]} {
- template::adp_puts "- [lindex $organizer 0]: [lindex $organizer 3]
"
- } else {
- template::adp_puts "- [lindex $organizer 0]: [lindex $organizer 3]
"
- }
- }
-%>
-
- |
-
-<% } %>
-
-
- Event Agenda/Attachments |
-
-
- |
+
+ Event Agenda/Attachments:
+
+
-
- | Related Web Site |
- @detail_url@ |
-
-
+
+
+ Related Web Site:
+ @detail_url@
+
+
-
-@event_info.description@
+@event_info.additional_note@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - You do not have permission to register for this Event
-
+
+
+ -
+
+
+ Register now
-
- You must first login before you can register for this Event
+ You do not have permission to register for this event.
+
+
+ Login or sign up
+ to register for this event.
+
+
+
-
-
Index: openacs-4/contrib/packages/events/www/event-info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/event-info.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/event-info.tcl 9 Mar 2003 12:08:08 -0000 1.1
+++ openacs-4/contrib/packages/events/www/event-info.tcl 9 Mar 2003 16:27:28 -0000 1.2
@@ -36,27 +36,44 @@
db_0or1row get_reg_id {}
if {[exists_and_not_null reg_id]} {
set title "Already registered for $event_info(name)"
+ events::registration::get -reg_id $reg_id -array reg_info
+ events::venue::get -venue_id $event_info(venue_id) -array venue_info
} else {
set title "$event_info(name) in $event_info(city) on $event_info(timespan)"
set reg_id "0"
}
-set organizers [list]
+multirow create organizers role role_id usr_id organizer_name bio view_url
db_foreach select_organizers {} {
- lappend organizers [list $role $role_id $user_id $organizer_name [db_string select_bio {} -default ""]]
+ set bio [db_string select_bio {} -default ""]
+ if { ![empty_string_p $bio] } {
+ set view_url "organizer?[export_vars { user_id role_id }]"
+ } else {
+ set view_url {}
+ }
+ multirow append organizers $role $role_id $user_id $organizer_name $bio $view_url
}
set attachments_enabled_p [events::event::attachments_enabled_p]
-if {$attachments_enabled_p} {
- set attachments [attachments::get_attachments -object_id $event_id]
+if { $attachments_enabled_p } {
+ multirow create attachments item_id name url
+ foreach set element [attachments::get_attachments -object_id $event_id] {
+ multirow append attachments [lindex $element 0] [lindex $element 1] [lindex $element 2]
+ }
}
-set detail_url "[ad_convert_to_html $event_info(detail_url)]"
-if { ![ad_looks_like_html_p $detail_url] } {
- set detail_url "$detail_url"
+if { ![empty_string_p $event_info(detail_url)] } {
+ set detail_url "[ad_convert_to_html $event_info(detail_url)]"
+ if { ![ad_looks_like_html_p $detail_url] } {
+ set detail_url "$detail_url"
+ }
+} else {
+ set detail_url {}
}
+
set title "$event_info(name) in $event_info(city) on $event_info(timespan)"
set context [list "$event_info(name) in $event_info(city)"]
+
ad_return_template
Index: openacs-4/contrib/packages/events/www/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/index-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/index-oracle.xql 9 Mar 2003 12:08:08 -0000 1.1
+++ openacs-4/contrib/packages/events/www/index-oracle.xql 9 Mar 2003 16:27:28 -0000 1.2
@@ -3,9 +3,15 @@
- select a.activity_id, e.event_id, aa.name, v.city,
+ select a.activity_id,
+ e.event_id,
+ aa.name,
+ aa.description,
+ aa.html_p,
+ v.city,
+ to_char(t.start_date,:date_format) as start_date_pretty,
CASE WHEN to_char(t.start_date, 'YYYY-MM-DD') = to_char(t.end_date, 'YYYY-MM-DD')
- THEN to_char(t.start_date, :date_format) || ' (' || to_char(t.start_date, :time_format) || ' - ' || to_char(t.end_date, :time_format) || ')'
+ THEN to_char(t.start_date, :time_format) || ' - ' || to_char(t.end_date, :time_format)
ELSE to_char(t.start_date, :date_format) || ' ' || to_char(t.start_date, :time_format) || ' - ' || to_char(t.end_date, :date_format) || ' ' || to_char(t.end_date, :time_format)
END as timespan
from acs_events ae,
Index: openacs-4/contrib/packages/events/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/index-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/index-postgresql.xql 9 Mar 2003 12:08:08 -0000 1.1
+++ openacs-4/contrib/packages/events/www/index-postgresql.xql 9 Mar 2003 16:27:28 -0000 1.2
@@ -3,9 +3,15 @@
- select a.activity_id, e.event_id, aa.name, v.city,
+ select a.activity_id,
+ e.event_id,
+ aa.name,
+ aa.description,
+ aa.html_p,
+ v.city,
+ to_char(t.start_date,:date_format) as start_date_pretty,
CASE WHEN to_char(t.start_date, 'YYYY-MM-DD') = to_char(t.end_date, 'YYYY-MM-DD')
- THEN to_char(t.start_date, :date_format) || ' (' || to_char(t.start_date, :time_format) || ' - ' || to_char(t.end_date, :time_format) || ')'
+ THEN to_char(t.start_date, :time_format) || ' - ' || to_char(t.end_date, :time_format)
ELSE to_char(t.start_date, :date_format) || ' ' || to_char(t.start_date, :time_format) || ' - ' || to_char(t.end_date, :date_format) || ' ' || to_char(t.end_date, :time_format)
END as timespan
from acs_events ae,
Index: openacs-4/contrib/packages/events/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/index.adp 9 Mar 2003 12:08:08 -0000 1.1
+++ openacs-4/contrib/packages/events/www/index.adp 9 Mar 2003 16:27:28 -0000 1.2
@@ -1,21 +1,37 @@
-Upcoming Events
+Events
@context@
-
-
+
+
-
-Upcoming Events
-
-
-
-
- - @events.name@ in @events.city@ - @events.timespan@
-
+
+ No planned events.
- - There are no events currently available.
+
+ Upcoming events:
+
+
+
+
+
+ |
+ @events.start_date_pretty@
+ |
+
+ @events.name@ in @events.city@, @events.timespan@
+ |
+
+
+ |
+
+ |
+
+ @events.description@
+ |
+
+
+
-
Index: openacs-4/contrib/packages/events/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/index.tcl 9 Mar 2003 12:08:08 -0000 1.1
+++ openacs-4/contrib/packages/events/www/index.tcl 9 Mar 2003 16:27:28 -0000 1.2
@@ -28,6 +28,9 @@
set date_format [parameter::get -parameter date_format -default "MM/DD/YYYY"]
set time_format [parameter::get -parameter time_format -default "HH12:MIam"]
-db_multirow events select_event_info {}
+db_multirow -extend { view_url } events select_event_info {} {
+ set view_url "event-info?[export_vars { event_id }]"
+ set description [ad_convert_to_html -html_p $html_p -- $description]
+}
ad_return_template
Index: openacs-4/contrib/packages/events/www/order-cancel.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/order-cancel.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/order-cancel.adp 9 Mar 2003 12:08:08 -0000 1.1
+++ openacs-4/contrib/packages/events/www/order-cancel.adp 9 Mar 2003 16:27:28 -0000 1.2
@@ -1,5 +1,4 @@
-
@title@
@context@
Index: openacs-4/contrib/packages/events/www/order-cancel.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/order-cancel.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/order-cancel.tcl 9 Mar 2003 12:08:08 -0000 1.1
+++ openacs-4/contrib/packages/events/www/order-cancel.tcl 9 Mar 2003 16:27:28 -0000 1.2
@@ -57,7 +57,7 @@
-label "Your Name" \
-datatype text \
-widget inform \
- -value " "
+ -value " "
element create confirm_cancel inform_of_cancel \
-label "Action" \
@@ -75,7 +75,8 @@
-label "Are you sure you want to cancel?" \
-datatype text \
-widget radio \
- -options {{yes t} {no f}}
+ -options {{Yes t} {No f}} \
+ -value f
if {[template::form is_valid confirm_cancel]} {
template::form get_values confirm_cancel reg_id confirm_p
Index: openacs-4/contrib/packages/events/www/order-check.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/order-check.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/order-check.adp 9 Mar 2003 12:08:08 -0000 1.1
+++ openacs-4/contrib/packages/events/www/order-check.adp 9 Mar 2003 16:27:28 -0000 1.2
@@ -2,60 +2,61 @@
@title@
@context@
-
-@reg_info.user_name@,
-
-
- Your place is reserved for @event_info.name@.
-
- @event_info.display_after@
-
-
About @event_info.name@
-
-
- | When |
- @event_info.timespan@
- ( view other times ) |
-
-
- | Where |
- @venue_info.venue_name@
-
@venue_info.address1@
-
@venue_info.address2@
-
-
@venue_info.city@ @venue_info.usps_abbrev@
-
-
- @venue_info.description@
- |
-
-
-
-
- If you would like to, you may cancel your registration.
-
+
+ Your place is reserved.
+
+
+ @event_info.display_after@
+
+
+
+
+ » Cancel your registration.
+
+
- Thank you for your interest in @event_info.name@. This
- event requires final approval for your registration from one of the
- event organizers. You have been placed on a registration queue, and
- we will notify you by e-mail once your registrating status changes.
-
- If you would like to, you may cancel your request.
+
+ Thank you for your interest in @event_info.name@.
+
+
+ Registration for this event requires approval by the event
+ organizers.
+
+
+ We will notify you by e-mail as soon as your registrating status
+ changes.
+
+
+ If you would like to, you may cancel your request.
+
- Thank you for your interest in @event_info.name@. Unfortunately,
- all spaces for this event were filled before you applied. Thus, you have
- been placed on a waiting list. We will notify you by e-mail if your
- registration status changes.
-
- If you would like to, you may cancel your registration.
+
+ Thank you for your interest in @event_info.name@.
+
+
+ Unfortunately, all spaces for this event were filled before you
+ applied. Thus, you have been placed on a waiting list.
+
+
+ We will notify you by e-mail if your registration status changes.
+
+
+ If you would like to, you may cancel your registration.
+
- Your registration has been canceled. If you want, you may
- place a new registration.
+
+ Your registration has been canceled. If you want, you may
+ place a new registration.
+
+
+
+ » Go back to the event page.
+
Index: openacs-4/contrib/packages/events/www/order-check.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/order-check.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/order-check.tcl 9 Mar 2003 12:08:08 -0000 1.1
+++ openacs-4/contrib/packages/events/www/order-check.tcl 9 Mar 2003 16:27:28 -0000 1.2
@@ -36,9 +36,12 @@
events::event::get -event_id $reg_info(event_id) -array event_info
events::venue::get -venue_id $event_info(venue_id) -array venue_info
-set title "Status of Registration for $event_info(name)"
-set context [list [list "event-info?event_id=$reg_info(event_id)" "$event_info(name) in $venue_info(city)"] "Status of Registration"]
+set title "Registration Status for $event_info(name)"
+set return_url "event-info?event_id=$reg_info(event_id)"
+
+set context [list [list "event-info?event_id=$reg_info(event_id)" "$event_info(name) in $venue_info(city)"] "Registration Status"]
+
ad_return_template
Index: openacs-4/contrib/packages/events/www/order-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/order-one.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/order-one.adp 9 Mar 2003 12:08:08 -0000 1.1
+++ openacs-4/contrib/packages/events/www/order-one.adp 9 Mar 2003 16:27:28 -0000 1.2
@@ -2,34 +2,17 @@
Register for @event_info.name@
@context@
+
+ Register for @event_info.name@ on @event_info.timespan@ in @event_info.city@.
+
-About the Event
-
-
-
- | When |
- @event_info.timespan@ |
-
-
- | Where |
- @event_info.city@ (you'll get specifics after you register) |
-
-
- | Registration Deadline |
- @event_info.reg_deadline@ |
-
-
-
-
-
-Registration Notes:
-
+
+ Note:
+
-About You
-
-
-
Index: openacs-4/contrib/packages/events/www/order-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/order-one.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/order-one.tcl 9 Mar 2003 12:08:08 -0000 1.1
+++ openacs-4/contrib/packages/events/www/order-one.tcl 9 Mar 2003 16:27:28 -0000 1.2
@@ -23,6 +23,7 @@
return 1
}
}
+ad_maybe_redirect_for_registration
set user_id [ad_verify_and_get_user_id]
if { [events::event::reg_deadline_elapsed_p -event_id $event_id] } {
@@ -50,50 +51,54 @@
-set reg_notes_p f
+multirow create reg_notes note
if { [string equal $event_info(reg_needs_approval_p) "t"] } {
- set reg_notes_p t
- append reg_notes "A registration for this event
- requires final approval from an administrator. If you sign up
- for $event_info(name), your final registration will be pending
- administrator approval.<\/font><\/li>"
- if {![empty_string_p $event_stats(max_people)] && 0 >= [expr $event_stats(max_people) - $event_stats(approved)]} {
- append reg_notes "The maximum number of registrations have already been approved
- and registered. If an administrator approves of your request, you
- will likely be placed on the waiting list.<\/font><\/li>"
+ multirow append reg_notes {
+ We will notify you when your registration has been approved.
}
+ if { ![empty_string_p $event_stats(max_people)] && 0 >= [expr $event_stats(max_people) - $event_stats(approved)] } {
+ multirow append reg_notes {
+ The maximum number of registrations have already been approved
+ and registered. If an administrator approves of your request, you
+ will likely be placed on the waiting list.
+ }
+ }
if { [string equal $event_info(reg_cancellable_p) "f"] } {
- append reg_notes "Registrations for this event cannot be canceled. Once approved,
- you are committed to coming.<\/font><\/li>"
+ multirow append reg_notes {
+ Registrations for this event cannot be canceled. Once approved,
+ you are committed to coming.
+ }
}
} else {
- if {![empty_string_p $event_stats(max_people)] && 0 >= [expr $event_stats(max_people) - $event_stats(approved)]} {
- set reg_notes_p t
- append reg_notes "This event has already received its maximum number of
- registrations. If you register for this event, you will be
- placed on a waiting list.<\/font><\/li>"
+ if { ![empty_string_p $event_stats(max_people)] && 0 >= [expr $event_stats(max_people) - $event_stats(approved)] } {
+ multirow append reg_notes {
+ This event has already received its maximum number of
+ registrations. If you register for this event, you will be
+ placed on a waiting list.
+ }
} else {
if { $event_stats(waiting) > 0 } {
- set reg_notes_p t
- append reg_notes "Although this event is not filled to maximum
- capacity, there is a waiting list. If you register for this event an administrator
- will need to approve of your registration.<\/font><\/li>"
+ multirow append reg_notes {
+ Although this event is not filled to maximum
+ capacity, there is a waiting list. If you register for this event an administrator
+ will need to approve of your registration.
+ }
}
}
if { [string equal $event_info(reg_cancellable_p) "f"] } {
- set reg_notes_p t
- append reg_notes "Registrations for this event cannot be canceled. Once registered,
- you are committed to coming.<\/font><\/li>"
+ multirow append reg_notes {
+ Registrations for this event cannot be canceled. Once registered,
+ you are committed to coming.
+ }
}
}
-
set user_name [db_exec_plsql select_user_name {}]
-form create registration
+form create registration -edit_buttons { { "Register" ok } }
element create registration event_id \
-datatype integer \
@@ -109,10 +114,10 @@
-label "Your Name" \
-datatype text \
-widget inform \
- -value " "
+ -value " "
element create registration comments \
- -label "Comments" \
+ -label "Optional comment" \
-datatype text \
-widget textarea \
-html {cols 70 rows 8 wrap soft} \
Index: openacs-4/contrib/packages/events/www/admin/activity-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/activity-add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/activity-add.adp 9 Mar 2003 12:08:22 -0000 1.1
+++ openacs-4/contrib/packages/events/www/admin/activity-add.adp 9 Mar 2003 16:27:55 -0000 1.2
@@ -4,7 +4,4 @@
Activity Description
-
-
-
Index: openacs-4/contrib/packages/events/www/admin/activity-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/activity-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/activity-edit.adp 9 Mar 2003 12:08:22 -0000 1.1
+++ openacs-4/contrib/packages/events/www/admin/activity-edit.adp 9 Mar 2003 16:27:55 -0000 1.2
@@ -4,6 +4,4 @@
Activity Description
-
-
Index: openacs-4/contrib/packages/events/www/admin/activity-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/activity-edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/activity-edit.tcl 9 Mar 2003 12:08:22 -0000 1.1
+++ openacs-4/contrib/packages/events/www/admin/activity-edit.tcl 9 Mar 2003 16:27:55 -0000 1.2
@@ -24,9 +24,6 @@
}
}
-set context_bar [ad_context_bar [list activities "Activities"] \
- [list "activity?activity_id=$activity_id" "Activity"] "Edit Activity"]
-
form create activity
element create activity activity_id \
@@ -100,6 +97,9 @@
events::activity::get -activity_id $activity_id -array activity_info
set title "Edit $activity_info(name)"
+set context_bar [ad_context_bar [list activities "Activities"] \
+ [list "activity?activity_id=$activity_id" "$activity_info(name)"] "Edit"]
+
element set_properties activity activity_id -value $activity_id
element set_properties activity name -value $activity_info(name)
element set_properties activity default_contact_user_id -value $activity_info(default_contact_user_id)
Index: openacs-4/contrib/packages/events/www/admin/event-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/event-add-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/event-add-2.adp 9 Mar 2003 12:08:22 -0000 1.1
+++ openacs-4/contrib/packages/events/www/admin/event-add-2.adp 9 Mar 2003 16:27:55 -0000 1.2
@@ -1,10 +1,8 @@
@title@
-@context_bar@
+@context@
-
Event Details
-
+
-
Index: openacs-4/contrib/packages/events/www/admin/event-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/event-add-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/event-add-2.tcl 9 Mar 2003 12:08:22 -0000 1.1
+++ openacs-4/contrib/packages/events/www/admin/event-add-2.tcl 9 Mar 2003 16:27:55 -0000 1.2
@@ -1,7 +1,7 @@
# events/www/admin/event-add-2.tcl
ad_page_contract {
- Purpose: allow an admin to insert info for a new event, one a
+ Purpose: allow an admin to insert info for a new event, once a
venue has been chosen.
@param activity_id the activity type of the new event
@@ -207,11 +207,17 @@
events::venue::get -venue_id $venue_id -array venue_info
set activity_name $activity_info(name)
-element set_properties event_add start_time -value [template::util::date::today]
-element set_properties event_add end_time -value [template::util::date::today]
-element set_properties event_add reg_deadline -value [template::util::date::today]
-element set_properties event_add display_after -value "Thanks for registering for $activity_name!"
-element set_properties event_add venue_name -value $venue_info(venue_name)
-element set_properties event_add max_people -value $venue_info(max_people)
+if { [form is_request event_add] } {
+ element set_properties event_add start_time -value [template::util::date::today]
+ element set_properties event_add end_time -value [template::util::date::today]
+ element set_properties event_add reg_deadline -value [template::util::date::today]
+ element set_properties event_add display_after -value "Thanks for registering for $activity_name!"
+ element set_properties event_add max_people -value $venue_info(max_people)
+}
+
+if { ![form is_valid event_add] } {
+ element set_properties event_add venue_name -value $venue_info(venue_name)
+}
+
set title "Add a New Event for $activity_name"
-set context_bar [ad_context_bar [list "activities" Activities] [list "activity?activity_id=$activity_id" Activity] "Add Event"]
\ No newline at end of file
+set context [list [list "activities" Activities] [list "activity?[export_vars { activity_id }]" $activity_info(name)] "Add Event"]
Index: openacs-4/contrib/packages/events/www/admin/event-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/event-add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/event-add.adp 9 Mar 2003 12:08:22 -0000 1.1
+++ openacs-4/contrib/packages/events/www/admin/event-add.adp 9 Mar 2003 16:27:55 -0000 1.2
@@ -1,20 +1,15 @@
@title@
-@context_bar@
+@context@
-
-Choose a Venue
-
-
-
+
-
-
-
-
-If you do not see your venue above, you may add a new venue.
-
+
+
+ If you do not see your venue above, you may add a new venue.
+
Index: openacs-4/contrib/packages/events/www/admin/event-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/event-add.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/event-add.tcl 9 Mar 2003 12:08:22 -0000 1.1
+++ openacs-4/contrib/packages/events/www/admin/event-add.tcl 9 Mar 2003 16:27:55 -0000 1.2
@@ -36,7 +36,7 @@
-options $venues
events::activity::get -activity_id $activity_id -array activity_info
-set context_bar [ad_context_bar [list "activities" Activities] [list "activity?activity_id=$activity_id" Activity] "Add Event"]
+set context [list [list "activities" Activities] [list "activity?[export_vars { activity_id }]" $activity_info(name)] "Add Event"]
set activity_name $activity_info(name)
set title "Add a New Event for $activity_name"
set return_url "event-add-2?activity_id=$activity_id"
Index: openacs-4/contrib/packages/events/www/admin/event-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/event-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/event-edit.adp 9 Mar 2003 12:08:22 -0000 1.1
+++ openacs-4/contrib/packages/events/www/admin/event-edit.adp 9 Mar 2003 16:27:55 -0000 1.2
@@ -2,6 +2,4 @@
@title@
@context_bar@
-
-
Index: openacs-4/contrib/packages/events/www/admin/event-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/event-edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/event-edit.tcl 9 Mar 2003 12:08:22 -0000 1.1
+++ openacs-4/contrib/packages/events/www/admin/event-edit.tcl 9 Mar 2003 16:27:55 -0000 1.2
@@ -164,6 +164,8 @@
{ expr {[template::util::date::compare $value [template::element::get_value event_edit start_time]] <= 0} } \
{Registration Deadline must be no later than the start date} }
+events::activity::get -activity_id $event_info(activity_id) -array activity_info
+
if {[template::form is_valid event_edit]} {
template::form get_values event_edit event_id venue_id max_people \
reg_cancellable_p reg_needs_approval_p contact_user_id \
@@ -172,7 +174,6 @@
set event_connecting [template::element get_values event_edit event_connecting]
events::venue::get -venue_id $venue_id -array venue_info
- events::activity::get -activity_id $event_info(activity_id) -array activity_info
set peeraddr [ns_conn peeraddr]
@@ -279,23 +280,26 @@
element set_properties event_edit action -value "Edit $event_info(name) on $event_info(timespan)"
element set_properties event_edit event_id -value $event_id
-element set_properties event_edit venue_id -value $event_info(venue_id)
-element set_properties event_edit event_price -value $price
-element set_properties event_edit category_id -value $category_id
-element set_properties event_edit max_people -value $event_info(max_people)
-element set_properties event_edit reg_cancellable_p -value $event_info(reg_cancellable_p)
-element set_properties event_edit reg_needs_approval_p -value $event_info(reg_needs_approval_p)
-element set_properties event_edit contact_user_id -value $event_info(contact_user_id)
-element set_properties event_edit display_after -value $event_info(display_after)
-element set_properties event_edit start_time -value [events::event::make_event_date \
- -which_type start_time -timespan_id $event_info(timespan_id)]
-element set_properties event_edit end_time -value [events::event::make_event_date \
- -which_type end_time -timespan_id $event_info(timespan_id)]
-element set_properties event_edit reg_deadline -value [events::event::make_event_date \
- -which_type reg_deadline -event_id $event_id]
-set context_bar [ad_context_bar [list "activities" Activities] [list "activity?activity_id=$event_info(activity_id)" Activity] [list "event?event_id=$event_id" "Event"] "Edit Event"]
+if { [form is_request event_edit] } {
+ element set_properties event_edit venue_id -value $event_info(venue_id)
+ element set_properties event_edit event_price -value $price
+ element set_properties event_edit category_id -value $category_id
+ element set_properties event_edit max_people -value $event_info(max_people)
+ element set_properties event_edit reg_cancellable_p -value $event_info(reg_cancellable_p)
+ element set_properties event_edit reg_needs_approval_p -value $event_info(reg_needs_approval_p)
+ element set_properties event_edit contact_user_id -value $event_info(contact_user_id)
+ element set_properties event_edit display_after -value $event_info(display_after)
+ element set_properties event_edit start_time -value [events::event::make_event_date \
+ -which_type start_time -timespan_id $event_info(timespan_id)]
+ element set_properties event_edit end_time -value [events::event::make_event_date \
+ -which_type end_time -timespan_id $event_info(timespan_id)]
+ element set_properties event_edit reg_deadline -value [events::event::make_event_date \
+ -which_type reg_deadline -event_id $event_id]
+}
+
+set context_bar [ad_context_bar [list "activities" Activities] [list "activity?activity_id=$event_info(activity_id)" $activity_info(name)] [list "event?event_id=$event_id" $event_info(city)] "Edit"]
set return_url "event-edit.tcl?event_id=$event_id"
set title "Edit Event"
-ad_return_template
\ No newline at end of file
+ad_return_template
Index: openacs-4/contrib/packages/events/www/admin/event.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/event.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/event.tcl 9 Mar 2003 12:08:22 -0000 1.1
+++ openacs-4/contrib/packages/events/www/admin/event.tcl 9 Mar 2003 16:27:55 -0000 1.2
@@ -79,21 +79,21 @@
-label "Refreshments Note" \
-datatype text \
-widget textarea \
- -html {cols 65 rows 6 wrap soft} \
+ -html {cols 65 rows 16 wrap soft} \
-optional
element create event_notes av_note \
-label "Audio/Visual Note" \
-datatype text \
-widget textarea \
- -html {cols 65 rows 6 wrap soft} \
+ -html {cols 65 rows 16 wrap soft} \
-optional
element create event_notes additional_note\
-label "Additional Note" \
-datatype text \
-widget textarea \
- -html {cols 65 rows 6 wrap soft} \
+ -html {cols 65 rows 16 wrap soft} \
-optional
element create event_notes submit \
Index: openacs-4/contrib/packages/events/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/index.adp 9 Mar 2003 12:08:22 -0000 1.1
+++ openacs-4/contrib/packages/events/www/admin/index.adp 9 Mar 2003 16:27:55 -0000 1.2
@@ -6,6 +6,9 @@
View/Add/Edit/Manage Activities
View/Add/Edit Venues
View/Add/Edit Roles
+
+
Edit parameters
+
(Note: To add/edit an event, you must first go to the
Index: openacs-4/contrib/packages/events/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/index.tcl 9 Mar 2003 12:08:22 -0000 1.1
+++ openacs-4/contrib/packages/events/www/admin/index.tcl 9 Mar 2003 16:27:55 -0000 1.2
@@ -31,11 +31,5 @@
db_multirow available_events_and_locations select_available_events_and_locations {}
-ad_return_template
+set parameters_edit_url "/admin/site-map/parameter-set?[export_vars { { package_id {[ad_conn package_id]} } }]"
-
-
-
-
-
-