Index: openacs-4/packages/dotlrn/www/communities.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/communities.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/communities.adp	15 Jan 2002 22:23:41 -0000	1.5
+++ openacs-4/packages/dotlrn/www/communities.adp	19 Jan 2002 17:26:07 -0000	1.6
@@ -10,10 +10,10 @@
       <td><a href="@communities.url@">@communities.pretty_name@</a></td>
       <td> 
 <if @communities.member_p@ eq 0>
-        (<include src="register" url="community-register?community_id=@communities.community_id@&referer=@referer@">)
+        (<include src="register-link" url="community-register?community_id=@communities.community_id@&referer=@referer@">)
 </if>
 <else>
-        (<include src="deregister" url="community-deregister?community_id=@communities.community_id@&referer=@referer@">)
+        (<include src="deregister-link" url="community-deregister?community_id=@communities.community_id@&referer=@referer@">)
 </else>
       </td>
       <td>
Index: openacs-4/packages/dotlrn/www/community-users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-users.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/community-users.adp	10 Jan 2002 19:30:18 -0000	1.1
+++ openacs-4/packages/dotlrn/www/community-users.adp	19 Jan 2002 17:26:07 -0000	1.2
@@ -3,9 +3,9 @@
 <multiple name="users">
   <li>
     @users.last_name@, @users.first_names@
-    (<a href=mailto:@users.email@>@users.email@</a>),
+    (<a href="mailto:@users.email@">@users.email@</a>),
     <i>@users.rel_type@</i>&nbsp;
-    (<include src="deregister" url="community-deregister?user_id=@users.user_id@&referer=one-community-admin" label="remove">)
+    (<include src="deregister-link" url="community-deregister?user_id=@users.user_id@&referer=one-community-admin" label="remove">)
   </li>
 </multiple>
   <p></p>
Index: openacs-4/packages/dotlrn/www/community.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/community.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/community.adp	11 Jan 2002 21:51:51 -0000	1.3
+++ openacs-4/packages/dotlrn/www/community.adp	19 Jan 2002 17:26:07 -0000	1.4
@@ -4,7 +4,7 @@
 
 [
   <font size="-1">
-    <include src="deregister">
+    <include src="deregister-link">
     |
     <a href="configure">customize</a>
 <if @admin_p@ eq 1>
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/deregister-link.adp	19 Jan 2002 17:26:07 -0000	1.1
@@ -0,0 +1 @@
+ <a href="<if @url@ nil>community-deregister</if><else>@url@</else>"><if @label@ nil>Drop Membership</if><else>@label@</else></a>
Index: openacs-4/packages/dotlrn/www/my-communities.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/my-communities.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/my-communities.adp	19 Jan 2002 17:26:07 -0000	1.1
@@ -0,0 +1,16 @@
+<h3><if @title@ nil>My Communities</if><else>@title@</else></h3>
+
+<ul>
+<multiple name="communities">
+  <li>
+    <a href="@communities.url@">@communities.pretty_name@</a>
+    - @communities.role@
+<if @communities.admin_p@ eq 1>
+    - [<a href="@communities.url@community-spam?community_id=@communities.community_id@&referer=@referer@">Email Members</a>]
+</if>
+    - [<include src="deregister-link" url="community-deregister?community_id=@communities.community_id@&referer=@referer@">]
+  </li>
+</multiple>
+  <p></p>
+  <li><a href="all-communities">Join A Group</a></li>
+</ul>
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.5 -r1.6
--- openacs-4/packages/dotlrn/www/one-community-not-member.adp	11 Jan 2002 21:51:51 -0000	1.5
+++ openacs-4/packages/dotlrn/www/one-community-not-member.adp	19 Jan 2002 17:26:07 -0000	1.6
@@ -4,7 +4,7 @@
 
 [
   <font size="-1">
-    <include src="register">
+    <include src="register-link">
 <if @admin_p@ eq 1>
     |
     <a href="one-community-admin">admin</a>
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.7 -r1.8
--- openacs-4/packages/dotlrn/www/one-community.adp	10 Jan 2002 19:30:18 -0000	1.7
+++ openacs-4/packages/dotlrn/www/one-community.adp	19 Jan 2002 17:26:07 -0000	1.8
@@ -4,7 +4,7 @@
 
 [
   <font size="-1">
-    <include src="deregister">
+    <include src="deregister-link">
     |
     <a href="configure">customize</a>
 <if @admin_p@ eq 1>
Index: openacs-4/packages/dotlrn/www/register-link.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/register-link.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/register-link.adp	19 Jan 2002 17:26:07 -0000	1.1
@@ -0,0 +1 @@
+ <a href="<if @url@ nil>community-register</if><else>@url@</else>"><if @label@ nil>Join</if><else>@label@</else></a>