Index: openacs-4/packages/dotlrn/www/site-map.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/site-map.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/site-map.adp	9 Nov 2008 23:29:23 -0000	1.2
+++ openacs-4/packages/dotlrn/www/site-map.adp	3 Apr 2009 15:12:06 -0000	1.3
@@ -60,45 +60,39 @@
         <ul>
           <li>#acs-subsite.My_Account#
             <ul>
-              <if @notifications_url@ not nil>
-                <li><a href="@notifications_url@" title="#acs-subsite.Manage_your_notifications#">#acs-subsite.Manage_your_notifications#</a></li>
-              </if>
+              <li><a href="@community_member_url@">#acs-subsite.lt_What_other_people_see#</a></li>
+              <li><a href="@portrait_url@">#acs-subsite.Manage_Portrait#</a></li>
+              <li><a href="@bio_update_url@">#dotlrn.Edit_Biography#</a></li>
+              <li><a href="@email_privacy_url@">#acs-subsite.Change_my_email_P#</a></li>
 
-              <if @allowed_to_change_site_template_p@>
-                <li><a href="@site_template_url@" title="#dotlrn.Customize_Template#">#dotlrn.Customize_Template#</a>
-              </if>
-				
-              <li><a href="configure" title="#dotlrn.Customize_Layout#">#dotlrn.Customize_Layout#</a></li>
-
               <li><a href="@change_locale_url@" title="#acs-subsite.Change_locale_label#">#acs-subsite.Change_locale_label#</a></li>
 
-              <li><a href="../user/password-update" title="#acs-subsite.Change_my_Password#">#acs-subsite.Change_my_Password#</a></li>
+              <li><a href="@password_update_url@" title="#acs-subsite.Change_my_Password#">#acs-subsite.Change_my_Password#</a></li>
 
               <if @account_status@ ne "closed">
                 <li><a href="/pvt/unsubscribe" title="#acs-subsite.Close_your_account#">#acs-subsite.Close_your_account#</a></li>
               </if>
             </ul>
           </li>
-          <li>
-            <a href="../user/portrait">#acs-subsite.Your_Portrait#</a>
-          </li>
-          <li>#acs-subsite.Privacy#
-			<ul>
-              <li>
-                <a href="@community_member_url@">#acs-subsite.lt_What_other_people_see#</a>
-              </li>
-              <li>
-                <a href="@whos_online_url@">#acs-subsite.Whos_Online_link_label#</a>
-              </li>
-              <li>
-                <a href="../user/email-privacy-level">#acs-subsite.Change_my_email_P#</a>
-              </li>
+          <li>#dotlrn.Preferences#
+            <ul>
+              <if @notifications_url@ not nil>
+                <li><a href="@notifications_url@" title="#acs-subsite.Manage_your_notifications#">#acs-subsite.Manage_your_notifications#</a></li>
+              </if>
+
+              <li><a href="configure" title="#dotlrn.Customize_Layout#">#dotlrn.Customize_Layout#</a></li>
+
+              <if @allowed_to_change_site_template_p@>
+                <li><a href="@site_template_url@" title="#dotlrn.Customize_Template#">#dotlrn.Customize_Template#</a>
+              </if>
+				
               <if @invisible_p@ true>
                 <li><a href="@make_visible_url@" title="#acs-subsite.Make_yourself_visible_label#">#acs-subsite.Make_yourself_visible_label#</a></li>
               </if>
               <else>
                 <li><a href="@make_invisible_url@" title="#acs-subsite.Make_yourself_invisible_label#">#acs-subsite.Make_yourself_invisible_label#</a></li>
               </else>
+              <li><a href="@whos_online_url@">#acs-subsite.Whos_Online_link_label#</a></li>
             </ul>
           </li>
           <li>
Index: openacs-4/packages/dotlrn/www/site-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/site-map.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/site-map.tcl	9 Nov 2008 23:29:23 -0000	1.2
+++ openacs-4/packages/dotlrn/www/site-map.tcl	3 Apr 2009 15:12:06 -0000	1.3
@@ -42,18 +42,21 @@
 }
 
 # control panel
-
+set subsite_url [subsite::get_element -element url]
 set account_status [ad_conn account_status]
 
 set notifications_url [lindex [site_node::get_children -node_id [subsite::get_element -element node_id] -package_key "notifications"] 0]
 
+set portrait_url "${subsite_url}user/portrait"
 set change_locale_url [apm_package_url_from_key "acs-lang"]
 set community_member_url [acs_community_member_url -user_id $user_id]
+set bio_update_url [export_vars -base "bio-update" {return_url}]
+set email_privacy_url [export_vars -base "${subsite_url}user/email-privacy-level" {return_url}]
+set password_update_url [export_vars -base "${subsite_url}user/password-update" {return_url}]
 
-
-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 whos_online_url "${subsite_url}shared/whos-online"
+set make_visible_url [export_vars -base "${subsite_url}shared/make-visible" {return_url}]
+set make_invisible_url [export_vars -base "${subsite_url}shared/make-invisible" {return_url}]
 set invisible_p [whos_online::user_invisible_p [ad_conn untrusted_user_id]]
 
 set allowed_to_change_site_template_p [parameter::get -package_id $dotlrn_package_id -parameter "UserChangeSiteTemplate_p" -default 0]