Index: openacs-4/packages/acs-admin/www/users/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/users/one.adp	21 Feb 2002 17:13:17 -0000	1.2
+++ openacs-4/packages/acs-admin/www/users/one.adp	2 Sep 2002 14:44:42 -0000	1.3
@@ -1,32 +1,27 @@
-<master>
+<master src="master">
 <property name=title>@first_names@ @last_name@</property>
+<property name="context_bar">@context_bar@</property>
 
-<h2>@first_names@ @last_name@</h2>
-
-@context_bar@
-
-<hr>
-
 <ul>
-<li>Name:  @first_names@ @last_name@ (<a href="/user/basic-info-update?@export_edit_vars@">edit</a>)
+<li>Name:  @first_names@ @last_name@ (<a href="/user/basic-info-update?@export_edit_vars@">edit</a>)</li>
 <li>Email:  <a href="mailto:@email@">@email@</a> 
-(<a href="/user/basic-info-update?@export_edit_vars@">edit</a>)
-<li>Screen name:  @screen_name@ (<a href="/user/basic-info-update?@export_edit_vars@">edit</a>)
-<li>User ID:  @user_id@
-<li>Registration date:  @registration_date@
+(<a href="/user/basic-info-update?@export_edit_vars@">edit</a>)</li>
+<li>Screen name:  @screen_name@ (<a href="/user/basic-info-update?@export_edit_vars@">edit</a>)</li>
+<li>User ID:  @user_id@</li>
+<li>Registration date:  @registration_date@</li>
 
 <if @last_visit@ not nil>
-  <li>Last visit: @last_visit@
+  <li>Last visit: @last_visit@</li>
 </if>
 
 <if @portrait_p@ eq 1>
-  <li>Portrait:  <a href="/shared/portrait?user_id=@user_id@">@portrait_title@</a>
+  <li>Portrait:  <a href="/shared/portrait?user_id=@user_id@">@portrait_title@</a></li>
 </if>
 
-<li> Member state: @member_state@ @user_finite_state_links@
+<li> Member state: @member_state@ @user_finite_state_links@</li>
 </ul>
 
-<h3>This user is a member of the following groups:</h3>
+<h2>This user is a member of the following groups:</h2>
 <p>Note: These are the groups to which the user has been granted 
 <em>direct</em> membership.</p>
 
@@ -42,34 +37,31 @@
 above.
 </p>
 
-<ul><li><strong>
-  <multiple name="all_group_membership">
-    @all_group_membership.group_name@<if @all_group_membership.rownum@ lt @all_group_membership:rowcount@>, </if>
-  </multiple>
+<ul><li><strong><multiple name="all_group_membership"> @all_group_membership.group_name@<if @all_group_membership.rownum@ lt @all_group_membership:rowcount@>, </if> </multiple>
   </strong>
   </li>
 </ul>
 
 <multiple name="user_contributions">
 
-  <H3>@user_contributions.pretty_plural@</H3>
+  <h2>@user_contributions.pretty_plural@</h2>
   <ul>
   
   <group column="pretty_name">
-    <li>@creation_date@: @user_contributions.object_name@
+    <li>@creation_date@: @user_contributions.object_name@</li>
   </group>
   </ul>
   
 </multiple>
 
-<h3>Administrative Actions</h3>
+<h2>Administrative Actions</h2>
 
 <ul>
-<li><a href="/user/password-update?@export_edit_vars@">Update this user's password</a><p>
-<p>
-<li><a href="/user/portrait/index.tcl?@export_edit_vars@">Manage this user's portrait</a><p>
-<p>
-<li><a href="become?user_id=@user_id@">Become this user!</a>
+<li><a href="/user/password-update?@export_edit_vars@">Update this user's password</a></li>
+
+<li><a href="/user/portrait/index.tcl?@export_edit_vars@">Manage this user's portrait</a></li>
+
+<li><a href="become?user_id=@user_id@">Become this user!</a></li>
 </ul>