Index: openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp	15 Aug 2003 21:23:26 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp	1 Sep 2003 11:41:01 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Confirm Unsubscribe</property>
-<property name="context">Confirm Unsubscribe</property>
+<property name="context">@context@</property>
 
 
 <p>Confirm that you'd like to unsubscribe from @site_link;noquote@.</p>
Index: openacs-4/packages/acs-subsite/www/pvt/unsubscribe.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/unsubscribe.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/pvt/unsubscribe.tcl	18 Nov 2002 18:01:13 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/pvt/unsubscribe.tcl	1 Sep 2003 11:41:01 -0000	1.4
@@ -8,6 +8,7 @@
     date_entry_widget:onevalue
     parameter_enabled_p:onevalue
     dont_spam_me_p:onevalue
+    context:onevalue
 }
 
 set user_id [ad_maybe_redirect_for_registration]
@@ -18,6 +19,8 @@
 
 set site_link [ad_site_home_link]
 
+set context [list [list [ad_pvt_home] "Your Account"] "Confirm Unsubscribe"]
+
 set pretty_no_alerts_until_date [lc_time_fmt $no_alerts_until "%q"]
 set date_entry_widget [ad_dateentrywidget_default_to_today on_vacation_until]
 
Index: openacs-4/packages/acs-subsite/www/user/password-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/password-update.adp,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/acs-subsite/www/user/password-update.adp	29 Aug 2003 21:14:26 -0000	1.12
+++ openacs-4/packages/acs-subsite/www/user/password-update.adp	1 Sep 2003 11:41:01 -0000	1.13
@@ -1,7 +1,7 @@
 <master>
   <property name="title">#acs-subsite.Update_Password#</property>
   <property name="context_bar">#acs-subsite.lt_for_first_names_last_#</property>
-  <property name="context">#acs-subsite.Update_Password#</property>
+  <property name="context">@context@</property>
   <property name="focus">@focus@</property>
 
 <if @expired_p@ true>
Index: openacs-4/packages/acs-subsite/www/user/password-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/password-update.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/www/user/password-update.tcl	28 Aug 2003 09:41:42 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/user/password-update.tcl	1 Sep 2003 11:41:01 -0000	1.11
@@ -14,12 +14,15 @@
     admin_enabled_p:onevalue
     export_vars:onevalue
     site_link:onevalue
+    context:onevalue
 }
 
 if {[empty_string_p $user_id]} {
     set user_id [ad_verify_and_get_user_id]
 }
 
+set context [list [list [ad_pvt_home] "Your Account"] [_ acs-subsite.Update_Password]]
+
 # We have a special provision here for expired passwords
 # The user will not be logged in, but we're supposed to log them in after we're done
 # We use template::util::is_true in order to be liberal in the input we accept
Index: openacs-4/packages/acs-subsite/www/user/portrait/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/index.adp,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/user/portrait/index.adp	28 Aug 2003 09:41:43 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/user/portrait/index.adp	1 Sep 2003 11:41:01 -0000	1.8
@@ -1,13 +1,16 @@
 <master>
-<property name="title">Portrait of @first_names;noquote@ @last_name;noquote@</property>
+<property name="title">Portrait of @first_names@ @last_name@</property>
 <property name="context">@context;noquote@</property>
 
-<if @admin_p@ eq 1>
+<switch @return_code@>
+
+<case value="no_error">
 <p>This is the image that we show to other users at @system_name@:</p>
 </if>
 
 <center>
-<img @widthheight@ src="@subsite_url@shared/portrait-bits.tcl?@export_vars@">
+<img @widthheight@ src="@subsite_url@shared/portrait-bits.tcl?@export_vars@"
+alt="Portrait of @first_names@ @last_name@">
 </center>
 
 <ul>
@@ -24,9 +27,38 @@
 
 <ul>
 <li><a href="comment-edit?@export_edit_vars@">edit comment</a></li>
-<li><a href="upload?@export_edit_vars@">upload a replacement portrait</a></li>
+<li><a href="upload?return_url=@return_url@">upload a replacement portrait</a></li>
 
 <li><a href="erase?@export_edit_vars@">erase portrait</a></li>
 
 </ul>
 </if>
