Index: openacs-4/packages/chat/catalog/chat.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/catalog/chat.en_US.ISO-8859-1.xml,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/chat/catalog/chat.en_US.ISO-8859-1.xml	10 Dec 2007 09:12:29 -0000	1.5
+++ openacs-4/packages/chat/catalog/chat.en_US.ISO-8859-1.xml	19 Aug 2008 21:06:25 -0000	1.5.2.1
@@ -54,6 +54,7 @@
   <msg key="Edit">Edit</msg>
   <msg key="Edit_room">Edit Room</msg>
   <msg key="Edit_transcript">Edit transcript</msg>
+  <msg key="Enter_rooms_pretty_name">Enter chat room \&quot;%pretty_name%\&quot;</msg>
   <msg key="exit_msg">exit chat room</msg>
   <msg key="Extreme_Actions">Extreme Actions</msg>
   <msg key="from">from</msg>
@@ -87,6 +88,7 @@
   <msg key="revoke">revoke</msg>
   <msg key="Revoke_moderator">Revoke moderator</msg>
   <msg key="Revoke_user">Revoke user</msg>
+  <msg key="Room_active">Room active</msg>
   <msg key="room_admin">Admin</msg>
   <msg key="Room_deactivate">Deactive Room</msg>
   <msg key="Room_Information">Room Information</msg>
Index: openacs-4/packages/chat/lib/transcript-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/lib/Attic/transcript-view.adp,v
diff -u -r1.2 -r1.2.4.1
--- openacs-4/packages/chat/lib/transcript-view.adp	24 Jun 2006 14:23:41 -0000	1.2
+++ openacs-4/packages/chat/lib/transcript-view.adp	19 Aug 2008 21:06:25 -0000	1.2.4.1
@@ -1,5 +1,5 @@
 <if @edit_p@ eq 1>
-<a class="button" href="transcript-edit?transcript_id=@transcript_id@&room_id=@room_id@">#chat.Edit#</a>
+<p><a class="button" href="@edit_url@">#chat.Edit#</a></p>
 </if>
 
 <table border="0" cellpadding="2" cellspacing="2">
Index: openacs-4/packages/chat/lib/transcript-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/lib/transcript-view.tcl,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/chat/lib/transcript-view.tcl	19 Nov 2007 01:14:15 -0000	1.4
+++ openacs-4/packages/chat/lib/transcript-view.tcl	19 Aug 2008 21:06:25 -0000	1.4.2.1
@@ -9,3 +9,5 @@
 }
 
 set edit_p [permission::permission_p -object_id $room_id -privilege "chat_transcript_edit"]
+
+set edit_url [export_vars -base "transcript-edit" {transcript_id room_id}]
Index: openacs-4/packages/chat/lib/transcripts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/lib/transcripts.tcl,v
diff -u -r1.2 -r1.2.4.1
--- openacs-4/packages/chat/lib/transcripts.tcl	24 Jun 2006 14:23:41 -0000	1.2
+++ openacs-4/packages/chat/lib/transcripts.tcl	19 Aug 2008 21:06:25 -0000	1.2.4.1
@@ -3,20 +3,25 @@
 set transcript_view_p [permission::permission_p -object_id $room_id -privilege chat_transcript_view]
 
 # List available chat transcript
