Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp,v
diff -u -r1.24 -r1.24.2.1
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp	9 Aug 2002 18:39:29 -0000	1.24
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp	17 Oct 2002 10:49:03 -0000	1.24.2.1
@@ -31,32 +31,36 @@
   </else>
   <br>
 </if>
+     <li><a href="members">Manage Membership</a> - Add/Remove @pretty_name@ members</li>
 
-  <li><a href="community-edit">Edit properties</a></li>
-  <br>
-
-  <li><a href="one-community-portal-configure">Customize layout</a></li>
-  <br>
-
-  <li>
-    Membership
-    <ul>
-      <li><a href="members">Manage Membership</a> - Add/Remove @pretty_name@ members</li>
       <li>
         Change Enrollment Policy -
           <if @join_policy@ eq "open">Open</if><else><a href="join-policy-toggle?policy=open">Open</a></else>
         | <if @join_policy@ eq "closed">Closed</if><else><a href="join-policy-toggle?policy=closed">Closed</a></else>
         |&nbsp;<if @join_policy@ eq "needs approval">Needs&nbsp;Approval</if><else><a href="join-policy-toggle?policy=needs%20approval">Needs&nbsp;Approval</a></else>
       </li>
+<p>
+  <li><a href="one-community-portal-configure">Customize Portal Layout</a></li>
       <li>
-        <a href="user-add?type=student&can_browse_p=0&read_private_data_p=t">Add a Limited Access user to this community</a>
-        - This allows you to register new users and give them access to just this community.
+        Change Bulk Mail Policy -
+          <if @members_can_spam_p@ true>All members</if><else><a href="spam-policy-toggle?policy=all">All members</a></else>
+          | <if @members_can_spam_p@ false>Only admins</if><else><a href="spam-policy-toggle?policy=admins">Only admins</a></else>
+          can send bulk mail to this community.
       </li>
-      <li>
-        <a href="user-add?type=student&can_browse_p=0&read_private_data_p=f">Add a Limited Access Guest user to this community</a>
-        - This allows you to register new non-MIT users and give them access to just this community.
-        Information about students who are part of this community will not be available to this user.
-      </li>
+  <li><a href="community-edit">Edit Group Properties</a> - Change name, description, etc.</li>
+
+<if @subcommunity_p@ eq 0>
+<p>
+<if @club_p@ eq 0>
+<li>
+        <a href="user-add?type=student&can_browse_p=0&read_private_data_p=t">Create a new Limited Access user</a> - Only use this to create an account for cross-registered students who do not have accounts from a previous class.
+</if>
+<li>        <a href="user-add?type=student&can_browse_p=0&read_private_data_p=f">Create a new Limited Access Guest user</a>
+        - Only use this to create accounts for non-affiliated users who do not already have an account.
+        Information about other members of this community will not be available to this user.
+</li>
+</ul>
+</if>
     </ul>
   </li>
   <br>
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl,v
diff -u -r1.12 -r1.12.2.1
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl	9 Aug 2002 18:39:29 -0000	1.12
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.tcl	17 Oct 2002 10:49:03 -0000	1.12.2.1
@@ -36,6 +36,18 @@
 set admin_pretty_name [ad_parameter dotlrn_admin_pretty_name dotlrn]
 set subcommunity_p [dotlrn_community::subcommunity_p -community_id $community_id]
 
+#The community_type is dotlrn_club for "communties" and the subject name for classes.
+set comm_type [dotlrn_community::get_community_type_from_community_id $community_id]
+
+if {$comm_type == "dotlrn_club"} {
+    set club_p 1
+} else {
+    set club_p 0
+}
+
+set members_rel_id [dotlrn_community::get_members_rel_id -community_id $community_id]
+set members_can_spam_p [permission::permission_p -party_id $members_rel_id -object_id $community_id -privilege dotlrn_spam_community]
+
 # get the community info
 db_1row select_community_info {}
 
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp,v
diff -u -r1.10 -r1.10.2.1
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp	9 Aug 2002 18:39:29 -0000	1.10
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp	17 Oct 2002 10:49:03 -0000	1.10.2.1
@@ -18,43 +18,49 @@
 
 %>
 
