Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	8 Oct 2001 21:38:37 -0000	1.6
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	9 Oct 2001 14:35:58 -0000	1.7
@@ -145,12 +145,15 @@
 	    # Callbacks
 	    applets_dispatch $community_id RemoveUser [list $community_id $user_id]
 	    
-	    # Get the relationship ID
-	    set rel_id [db_string select_rel_id {}]
+	    # Get a few important things, like rel_id and portal page_id
+	    db_1row select_rel_info {}
 	    
 	    # Remove the membership
 	    db_dml delete_membership {}
 	    
+	    # Remove the page
+	    portal::delete_portal $page_id
+	    
 	    # Remove it
 	    relation_remove $rel_id
 	}
@@ -165,6 +168,15 @@
 	return [db_string select_page_id {}]
     }
 
+    ad_proc -public get_all_communities_by_user {
+	user_id
+    } {
+	returns all communities for a user
+    } {
+	set list_of_communities [list]
+	### HACK HERE !!! (ben)
+    }
+
     ad_proc -public get_communities_by_user {
 	community_type
 	user_id
Index: openacs-4/packages/dotlrn/tcl/community-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/tcl/community-procs.xql	8 Oct 2001 21:39:05 -0000	1.1
+++ openacs-4/packages/dotlrn/tcl/community-procs.xql	9 Oct 2001 14:35:58 -0000	1.2
@@ -35,7 +35,7 @@
 
 <fullquery name="dotlrn_community::list_users.select_users">
 <querytext>
-select rel_id, users.user_id, first_names, last_name, email from users, dotlrn_community_memberships 
+select rel_id, users.user_id, first_names, last_name, email from registered_users users, dotlrn_community_memberships 
 where community_id= :community_id and users.user_id = dotlrn_community_memberships.user_id
 </querytext>
 </fullquery>
@@ -55,9 +55,9 @@
 </querytext>
 </fullquery>
 
-<fullquery name="dotlrn_community::remove_user.select_rel_id">
+<fullquery name="dotlrn_community::remove_user.select_rel_info">
 <querytext>
-select rel_id from dotlrn_community_memberships where community_id= :community_id and user_id= :user_id
+select rel_id, page_id from dotlrn_community_memberships where community_id= :community_id and user_id= :user_id
 </querytext>
 </fullquery>
 
Index: openacs-4/packages/dotlrn/www/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/index-oracle.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/index-oracle.xql	6 Oct 2001 18:24:42 -0000	1.3
+++ openacs-4/packages/dotlrn/www/index-oracle.xql	9 Oct 2001 14:35:58 -0000	1.4
@@ -5,7 +5,7 @@
 
 <fullquery name="select_classes">
 <querytext>
-select class_key, package_id from dotlrn_classes, dotlrn_community_types where dotlrn_community_types.community_type=dotlrn_classes.class_key order by class_key
+select class_key, pretty_name, package_id from dotlrn_classes, dotlrn_community_types where dotlrn_community_types.community_type=dotlrn_classes.class_key order by class_key
 </querytext>
 </fullquery>
 
Index: openacs-4/packages/dotlrn/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/index.adp	6 Oct 2001 18:24:42 -0000	1.2
+++ openacs-4/packages/dotlrn/www/index.adp	9 Oct 2001 14:35:58 -0000	1.3
@@ -8,7 +8,7 @@
 <else>
 <ul>
 <multiple name=classes>
-<li><a href=<%= [dotlrn_community::get_url -package_id @classes.package_id@] %>>@classes.class_key@</a>
+<li><a href=<%= [dotlrn_community::get_url -package_id @classes.package_id@] %>>@classes.pretty_name@</a>
 </multiple>
 </ul>
 </else>
Index: openacs-4/packages/dotlrn/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/www/index.tcl	7 Oct 2001 19:21:08 -0000	1.4
+++ openacs-4/packages/dotlrn/www/index.tcl	9 Oct 2001 14:35:58 -0000	1.5
@@ -19,6 +19,9 @@
     return
 }
 
+# Select communities this user is part of
+set user_id [ad_get_user_id]
+
 # Select the classes that exist
 db_multirow classes select_classes {}
 
