Index: openacs-4/packages/acs-subsite/www/shared/community-member.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/community-member.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/shared/community-member.adp	15 Aug 2003 21:18:13 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/shared/community-member.adp	28 Aug 2003 09:41:42 -0000	1.7
@@ -1,77 +1,75 @@
 <master>
-<property name="title">@first_names;noquote@ @last_name;noquote@</property>
-<property name="context">Community Member</property>
+  <property name="title">@page_title@</property>
+  <property name="context">@context;noquote@</property>
 
 <if @inline_portrait_state@ eq "inline">
-  <a href="portrait?@portrait_export_vars@"><img src="portrait-bits?@portrait_export_vars@" align="right" width="@width@" height="@height@"></a><br />
-
+  <a href="portrait?@portrait_export_vars@"><img src="portrait-bits?@portrait_export_vars@" align="right" width="@width@" height="@height@"></a>
 </if>
-<else><if @inline_portrait_state eq "link">
- <a href="portrait?@portrait_export_vars@">Portrait</a>
-</if></else>
+<else>
+  <if @inline_portrait_state eq "link">
+    <p>
+      <b>&raquo;</b> <a href="portrait?@portrait_export_vars@">Portrait</a>
+    </p>
+  </if>
+</else>
 
-A member of the @system_name@ community since @pretty_creation_date@
+<p>
+  A member of the @system_name@ community since <b>@pretty_creation_date@</b>.
+</p>
 
 <if @member_state@ eq "deleted">
-
-  <blockquote><font color="red">this user is deleted</font></blockquote>
-  
+  <blockquote>
+    <font color="red">
+      This user has left the community.
+    </font>
+  </blockquote>
 </if>
-<else><if @member_state@ eq "banned">
+<else>
+  <if @member_state@ eq "banned">
+    <blockquote>
+      <font color="red">
+        This user is deleted and banned from the community.
+       </font>
+    </blockquote>
+  </if>
+</else>
 
-  <blockquote><font color="red">this user is deleted and
-  banned from the community.</font></blockquote>
-  
-</if></else>
+<p>
+  <b>Name:</b> @first_names@ @last_name@
+</p>
 
-<if @show_intranet_info_p@ eq 1>
+<if @show_email_p@ true>
+  <p>
+    <b>E-mail:</b> <a href="mailto:@email@">@email@</a>
+  </p>
+</if>
 
-  @intranet_info@
+<if @url@ not nil>
+  <p>
+    <b>Home page:</b> <a href="@url@">@url@</a>
+  </p>
+</if>
 
+<if @bio@ not nil>
+  <p>
+    <b>Biography:</b>
+   </p>
+   <blockquote>
+     @bio@
+   </blockquote>
 </if>
-<else>
-  <if @show_email_p@ eq 1>
 
-    <ul>
-    <li>E-mail @first_names@ @last_name@:
-    <a href="mailto:@email@">@email@</a></li>
 
-    <if @url@ not nil>
-      <li>Personal home page: <a href="@url@">@url@</a></li>
-    </if>
-
-    <if @bio@ not nil>
-      <p> Biography:</p><p>@bio@</p>
-    </if>
-
-    </ul>
-    
-  </if>
-  <else>
-
-    <if @url@ not nil>
-      <ul><li>Personal home page:  <a href="@url@">@url@</a></li></ul>
-    </if>
-
-  </else>
-</else>
-
 <if @verified_user_id@ eq 0>
-
   <blockquote>
-  If you were to <a href="@subsite_url@register/index?@login_export_vars@">log in</a>, you'd be able to get more information on your fellow community member.
+    If you were to <a href="@subsite_url@register/index?@login_export_vars@">log in</a>, you'd be able to get more information on your fellow community member.
   </blockquote>
+</if>
 
+<if @site_wide_admin_p@>
+  <h3>For Site-Wide Administrators</h3>
+  <p>
+    <b>&raquo;</b> <a href="@admin_user_url@">Administrative options for this user</a>
+  </p>
 </if>
 
-<multiple name="user_contributions">
-
-  <h3>@user_contributions.pretty_plural@</h3>
-  <ul>
-  
-  <group column="pretty_name">
-    <li>@user_contributions.creation_date@: @user_contributions.object_name@</li>
-  </group>
-  </ul>
-  
-</multiple>