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.4 -r1.1.2.5
--- openacs-4/contrib/packages/room-reservation/catalog/room-reservation.en_US.ISO-8859-1.xml	5 Oct 2004 00:08:57 -0000	1.1.2.4
+++ openacs-4/contrib/packages/room-reservation/catalog/room-reservation.en_US.ISO-8859-1.xml	10 Jun 2005 22:44:24 -0000	1.1.2.5
@@ -72,7 +72,7 @@
   <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% &lt;a href=\&quot;reservation-view?reservation_id=%reservation_id%\&quot;&gt;(view)&lt;/a&gt;&lt;br&gt;</msg>
+  <msg key="lt_Reservation_reservati">Reservation %reservation_id% &lt;a href=&quot;reservation-view?reservation_id=%reservation_id%&quot;&gt;(view)&lt;/a&gt;&lt;br&gt;</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>
Index: openacs-4/contrib/packages/room-reservation/tcl/datetime-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/room-reservation/tcl/datetime-procs-postgresql.xql,v
diff -u -r1.1.4.1 -r1.1.4.2
--- openacs-4/contrib/packages/room-reservation/tcl/datetime-procs-postgresql.xql	12 Jul 2004 22:08:42 -0000	1.1.4.1
+++ openacs-4/contrib/packages/room-reservation/tcl/datetime-procs-postgresql.xql	10 Jun 2005 22:44:24 -0000	1.1.4.2
@@ -6,7 +6,7 @@
 
     <fullquery name="room-reservation::datetime::check_valid_end_date_p.valid_p">
       <querytext>
-        select CASE WHEN (now() - :date::timestamp) < 0 
+        select CASE WHEN now() < :date::timestamp
                     THEN 1
                     ELSE 0
                END 
@@ -16,7 +16,7 @@
 
     <fullquery name="room-reservation::datetime::check_valid_dates_p.valid_p">
       <querytext>
-        select CASE WHEN (:start_date::timestamp - :end_date::timestamp) < 0 
+        select CASE WHEN :start_date::timestamp < :end_date::timestamp
                     THEN 1
                     ELSE 0
                END 
@@ -26,7 +26,7 @@
 
     <fullquery name="room-reservation::datetime::check_valid_year_p.valid_p">
       <querytext>
-        select CASE WHEN (:start_date::timestamp - (now() + :future_years)) < 0 
+        select CASE WHEN :start_date::timestamp < now() + :future_years
                     THEN 1
                     ELSE 0
                END 
Index: openacs-4/contrib/packages/room-reservation/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/room-reservation/www/index.adp,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/contrib/packages/room-reservation/www/index.adp	12 Jul 2004 22:08:42 -0000	1.2.2.1
+++ openacs-4/contrib/packages/room-reservation/www/index.adp	10 Jun 2005 22:44:24 -0000	1.2.2.2
@@ -11,30 +11,9 @@
   <li><a href="admin/">#room-reservation.Administer#</a></li>
 </if>
 </ul>
+
 <p>
-#room-reservation.Your_reservations#
+#room-reservation.Show#: <list name="filter_list"><if @filter_on@ ne @filter_list:item@><a href="?filter_on=@filter_list:item@">@filter_list:item@</a></if><else><b>@filter_list:item@</b></else><if @filter_list:rownum@ ne @filter_list:rowcount@> | </if></list>
 <p>