-db_multirow -extend { creation_date_pretty viewer } chat_transcripts list_transcripts *SQL* {
+db_multirow -extend { creation_date_pretty viewer transcript_url} chat_transcripts list_transcripts *SQL* {
     set creation_date_pretty [lc_time_fmt $creation_date "%q %X"]
+    set transcript_url [export_vars -base "chat-transcript" {room_id transcript_id}]
 }
 
+set actions [list [_ chat.Create_transcript] [export_vars -base "transcript-new" {room_id}]]
+
 list::create \
     -name "chat_transcripts" \
     -multirow "chat_transcripts" \
     -key transcript_id \
     -pass_properties { transcript_delete_p room_id } \
     -row_pretty_plural [_ chat.Transcripts] \
+    -actions $actions \
     -elements {
         pretty_name {
             label "#chat.Name#"
-            link_url_eval {chat-transcript?room_id=$room_id&transcript_id=$transcript_id}
+            link_url_col transcript_url
+            link_html {title "[_ chat.View_transcript]"}
         }
         creation_date_pretty {
             label "#chat.creation_date#"
@@ -26,8 +31,8 @@
             html { align "center" }
             display_template {
                 <if @transcript_delete_p@ eq "1">
-                <a href="transcript-delete?transcript_id=@chat_transcripts.transcript_id@&room_id=@room_id@">
-                <img src="/shared/images/Delete16.gif" border="0">
+                <a href="transcript-delete?transcript_id=@chat_transcripts.transcript_id@&amp;room_id=@room_id@">
+                <img src="/shared/images/Delete16.gif" alt="#chat.Delete_transcript#">
                 </a>
                 </if>
             }
Index: openacs-4/packages/chat/tcl/chat-ajax-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/chat-ajax-procs.tcl,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/chat/tcl/chat-ajax-procs.tcl	19 Nov 2007 01:14:16 -0000	1.8
+++ openacs-4/packages/chat/tcl/chat-ajax-procs.tcl	19 Aug 2008 21:06:25 -0000	1.8.2.1
@@ -29,33 +29,41 @@
 
   Chat proc login {-chat_id -package_id} {
     auth::require_login
-    if {![info exists package_id]} {set package_id [ad_conn package_id] }
-    if {![info exists chat_id]}    {set chat_id $package_id }
+      if {![info exists package_id]} {
+          set package_id [ad_conn package_id] 
+      }
+      if {![info exists chat_id]} {
+          set chat_id $package_id 
+      }
 
-    set context id=$chat_id&s=[ad_conn session_id].[clock seconds]
-    set jspath packages/chat/www/ajax/chat.js
-    if { ![file exists [acs_root_dir]/$jspath] } {
-      return -code error "File [acs_root_dir]/$jspath does not exist"
-    }
-    set file [open [acs_root_dir]/$jspath]; set js [read $file]; close $file
-    set path      [site_node::get_url_from_object_id -object_id $package_id]
-    set login_url ${path}ajax/chat?m=login&$context
-    set send_url  ${path}ajax/chat?m=add_msg&$context&msg=
-    set users_url ${path}ajax/chat?m=get_users&$context
-    return "\
-      <script type='text/javascript' language='javascript'>
+      set context "id=$chat_id&amp;s=[ad_conn session_id].[clock seconds]"
+      set jspath "packages/chat/www/ajax/chat.js"
+
+      if { ![file exists [acs_root_dir]/$jspath] } {
+          return -code error "File [acs_root_dir]/$jspath does not exist"
+      }
+      set file [open [acs_root_dir]/$jspath]; set js [read $file]; close $file
+
+      set path      [site_node::get_url_from_object_id -object_id $package_id]
+      set login_url "${path}ajax/chat?m=login&amp;$context"
+      set send_url  "${path}ajax/chat?m=add_msg&amp;$context&amp;msg="
+      set users_url "${path}ajax/chat?m=get_users&amp;$context"
+      return "\
+      <script type='text/javascript'>
       $js
       // register the data sources (for sending messages, receiving updates)
-      var pushMessage = registerDataConnection(pushReceiver, '$path/ajax/chat?m=get_new&$context', false);
-      var pullUpdates = registerDataConnection(updateReceiver, '$path/ajax/chat?m=get_updates&$context', true);
+      var pushMessage = registerDataConnection(pushReceiver, '$path/ajax/chat?m=get_new&amp;$context', false);
+      var pullUpdates = registerDataConnection(updateReceiver, '$path/ajax/chat?m=get_updates&amp;$context', true);
       // register an update function to refresh the data sources every 5 seconds
       var updateInterval = setInterval(updateDataConnections,5000);
       </script>
       <form id='ichat_form' name='ichat_form' action='#' onsubmit='pushMessage.chatSendMsg(\"$send_url\"); return false;'>
       <iframe name='ichat' id='ichat' frameborder='0' src='$login_url'
-          style='width:70%; border:1px solid black; margin-right:15px;' height='257'></iframe>
+          style='width:70%; border:1px solid black; margin-right:15px;' height='257'>
+      </iframe>
       <iframe name='ichat-users' id='ichat-users' frameborder='0' src='$users_url'
-          style='width:25%; border:1px solid black;' height='257'></iframe>
+          style='width:25%; border:1px solid black;' height='257'>
+      </iframe>
       <div style='margin-top:10px;'>
       #chat.message# <input tabindex='1' type='text' size='80' name='msg' id='chatMsg'>
       <input type='submit' value='#chat.Send_Refresh#'>
Index: openacs-4/packages/chat/www/ajax-chat-script.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/ajax-chat-script.adp,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/chat/www/ajax-chat-script.adp	19 Nov 2007 01:14:16 -0000	1.4
+++ openacs-4/packages/chat/www/ajax-chat-script.adp	19 Aug 2008 21:06:25 -0000	1.4.2.1
@@ -1,13 +1,12 @@
 <master>
-<property name="context">@context_bar;noquote@</property>
-<property name="title">@room_name;noquote@</property>
+<property name="context">@context;noquote@</property>
+<property name="&doc">doc</property>
 <property name="focus">ichat_form.msg</property>
 
 <p>
 <a href="room-exit?room_id=@room_id@" class="button" title="#chat.exit_msg#">#chat.Log_off#</a> 
 <a href="chat-transcript?room_id=@room_id@" class="button" title="#chat.transcription_msg#">#chat.Transcript#</a>
-<a href="room-enter?room_id=@room_id@&client=html" class="button" title="#chat.html_client_msg#">#chat.Hml#</a>
+<a href="@html_room_url@" class="button" title="#chat.html_client_msg#">#chat.Hml#</a>
 </p>
 
 @chat_frame;noquote@
-
Index: openacs-4/packages/chat/www/ajax-chat-script.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/ajax-chat-script.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/chat/www/ajax-chat-script.tcl	19 Nov 2007 01:14:16 -0000	1.6
+++ openacs-4/packages/chat/www/ajax-chat-script.tcl	19 Aug 2008 21:06:25 -0000	1.6.2.1
@@ -8,5 +8,7 @@
   msg:optional
 }
 
+set html_room_url [export_vars -base "room-enter" {room_id {client html}}]
+
 set chat_frame [ ::chat::Chat login -chat_id $room_id]
 
Index: openacs-4/packages/chat/www/chat-transcript.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/chat-transcript.adp,v
diff -u -r1.2 -r1.2.4.1
--- openacs-4/packages/chat/www/chat-transcript.adp	24 Jun 2006 14:23:41 -0000	1.2
+++ openacs-4/packages/chat/www/chat-transcript.adp	19 Aug 2008 21:06:25 -0000	1.2.4.1
@@ -1,22 +1,7 @@
 <master>
-<property name="context">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 <property name="title">#chat.transcript_of_room# "@room_name;noquote@"</property>
 
-<style type='text/css'>
-#messages { 
-    border: 1px dotted black; 
-    padding: 5px;
-    margin-top:10px; 
-    font-size: 12px; 
-    color: #666666; 
-    font-family: Trebuchet MS, Lucida Grande, Lucida Sans Unicode, Arial, sans-serif; 
-}
-#messages .timestamp {vertical-align: top; color: #CCCCCC; }
-#messages .user {text-align: right; vertical-align: top; font-weight:bold; }
-#messages .message {vertical-align: top}
-#messages .line {margin:0px;}
-</style>
-
 <if @transcript_id@ eq 0>
 <include src="/packages/chat/lib/current-messages" room_id=@room_id@>
 </if>
Index: openacs-4/packages/chat/www/chat-transcript.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/chat-transcript.tcl,v
diff -u -r1.2 -r1.2.4.1
--- openacs-4/packages/chat/www/chat-transcript.tcl	24 Jun 2006 14:23:41 -0000	1.2
+++ openacs-4/packages/chat/www/chat-transcript.tcl	19 Aug 2008 21:06:25 -0000	1.2.4.1
@@ -6,7 +6,7 @@
 } 
 
 set page_title "[_ chat.Transcript]"   
-set context_bar "$page_title"
+set context [list $page_title]
 set user_id [ad_conn user_id]
 
 set read_p  [permission::permission_p -object_id $room_id -privilege "chat_read"]
@@ -23,4 +23,17 @@
     ad_return_complaint 1 "[_ chat.Room_not_found]"
 }
 
