Index: openacs-4/packages/dotlrn/www/deregister-link.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/deregister-link.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/deregister-link.adp	9 Mar 2002 00:39:20 -0000	1.3
+++ openacs-4/packages/dotlrn/www/deregister-link.adp	19 Mar 2002 21:56:54 -0000	1.4
@@ -1 +1 @@
- <a href="<if @url@ nil>deregister<if @referer@ not nil>?referer=@referer@</if></if><else>@url@<if @referer@ not nil>?referer=@referer@</if></else>"><if @label@ nil>Drop Membership</if><else>@label@</else></a>
+<a href="<if @url@ nil>deregister<if @referer@ not nil>?referer=@referer@</if></if><else>@url@<if @referer@ not nil>?referer=@referer@</if></else>"><if @label@ nil>Drop Membership</if><else>@label@</else></a>
\ No newline at end of file
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 -N -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/members-chunk.adp	16 Mar 2002 02:02:07 -0000	1.6
+++ openacs-4/packages/dotlrn/www/members-chunk.adp	19 Mar 2002 21:56:54 -0000	1.7
@@ -38,8 +38,7 @@
 
 </ul>
 
-<if @admin_p@ eq 1>
-<if @pending_users:rowcount@ gt 0>
+<if @admin_p@ eq 1 and @pending_users:rowcount@ gt 0>
 
 <h3>Membership Requests</h3>
 
@@ -53,14 +52,41 @@
     &nbsp;
     <i>@pending_users.role@</i>
     &nbsp;
-    [
-      <small><include src="approve-link" url="approve?user_id=@pending_users.user_id@&referer=@referer@"></small>
+      <small>[<include src="approve-link" url="approve?user_id=@pending_users.user_id@&referer=@referer@"></small>
       &nbsp;|&nbsp;
-      <small><include src="reject-link" url="reject?user_id=@pending_users.user_id@&referer=@referer@"></small>
-    ]
+      <small><include src="reject-link" url="reject?user_id=@pending_users.user_id@&referer=@referer@"]></small>
   </li>
 </multiple>
 </ul>
 
 </if>
+
+<if @admin_p@ eq 1 and @subcomm_p@ eq 1>
+
+  <h3>Members of 
+    <%= [dotlrn_community::get_parent_name -community_id $community_id] %> 
+    That Are Not Members of <%= [dotlrn_community::get_community_name $community_id] %>
+  </h3>
+
+  NOT DONE YET!
+
+  <if @parent_users:rowcount@ gt 0>
+
+  <ul>
+
+    <multiple name="parent_users">
+      <li>
+        <%= [acs_community_member_link -user_id $parent_users(user_id) -label "$parent_users(first_names) $parent_users(last_name)"] %>
+        (<a href="mailto:@parent_users.email@">@parent_users.email@</a>)
+        &nbsp;
+
+      </li>
+    </multiple>
+
+  </ul>
+
+  </if>
+
 </if>
+
+<br>
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 -N -r1.6 -r1.7
--- openacs-4/packages/dotlrn/www/members-chunk.tcl	16 Mar 2002 02:02:07 -0000	1.6
+++ openacs-4/packages/dotlrn/www/members-chunk.tcl	19 Mar 2002 21:56:54 -0000	1.7
@@ -60,4 +60,32 @@
     and dotlrn_member_rels_full.member_state = 'needs approval'
 }
 
-ad_return_template
+
+#  If we are in a subcomm. get the list of the users of the parent
+# comm that are not in the subcomm yet, and output them with radios
+# for roles, etc.
+
+set subcomm_p [dotlrn_community::subcommunity_p -community_id $community_id]
+
+if {$subcomm_p} {
+    # Get all users for this community, including role
+    set list_of_parent_users [dotlrn_community::list_possible_subcomm_users \
+            -subcomm_id $community_id]
+    
+    template::multirow create parent_users rel_id rel_type user_id first_names last_name email
+    
+    set parent_user_list [list]
+    foreach parent_user $list_of_parent_users {
+        lappend parent_user_list [lindex $parent_user 2]
+        template::multirow append parent_users \
+                [lindex $parent_user 0] \
+                [dotlrn_community::get_role_pretty_name_from_rel_type -rel_type [lindex $parent_user 1]] \
+                [lindex $parent_user 2] \
+                [lindex $parent_user 3] \
+                [lindex $parent_user 4] \
+                [lindex $parent_user 5]
+    }
+}
+
+ad_return_template    
+    
Index: openacs-4/packages/dotlrn/www/preferences.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/preferences.adp,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/dotlrn/www/preferences.adp	18 Mar 2002 16:48:37 -0000	1.11
+++ openacs-4/packages/dotlrn/www/preferences.adp	19 Mar 2002 21:56:54 -0000	1.12
@@ -7,7 +7,7 @@
 
 <ul>
   <li><a href="/pvt/home">Edit My Profile</a></li>
-  <li><a href="/user/password-update">Change My Password</a></li>
+  <li><a href="/user/password-update?return_url=@referer@">Change My Password</a></li>
   <li><a href="applets/bboard/alerts">Edit My Bulletin Board Email Alerts</a></li>
   <li><a href="configure">Customize This Portal</a></li>
 <if @admin_p@ eq 1>
Index: openacs-4/packages/dotlrn/www/preferences.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/preferences.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/preferences.tcl	23 Jan 2002 06:29:14 -0000	1.8
+++ openacs-4/packages/dotlrn/www/preferences.tcl	19 Mar 2002 21:56:54 -0000	1.9
@@ -12,6 +12,7 @@
     title:onevalue
     admin_p:onevalue
     admin_url:onevalue
+    referer:onevalue
 }
 
 set portal_id [dotlrn::get_workspace_portal_id [ad_get_user_id]]
@@ -22,5 +23,6 @@
 set title "Preferences"
 set admin_p [dotlrn::admin_p]
 set admin_url "[dotlrn::get_url]/admin"
+set referer [ns_conn url]
 
 ad_return_template