-#room-reservation.Show# <list name="filter_list"><if @filter_on@ ne @filter_list:item@><a href="?filter_on=@filter_list:item@">@filter_list:item@</a></if><else><b>@filter_list:item@</b></else><if @filter_list:rownum@ ne @filter_list:rowcount@> | </if></list> #room-reservation.reservations#
-<p>
-<table border="0" cellpadding="5">
-    <tr valign="top">
-        <th>#room-reservation.lt_facilities_pretty_nam#</th>
-        <th>#room-reservation.lt_rooms_pretty_name_Nam#</th>
-        <th>#room-reservation.Event#</th>
-        <th>#room-reservation.Date_Reserved#</th>
-        <th>#room-reservation.Status#</th>
-        <th>#room-reservation.Action#</th>
-    </tr>
-<multiple name="personal_reservations">
-     <tr valign="top">
-         <td>@personal_reservations.facility_name@</td>   
-         <td>@personal_reservations.room_name@</td>   
-         <td>@personal_reservations.name@</td>   
-         <td>#room-reservation.lt_personal_reservations#<br>@personal_reservations.full_end_date@</td>   
-         <td>@personal_reservations.status@</td>   
-         <td>[ <a href="reservation-view?reservation_id=@personal_reservations.reservation_id@">#room-reservation.View_Details#</a> <if @personal_reservations.status@ eq pending>| <a href="reservation-edit?reservation_id=@personal_reservations.reservation_id@">#room-reservation.Edit#</a> </if>| <a href="reservation-cancel?reservation_id=@personal_reservations.reservation_id@">#room-reservation.Cancel#</a> ]</td>   
-     </tr>
-</multiple>
-</table>
 
-
+<listtemplate name="personal_reservations"></listtemplate>
Index: openacs-4/contrib/packages/room-reservation/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/room-reservation/www/index.tcl,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/contrib/packages/room-reservation/www/index.tcl	12 Jul 2004 22:08:42 -0000	1.2.2.1
+++ openacs-4/contrib/packages/room-reservation/www/index.tcl	10 Jun 2005 22:44:24 -0000	1.2.2.2
@@ -26,9 +26,6 @@
 set title "[_ room-reservation.Room_Reservation]"
 
 switch -exact -- $filter_on {
-    {canceled} {
-	set status "canceled"
-    }
     {pending} {
 	set status "pending"
     }
@@ -44,7 +41,7 @@
     }
 }
 
