Index: openacs-4/packages/acs-subsite/www/pvt/home.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/home.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/pvt/home.adp	15 Aug 2003 21:18:12 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/pvt/home.adp	28 Aug 2003 09:41:42 -0000	1.8
@@ -1,62 +1,35 @@
 <master>
-<property name=title>@full_name;noquote@'s workspace at @system_name;noquote@</property>
-<property name="context">@context;noquote@</property>
+  <property name=title>@page_title@</property>
+  <property name="context">@context;noquote@</property>
+  <property name="focus">user_info.first_names</property>
 
-<ul>
+<h2>#acs-subsite.Basic_Information#</h2>
 
-<p>
+<formtemplate id="user_info"></formtemplate>
 
-<li><a href="@subsite_url@register/logout?return_url=@subsite_url@">Log Out</a>
-<p>
+<if @form_request_p@ true>
+  <p>
+    <b>&raquo;</b> <a href="../user/password-update">#acs-subsite.Change_my_Password#</a>
+  </p>
 
-<li><a href="@subsite_url@user/password-update?return_url=@pvt_home_url@">#acs-subsite.Change_my_Password#</a>
+  <p>
+    <b>&raquo;</b> <a href="@community_member_url@">What other people see when they click your name</a>
+  </p>
 
+  <p>
+    <b>&raquo;</b> <a href="unsubscribe">#acs-subsite.Unsubscribe#</a> (#acs-subsite.lt_for_a_period_of_vacat#)
+  </p>
 
-</ul>
-
-<h3>#acs-subsite.lt_What_we_tell_other_us#</h3>
-
-#acs-subsite.lt_In_general_we_identif#
-
-<p>
-
-#acs-subsite.lt_If_you_want_to_check_#
-
-<h4>#acs-subsite.Basic_Information#</h4>
-
-<ul>
-<li>#acs-subsite.Name#  @full_name@</li>
-<li>#acs-subsite.email_address#  @email@</li>
-<li>#acs-subsite.personal_URL#  <a target=new_window href="@url@">@url@</a></li>
-<li>#acs-subsite.screen_name#  @screen_name;noquote@</li>
-<li>#acs-subsite.bio# @bio@</li>
-</ul>
-<p>(<a href="@subsite_url@user/basic-info-update?return_url=@pvt_home_url@">#acs-subsite.Update#</a>)</p>
-
-
-<if @portrait_state@ eq upload>
-
-<h4>#acs-subsite.Your_Portrait#</h4>
-#acs-subsite.lt_Show_everyone_else_at#  <a href="@subsite_url@user/portrait/upload?return_url=@pvt_home_url@">#acs-subsite.upload_a_portrait#</a>
-
+  <if @portrait_state@ eq upload>
+    <h2>#acs-subsite.Your_Portrait#</h2>
+    <p>
+      #acs-subsite.lt_Show_everyone_else_at#  <a href="@portrait_upload_url@">#acs-subsite.upload_a_portrait#</a>
+    </p>
+  </if>
+  <if @portrait_state@ eq show>
+    <h2>#acs-subsite.Your_Portrait#</h2>
+    <p>
+      #acs-subsite.lt_On_portrait_publish_d#.
+    </p>
+  </if>
 </if>
-<if @portrait_state@ eq show>
-
-<h4>#acs-subsite.Your_Portrait#</h4>
-#acs-subsite.lt_On_portrait_publish_d#.
-
-</if>
-
-
-
-<h3>#acs-subsite.lt_If_youre_getting_too_#</h3>
-
-#acs-subsite.lt_Then_you_should_eithe# 
-
-<ul>
-<li><a href="alerts?return_url=@pvt_home_url@">#acs-subsite.edit_your_alerts#</a></li>
-</ul>
-<p>#acs-subsite.or#</p>
-<ul>
-<li><a href="unsubscribe?return_url=@pvt_home_url@">#acs-subsite.Unsubscribe#</a> (#acs-subsite.lt_for_a_period_of_vacat#)</li>
-</ul>