-<if @config.shaded_p@ ne "t">
 
-<ul>
-
+<if @config.shaded_p@ ne "t">
+<if @read_private_data_p@ eq 1>
+<table class="table-display" cellpadding=3 cellspacing=0>
+<tr class="table-header"><td align=right colspan=3>
+<a href="members">Sort
+<if @admin_p@ eq 1>
+/manage
+</if>
+</a>
+</td></tr>
 <multiple name="users">
 <group column="role">
-  <li>
-    <%= [acs_community_member_link -user_id $users(user_id) -label "$users(first_names) $users(last_name)"] %>
-    
-    <if @read_private_data_p@ eq 1 or @user_id@ eq @users.user_id@>
-      (<a href="mailto:@users.email@">@users.email@</a>)
-    </if>
-      <i>@users.role@</i>
+<if @users.rownum@ odd>
+<tr class="z_light">
+</if>
+<else>
+<tr class="z_dark">
+</else>
 
-    <if @admin_p@ eq 1>
-      [<small> <a href="deregister?user_id=@users.user_id@&amp;referer=members">deregister</a> </small>]
-    </if>
-    <else>
-      <if @user_id@ eq @users.user_id@>
-        [<small> <a href="deregister?">deregister</a> </small>]
-      </if>
-    </else>
-    </li>
-</group>
-<br>
-</multiple>
+<td>
+      <%= [acs_community_member_link -user_id $users(user_id) -label "$users(first_names) $users(last_name)"] %>
+</td><td>    
+      <a href="mailto:@users.email@">@users.email@</a>
+</td><td>
+	<i>@users.role@</i>
+</td></tr>
+  </group>
 
-</ul>
 
-<if @admin_p@ eq 1>
-   <form method="get" action="member-add">
-      Add A Member: <input type="text" name="search_text"><input type="submit" value="search">
-      <input type="hidden" name="referer" value="@referer@">
-    </form>
+</multiple>
+</table>
+<if @spam_p@ true>
+<ul>
+<li>        <a href="spam?community_id=@community_id@&referer=@referer@">Email Members</a>
+</ul>
 </if>
 
 </if>
 <else>
-  <br>
+	Sorry, this functionality is not available to guests
 </else>
+</if>
+<else>
+<br>
+</else>
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl	9 Aug 2002 18:39:29 -0000	1.9
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl	17 Oct 2002 10:49:03 -0000	1.9.2.1
@@ -32,6 +32,7 @@
 
 set admin_p [dotlrn::user_can_admin_community_p -user_id $user_id -community_id $community_id]
 set read_private_data_p [dotlrn::user_can_read_private_data_p -user_id $user_id]
+set spam_p [dotlrn::user_can_spam_community_p -user_id [ad_get_user_id] -community_id $community_id]
 
 # Get all users for this community, including role
 template::util::list_of_ns_sets_to_multirow \
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp,v
diff -u -r1.11 -r1.11.2.1
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp	9 Aug 2002 18:39:29 -0000	1.11
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp	17 Oct 2002 10:49:03 -0000	1.11.2.1
@@ -80,5 +80,5 @@
 
 <if @read_private_data_p@>
 <br>
-<a href="members"><%= [dotlrn_community::get_role_pretty_plural -community_id $community_id -rel_type dotlrn_student_rel] %> List</a>
+<a href="members">Member List</a>
 </if>
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-portlet.adp,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-portlet.adp	9 Aug 2002 18:39:29 -0000	1.9
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-portlet.adp	17 Oct 2002 10:49:03 -0000	1.9.2.1
@@ -43,3 +43,6 @@
 <else>
   <br>
 </else>
+
+
+