Index: openacs-4/packages/dotlrn/www/members-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/members-chunk.adp	20 Jan 2002 19:17:39 -0000	1.2
+++ openacs-4/packages/dotlrn/www/members-chunk.adp	22 Jan 2002 23:45:22 -0000	1.3
@@ -2,17 +2,22 @@
 <ul>
 <multiple name="users">
   <li>
-    @users.last_name@, @users.first_names@
-    (<a href="mailto:@users.email@">@users.email@</a>),
-    <i>@users.rel_type@</i>&nbsp;
-    (<include src="deregister-link" url="deregister?user_id=@users.user_id@&referer=@referer@" label="remove">)
-  </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.rel_type@</i>
+<if @admin_p@ eq 1 or @user_id@ eq @users.user_id@>
+    &nbsp; (<include src="deregister-link" url="deregister?user_id=@users.user_id@&referer=@referer@" label="Drop Membership">) </li>
+</if>
 </multiple>
+<if @admin_p@ eq 1>
   <p></p>
   <li>
     <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>
   </li>
+</if>
 </ul>
Index: openacs-4/packages/dotlrn/www/members-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/members-chunk.tcl	20 Jan 2002 19:17:39 -0000	1.2
+++ openacs-4/packages/dotlrn/www/members-chunk.tcl	22 Jan 2002 23:45:22 -0000	1.3
@@ -9,13 +9,18 @@
     users:multirow
 }
 
+set user_id [ad_conn user_id]
 set community_id [dotlrn_community::get_community_id]
 
-# Permissions
-dotlrn::require_user_admin_community $community_id
+set admin_p [dotlrn::user_can_admin_community_p -user_id $user_id $community_id]
+set read_private_data_p [dotlrn::user_can_read_private_data_p $user_id]
 
 if {![exists_and_not_null referer]} {
-    set referer "one-community-admin"
+    if {[string equal $admin_p "t"] == 1} {
+        set referer "one-community-admin"
+    } else {
+        set referer "one-community"
+    }
 }
 
 # Get all users for this community, including role
Index: openacs-4/packages/dotlrn/www/members.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/members.tcl	21 Jan 2002 06:30:11 -0000	1.3
+++ openacs-4/packages/dotlrn/www/members.tcl	22 Jan 2002 23:45:22 -0000	1.4
@@ -8,7 +8,6 @@
 }
 
 set portal_id ""
-
 set context_bar {{"one-community-admin" Admin} {Manage Members}}
 
 ad_return_template
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/student-list.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.7 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/student-list.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/student-list.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl	21 Jan 2002 06:31:47 -0000	1.18
+++ openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl	22 Jan 2002 23:52:55 -0000	1.19
@@ -84,7 +84,7 @@
 	    
 	    # BIG BAD THING (fixme: ben)
 	    if {[dotlrn::user_can_read_private_data_p]} {
-		append data "<p><a href=student-list>List of Members</a>"
+		append data "<p><a href="members">List of Members</a>"
 	    }
 	} else {
 	    set data ""