Index: openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml,v
diff -u -N -r1.50.2.3 -r1.50.2.4
--- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	2 Jun 2008 16:43:20 -0000	1.50.2.3
+++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	22 Aug 2008 13:31:15 -0000	1.50.2.4
@@ -152,6 +152,7 @@
   <msg key="Courses_Accesskey">5</msg>
   <msg key="Create_A_New_User">Create A New User</msg>
   <msg key="Create_a_Web_Log">Create a Web Log</msg>
+  <msg key="Create_and_add_a_member">Create and add a member</msg>
   <msg key="Create_Club">Create Club</msg>
   <msg key="Created">Created</msg>
   <msg key="CSV_File_Format">CSV File Format</msg>
@@ -231,6 +232,7 @@
   <msg key="Error_sending_mail">Error sending mail</msg>
   <msg key="Example_File">Example File</msg>
   <msg key="Expand_list">Expand list</msg>
+  <msg key="Export_members_list_to_CSV">Export members list to a CSV file</msg>
   <msg key="External_URL">External URL</msg>
   <msg key="External_URL_1">External URL:</msg>
   <msg key="Extra_Large">Extra Large</msg>
Index: openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml,v
diff -u -N -r1.20.2.2 -r1.20.2.3
--- openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml	2 Jun 2008 16:43:20 -0000	1.20.2.2
+++ openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml	22 Aug 2008 13:31:15 -0000	1.20.2.3
@@ -142,6 +142,7 @@
   <msg key="Courses_Accesskey">5</msg>
   <msg key="Create_A_New_User">Crear un nuevo usuario</msg>
   <msg key="Create_a_Web_Log">Crear un weblog</msg>
+  <msg key="Create_and_add_a_member">Crear y a�adir usuario</msg>
   <msg key="Create_Club">Crear comunidad</msg>
   <msg key="Created">Creado</msg>
   <msg key="CSV_File_Format">Formato CSV</msg>
@@ -218,6 +219,7 @@
   <msg key="Error_sending_mail">Error al enviar el correo</msg>
   <msg key="Example_File">Archivo ejemplo</msg>
   <msg key="Expand_list">Expandir lista</msg>
+  <msg key="Export_members_list_to_CSV">Exportar lista de usuarios a un fichero CSV</msg>
   <msg key="External_URL">Servidor web propio</msg>
   <msg key="External_URL_1">Servidor propio:</msg>
   <msg key="Extra_Large">Muy grande</msg>
Index: openacs-4/packages/dotlrn/www/members.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.adp,v
diff -u -N -r1.25.2.1 -r1.25.2.2
--- openacs-4/packages/dotlrn/www/members.adp	3 Apr 2008 20:28:21 -0000	1.25.2.1
+++ openacs-4/packages/dotlrn/www/members.adp	22 Aug 2008 13:31:15 -0000	1.25.2.2
@@ -23,57 +23,59 @@
 <property name="link_all">1</property>
 <property name="context">@context;noquote@</property>
 
-<if @spam_p@ true>
-<p>
-  <a href="spam-recipients?community_id=@community_id@">#dotlrn.Email_Members#</a>
-</p>
-</if>
+<h1>#dotlrn.Manage_Membership#</h1>
 
 <if @admin_p@ eq 1 and @subcomm_p@ eq 0>
-<form method="get" action="member-add">
-   #dotlrn.Add_A_Member# <input type="text" name="search_text"><input
-   type="submit" value="#dotlrn.search#">
-   <input type="hidden" name="referer" value="@return_url@">
-</form>
-<a href="@add_member_url;noquote@" class="button">Create and add a member</a>
-<p />
+  <div style="padding: 5px 0px;">
+  <form method="get" action="member-add" class="inline-form">
+    <div><input type="hidden" name="referer" value="@return_url@"></div>
+    <div class="form-item-wrapper">      
+      <label for="search_text">
+        #dotlrn.Add_A_Member# 
+        <input type="text" name="search_text" id="search_text">
+      </label>
+    </div>
+    <div class="form-button">
+      <input type="submit" value="#dotlrn.search#">
+    </div>
+  </form>
+  </div>
 </if>
 
 
 <listtemplate name="members"></listtemplate>
 
 <if @admin_p@ eq 1>
   <if @pending_users:rowcount@ gt 0 or @approval_policy_p@ eq 1>