-ad_return_template
\ No newline at end of file
+template::head::add_style -style "#messages { 
+    border: 1px dotted black; 
+    padding: 5px;
+    margin-top:10px; 
+    font-size: 12px; 
+    color: #666666; 
+    font-family: Trebuchet MS, Lucida Grande, Lucida Sans Unicode, Arial, sans-serif; 
+}
+#messages .timestamp {vertical-align: top; color: #CCCCCC; }
+#messages .user {text-align: right; vertical-align: top; font-weight:bold; }
+#messages .message {vertical-align: top}
+#messages .line {margin:0px;}"
+
+ad_return_template
Index: openacs-4/packages/chat/www/chat.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/chat.tcl,v
diff -u -r1.12 -r1.12.2.1
--- openacs-4/packages/chat/www/chat.tcl	19 Nov 2007 01:14:16 -0000	1.12
+++ openacs-4/packages/chat/www/chat.tcl	19 Aug 2008 21:06:25 -0000	1.12.2.1
@@ -11,7 +11,7 @@
   {client "ajax"}
     {message:html ""}
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     user_id:onevalue
     user_name:onevalue
     message:onevalue
@@ -29,7 +29,11 @@
     ad_return_complaint 1 "[_ chat.Room_not_found]"
 }
 
-set context_bar $room_name
+set doc(title) $room_name
+set doc(type) {<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">}
+
+set context [list $doc(title)]
+
 auth::require_login
 set user_id [ad_conn user_id]
 set read_p [permission::permission_p -object_id $room_id -privilege "chat_read"]
Index: openacs-4/packages/chat/www/html-chat.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/html-chat.adp,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/chat/www/html-chat.adp	19 Nov 2007 01:14:16 -0000	1.8
+++ openacs-4/packages/chat/www/html-chat.adp	19 Aug 2008 21:06:26 -0000	1.8.2.1
@@ -1,22 +1,11 @@
 <master>
-<property name="context">@context_bar;noquote@</property>
-<property name="title">@room_name;noquote@</property>
+<property name="context">@context;noquote@</property>
+<property name="&doc">doc</property>
 
-<style type='text/css'>
-#messages { margin-right:15px; float:left; width:70%; height:250px; overflow:auto; border:1px solid black; padding:5px; font-size: 12px; color: #666666; font-family: Trebuchet MS, Lucida Grande, Lucida Sans Unicode, Arial, sans-serif; }
-#messages .timestamp {vertical-align: top; color: #CCCCCC; }
-#messages .user {margin: 0px 5px; text-align: right; vertical-align: top; font-weight:bold;}
-#messages .message {vertical-align: top;}
-#messages .line {margin:0px;}
-#users { float:right; width:25%; height:250px; border:1px solid black; padding:5px; font-size: 12px; color: #666666; font-family: Trebuchet MS, Lucida Grande, Lucida Sans Unicode, Arial, sans-serif; }
-#users .user {text-align: left; vertical-align: top; font-weight:bold; }
-#users .timestamp {text-align: right; vertical-align: top; }
-</style>
-
 <p>
 <a href="room-exit?room_id=@room_id@" class=button title="#chat.exit_msg#">#chat.Log_off#</a>
 <a href="chat-transcript?room_id=@room_id@" class=button title="#chat.transcription_msg#" >#chat.Transcript#</a>
-<a href="room-enter?room_id=@room_id@&client=@richclient.short@#xj220" class=button title="@richclient.msg@" >@richclient.title@</a>
+<a href="@room_enter_url@" class=button title="@richclient.msg@" >@richclient.title@</a>
 </p>
 
 <div id='messages'>
Index: openacs-4/packages/chat/www/html-chat.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/html-chat.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/chat/www/html-chat.tcl	19 Nov 2007 01:14:16 -0000	1.3
+++ openacs-4/packages/chat/www/html-chat.tcl	19 Aug 2008 21:06:26 -0000	1.3.2.1
@@ -31,4 +31,16 @@
 set html_chat [c1 get_all]
 set html_users [c1 get_users]
 
-ad_return_template
\ No newline at end of file
+template::head::add_style -style "#messages { margin-right:15px; float:left; width:70%; height:250px; overflow:auto; border:1px solid black; padding:5px; font-size: 12px; color: #666666; font-family: Trebuchet MS, Lucida Grande, Lucida Sans Unicode, Arial, sans-serif; }
+#messages .timestamp {vertical-align: top; color: #CCCCCC; }
+#messages .user {margin: 0px 5px; text-align: right; vertical-align: top; font-weight:bold;}
+#messages .message {vertical-align: top;}
+#messages .line {margin:0px;}
+#users { float:right; width:25%; height:250px; border:1px solid black; padding:5px; font-size: 12px; color: #666666; font-family: Trebuchet MS, Lucida Grande, Lucida Sans Unicode, Arial, sans-serif; }
+#users .user {text-align: left; vertical-align: top; font-weight:bold; }
+#users .timestamp {text-align: right; vertical-align: top; }
+"
+
+set room_enter_url [export_vars -base "room-enter" {room_id {client $richclient(short)}}]
+
+ad_return_template
Index: openacs-4/packages/chat/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/index.adp,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/chat/www/index.adp	19 Nov 2007 01:14:16 -0000	1.9
+++ openacs-4/packages/chat/www/index.adp	19 Aug 2008 21:06:26 -0000	1.9.2.1
@@ -6,20 +6,12 @@
      @cvs-id $Id$
 -->
 <master>
-<property name="context">#chat.Chat_main_page#</property>
-<property name="title">#chat.Chat_main_page#</property>
+<property name="&doc">doc</property>
 
 <if @warning@ not nil>
 <div style="border: 1px solid red; padding: 5px; margin: 10px;">
     @warning;noquote@
 </div>
 </if>
 
-<if @rooms:rowcount@ eq 0>
-<p><i>#chat.There_are_no_rooms_available#</i></p>
-<if @room_create_p@ eq 1><p><a class="button" href="room-edit">#chat.Create_a_new_room#</a></p></if>
-</if>
-<else>
 <listtemplate name="rooms"></listtemplate>
-</else>
-
Index: openacs-4/packages/chat/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/index.tcl,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/chat/www/index.tcl	19 Nov 2007 01:14:16 -0000	1.8
+++ openacs-4/packages/chat/www/index.tcl	19 Aug 2008 21:06:26 -0000	1.8.2.1
@@ -29,10 +29,15 @@
     lappend actions "#chat.Create_a_new_room#" room-edit "#chat.Create_a_new_room#"
 }
 
