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 -r1.6
--- openacs-4/packages/chat-portlet/www/chat-portlet.tcl	19 Nov 2007 14:12:54 -0000	1.5
+++ openacs-4/packages/chat-portlet/www/chat-portlet.tcl	9 Nov 2008 23:29:23 -0000	1.6
@@ -29,11 +29,11 @@
 }
 
 array set config $cf
+set shaded_p $config(shaded_p)
 set list_of_package_ids $config(package_id)
 set sep_package_ids [join $list_of_package_ids ", "]
 set chat_url "[ad_conn package_url]/chat/"
 
-set context [list]
 set user_id [ad_conn user_id]
 set community_id [dotlrn_community::get_community_id]
 set room_create_p [ad_permission_p $user_id chat_room_create]
@@ -45,12 +45,35 @@
 } else {
 	set query_name "rooms_list"
 }
-db_multirow -extend { can_see_p } rooms $query_name {} {
+db_multirow -extend { can_see_p room_enter_url room_html_url html_text } 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}}]
+    set room_html_url [export_vars -base "${base_url}room-enter" {room_id {client html}}]
+    set html_text [_ chat.html_client_msg]
 }
 
+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]"
+        }
+        html_mode {
+            label "[_ chat-portlet.html_mode]"
+            link_url_col room_html_url
+            display_col html_text
+            link_html {title "[_ chat.Enter_html_pretty_name]"}
+        }
+    }
+
 ad_return_template