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.2 -r1.1.2.3
--- 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
+++ openacs-4/contrib/packages/room-reservation/catalog/room-reservation.en_US.ISO-8859-1.xml	14 Jul 2004 21:19:48 -0000	1.1.2.3
@@ -35,15 +35,15 @@
   <msg key="lt_Add_a_rooms_pretty_na">Add a %rooms_pretty_name%</msg>
   <msg key="lt_Added_Instructions__E">Added Instructions / Extra Notes:</msg>
   <msg key="lt_Added_Instructions__E_1">Added Instructions / Extra Notes</msg>
-  <msg key="lt_Administrators_reason">Administrator's reason why reservation request was %reservation_info.status%:</msg>
+  <msg key="lt_Administrators_reason">Why reservation was %reservation_info.status%:</msg>
   <msg key="lt_all_reservationsfull_">%all_reservations.full_start_date% to</msg>
   <msg key="lt_by_all_reservationsus">by %all_reservations.username% for &amp;quot;%all_reservations.name%&amp;quot;</msg>
   <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_Date_when_reservation">Date when reservation request was %reservation_info.status%:</msg>
+  <msg key="lt_Date_when_reservation">Date %reservation_info.status%:</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>
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.1 -r1.2.2.2
--- openacs-4/contrib/packages/room-reservation/www/reservation-view.adp	12 Jul 2004 22:08:42 -0000	1.2.2.1
+++ openacs-4/contrib/packages/room-reservation/www/reservation-view.adp	14 Jul 2004 21:19:49 -0000	1.2.2.2
@@ -1,81 +1,80 @@
 <master>
-<property name="title">@title@</property>
-<property name="context">@context@</property>
+  <property name="title">@title@</property>
+  <property name="context">@context@</property>
+  
+  <p />
+  <ul>
+    <if @owner_p@ true and @reservation_info.status@ eq "pending">
+      <li><a href="reservation-edit?reservation_id=@reservation_info.reservation_id@">#room-reservation.Edit#</a></li>
+      <li><a href="reservation-cancel?reservation_id=@reservation_info.reservation_id@">#room-reservation.Cancel#</a></li>
+    </if>
 
-<p>
-<ul>
-<if @owner_p@ true and @reservation_info.status@ eq "pending">
-  <li><a href="reservation-edit?reservation_id=@reservation_info.reservation_id@">#room-reservation.Edit#</a></li>
-  <li><a href="reservation-cancel?reservation_id=@reservation_info.reservation_id@">#room-reservation.Cancel#</a></li>
-</if>
-<if @write_p@ true>
-  <if @owner_p@ false>
-  <li><a href="reservation-edit?reservation_id=@reservation_info.reservation_id@">#room-reservation.Edit#</a></li>
-   </if>
-<if @conflict_p@ false and @reservation_info.status@ in "pending" "rejected" >
-  <li><a href="moderate/reservation-approve?reservation_id=@reservation_info.reservation_id@">#room-reservation.Approve#</a></li>
-</if>
-<if @reservation_info.status@ in "pending" "approved">
-  <li><a href="moderate/reservation-reject?reservation_id=@reservation_info.reservation_id@">#room-reservation.Reject#</a></li>
-</if>
-</if>
-</ul>
+    <if @write_p@ true>
+      <li><a href="reservation-edit?reservation_id=@reservation_info.reservation_id@">#room-reservation.Edit#</a></li>
+      <li><a href="reservation-cancel?reservation_id=@reservation_info.reservation_id@">#room-reservation.Cancel#</a></li>
+      <if @conflict_p@ false and @reservation_info.status@ in "pending" "rejected" >
+        <li><a href="moderate/reservation-approve?reservation_id=@reservation_info.reservation_id@">#room-reservation.Approve#</a></li>
+      </if>
+      <if @reservation_info.status@ in "pending" "approved">
+        <!--Not working: <li><a href="moderate/reservation-reject?reservation_id=@reservation_info.reservation_id@">#room-reservation.Reject#</a></li>-->
+      </if>
+    </if>
+  </ul>
 