+</case>
+
+<case value="no_user">
+We can't find you (user @user_id@) in the users table.  Probably your
+account was deleted for some reason.
+</case>
+
+<case value="no_portrait_info">
+The picture of you in the system is invalid. Please
+<a href="upload?return_url=@return_url@">upload</a> another picture.
+</case>
+
+<case value="no_portrait">
+<if @admin_p@ eq "0">
+This user doesn't have a portrait yet. You can
+<a href="upload?@export_edit_vars@">go upload the user's portrait</a>.
+</if>
+<else>
+You don't have a portrait yet. You can
+<a href="upload?return_url=@return_url@">go upload your portrait</a>.
+</else>
+</case>
+ 
+</switch>
+
+
+
+
+
Index: openacs-4/packages/acs-subsite/www/user/portrait/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/index.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/user/portrait/index.tcl	28 Aug 2003 09:41:43 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/user/portrait/index.tcl	1 Sep 2003 11:41:01 -0000	1.7
@@ -18,11 +18,22 @@
     description:onevalue
     export_edit_vars:onevalue
     subsite_url:onevalue
+    return_url:onevalue
+    admin_p:onevalue
+    user_id:onevalue
+    return_code:onevalue
 }
    
 set current_user_id [ad_verify_and_get_user_id]
 set subsite_url     [subsite::get_element -element url]
+set return_url      "[subsite::get_element -element url]user/portrait/"
 
+set return_code "no_error"
+# Other possibilities:
+# no_user          : Unknown user_id, not in DB.
+# no_portrait      : No portrait uploaded yet for this user.
+# no_portrait_info : Unable to retrieve information on portrait.
+
 if [empty_string_p $user_id] {
     set user_id $current_user_id
 }
@@ -34,13 +45,17 @@
     set admin_p 0
 }
 
+set export_vars      [export_url_vars user_id]
+set export_edit_vars [export_url_vars user_id return_url]
 
 if ![db_0or1row user_info "select 
   first_names, 
   last_name 
 from persons 
 where person_id=:user_id"] {
-    ad_return_error "Account Unavailable" "We can't find you (user #$user_id) in the users table.  Probably your account was deleted for some reason."
+    set return_code "no_user"
+    set context [list "Account Unavailable"]
+    ad_return_template
     return
 }
 
@@ -51,13 +66,21 @@
 and a.object_id_one = :user_id
 and a.rel_type = 'user_portrait_rel'"] || [empty_string_p $revision_id]} {
     # The user doesn't have a portrait yet
-    if {$admin_p} {
-	set message "This user doesn't have a portrait yet.  You can <a href=\"upload?[export_url_vars user_id return_url]\">go upload the user's portrait</a>."
-    } else {
-	set message "You don't have a portrait yet. You can <a href=\"upload?[export_url_vars return_url]\">go upload your portrait</a>"
-    }
+    set portrait_p 0
+} else {
+    set portrait_p 1
+}
     
-    ad_return_error "No Portrait" "$message"
+if {$portrait_p} {
+     if {$admin_p} {
+	 set context [list [list [ad_pvt_home] "Your Account"] "Your Portrait"]
+     } else {
+	 set context [list [list [ad_pvt_home] "User's Account"] "User's Portrait"]
+     }
+} else {
+    set context [list "No Portrait"]
+    set return_code "no_portrait"
+    ad_return_template
     return
 }
 
@@ -71,8 +94,9 @@
 and image_id = :revision_id
 "} errmsg] {
     # There was an error obtaining the picture information
-
-    ad_return_error "Invalid Picture" "The picture of you in the system is invalid. Please <a href=\"upload\">upload</a> another picture."
+    set context [list "Invalid Picture"]
+    set return_code "no_portrait_info"
+    ad_return_template
     return
 }
 
@@ -89,15 +113,7 @@
 
 db_release_unused_handles
 
-if {$admin_p} {
-    set context [list "User's Portrait"]
-} else {
-    set context [list "Your Portrait"]
-}
-
 set system_name [ad_system_name]
-set export_vars [export_url_vars user_id]
 set pretty_date [lc_time_fmt $publish_date "%q"]
-set export_edit_vars [export_url_vars user_id return_url]
 
 ad_return_template