Index: openacs-4/packages/chat-portlet/www/chat-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/www/chat-portlet-oracle.xql,v
diff -u -r1.1 -r1.1.8.1
--- openacs-4/packages/chat-portlet/www/chat-portlet-oracle.xql	14 Mar 2006 12:23:38 -0000	1.1
+++ openacs-4/packages/chat-portlet/www/chat-portlet-oracle.xql	19 Aug 2008 22:09:45 -0000	1.1.8.1
@@ -20,6 +20,7 @@
          acs_objects obj
     where rm.room_id = obj.object_id
           and obj.context_id IN ($sep_package_ids)
+          and rm.active_p = 't'
     order by rm.pretty_name
   </querytext>
 </fullquery>
@@ -39,7 +40,7 @@
                    where site_nodes.object_id = obj.context_id) as base_url
     from chat_rooms rm, 
          acs_objects obj
-    where rm.room_id = obj.object_id
+    where rm.room_id = obj.object_id and rm.active_p = 't'
     order by rm.pretty_name
   </querytext>
 </fullquery>
Index: openacs-4/packages/chat-portlet/www/chat-portlet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/www/chat-portlet-postgresql.xql,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/chat-portlet/www/chat-portlet-postgresql.xql	19 Nov 2007 14:12:54 -0000	1.3
+++ openacs-4/packages/chat-portlet/www/chat-portlet-postgresql.xql	19 Aug 2008 22:09:45 -0000	1.3.2.1
@@ -20,6 +20,7 @@
          acs_objects obj
     where rm.room_id = obj.object_id
           and obj.context_id IN ($sep_package_ids)
+          and rm.active_p = 't'
     order by rm.pretty_name
   </querytext>
 </fullquery>
@@ -39,7 +40,7 @@
                    where site_nodes.object_id = obj.context_id) as base_url
     from chat_rooms rm, 
          acs_objects obj
-    where rm.room_id = obj.object_id
+    where rm.room_id = obj.object_id and rm.active_p = 't'
     order by rm.pretty_name
   </querytext>
 </fullquery>
Index: openacs-4/packages/chat-portlet/www/chat-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/www/chat-portlet.adp,v
diff -u -r1.8.2.1 -r1.8.2.2
--- openacs-4/packages/chat-portlet/www/chat-portlet.adp	19 Aug 2008 17:42:59 -0000	1.8.2.1
+++ openacs-4/packages/chat-portlet/www/chat-portlet.adp	19 Aug 2008 22:09:45 -0000	1.8.2.2
@@ -17,40 +17,8 @@
 %>
 
 <if @shaded_p@ false>
-<if @community_id@ gt 0 and @room_create_p@ ne 0>
-<div style="text-align:right">
-<a href="@chat_url@room-edit" title="#chat.Create_a_new_room#" class="button">#chat.Create_a_new_room#</a>
-    </div>
+  <listtemplate name="chat_rooms"></listtemplate>
 </if>
-
-<if @rooms:rowcount@ eq 0 or @num_rooms@ eq 0>
-<p><i>#chat.There_are_no_rooms_available#</i></p>
-</if>
 <else>
-  <table border=0>
-    <multiple name=rooms>
-    <if @rooms.can_see_p@ eq 1>
-      <tr>
-        <td valign=top><a href="@rooms.base_url@room-enter?room_id=@rooms.room_id@&client=@default_mode@">@rooms.pretty_name@</a></td>
-        <td valign=top>
-            [&nbsp;<a href="@rooms.base_url@room-enter?room_id=@rooms.room_id@&client=html">#chat-portlet.html_mode#</a>&nbsp;]
-        </td>
-        <td valign=top>
-        <if @rooms.admin_p@ eq "t">
-          [<a href="@rooms.base_url@room?room_id=@rooms.room_id@">#chat.room_admin#</a>] 
-        </if>
-        <if @rooms.active_p@ ne "t">
-          (NO #chat.Active#)
-        </if>
-        <td valign=top>
-            <I>@rooms.description@</I>
-        </td>
-      </tr>            
-    </if>
-    </multiple>
-  </table>
-</else>
-</if>
-<else>
     #new-portal.when_portlet_shaded#
 </else>
Index: openacs-4/packages/chat-portlet/www/chat-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/www/chat-portlet.tcl,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/chat-portlet/www/chat-portlet.tcl	19 Aug 2008 17:42:59 -0000	1.5.2.1
+++ openacs-4/packages/chat-portlet/www/chat-portlet.tcl	19 Aug 2008 22:09:45 -0000	1.5.2.2
@@ -45,12 +45,27 @@
 } else {
 	set query_name "rooms_list"
 }
-db_multirow -extend { can_see_p } rooms $query_name {} {
+db_multirow -extend { can_see_p room_enter_url } rooms $query_name {} {
 	set can_see_p 0
-	if {($active_p eq "t" && $user_p eq "t") || ($admin_p eq "t")} {
+	if { $user_p || $admin_p } {
 		set can_see_p 1
 		set num_rooms [expr $num_rooms + 1]
 	}   
+    set room_enter_url [export_vars -base "${base_url}room-enter" {room_id {client $default_mode}}]
 }
 
+template::list::create -name chat_rooms -multirow rooms \
+    -no_data [_ chat.There_are_no_rooms_available] \
+    -filters {can_see_p {default_value 1}} \
+    -elements {
+        pretty_name {
+            label "[_ chat.Room_name]"
+            link_url_col room_enter_url
+            link_html {title "[_ chat.Enter_rooms_pretty_name]"}
+        }
+        description {
+            label "[_ chat.Description]"
+        }
+    }
+
 ad_return_template