Index: openacs-4/packages/chat-portlet/chat-portlet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/chat-portlet.info,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/chat-portlet/chat-portlet.info	14 Mar 2006 12:23:37 -0000	1.1
+++ openacs-4/packages/chat-portlet/chat-portlet.info	25 Apr 2006 08:58:24 -0000	1.1.2.1
@@ -7,14 +7,15 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="0.1d" url="http://openacs.org/repository/download/apm/chat-portlet-0.1d.apm">
+    <version name="0.2d" url="http://openacs.org/repository/download/apm/chat-portlet-0.2d.apm">
         <owner url="http://opeancs.org">OpenACS</owner>
-        <release-date>2004-10-10</release-date>
+        <release-date>2006-04-25</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
 
-        <provides url="chat-portlet" version="0.1d"/>
-        <requires url="new-portal" version="0.1a"/>
-        <requires url="chat" version="5.0d2"/>
+        <provides url="chat-portlet" version="0.2d"/>
+        <requires url="dotlrn" version="2.2.0a3"/>
+        <requires url="new-portal" version="2.2.0a1"/>
+        <requires url="chat" version="5.0d6"/>
 
     </version>
 </package>
Index: openacs-4/packages/chat-portlet/catalog/chat-portlet.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/catalog/chat-portlet.en_US.ISO-8859-1.xml,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/chat-portlet/catalog/chat-portlet.en_US.ISO-8859-1.xml	14 Mar 2006 12:23:37 -0000	1.1
+++ openacs-4/packages/chat-portlet/catalog/chat-portlet.en_US.ISO-8859-1.xml	25 Apr 2006 08:58:25 -0000	1.1.2.1
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="chat-portlet" package_version="0.1d" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="chat-portlet" package_version="0.2d" locale="en_US" charset="ISO-8859-1">
 
   <msg key="Add_a_Chat_Item">Add a chat room</msg>
   <msg key="admin_pretty_name">Chat administration</msg>
+  <msg key="html_mode">HTML mode</msg>
   <msg key="Manage_Chat">Manage chat</msg>
   <msg key="pretty_name">Chat</msg>
+  <msg key="Rooms_admin">Rooms Administration</msg>
 </message_catalog>
Index: openacs-4/packages/chat-portlet/catalog/chat-portlet.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/catalog/chat-portlet.es_ES.ISO-8859-1.xml,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/chat-portlet/catalog/chat-portlet.es_ES.ISO-8859-1.xml	14 Mar 2006 12:23:37 -0000	1.1
+++ openacs-4/packages/chat-portlet/catalog/chat-portlet.es_ES.ISO-8859-1.xml	25 Apr 2006 08:58:25 -0000	1.1.2.1
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="chat-portlet" package_version="0.1d" locale="es_ES" charset="ISO-8859-1">
+<message_catalog package_key="chat-portlet" package_version="0.2d" locale="es_ES" charset="ISO-8859-1">
 
   <msg key="Add_a_Chat_Item">A�adir una sala</msg>
   <msg key="admin_pretty_name">Administraci�n de chat</msg>
+  <msg key="html_mode">Modo HTML</msg>
   <msg key="Manage_Chat">Gestionar sala</msg>
   <msg key="pretty_name">Chat</msg>
+  <msg key="Rooms_admin">Administraci�n de salas</msg>
 </message_catalog>
Index: openacs-4/packages/chat-portlet/www/chat-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/www/chat-admin-portlet.adp,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/chat-portlet/www/chat-admin-portlet.adp	14 Mar 2006 12:23:38 -0000	1.1
+++ openacs-4/packages/chat-portlet/www/chat-admin-portlet.adp	25 Apr 2006 08:58:25 -0000	1.1.2.1
@@ -17,6 +17,6 @@
 %>
 
 <ul>
-  <li><a href="@url@room-new">#chat-portlet.Add_a_Chat_Item#</a>
+  <li><a href="@url@">#chat-portlet.Rooms_admin#</a></li>
+  <li><a href="@url@room-edit">#chat-portlet.Add_a_Chat_Item#</a></li>
 </ul>
