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.11 -r1.12
--- openacs-4/packages/acs-subsite/www/pvt/home.adp	15 Sep 2003 10:31:25 -0000	1.11
+++ openacs-4/packages/acs-subsite/www/pvt/home.adp	19 Sep 2003 15:00:44 -0000	1.12
@@ -7,29 +7,39 @@
 
 <include src="/packages/acs-subsite/lib/user-info">
 
-<if @form_request_p@ true>
+<if @account_status@ eq "closed">
   <p>
-    <b>&raquo;</b> <a href="../user/password-update">#acs-subsite.Change_my_Password#</a>
+    <font color="red">
+      <b> Your account is currently closed. </b> 
+    </font>
+    <a href="@login_url@">Log in</a> again to see what you can do about it.
   </p>
+</if>
 
+<p>
+  <b>&raquo;</b> <a href="../user/password-update">#acs-subsite.Change_my_Password#</a>
+</p>
+
+<p>
+  <b>&raquo;</b> <a href="@community_member_url@">What other people see when they click your name</a>
+</p>
+
+<if @account_status@ ne "closed">
   <p>
-    <b>&raquo;</b> <a href="@community_member_url@">What other people see when they click your name</a>
+    <b>&raquo;</b> <a href="unsubscribe-2">Close your account</a> 
   </p>
+</if>
 
+<if @portrait_state@ eq upload>
+  <h2>#acs-subsite.Your_Portrait#</h2>
   <p>
-    <b>&raquo;</b> <a href="unsubscribe">#acs-subsite.Unsubscribe#</a> (#acs-subsite.lt_for_a_period_of_vacat#)
+    #acs-subsite.lt_Show_everyone_else_at#  <a href="@portrait_upload_url@">#acs-subsite.upload_a_portrait#</a>
   </p>
-
-  <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>
+  <h2>#acs-subsite.Your_Portrait#</h2>
+  <p>
+    #acs-subsite.lt_On_portrait_publish_d#.
+  </p>
+</if>
+