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.6 -r1.7
--- openacs-4/packages/acs-subsite/www/pvt/home.adp	22 May 2003 14:12:54 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/pvt/home.adp	15 Aug 2003 21:18:12 -0000	1.7
@@ -6,11 +6,10 @@
 
 <p>
 
-<li><a href="/register/logout">#acs-subsite.Log_Out#</a>
-
+<li><a href="@subsite_url@register/logout?return_url=@subsite_url@">Log Out</a>
 <p>
 
-<li><a href="/user/password-update">#acs-subsite.Change_my_Password#</a>
+<li><a href="@subsite_url@user/password-update?return_url=@pvt_home_url@">#acs-subsite.Change_my_Password#</a>
 
 
 </ul>
@@ -32,13 +31,13 @@
 <li>#acs-subsite.screen_name#  @screen_name;noquote@</li>
 <li>#acs-subsite.bio# @bio@</li>
 </ul>
-<p>(<a href="/user/basic-info-update">#acs-subsite.update#</a>)</p>
+<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="/user/portrait/upload">#acs-subsite.upload_a_portrait#</a>
+#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>
 <if @portrait_state@ eq show>
@@ -55,9 +54,9 @@
 #acs-subsite.lt_Then_you_should_eithe# 
 
 <ul>
-<li><a href="alerts">#acs-subsite.edit_your_alerts#</a></li>
+<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">#acs-subsite.Unsubscribe#</a> (#acs-subsite.lt_for_a_period_of_vacat#)</li>
+<li><a href="unsubscribe?return_url=@pvt_home_url@">#acs-subsite.Unsubscribe#</a> (#acs-subsite.lt_for_a_period_of_vacat#)</li>
 </ul>