Index: openacs-4/contrib/packages/room-reservation/room-reservation.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/room-reservation/room-reservation.info,v diff -u -r1.1.4.1 -r1.1.4.2 --- openacs-4/contrib/packages/room-reservation/room-reservation.info 12 Jul 2004 22:08:40 -0000 1.1.4.1 +++ openacs-4/contrib/packages/room-reservation/room-reservation.info 12 Jul 2004 23:02:47 -0000 1.1.4.2 @@ -6,18 +6,15 @@ <pretty-plural>Room Reservations</pretty-plural> <initial-install-p>f</initial-install-p> <singleton-p>f</singleton-p> - - <version name="0.1d" url="http://www.infiniteinfo.com/openacs/room-reservation-0.1d.apm"> - <database-support> - <database>oracle</database> - <database>postgresql</database> - </database-support> + + <version name="0.2d" url="http://www.infiniteinfo.com/openacs/room-reservation-0.2d.apm"> <owner url="mailto:deds@infiniteinfo.com">Deds Castillo</owner> <summary>Room Reservation</summary> + <release-date>2004-07-12</release-date> <vendor url="http://www.infiniteinfo.com">Infiniteinfo</vendor> <description format="text/plain">Room Reservation</description> - <provides url="room-reservation" version="0.1d"/> + <provides url="room-reservation" version="0.2d"/> <requires url="acs-datetime" version="4.0"/> <requires url="acs-events" version="0.2d"/> <requires url="acs-kernel" version="4.5.1"/> @@ -26,108 +23,15 @@ <requires url="acs-templating" version="4.5"/> <requires url="calendar" version="1.0"/> - <files> - <file type="package_spec" path="room-reservation.info"/> - <file type="data_model" db_type="postgresql" path="sql/postgresql/facilities-create.sql"/> - <file type="data_model" db_type="postgresql" path="sql/postgresql/facilities-drop.sql"/> - <file type="data_model" db_type="postgresql" path="sql/postgresql/facilities-package-create.sql"/> - <file type="data_model" db_type="postgresql" path="sql/postgresql/facilities-package-drop.sql"/> - <file type="data_model" db_type="postgresql" path="sql/postgresql/reservations-create.sql"/> - <file type="data_model" db_type="postgresql" path="sql/postgresql/reservations-drop.sql"/> - <file type="data_model" db_type="postgresql" path="sql/postgresql/reservations-package-create.sql"/> - <file type="data_model" db_type="postgresql" path="sql/postgresql/reservations-package-drop.sql"/> - <file type="data_model_create" db_type="postgresql" path="sql/postgresql/room-reservation-create.sql"/> - <file type="data_model_drop" db_type="postgresql" path="sql/postgresql/room-reservation-drop.sql"/> - <file type="data_model" db_type="postgresql" path="sql/postgresql/rooms-create.sql"/> - <file type="data_model" db_type="postgresql" path="sql/postgresql/rooms-drop.sql"/> - <file type="data_model" db_type="postgresql" path="sql/postgresql/rooms-package-create.sql"/> - <file type="data_model" db_type="postgresql" path="sql/postgresql/rooms-package-drop.sql"/> - <file type="query_file" db_type="postgresql" path="tcl/calendar-procs-postgresql.xql"/> - <file type="tcl_procs" path="tcl/calendar-procs.tcl"/> - <file type="query_file" db_type="postgresql" path="tcl/datetime-procs-postgresql.xql"/> - <file type="tcl_procs" path="tcl/datetime-procs.tcl"/> - <file type="query_file" db_type="postgresql" path="tcl/facilities-procs-postgresql.xql"/> - <file type="tcl_procs" path="tcl/facilities-procs.tcl"/> - <file type="query_file" path="tcl/facilities-procs.xql"/> - <file type="query_file" db_type="postgresql" path="tcl/reservations-procs-postgresql.xql"/> - <file type="tcl_procs" path="tcl/reservations-procs.tcl"/> - <file type="query_file" path="tcl/reservations-procs.xql"/> - <file type="tcl_init" path="tcl/room-reservation-init.tcl"/> - <file type="query_file" db_type="postgresql" path="tcl/room-reservation-procs-postgresql.xql"/> - <file type="tcl_procs" path="tcl/room-reservation-procs.tcl"/> - <file type="query_file" db_type="postgresql" path="tcl/rooms-procs-postgresql.xql"/> - <file type="tcl_procs" path="tcl/rooms-procs.tcl"/> - <file type="query_file" path="tcl/rooms-procs.xql"/> - <file type="content_page" path="www/admin/facilities.adp"/> - <file type="content_page" path="www/admin/facilities.tcl"/> - <file type="query_file" path="www/admin/facilities.xql"/> - <file type="content_page" path="www/admin/facility-delete.tcl"/> - <file type="content_page" path="www/admin/facility-disable.adp"/> - <file type="content_page" path="www/admin/facility-disable.tcl"/> - <file type="content_page" path="www/admin/facility-edit.adp"/> - <file type="content_page" path="www/admin/facility-edit.tcl"/> - <file type="content_page" path="www/admin/facility-enable.tcl"/> - <file type="content_page" path="www/admin/facility-new.adp"/> - <file type="content_page" path="www/admin/facility-new.tcl"/> - <file type="content_page" path="www/admin/facility-view.adp"/> - <file type="content_page" path="www/admin/facility-view.tcl"/> - <file type="query_file" path="www/admin/facility-view.xql"/> - <file type="content_page" path="www/admin/index.adp"/> - <file type="content_page" path="www/admin/index.tcl"/> - <file type="content_page" path="www/admin/params-flush.adp"/> - <file type="content_page" path="www/admin/params-flush.tcl"/> - <file type="content_page" path="www/admin/params.adp"/> - <file type="content_page" path="www/admin/params.tcl"/> - <file type="query_file" db_type="postgresql" path="www/admin/reservations-postgresql.xql"/> - <file type="content_page" path="www/admin/reservations.adp"/> - <file type="content_page" path="www/admin/reservations.tcl"/> - <file type="content_page" path="www/admin/room-delete.tcl"/> - <file type="content_page" path="www/admin/room-disable.adp"/> - <file type="content_page" path="www/admin/room-disable.tcl"/> - <file type="content_page" path="www/admin/room-edit.adp"/> - <file type="content_page" path="www/admin/room-edit.tcl"/> - <file type="content_page" path="www/admin/room-enable.tcl"/> - <file type="query_file" db_type="postgresql" path="www/admin/room-history-postgresql.xql"/> - <file type="content_page" path="www/admin/room-history.adp"/> - <file type="content_page" path="www/admin/room-history.tcl"/> - <file type="content_page" path="www/admin/room-new.adp"/> - <file type="content_page" path="www/admin/room-new.tcl"/> - <file type="content_page" path="www/admin/room-view.adp"/> - <file type="content_page" path="www/admin/room-view.tcl"/> - <file type="query_file" db_type="postgresql" path="www/admin/rooms-postgresql.xql"/> - <file type="content_page" path="www/admin/rooms.adp"/> - <file type="content_page" path="www/admin/rooms.tcl"/> - <file type="content_page" path="www/index.adp"/> - <file type="content_page" path="www/index.tcl"/> - <file type="content_page" path="www/master.adp"/> - <file type="content_page" path="www/moderate/reservation-approve.adp"/> - <file type="content_page" path="www/moderate/reservation-approve.tcl"/> - <file type="content_page" path="www/moderate/reservation-reject.adp"/> - <file type="content_page" path="www/moderate/reservation-reject.tcl"/> - <file type="content_page" path="www/reservation-cancel.tcl"/> - <file type="content_page" path="www/reservation-edit.adp"/> - <file type="content_page" path="www/reservation-edit.tcl"/> - <file type="content_page" path="www/reservation-new.adp"/> - <file type="content_page" path="www/reservation-new.tcl"/> - <file type="content_page" path="www/reservation-view.adp"/> - <file type="content_page" path="www/reservation-view.tcl"/> - <file type="content_page" path="www/room-reservations.adp"/> - <file type="content_page" path="www/room-reservations.tcl"/> - <file type="content_page" path="www/room-search.adp"/> - <file type="content_page" path="www/room-search.tcl"/> - <file type="content_page" path="www/room-view.adp"/> - <file type="content_page" path="www/room-view.tcl"/> - <file type="content_page" path="www/rooms.adp"/> - <file type="content_page" path="www/rooms.tcl"/> - <file type="query_file" path="www/rooms.xql"/> - </files> + <callbacks> + </callbacks> <parameters> + <parameter datatype="number" min_n_values="1" max_n_values="1" name="ExpiryDays" default="30" description="This is the number of days a reservation (any state) is stored on db. 0 means "store forever"."/> <parameter datatype="string" min_n_values="1" max_n_values="1" name="FacilitiesPrettyName" default="Facility" description="The pretty name of the facilities. Used in UI."/> <parameter datatype="string" min_n_values="1" max_n_values="1" name="FacilitiesPrettyPlural" default="Facilities" description="The plural pretty name of the facilities. Used in UI."/> + <parameter datatype="number" min_n_values="1" max_n_values="1" name="FutureYears" default="5" description="This is used for checking on how many years into the future (relative to the current year) can a reservation be made."/> <parameter datatype="string" min_n_values="1" max_n_values="1" name="RoomsPrettyName" default="Room" description="The pretty name of the rooms. Used in UI."/> <parameter datatype="string" min_n_values="1" max_n_values="1" name="RoomsPrettyPlural" default="Rooms" description="The plural pretty name of the rooms. Used in UI."/> - <parameter datatype="number" min_n_values="1" max_n_values="1" name="FutureYears" default="5" description="This is used for checking on how many years into the future (relative to the current year) can a reservation be made."/> - <parameter datatype="number" min_n_values="1" max_n_values="1" name="ExpiryDays" default="30" description="This is the number of days a reservation (any state) is stored on db. 0 means "store forever"."/> </parameters> </version> Index: openacs-4/contrib/packages/room-reservation/catalog/room-reservation.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/room-reservation/catalog/room-reservation.en_US.ISO-8859-1.xml,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/contrib/packages/room-reservation/catalog/room-reservation.en_US.ISO-8859-1.xml 12 Jul 2004 22:08:41 -0000 1.1.2.1 +++ openacs-4/contrib/packages/room-reservation/catalog/room-reservation.en_US.ISO-8859-1.xml 12 Jul 2004 23:02:49 -0000 1.1.2.2 @@ -41,15 +41,15 @@ <msg key="lt_Cached_parameters_flu">Cached parameters flushed. Here are the new values:</msg> <msg key="lt_Create_a_New_faciliti">Create a New %facilities_pretty_name%</msg> <msg key="lt_Create_a_New_rooms_pr">Create a New %rooms_pretty_name%</msg> - <msg key="lt_Create_New_facilities">Create New $facilities_pretty_name</msg> - <msg key="lt_Create_New_rooms_pret">Create New $rooms_pretty_name</msg> + <msg key="lt_Create_New_facilities">Create New %facilities_pretty_name%</msg> + <msg key="lt_Create_New_rooms_pret">Create New %rooms_pretty_name%</msg> <msg key="lt_Date_when_reservation">Date when reservation request was %reservation_info.status%:</msg> - <msg key="lt_Disable_facility_name">Disable $facility_name</msg> + <msg key="lt_Disable_facility_name">Disable %facility_name%</msg> <msg key="lt_Disabled_facilities_p">Disabled %facilities_pretty_plural%</msg> <msg key="lt_Disabled_rooms_pretty">Disabled %rooms_pretty_plural%</msg> - <msg key="lt_Edit_A_facilities_pre">Edit A $facilities_pretty_name</msg> + <msg key="lt_Edit_A_facilities_pre">Edit A %facilities_pretty_name%</msg> <msg key="lt_Edit_Package_Paramete">Edit Package Parameters</msg> - <msg key="lt_Edit_rooms_pretty_nam">Edit $rooms_pretty_name Properties</msg> + <msg key="lt_Edit_rooms_pretty_nam">Edit %rooms_pretty_name% Properties</msg> <msg key="lt_Enabled_facilities_pr">Enabled %facilities_pretty_plural%</msg> <msg key="lt_Enabled_rooms_pretty_">Enabled %rooms_pretty_plural%</msg> <msg key="lt_End_date_and_time_has">End date and time has already passed</msg> @@ -70,19 +70,19 @@ <msg key="lt_Reservation_Date_and_">Reservation Date and Time:</msg> <msg key="lt_Reservation_History_f">Reservation History for %room_full_name%</msg> <msg key="lt_reservation_infofull_">%reservation_info.full_start_date% to</msg> - <msg key="lt_Reservation_reservati">Reservation $reservation_id <a href=\"reservation-view?reservation_id=$reservation_id\">(view)</a><br></msg> + <msg key="lt_Reservation_reservati">Reservation %reservation_id% <a href=\"reservation-view?reservation_id=%reservation_id%\">(view)</a><br></msg> <msg key="lt_reservations_listfull">%reservations_list.full_start_date% to</msg> <msg key="lt_Reserve__View_rooms_p">Reserve / View %rooms_pretty_plural%</msg> - <msg key="lt_Reserve_A_rooms_prett">Reserve A $rooms_pretty_name</msg> + <msg key="lt_Reserve_A_rooms_prett">Reserve A %rooms_pretty_name%</msg> <msg key="lt_Reserve_this_rooms_pr">Reserve this %rooms_pretty_name%</msg> <msg key="lt_room_full_name_cannot">%room_full_name% cannot be disabled if pending and/or approved reservations exist. The conflicting reservations are listed blow.</msg> - <msg key="lt_room_full_name_Reserv">$room_full_name Reservations</msg> + <msg key="lt_room_full_name_Reserv">%room_full_name% Reservations</msg> <msg key="lt_Room_Reservation_Admi">Room Reservation Administration</msg> <msg key="lt_rooms_pretty_name_Det">%rooms_pretty_name% Details</msg> <msg key="lt_rooms_pretty_name_Nam">%rooms_pretty_name% Name</msg> <msg key="lt_rooms_pretty_name_Nam_1">%rooms_pretty_name% Name:</msg> <msg key="lt_Search_for_Available_">Search for Available %rooms_pretty_plural%</msg> - <msg key="lt_Search_for_rooms_pret">Search for $rooms_pretty_plural</msg> + <msg key="lt_Search_for_rooms_pret">Search for %rooms_pretty_plural%</msg> <msg key="lt_Start_date_must_be_be">Start date must be before end date</msg> <msg key="lt_Start_date_must_fall_">Start date must fall within [parameter::get -parameter FutureYears -default 5] years from now</msg> <msg key="lt_the_name_you_provided">the name you provided is already being used.</msg> @@ -111,7 +111,7 @@ <msg key="Reserved_by_1">Reserved by:</msg> <msg key="Return_URL">Return URL</msg> <msg key="Room">Room</msg> - <msg key="room_full_name_Info">$room_full_name Info</msg> + <msg key="room_full_name_Info">%room_full_name% Info</msg> <msg key="Room_ID">Room ID</msg> <msg key="Room_Name">Room Name:</msg> <msg key="Room_Name_1">Room Name</msg> Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/room-reservation/sql/postgresql/upgrade/upgrade-0.1d-0.2d.sql'. Fisheye: No comparison available. Pass `N' to diff?