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.3 -r1.4
--- openacs-4/contrib/packages/room-reservation/www/index.tcl	1 Mar 2005 00:01:21 -0000	1.3
+++ openacs-4/contrib/packages/room-reservation/www/index.tcl	18 Oct 2005 23:32:35 -0000	1.4
@@ -10,6 +10,8 @@
 
 } {
     {filter_on ""}
+    {orderby ""}
+    {status:optional}
 } -properties {
     title:onevalue
     context:onevalue
@@ -21,38 +23,59 @@
 
 set admin_p [ad_permission_p $package_id admin]
 
-room-reservation::get_ui_params -facilities_pretty_name facilities_pretty_name -rooms_pretty_name rooms_pretty_name -rooms_pretty_plural rooms_pretty_plural
-
 set title "[_ room-reservation.Room_Reservation]"
 
-switch -exact -- $filter_on {
-    {canceled} {
-	set status "canceled"
+set where_clause "and reserving_user = :user_id"
+
+set actions {
+    "View all Reservations" "room-reservations-all" ""
+    "Reserve / View Rooms" "rooms" ""
+}
+
+if {$admin_p} {
+    append actions {
+        "Administer" "admin" ""
     }
-    {pending} {
-	set status "pending"
-    }
-    {approved} {
-	set status "approved"
-    }
-    {rejected} {
-	set status "rejected"
-    }
-    default {
-	set status ""
-	set filter_on "all"
-    }
 }
 
-set filter_list [list all pending approved rejected canceled]
+template::list::create \
+    -name room_reservations \
+    -multirow room_reservations \
+    -key reservation_id \
+    -actions $actions \
+    -elements {
+        name {
+            label "Name"
+            display_template {
+                <a href="reservation-view?reservation_id=@room_reservations.reservation_id@">@name@</a>
+            }
+        }
+        room_name {
+            label "Room Name"
+        }
+        facility_name {
+            label "Facility Name"
+        }
+        full_end_date {
+            label "Date Reserved"
+        }
+        status {
+            label "Status"
+        }
+    } \
+    -filters {
+        status {
+            label "Status"
+            values {{Pending pending} {Approved approved} {Rejected rejected} {Canceled canceled}}
+            where_clause {
+                status = :status
+            }
+        }
+    } \
+    
+db_multirow -extend {} room_reservations get_reservations {
+} { 
+    
+}
 
-set reservations [room-reservation::rooms::get_reservations_list_of_ns_sets \
-                      -reserving_user $user_id \
-                      -status_list [list $status] \
-		      -package_id $package_id \
-		 ]
 
-template::util::list_of_ns_sets_to_multirow -rows $reservations -var_name personal_reservations
-
-
-ad_return_template