-set filter_list [list all pending approved rejected canceled]
+set filter_list [list all pending approved rejected]
 
 set reservations [room-reservation::rooms::get_reservations_list_of_ns_sets \
                       -reserving_user $user_id \
@@ -54,5 +51,20 @@
 
 template::util::list_of_ns_sets_to_multirow -rows $reservations -var_name personal_reservations
 
+template::list::create \
+    -name personal_reservations \
+    -elements {
+	actions { 
+	    label "Actions"
+	    display_template "<a href=\"reservation-view?reservation_id=@personal_reservations.reservation_id@\">details</a> | <a href=\"reservation-delete?reservation_id=@personal_reservations.reservation_id@\">delete</a>"
+	}
 
+	facility_name { label $facilities_pretty_name }
+	room_name { label $rooms_pretty_name }
+	name { label "Event" }
+	full_start_date { label "Start" }
+	full_end_date { label "End" }
+	status { label "Status" }
+    }
+
 ad_return_template
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/room-reservation/www/reservation-delete.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/contrib/packages/room-reservation/www/reservation-delete.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/contrib/packages/room-reservation/www/reservation-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/room-reservation/www/reservation-view.adp,v
diff -u -r1.2.2.3 -r1.2.2.4
--- openacs-4/contrib/packages/room-reservation/www/reservation-view.adp	5 Oct 2004 00:08:58 -0000	1.2.2.3
+++ openacs-4/contrib/packages/room-reservation/www/reservation-view.adp	10 Jun 2005 22:44:24 -0000	1.2.2.4
@@ -23,67 +23,67 @@
 
   <h3>#room-reservation.Reservation_Info#</h3>
 
-  <table border="0">
-    <tr>
-      <th>#room-reservation.lt_facilities_pretty_nam_1#</th>
-      <td>@reservation_info.facility_name@</td>
+  <table cellspacing="2" cellpadding="2" border="0">
+    <tr class="form-element">
+      <td class="form-label">@facilities_pretty_name@:</td>
+      <td class="form-widget">@reservation_info.facility_name@</td>
     </tr>
-    <tr>
-      <th>#room-reservation.lt_rooms_pretty_name_Nam_1#</th>
-      <td>@reservation_info.room_name@</td>
+    <tr class="form-element">
+      <td class="form-label">@rooms_pretty_name@:</td>
+      <td class="form-widget">@reservation_info.room_name@</td>
     </tr>
-    <tr>
-      <th>#room-reservation.Event_1#</th>
-      <td>@reservation_info.name@</td>
+    <tr class="form-element">
+      <td class="form-label">#room-reservation.Event_1#</td>
+      <td class="form-widget">@reservation_info.name@</td>
     </tr>
-    <tr>
-      <th>#room-reservation.lt_Reservation_Date_and_#</th>
-      <td>#room-reservation.lt_reservation_infofull_#<br>@reservation_info.full_end_date@</td>
+    <tr class="form-element">
+      <td class="form-label">Date and Time:</td>
+      <td class="form-widget">#room-reservation.lt_reservation_infofull_# @reservation_info.full_end_date@</td>
     </tr>
   </table>
 
   <h3>#room-reservation.Additional_information#</h3>
-  <table border="0">
-    <tr>
-      <td>#room-reservation.Reserved_by_1#</td>
-      <td>@reservation_info.username@</td>
+  <table cellspacing="2" cellpadding="2" border="0">
+    <tr class="form-element">
+      <td class="form-label">#room-reservation.Reserved_by_1#</td>
+      <td class="form-widget">@reservation_info.username@</td>
     </tr>
-    <tr>
-      <td>#room-reservation.lt_Estimated_No_of_Atten#</td>
-      <td>@reservation_info.attendees@</td>
+    <tr class="form-element">
+      <td class="form-label">#room-reservation.lt_Estimated_No_of_Atten#</td>
+      <td class="form-widget">@reservation_info.attendees@</td>
     </tr>
-    <tr>
-      <td>#room-reservation.lt_Added_Instructions__E#</td>
-      <td>@reservation_info.note@</td>
+    <tr class="form-element">
+      <td class="form-label">#room-reservation.lt_Added_Instructions__E#</td>
+      <td class="form-widget">@reservation_info.note@</td>
     </tr>
-    <tr>
-      <td>#room-reservation.Contact_Person#</td>
-      <td>@reservation_info.contact_person@</td>
+    <tr class="form-element">
+      <td class="form-label">#room-reservation.Contact_Person#</td>
+      <td class="form-widget">@reservation_info.contact_person@</td>
     </tr>
-    <tr>
-      <td>#room-reservation.Contact_Email#</td>
-      <td>@reservation_info.contact_email@</td>
+    <tr class="form-element">
+      <td class="form-label">#room-reservation.Contact_Email#</td>
+      <td class="form-widget">@reservation_info.contact_email@</td>
     </tr>
     <tr>
-      <td>#room-reservation.Contact_Phone#</td>
-      <td>@reservation_info.contact_phone@</td>
+      <td class="form-label">#room-reservation.Contact_Phone#</td>
+      <td class="form-widget">@reservation_info.contact_phone@</td>
     </tr>
-    <tr>
-      <td>#room-reservation.Status_1#</td>
-      <td>@reservation_info.status@</td>
+    <tr class="form-element">
+      <td class="form-label">#room-reservation.Status_1#</td>
+      <td class="form-widget">@reservation_info.status@</td>
     </tr>
   </table>
 
   <h4>#room-reservation.Administrative_details#</h4>
-  <table border="0">
+  <table cellspacing="2" cellpadding="2" border="0">
     <if @reservation_info.status@ in "approved" "rejected">
-      <tr>
-        <td>#room-reservation.lt_Administrators_reason#</td>
-        <td>@reservation_info.reason@</td>
+      <tr class="form-element">
+        <td class="form-label">#room-reservation.lt_Administrators_reason#</td>
+        <td class="form-widget">@reservation_info.reason@</td>
       </tr>
-      <tr>
-        <td>#room-reservation.lt_Date_when_reservation#</td>
-        <td>@reservation_info.full_action_date@</td>
+      <tr class="form-element">
+        <td class="form-label">#room-reservation.lt_Date_when_reservation#</td>
+        <td class="form-widget">@reservation_info.full_action_date@</td>
       </tr>
     </if>
   </table>
Index: openacs-4/contrib/packages/room-reservation/www/room-reservations.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/room-reservation/www/room-reservations.tcl,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/contrib/packages/room-reservation/www/room-reservations.tcl	12 Jul 2004 22:08:43 -0000	1.2.2.1
+++ openacs-4/contrib/packages/room-reservation/www/room-reservations.tcl	10 Jun 2005 22:44:24 -0000	1.2.2.2
@@ -54,6 +54,14 @@
                     ]
     }
     {day} {
+	if { [regexp {(\d\d\d\d)(\d\d)(\d\d)} $date match year month day] } {
+	    set date "$year-$month-$day"
+	} elseif { ![regexp {\d\d\d\d-\d\d-\d\d} $date] } {
+	    ad_return_complaint 1 \
+		"<li>The date must be of the form YYYY-MM-DD."
+	    ad_script_abort
+	}
+
 	set content [room-reservation::calendar::one_day_display -room_id $room_id \
                          -date $date \
                          -prev_nav_template "<a href=\"?view=day&date=\[ns_urlencode \$yesterday]&room_id=$room_id\">&lt;</a>" \
Index: openacs-4/contrib/packages/room-reservation/www/room-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/room-reservation/www/room-view.adp,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/contrib/packages/room-reservation/www/room-view.adp	12 Jul 2004 22:08:43 -0000	1.2.2.1
+++ openacs-4/contrib/packages/room-reservation/www/room-view.adp	10 Jun 2005 22:44:24 -0000	1.2.2.2
@@ -7,34 +7,34 @@
   <li><a href="room-reservations?room_id=@room_info.room_id@&facility_id=@room_info.facility_id@">#room-reservation.View_Reservations#</a></li>
 </ul>
 <p>
-<table border=0>
-  <tr>
-    <td>#room-reservation.Room_Name#</td>
-    <td>@room_info.name@</td>
+<table cellspacing="2" cellpadding="2" border="0">
+  <tr class="form-element">
+    <td class="form-label">#room-reservation.Room_Name#</td>
+    <td class="form-widget">@room_info.name@</td>
   </tr>
-  <tr>
-    <td>#room-reservation.Description_1#</td>
-    <td>@room_info.description@</td>
+  <tr class="form-element">
+    <td class="form-label">#room-reservation.Description_1#</td>
+    <td class="form-widget">@room_info.description@</td>
   </tr>
-  <tr>
-    <td>#room-reservation.Capacity#</td>
-    <td>@room_info.capacity@</td>
+  <tr class="form-element">
+    <td class="form-label">#room-reservation.Capacity#</td>
+    <td class="form-widget">@room_info.capacity@</td>
   </tr>
-  <tr>
-    <td>#room-reservation.Room_Name#</td>
-    <td>@room_info.name@</td>
+  <tr class="form-element">
+    <td class="form-label">#room-reservation.Room_Name#</td>
+    <td class="form-widget">@room_info.name@</td>
   </tr>
-  <tr>
-    <td>#room-reservation.Phone#</td>
-    <td>@room_info.phone@</td>
+  <tr class="form-element">
+    <td class="form-label">#room-reservation.Phone#</td>
+    <td class="form-widget">@room_info.phone@</td>
   </tr>
-  <tr>
-    <td>#room-reservation.Needs_Approval#</td>
-    <td><if @room_info.approval_needed_p@ true>#room-reservation.Yes#</if><else>#room-reservation.No#</else></td>
+  <tr class="form-element">
+    <td class="form-label">#room-reservation.Needs_Approval#</td>
+    <td class="form-widget"><if @room_info.approval_needed_p@ true>#room-reservation.Yes#</if><else>#room-reservation.No#</else></td>
   </tr>
-  <tr>
-    <td>#room-reservation.Enabled#</td>
-    <td><if @room_info.enabled_p@ true>#room-reservation.Yes#</if><else>#room-reservation.No#</else></td>
+  <tr class="form-element">
+    <td class="form-label">#room-reservation.Enabled#</td>
+    <td class="form-widget"><if @room_info.enabled_p@ true>#room-reservation.Yes#</if><else>#room-reservation.No#</else></td>
   </tr>
 </table>
 <p>
Index: openacs-4/contrib/packages/room-reservation/www/rooms.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/room-reservation/www/rooms.adp,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/contrib/packages/room-reservation/www/rooms.adp	12 Jul 2004 22:08:43 -0000	1.2.2.1
+++ openacs-4/contrib/packages/room-reservation/www/rooms.adp	10 Jun 2005 22:44:24 -0000	1.2.2.2
@@ -2,8 +2,6 @@
 <property name="title">@title@</property>
 <property name="context">@title@</property>
 
-<h2>@rooms_pretty_plural@</h2>
-<p>
 <multiple name="rooms">
 <b>@facilities_pretty_name@:</b> @rooms.facility_name@ (@rooms.room_count@ @rooms_pretty_plural@)
 <ul>