Index: openacs-4/packages/dotlrn/www/control-panel.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/control-panel.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/control-panel.tcl	9 Nov 2008 23:29:23 -0000	1.13
+++ openacs-4/packages/dotlrn/www/control-panel.tcl	3 Apr 2009 12:13:49 -0000	1.14
@@ -23,65 +23,60 @@
     @creation-date 2001-11-10
     @version $Id$
 
-} -query {
-} -properties {
-    title:onevalue
-    admin_p:onevalue
-    admin_url:onevalue
-    referer:onevalue
 }
 
 
+# Make sure user is logged in
+set user_id [auth::require_login]
+acs_user::get -array user -include_bio -user_id $user_id
+
+# General data
 set dotlrn_url [dotlrn::get_url]
 set dotlrn_package_id [dotlrn::get_package_id]
-set portal_id [dotlrn::get_portal_id -user_id [ad_get_user_id]]
 
-# Make sure user is logged in
-set user_id [auth::require_login -account_status closed]
+set return_url [ad_return_url]
 
-set title [parameter::get -localize -parameter admin_page_name]
-set context [list [parameter::get -localize -parameter admin_page_name]]
-set admin_p [dotlrn::admin_p]
-set admin_url "[dotlrn::get_url]/admin"
-set cockpit_url "[dotlrn::get_url]/admin/cockpit"
-set referer [ns_conn url]
-set admin_pretty_name [parameter::get -localize -parameter dotlrn_admin_pretty_name]
-set system_owner [ad_system_owner]
+set subsite_url [subsite::get_element -element url]
 
-set pvt_home [ad_pvt_home]
+set pvt_home_url [ad_pvt_home]
 set pvt_home_name [ad_pvt_home_name]
 
-acs_user::get -array user -include_bio -user_id $user_id
+set system_owner [ad_system_owner]
 
-set account_status [ad_conn account_status]
+# Page information
+set doc(title) $pvt_home_name
+set context [list $doc(title)]
 
-set community_member_url [acs_community_member_url -user_id $user_id]
+# Get URLs for options
 
-set notifications_url [lindex [site_node::get_children -node_id [subsite::get_element -element node_id] -package_key "notifications"] 0]
+## Your account
 
-set system_name [ad_system_name]
+set portrait_p [db_0or1row get_portrait_info {}] 
+if { $portrait_p } {
+    set portrait_image_src [export_vars -base "${subsite_url}shared/portrait-bits.tcl" { user_id item_id {size avatar}}]
+    set portrait_url [export_vars -base "${subsite_url}user/portrait" { return_url }]
+} else {
+    set portrait_url [export_vars -base "${subsite_url}user/portrait/upload" { return_url }]
+}
 
+set user_info_template [parameter::get -package_id [ad_conn subsite_id] -parameter UserInfoTemplate -default "/packages/acs-subsite/lib/user-info"]
+
+set community_member_url [acs_community_member_url -user_id $user_id]
+
+set edit_bio_url [export_vars -base "bio-update" {return_url}]
+set email_privacy_url "${subsite_url}user/email-privacy-level"
 set change_locale_url [apm_package_url_from_key "acs-lang"]
+set change_password_url "${subsite_url}user/password-update"
 
-set whos_online_url "[subsite::get_element -element url]shared/whos-online"
-set make_visible_url "[subsite::get_element -element url]shared/make-visible"
-set make_invisible_url "[subsite::get_element -element url]shared/make-invisible"
-set invisible_p [whos_online::user_invisible_p [ad_conn untrusted_user_id]]
+set close_account_url "${subsite_url}pvt/unsubscribe"
 
-if { ![db_0or1row get_portrait_info {}] } {
-    set portrait_state "upload"
-} else {
-    if { $portrait_title eq "" } {
-        set portrait_title "[_ acs-subsite.no_portrait_title_message]"
-	set portrait_state "show"
-	set portrait_publish_date [lc_time_fmt $publish_date "%q"]
-    }
-}
-set portrait_upload_url [export_vars -base "../user/portrait/upload" { { return_url [ad_return_url] } }]
-set subsite_url [ad_conn vhost_subsite_url]
-set pvt_home_url [ad_pvt_home]
+## Preferences
+set notifications_url [lindex [site_node::get_children -node_id [subsite::get_element -element node_id] -package_key "notifications"] 0]
 
-set allowed_to_change_site_template_p [parameter::get -package_id $dotlrn_package_id -parameter "UserChangeSiteTemplate_p" \
-			      -default 0]
+set allowed_to_change_site_template_p [parameter::get -package_id $dotlrn_package_id -parameter "UserChangeSiteTemplate_p" -default 0]
+set site_template_url [export_vars -base "change-site-template" {{referer $return_url}}]
 
-set user_info_template [parameter::get -package_id [ad_conn subsite_id] -parameter UserInfoTemplate -default "/packages/acs-subsite/lib/user-info"]
\ No newline at end of file
+set invisible_p [whos_online::user_invisible_p [ad_conn untrusted_user_id]]
+set make_visible_url "${subsite_url}shared/make-visible"
+set make_invisible_url "${subsite_url}shared/make-invisible"
+set whos_online_url "${subsite_url}shared/whos-online"