-
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.1 -r1.1.2.1
--- openacs-4/packages/chat-portlet/www/chat-portlet.adp	14 Mar 2006 12:23:38 -0000	1.1
+++ openacs-4/packages/chat-portlet/www/chat-portlet.adp	25 Apr 2006 08:58:25 -0000	1.1.2.1
@@ -19,29 +19,21 @@
 <property name="context">@context;noquote@</property>
 <property name="title">#chat.Chat_main_page#</property>
 
-<if @room_create_p@ ne 0 and @inside_comm_p@ eq 1>
-[<a href="@chat_url@room-new">#chat.Create_a_new_room#</a>]
+<if @community_id@ gt 0 and @room_create_p@ ne 0>
+[<a href="@chat_url@room-edit">#chat.Create_a_new_room#</a>]
 </if>
 
-<if @rooms:rowcount@ eq 0>
-<p><i>#chat.There_are_no_rooms_available#</i>
+<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>
-    <% set num_rooms 0 %>
     <multiple name=rooms>
-    <%
-    set can_see 0
-    if {($rooms(active_p) eq "t" && $rooms(user_p) eq "t") || ($rooms(admin_p) eq "t")} {
-      set can_see 1
-      set num_rooms [expr $num_rooms + 1]
-    }   
-    %>
-    <if @can_see@ eq 1>
+    <if @rooms.can_see_p@ eq 1>
       <tr>
-        <td valign=top>@rooms.pretty_name@</td>
+        <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">HTML</a>&nbsp;|&nbsp;<a href="@rooms.base_url@room-enter?room_id=@rooms.room_id@&client=java">java</a>&nbsp;]
+            [&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">
@@ -50,21 +42,11 @@
         <if @rooms.active_p@ ne "t">
           (NO #chat.Active#)
         </if>
-        <% 
-        if {$inside_comm_p eq "1"} {
-          set desc [string range $rooms(description) 0 50] 
-        } else {
-          set desc $rooms(keyclub)
-        }
-        %>
         <td valign=top>
-            <I>@desc@</I>
+            <I>@rooms.description@</I>
         </td>
       </tr>            
     </if>
     </multiple>
-    <if @num_rooms@ eq 0>
-    <p><i>#chat.There_are_no_rooms_available#</i>
-    </if>    
   </table>
 </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.1 -r1.1.2.1
--- openacs-4/packages/chat-portlet/www/chat-portlet.tcl	14 Mar 2006 12:23:38 -0000	1.1
+++ openacs-4/packages/chat-portlet/www/chat-portlet.tcl	25 Apr 2006 08:58:25 -0000	1.1.2.1
@@ -30,34 +30,27 @@
 
 array set config $cf
 set list_of_package_ids $config(package_id)
-set user_id [ad_conn user_id]
 set sep_package_ids [join $list_of_package_ids ", "]
+set chat_url "[ad_conn package_url]/chat/"
 
-if {[llength $list_of_package_ids] == 1} { 
-	set single_p "t"
-} else {
-	set single_p "f"
-}
-
 set context [list]
-set shaded_p $config(shaded_p)
-set chat_url "[ad_conn package_url]/chat/"
+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]
-set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0]
-if {[exists_and_not_null community_id]} {
-    #We are in portal for one class or community
-    set inside_comm_p 1
-    db_multirow rooms rooms_list {}
+set default_mode [ad_parameter DefaultClient chat "ajax"]
+set num_rooms 0
+
+if { $community_id eq 0 } {
+	set query_name "rooms_list_all"
 } else {
-    #We are in user portal
-    set inside_comm_p 0
-    db_multirow -extend { keyclub } rooms rooms_list_all {} {
-		set keyclub [dotlrn_community::get_community_description -community_id [dotlrn_community::get_community_id_from_url -url $base_url]]
-		if {$keyclub eq ""} {
-			set keyclub $description
-		}
-    }
+	set query_name "rooms_list"
 }
-ad_return_template
+db_multirow -extend { can_see_p } rooms $query_name {} {
+	set can_see_p 0
+	if {($active_p eq "t" && $user_p eq "t") || ($admin_p eq "t")} {
+		set can_see_p 1
+		set num_rooms [expr $num_rooms + 1]
+	}   
+}
 
+ad_return_template