Index: openacs-4/packages/dotlrn/www/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/master.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/master.adp	20 Sep 2001 18:29:35 -0000	1.1
+++ openacs-4/packages/dotlrn/www/master.adp	9 Oct 2001 14:35:58 -0000	1.2
@@ -1,6 +1,22 @@
 <master>
 <property name="title">@title@</property>
 
+<table width="100%" border=0 cellspacing=0 cellpadding=2>
+<tr>
+<td align=left colspan=2>
+<table width="100%" border="0" cellpadding="3" cellspacing="0" bgcolor="#FFFFFF">
+<tr bgcolor="#CC0000"> <td colspan="3" valign="middle"><img src="spacer.gif" width="1" height="2"></td>
+</tr><tr> <td align="left" valign="middle" bgcolor="#FFFFFF"> <font face="arial,helvetica"  size="+1" color="#000000">dotLRN</font></td>
+<td valign="middle" bgcolor="#FFFFFF" align="right"><font face="arial,helvetica"  size="+1" color="#000000">MIT Sloan</font></td>
+
+</tr></table>
+<tr bgcolor="#CC0000"> <td colspan="3"  valign="middle"  ><img src="spacer.gif" width="1" height="2"></td>
+</tr>
+</table>
+
+
+
+
 <h2>@title@</h2>
  <if @context_bar@ not nil>
   <%= [eval ad_context_bar $context_bar] %>
Index: openacs-4/packages/dotlrn/www/one-community-not-member.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/one-community-not-member.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/one-community-not-member.adp	7 Oct 2001 19:21:08 -0000	1.1
+++ openacs-4/packages/dotlrn/www/one-community-not-member.adp	9 Oct 2001 14:35:58 -0000	1.2
@@ -1,5 +1,6 @@
 <master src="master">
-<property name="title">dotLRN Commnity: @pretty_name@</property>
+<property name="context_bar">@context_bar@</property>
+<property name="title">dotLRN Community: @pretty_name@</property>
 
 You are not a member of this community. Would you like to <a href=community-register>register</a>?
 
Index: openacs-4/packages/dotlrn/www/one-community-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-type.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/one-community-type.adp	8 Oct 2001 21:38:37 -0000	1.3
+++ openacs-4/packages/dotlrn/www/one-community-type.adp	9 Oct 2001 14:35:58 -0000	1.4
@@ -1,4 +1,5 @@
 <master src="master">
+<property name="context_bar">@context_bar@</property>
 <property name="title">dotLRN: @pretty_name@</property>
 <p>
 <blockquote>
Index: openacs-4/packages/dotlrn/www/one-community-type.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-type.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/one-community-type.tcl	7 Oct 2001 19:21:08 -0000	1.2
+++ openacs-4/packages/dotlrn/www/one-community-type.tcl	9 Oct 2001 14:35:58 -0000	1.3
@@ -44,4 +44,6 @@
     template::multirow append active_communities [lindex $comm 0] [lindex $comm 1] [lindex $comm 2] [lindex $comm 3] [lindex $comm 4]
 }
 
+set context_bar {One Community Type}
+
 ad_return_template
Index: openacs-4/packages/dotlrn/www/one-community.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/one-community.adp	8 Oct 2001 21:38:37 -0000	1.2
+++ openacs-4/packages/dotlrn/www/one-community.adp	9 Oct 2001 14:35:58 -0000	1.3
@@ -1,7 +1,8 @@
 <master src="master">
-<property name="title">dotLRN Community</property>
+<property name="context_bar">@context_bar@</property>
+<property name="title">dotLRN Community: @pretty_name@</property>
 
-<h2>dotLRN Community: @pretty_name@</h2>
+You are registered! You may <a href=community-deregister>deregister</a> if you'd like.
+<p>
 
-
 @rendered_page@
Index: openacs-4/packages/dotlrn/www/one-community.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/one-community.tcl	7 Oct 2001 19:21:08 -0000	1.2
+++ openacs-4/packages/dotlrn/www/one-community.tcl	9 Oct 2001 14:35:58 -0000	1.3
@@ -23,6 +23,8 @@
 
 # Check that this user is a member
 if {![dotlrn_community::member_p $community_id $user_id]} {
+    set context_bar [list "Not a member"]
+
     ad_return_template one-community-not-member
     return
 } else {
@@ -31,5 +33,7 @@
 
     set rendered_page [portal::render_portal $page_id]
 
+    set context_bar {View}
+
     ad_return_template
 }