-    <h1>#dotlrn.Membership_Requests#</h1>
+    <h2>#dotlrn.Membership_Requests#</h2>
     <listtemplate name="pending_users"></listtemplate>
   </if>
 </if>
 
 <if @admin_p@ eq 1 and @subcomm_p@ eq 1 and @n_parent_users@ gt 0>
 
-  <hr>
+  <h2>#dotlrn.Add_New_Members#</h2>
 
-  <h1>#dotlrn.Add_New_Members#</h1>
-
-  <blockquote>
     <p>
       #dotlrn.lt_The_following_members#
     </p>
 
     <p>
       #dotlrn.lt_First_check_the_box_o#
     </p>
-  </blockquote>
 
 <formtemplate id="parent_users_form">
-  <table width="75%" border="0">
+  <table>
 
-    <tr>
-      <td width="15%" align="center"><strong>#dotlrn.Dont_Add#</strong></td>
-      <td width="15%" align="center"><strong>#dotlrn.Member#</strong></td>
-      <td width="15%" align="center"><strong>#dotlrn.Administrator#</strong></td>
-      <td>&nbsp;</td>
-    </tr>
+    <thead>
+      <tr>
+        <th>#dotlrn.Dont_Add#</th>
+        <th>#dotlrn.Member#</th>
+        <th>#dotlrn.Administrator#</th>
+        <th>#dotlrn.Users#</th>
+      </tr>
+    </thead>
+    <tbody>
 
 <%
     foreach user $parent_user_list {
@@ -84,8 +86,8 @@
 %>
 
     <tr>
-<formgroup id="selected_user.@this_user_id@" cols="3">
-      <td width="15%" align="center">@formgroup.widget;noquote@</td>
+<formgroup id="selected_user.@this_user_id@">
+      <td align="center">@formgroup.widget;noquote@</td>
 </formgroup>
       <td>@this_last_name@, @this_first_names@</td>
     </tr>
@@ -94,13 +96,10 @@
     }
 %>
 
-    <tr><td colspan="4">&nbsp;</td></tr>
-
     <tr>
-      <td><input type="submit" value="#dotlrn.add_selected_members#"></td>
-      <td colspan="3">&nbsp;</td>
+      <td colspan="4" align="center"><input type="submit" value="#dotlrn.add_selected_members#"></td>
     </tr>
-
+    </tbody>
   </table>
 </formtemplate>
 
Index: openacs-4/packages/dotlrn/www/members.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.tcl,v
diff -u -N -r1.27.2.5 -r1.27.2.6
--- openacs-4/packages/dotlrn/www/members.tcl	22 Aug 2008 11:33:17 -0000	1.27.2.5
+++ openacs-4/packages/dotlrn/www/members.tcl	22 Aug 2008 13:31:15 -0000	1.27.2.6
@@ -32,6 +32,7 @@
 set community_id [dotlrn_community::get_community_id]
 set spam_p [dotlrn::user_can_spam_community_p -user_id [ad_get_user_id] -community_id $community_id]
 set approval_policy_p [string eq [group::join_policy -group_id $community_id] "needs approval"]
+set subcomm_p [dotlrn_community::subcommunity_p -community_id $community_id]
 
 set referer [ns_conn url]
 set return_url "[ns_conn url]?[ns_conn query]"
@@ -46,19 +47,6 @@
     set admin_p 1
 }
 