-db_multirow -extend { active_users last_activity } rooms rooms_list {} {
-  set room [::chat::Chat create new -volatile -chat_id $room_id]
-  set active_users [$room nr_active_users]
-  set last_activity [$room last_activity]
+db_multirow -extend { active_users last_activity room_url} rooms rooms_list {} {
+
+    set room [::chat::Chat create new -volatile -chat_id $room_id]
+    set active_users [$room nr_active_users]
+    set last_activity [$room last_activity]
+
+    if { $active_p } {
+        set room_url [export_vars -base "room-enter" {room_id {client $default_client}}]
+    }
 }
 
 list::create \
@@ -42,36 +47,28 @@
     -pass_properties {room_create_p} \
     -actions $actions \
     -row_pretty_plural [_ chat.rooms] \
+    -no_data [_ chat.There_are_no_rooms_available] \
     -elements {
         active {
             label "#chat.Active#"
-            html { align "center" }
+            html { style "text-align: center" }
             display_template {
                 <if @rooms.active_p@ eq t>
-                <div style="padding-top:5px;">
-                <img src="/resources/chat/active.png">
-                </div>
+                <img src="/resources/chat/active.png" alt="#chat.Room_active#">
                 </if>
                 <else>
-                <div style="padding-top:5px;">                
-                <img src="/resources/chat/inactive.png">
-                </div>
+                <img src="/resources/chat/inactive.png" alt="#chat.Room_no_active#">
                 </else>
             }
         }
         pretty_name {
             label "#chat.Room_name#"
-            html { width 400px }
-            display_template {
-                <if @rooms.active_p@ eq t>
-                <a href="room-enter?room_id=@rooms.room_id@&client=$default_client">@rooms.pretty_name@</a>&nbsp;\[<a href="room-enter?room_id=@rooms.room_id@&client=html">#chat.HTML_chat#</a>\]
-                </if>
-                <else>
-                @rooms.pretty_name@
-                </else>
-                <div style="float:left">@rooms.description@</div>                
-            }
+            link_url_col room_url
+            link_html {title "[_ chat.Enter_rooms_pretty_name]"}
         }
+        description {
+            label "[_ chat.Description]"
+        }
         active_users {
             label "#chat.active_users#"
             html { style "text-align:center;" }
@@ -91,4 +88,8 @@
         }
     }
 
+# set page properties
+
+set doc(title) [_ chat.Chat_main_page]
+
 ad_return_template
Index: openacs-4/packages/chat/www/message-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/message-delete.adp,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/chat/www/message-delete.adp	19 Nov 2007 01:14:16 -0000	1.8
+++ openacs-4/packages/chat/www/message-delete.adp	19 Aug 2008 21:06:26 -0000	1.8.2.1
@@ -10,7 +10,7 @@
 <property name="title">#chat.Confirm_message_delete#</property>
 
 <form method="post" action="message-delete-2">
-<input type=hidden name=room_id value=@room_id@>
-#chat.Are_you_sure_you_want_to_delete# @message_count@ #chat.messages_in# @pretty_name@?
-<p><input type=submit value=#acs-kernel.common_Yes#>
+<div><input type=hidden name=room_id value=@room_id@></div>
+<p>#chat.Are_you_sure_you_want_to_delete# @message_count@ #chat.messages_in# @pretty_name@?</p>
+<div><input type=submit value=#acs-kernel.common_Yes#></div>
 </form>
Index: openacs-4/packages/chat/www/room-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-delete.adp,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/chat/www/room-delete.adp	19 Nov 2007 01:14:16 -0000	1.7
+++ openacs-4/packages/chat/www/room-delete.adp	19 Aug 2008 21:06:26 -0000	1.7.2.1
@@ -10,9 +10,9 @@
 <property name="title">#chat.Confirm_room_delete#</property>
 
 <form method="post" action="room-delete-2">	
-<input type=hidden name=room_id value=@room_id@>
-#chat.Are_you_sure_you_want_to_delete# @pretty_name@?
-<p><input type=submit value=#acs-kernel.common_Yes#>
+<div><input type=hidden name=room_id value=@room_id@></div>
+<p>#chat.Are_you_sure_you_want_to_delete# @pretty_name@?</p>
+<div><input type=submit value=#acs-kernel.common_Yes#></div>
 </form>
 
 
Index: openacs-4/packages/chat/www/room-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-edit.adp,v
diff -u -r1.2 -r1.2.4.1
--- openacs-4/packages/chat/www/room-edit.adp	24 Jun 2006 14:23:42 -0000	1.2
+++ openacs-4/packages/chat/www/room-edit.adp	19 Aug 2008 21:06:26 -0000	1.2.4.1
@@ -1,4 +1,5 @@
 <master>
 <property name="title">@title@</property>
+<property name="context">@context;noquote@</property>
 
 <formtemplate id="edit-room"></formtemplate>
Index: openacs-4/packages/chat/www/room-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-edit.tcl,v
diff -u -r1.10 -r1.10.2.1
--- openacs-4/packages/chat/www/room-edit.tcl	14 Mar 2008 12:24:30 -0000	1.10
+++ openacs-4/packages/chat/www/room-edit.tcl	19 Aug 2008 21:06:26 -0000	1.10.2.1
@@ -13,9 +13,11 @@
 if { ![info exists room_id] } {
     set title "[_ chat.Create_a_new_room]"
 } else {
-    set title "[_ chat.Edit_room] \"[chat_room_name $room_id]\""
+    set title "[_ chat.Edit_room]"
 }
 
+set context [list $title]
+
 ad_form -name "edit-room" -edit_buttons [list [list [_ chat.Update_room] next]] -has_edit 1 -form {
     {room_id:key}    
     {moderated_p:boolean(hidden)
Index: openacs-4/packages/chat/www/room.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room.adp,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/chat/www/room.adp	19 Nov 2007 01:14:16 -0000	1.8
+++ openacs-4/packages/chat/www/room.adp	19 Aug 2008 21:06:26 -0000	1.8.2.1
@@ -9,7 +9,7 @@
 <property name="context">@context_bar;noquote@</property>
 <property name="title">#chat.Room_Information#</property>
 
-<h4>#chat.Room_Information#</h4>
+<h1>#chat.Room_Information#</h1>
 <if @room_view_p@ eq "1">
 <table border="0" cellpadding="2" cellspacing="2">
     <tr class="form-element">
@@ -42,28 +42,22 @@
     </tr>
 </table>
 <if @room_edit_p@ eq "1">
-<p>
-<a class="button" href="room-edit?room_id=@room_id@">#chat.Edit#</a>
-<a class="button" href="/permissions/one?object_id=@room_id@">#acs-kernel.common_Permissions#</a>
+  <a class="button" href="room-edit?room_id=@room_id@">#chat.Edit#</a>
+  <a class="button" href="/permissions/one?object_id=@room_id@">#acs-kernel.common_Permissions#</a>
 </if>
 <if @room_delete_p@ eq "1">
-<a class="button" href="message-delete?room_id=@room_id@">#chat.Delete_all_messages_in_the_room#</a>
-<a class="button" href="room-delete?room_id=@room_id@">#chat.Delete_room#</a>
+  <a class="button" href="message-delete?room_id=@room_id@">#chat.Delete_all_messages_in_the_room#</a>
+  <a class="button" href="room-delete?room_id=@room_id@">#chat.Delete_room#</a>
 </if>
 </if>
 <else>
-<p><i>#chat.No_information_available#.
+  <p><i>#chat.No_information_available#</i></p>
 </else>
 
-<p><b>#chat.Users_ban#</b></p>
+<h2>#chat.Users_ban#</h2>
 <listtemplate name="banned_users"></listtemplate>
-<if @user_ban_p@ eq "1">
-<p><a class="button" href="search?room_id=@room_id@&type=ban">#chat.Ban_user#</a>      
-</if>
    
-<p><b>#chat.Transcripts#</b>
-<include src="/packages/chat/lib/transcripts" room_id=@room_id@>
+<h2>#chat.Transcripts#</h2>
 <if @transcript_create_p@ eq "1">
-<p><a class="button" href="transcript-new?room_id=@room_id@">#chat.Create_transcript#</a>
+<include src="/packages/chat/lib/transcripts" room_id=@room_id@>
 </if>
-
Index: openacs-4/packages/chat/www/room.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room.tcl,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/chat/www/room.tcl	19 Nov 2007 01:14:16 -0000	1.7
+++ openacs-4/packages/chat/www/room.tcl	19 Aug 2008 21:06:26 -0000	1.7.2.1
@@ -60,14 +60,25 @@
 set message_count [db_string message_count "select count(*) from chat_msgs where room_id = :room_id" -default 0]
 
 # List user ban from chat
-db_multirow banned_users list_user_ban {}
+db_multirow -extend {unban_url unban_text} banned_users list_user_ban {} {
+    if { $user_unban_p } {
+        set unban_url [export_vars -base "user-unban" {room_id party_id}]
+        set unban_text [_ chat.Unban_user]
+    }
+}
 
+set actions ""
+if { $user_ban_p } {
+    set actions [list [_ chat.Ban_user] [export_vars -base "search" {room_id {type ban}}]]
+}
+
 list::create \
     -name "banned_users" \
     -multirow "banned_users" \
     -key party_id \
     -pass_properties { user_unban_p room_id } \
     -row_pretty_plural [_ chat.banned_users] \
+    -actions $actions \
     -elements {
         name {
             label "#chat.Name#"
@@ -77,16 +88,11 @@
         }
         actions {
             label "#chat.actions#"
-            html { align "center" }
-            display_template {
-                <if @user_unban_p@ eq "1">
-                <a href="user-unban?room_id=@room_id@&party_id=@banned_users.party_id@">
-                <img src="/shared/images/Delete16.gif" border="0">
-                </a>
-                </if>
-            }
+            html { style "text-align:center" }
+            link_url_col unban_url
+            display_col unban_text
+            link_html {class "button"}
         }
     }
 
 ad_return_template
-
Index: openacs-4/packages/chat/www/search-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/search-2.adp,v
diff -u -r1.1 -r1.1.8.1
--- openacs-4/packages/chat/www/search-2.adp	14 Mar 2006 12:16:09 -0000	1.1
+++ openacs-4/packages/chat/www/search-2.adp	19 Aug 2008 21:06:26 -0000	1.1.8.1
@@ -2,28 +2,32 @@
 <property name="title">#chat.Add_user_to_room#</property>
 <property name="context">@context;noquote@</property>
 
-<if @search_type@ eq "keyword">
-                                   
- #dotlrn.lt_The_results_of_your_s#<BR> 
+<p>
+  <if @search_type@ eq "keyword">
+   #dotlrn.lt_The_results_of_your_s#<BR> 
    (#chat.What_search# @SQL_LIMIT@)
- </if><else>
- <if @search_type@ eq "email">
-  for email "@email@"
- </if><else>
-  for last name "@last_name@"
-</else></else>
+  </if>
+  <else>
+    <if @search_type@ eq "email">
+      for email "@email@"
+    </if>
+   <else>
+     for last name "@last_name@"
+   </else>
+  </else>
+</p>
 
 <ul>
 <multiple name="user_search">
   <li>
-    <a href="search-3?room_id=@room_id@&type=@type@&party_id=@user_search.user_id@">
+    <a href="@user_search.url@">
        @user_search.first_names@ @user_search.last_name@ (@user_search.email@)
     </a>
   </li>
 </multiple>
 
 <if @user_search:rowcount@ eq 0>
-  <li>No users found.
+  <li>No users found.</li>
 </if>
 
 </ul>
Index: openacs-4/packages/chat/www/search-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/search-2.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/chat/www/search-2.tcl	19 Nov 2007 01:14:16 -0000	1.3
+++ openacs-4/packages/chat/www/search-2.tcl	19 Aug 2008 21:06:26 -0000	1.3.2.1
@@ -25,7 +25,7 @@
 set exception_text ""
 set SQL_LIMIT 20
 
-set context [list [list "./" "Users"] "Search"]
+set context [list "Search"]
 
 if [info exists keyword] {
     # this is an administrator 
@@ -122,6 +122,7 @@
     set user_search:[set rowcount](email) $email
     set user_search:[set rowcount](export_vars) [export_url_vars user_id_from_search first_names_from_search last_name_from_search email_from_search]
     set user_search:[set rowcount](member_state) $member_state
+    set user_search:[set rowcount](url) [export_vars -base "search-3" {room_id type user_id}]
 
     
     if { $member_state != "approved" } {
Index: openacs-4/packages/chat/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/search.adp,v
diff -u -r1.2.4.1 -r1.2.4.2
--- openacs-4/packages/chat/www/search.adp	29 Jul 2008 21:16:24 -0000	1.2.4.1
+++ openacs-4/packages/chat/www/search.adp	19 Aug 2008 21:06:26 -0000	1.2.4.2
@@ -3,10 +3,14 @@
 <property name="context">@context;noquote@</property>
 
 <FORM METHOD=get ACTION=search-2>
+  <div>
   <input type="hidden" name="room_id" value="@room_id@">
   <input type="hidden" name="target" value="one">
   <input type="hidden" name="type" value="@type@">
-  <input type="text" size="15" name="keyword">
-  <input type="submit" value="#acs-subsite.Search_For_Exist_User#">
+  </div>
+  <p>
+    <input type="text" size="15" name="keyword">
+    <input type="submit" value="#acs-subsite.Search_For_Exist_User#">
+  </p>
 </FORM>
 
Index: openacs-4/packages/chat/www/transcript-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-delete.adp,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/chat/www/transcript-delete.adp	19 Nov 2007 01:14:16 -0000	1.7
+++ openacs-4/packages/chat/www/transcript-delete.adp	19 Aug 2008 21:06:26 -0000	1.7.2.1
@@ -6,12 +6,14 @@
     @cvs-id $Id$
 -->
 <master>
-<property name="context">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 <property name="title">#chat.Confirm_chat_transcript_delete#</property>
 
 <form method="post" action="transcript-delete-2">
+<div>
 <input type="hidden" name="transcript_id" value="@transcript_id@">
 <input type="hidden" name="room_id" value="@room_id@">
-#chat.Are_you_sure_you_want_to_delete# <b>Replace with transcript name</b>?
-<p><input type="submit" value="#acs-kernel.common_Yes#">
+</div>
+<p>#chat.Are_you_sure_you_want_to_delete# <b>Replace with transcript name</b>?</p>
+<p><input type="submit" value="#acs-kernel.common_Yes#"></p>
 </form>
Index: openacs-4/packages/chat/www/transcript-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-delete.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/chat/www/transcript-delete.tcl	19 Nov 2007 01:14:16 -0000	1.5
+++ openacs-4/packages/chat/www/transcript-delete.tcl	19 Aug 2008 21:06:26 -0000	1.5.2.1
@@ -16,5 +16,5 @@
 
 permission::require_permission -object_id $transcript_id -privilege chat_transcript_delete
 
-set context_bar [list "[_ chat.Delete_transcript]"]
+set context [list "[_ chat.Delete_transcript]"]
 ad_return_template
Index: openacs-4/packages/chat/www/transcript-entry.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/transcript-entry.adp,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/chat/www/transcript-entry.adp	19 Nov 2007 01:14:16 -0000	1.8
+++ openacs-4/packages/chat/www/transcript-entry.adp	19 Aug 2008 21:06:26 -0000	1.8.2.1
@@ -6,48 +6,64 @@
     @cvs-id $Id$
 -->
 <master>
-<property name="context">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 <property name="title">@title;noquote@</property>
 
-<form action="@action@" method="post">
+<form action="@action@" method="post" class="margin-form">
+    <div>
     <input type="hidden" name="transcript_id" value="@transcript_id@">
     <input type="hidden" name="room_id" value="@room_id@">
     <input type="hidden" name="contents" value="@contents@">
-    <table border="0" cellpadding="2" cellspacing="2">
-       <tr class="form-element">
-          <td class="form-label">#chat.Transcript_name#</th>
-          <td><input size="50" name="transcript_name" value="@transcript_name@"></td>
-       </tr>
-       <tr class="form-element">
-          <td class="form-label">#chat.Delete_messages#</td>
-          <td><input type="checkbox" name="delete_messages">
-          <div class="form-help-text">
-            <img src="/shared/images/info.gif" alt="[i]" title="Help text" border="0" height="9" width="12">
+    </div>
+    <div class="form-item-wrapper">
+        <div class="form-label">
+          <label for="transcript_name">#chat.Transcript_name#</label>
+        </div>
+        <div class="form-widget">
+          <input size="50" name="transcript_name" id="transcript_name" value="@transcript_name@">
+        </div>
+      </div>
+      <div class="form-item-wrapper">
+        <div class="form-label">
+          <label for="delete_messages">#chat.Delete_messages#</label>
+        </div>
+        <div class="form-widget">
+          <input type="checkbox" name="delete_messages" id="delete_messages">
+        </div>
+        <div class="form-help-text">
+            <img src="/shared/images/info.gif" alt="Help text" height="9" width="12">
             #chat.delete_messages_after_transcript#
+        </div>
+      </div>
+      <if @active_p@ eq "t">
+        <div class="form-item-wrapper">
+          <div class="form-label">
+            <label for="deactivate_room">#chat.Room_deactivate#</label>
           </div>
-          </td>
-       </tr>
-       <if @active_p@ eq "t">
-       <tr class="form-element">
-          <td class="form-label">#chat.Room_deactivate#</td>
-          <td><input type="checkbox" name="deactivate_room">
+          <div class="form-widget">
+            <input type="checkbox" name="deactivate_room" id="deactivate_room">
+          </div>
           <div class="form-help-text">
-            <img src="/shared/images/info.gif" alt="[i]" title="Help text" border="0" height="9" width="12">
+            <img src="/shared/images/info.gif" alt="Help text" height="9" width="12">
             #chat.deactivate_room_after_transcript#
           </div>
-          </td>
-       </tr>       
-       </if>
-       <tr class="form-element">
-          <td class="form-label">#chat.Description#</th>
-          <td><textarea name="description" rows=6 cols=65>@description@</textarea>
-       </tr>
-       <tr class="form-element">
-          <td class="form-label">#chat.Contents#</th>
-    	  <td><div style="border: 1px solid #A4B97F; padding:3px; color: #666666;">@contents;noquote@</div>
-       </tr>
-       <tr class="form-element">
-          <td><input type="submit" value="@submit_label@">
-    </table>
-    
+        </div>
+      </if>
+      <div class="form-item-wrapper">
+        <div class="form-label">
+          <label for="description">#chat.Description#</label>
+        </div>
+        <div class="form-widget">
+          <textarea name="description" id="description" rows=6 cols=65>@description@</textarea>
+        </div>
+      </div>
+      <div class="form-item-wrapper">
+        <div class="form-label">#chat.Contents#</div>
+        <div class="form-widget">
+    	  <div style="border: 1px solid #222; padding: 3px">@contents;noquote@</div>
+        </div>
+      </div>
+      <div class="form-button">
+        <input type="submit" value="@submit_label@">
+      </div>
 </form>
Index: openacs-4/packages/chat/www/transcript-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-new.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/chat/www/transcript-new.tcl	19 Nov 2007 01:14:16 -0000	1.6
+++ openacs-4/packages/chat/www/transcript-new.tcl	19 Aug 2008 21:06:26 -0000	1.6.2.1
@@ -16,14 +16,14 @@
 
 permission::require_permission -object_id $room_id -privilege chat_transcript_create
 
-set context_bar [list [list "room?room_id=$room_id" "[_ chat.Room_Information]"] "[_ chat.Create_transcript]"]
+set title "[_ chat.Create_transcript]"
+set context [list [list "room?room_id=$room_id" "[_ chat.Room_Information]"] $title]
 
 set transcript_id ""
 set transcript_name "[_ chat.transcript_of_date] [clock format [clock seconds] -format "%d.%m.%y %H:%M:%S"]"
 set description ""
 set contents ""
 set action "transcript-new-2"
-set title "[_ chat.Create_transcript]"
 set submit_label "[_ chat.Create_transcript]"
 set active_p [room_active_status $room_id]