-<table border=0>
-  <tr>
-    <td>#room-reservation.lt_facilities_pretty_nam_1#</td>
-    <td>@reservation_info.facility_name@</td>
-  </tr>
-  <tr>
-    <td>#room-reservation.lt_rooms_pretty_name_Nam_1#</td>
-    <td>@reservation_info.room_name@</td>
-  </tr>
-  <tr>
-    <td>#room-reservation.Event_1#</td>
-    <td>@reservation_info.name@</td>
-  </tr>
-  <tr>
-    <td>#room-reservation.lt_Reservation_Date_and_#</td>
-    <td>#room-reservation.lt_reservation_infofull_#<br>@reservation_info.full_end_date@</td>
-  </tr>
-  <tr>
-    <td>#room-reservation.Reserved_by_1#</td>
-    <td>@reservation_info.username@</td>
-  </tr>
-  <tr>
-    <td>#room-reservation.lt_Estimated_No_of_Atten#</td>
-    <td>@reservation_info.attendees@</td>
-  </tr>
-  <tr>
-    <td>#room-reservation.lt_Added_Instructions__E#</td>
-    <td>@reservation_info.note@</td>
-  </tr>
-  <tr>
-    <td>#room-reservation.Contact_Person#</td>
-    <td>@reservation_info.contact_person@</td>
-  </tr>
-  <tr>
-    <td>#room-reservation.Contact_Email#</td>
-    <td>@reservation_info.contact_email@</td>
-  </tr>
-  <tr>
-    <td>#room-reservation.Contact_Phone#</td>
-    <td>@reservation_info.contact_phone@</td>
-  </tr>
-  <tr>
-    <td>#room-reservation.Status_1#</td>
-    <td>@reservation_info.status@</td>
-  </tr>
-<if @reservation_info.status@ in "approved" "rejected">
-  <tr>
-    <td>#room-reservation.lt_Administrators_reason#</td>
-    <td>@reservation_info.reason@</td>
-  </tr>
-  <tr>
-    <td>#room-reservation.lt_Date_when_reservation#</td>
-    <td>@reservation_info.full_action_date@</td>
-  </tr>
-</if>
-</table>
-<p>
-
+  <table border="0">
+    <tr>
+      <th>#room-reservation.lt_facilities_pretty_nam_1#</th>
+      <td>@reservation_info.facility_name@</td>
+    </tr>
+    <tr>
+      <th>#room-reservation.lt_rooms_pretty_name_Nam_1#</th>
+      <td>@reservation_info.room_name@</td>
+    </tr>
+    <tr>
+      <th>#room-reservation.Event_1#</th>
+      <td>@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>
+    <tr>
+      <th>#room-reservation.Reserved_by_1#</th>
+      <td>@reservation_info.username@</td>
+    </tr>
+    <tr>
+      <th>#room-reservation.lt_Estimated_No_of_Atten#</th>
+      <td>@reservation_info.attendees@</td>
+    </tr>
+    <tr>
+      <th>#room-reservation.lt_Added_Instructions__E#</th>
+      <td>@reservation_info.note@</td>
+    </tr>
+    <tr>
+      <th>#room-reservation.Contact_Person#</th>
+      <td>@reservation_info.contact_person@</td>
+    </tr>
+    <tr>
+      <th>#room-reservation.Contact_Email#</th>
+      <td>@reservation_info.contact_email@</td>
+    </tr>
+    <tr>
+      <th>#room-reservation.Contact_Phone#</th>
+      <td>@reservation_info.contact_phone@</td>
+    </tr>
+    <tr>
+      <th>#room-reservation.Status_1#</th>
+      <td>@reservation_info.status@</td>
+    </tr>
+    <if @reservation_info.status@ in "approved" "rejected">
+      <tr>
+        <th>#room-reservation.lt_Administrators_reason#</th>
+        <td>@reservation_info.reason@</td>
+      </tr>
+      <tr>
+        <th>#room-reservation.lt_Date_when_reservation#</th>
+        <td>@reservation_info.full_action_date@</td>
+      </tr>
+    </if>
+  </table>
+  <p />