-# make it so that only course admins 
-# and site wide admins can read this page 
-# if { !$admin_p } {
-#        ad_return_forbidden  "Permission Denied"  "<blockquote>
-#    You don't have permission to view this page.
-#    </blockquote>"
-#        ad_script_abort
-#}
-
-if {$admin_p} {
-    set add_member_url [export_vars -base user-add { {can_browse_p 1} {read_private_data_p t} {referer $return_url} }]
-}
-
 if {![exists_and_not_null referer]} {
     if {[string equal $admin_p t] == 1} {
         set referer "one-community-admin"
@@ -77,10 +65,20 @@
 if {$admin_p && !$csv_p} {
     set bulk_actions [list "[_ dotlrn.Drop_Membership]" "deregister" "[_ dotlrn.Drop_Membership]"]
     set bulk_actions_export_vars [list "user_id" "referer" "reset"]
-    set actions [list "CSV" "members?csv=yes" "[_ dotlrn.Comma_Separated_Values]"]
+
+    if { !$subcomm_p } {
+        lappend actions [_ dotlrn.Create_and_add_a_member] [export_vars -base user-add { {can_browse_p 1} {read_private_data_p t} {referer $return_url} }] [_ dotlrn.Create_and_add_a_member]
+    }
+
+    if { $spam_p } {
+        lappend actions [_ dotlrn.Email_Members] [export_vars -base "spam-recipients" {community_id}] [_ dotlrn.Email_Members]
+    }
+
+    lappend actions "CSV" "members?csv=yes" [_ dotlrn.Export_members_list_to_CSV]
+
     foreach role $rel_types {
-        # lappend actions "[_ dotlrn.Remove_all] [lang::util::localize [lindex $role 3]]" "members?reset=1&reltype=[lindex $role 0]" "[lang::util::localize [lindex $role 2]]"
-        lappend actions "[_ dotlrn.Remove_all] [lang::util::localize [lindex $role 3]]" "member-confirm?reset=1&reltype=[lindex $role 0]" "[lang::util::localize [lindex $role 2]]"
+        set action_label "[_ dotlrn.Remove_all] [lang::util::localize [lindex $role 3]]" 
+        lappend actions  $action_label "member-confirm?reset=1&reltype=[lindex $role 0]" $action_label
     }
 }
 
@@ -125,8 +123,8 @@
         html "align left"
         display_template {
         <if @members.user_id@ ne \"\">
-            <a href="member-confirm?user_id=@members.user_id@&referer=@members.member_referer@">#dotlrn.Drop_Membership#</a> | 
-            <a href="member-add-2?user_id=@members.user_id@&referer=@members.member_referer@">#dotlrn.User_Admin_Page#</a>
+            <a href="member-confirm?user_id=@members.user_id@&amp;referer=@members.member_referer@">#dotlrn.Drop_Membership#</a> | 
+            <a href="member-add-2?user_id=@members.user_id@&amp;referer=@members.member_referer@">#dotlrn.User_Admin_Page#</a>
         </if>
         }
     }
@@ -159,19 +157,6 @@
     template::list::write_output -name members
 }
 
-# # Bulk action User Admin Page
-# # Depending on the community_type, we have allowable rel_types
-# set rel_types [dotlrn_community::get_roles -community_id $community_id]
-# set selection "<select name=\"rel_type\">"
-# foreach role $rel_types {
-#     append selection "<option value=\"[lindex $role 0]\">[lang::util::localize [lindex $role 2]]</option>"
-# }
-# append selection "</select>"
-# set size [multirow size members]
-# if { $size > 0 } {
-#     multirow append members "" "" "" "" "" $selection
-# }
-
 set user_ids ""
 db_multirow -extend { member_url pending_user_referer } pending_users select_pending_users {} {
     set role [dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type]
@@ -224,8 +209,6 @@
     }
 }
 
-set subcomm_p [dotlrn_community::subcommunity_p -community_id $community_id]
-
 if {$subcomm_p} {
 
     form create parent_users_form