Index: openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml,v
diff -u -r1.51 -r1.52
--- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	9 Nov 2008 23:29:23 -0000	1.51
+++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	3 Apr 2009 12:13:49 -0000	1.52
@@ -28,6 +28,7 @@
   <msg key="Add_User">Add User</msg>
   <msg key="Add_users_to">Add users to</msg>
   <msg key="Add_Users_to_Group">Add Users to Group</msg>
+  <msg key="Add_your_bio">Add your biography</msg>
   <msg key="AddDrop_Memberships">Add/Drop Memberships</msg>
   <msg key="added_community_message">To visit the community's home page, point your browser at %package%, log in, and click on the %community_name% link in the &quot;Groups&quot; portlet.</msg>
   <msg key="added_community_subject">You have been added to the &quot;%community_name%&quot; community at %package%</msg>
@@ -140,6 +141,7 @@
   <msg key="Confirm_1">Confirm:</msg>
   <msg key="Confirm_Drop">Confirm Drop</msg>
   <msg key="Confirmation">Confirmation</msg>
+  <msg key="Contact_us">Contact Us</msg>
   <msg key="control_panel">Control Panel</msg>
   <msg key="control_panel_accesskey">7</msg>
   <msg key="Copy">Copy</msg>
@@ -158,6 +160,7 @@
   <msg key="CSV_File_Format">CSV File Format</msg>
   <msg key="Customize_Layout">Customize Layout</msg>
   <msg key="Customize_Template">Customize Site Template</msg>
+  <msg key="Cut_and_paste_or_type_your_bio_">Cut and paste or type your biography</msg>
   <msg key="database_choked">&lt;p&gt;Database error while trying to create the last user in the list above!&lt;br&gt; The transaction has been aborted, no users have been entered, and no e-mail notifications have been sent.&lt;p&gt;</msg>
   <msg key="datafile_must">&lt;p&gt;Datafile must include at least the email, first_names, last_name fields.&lt;p&gt;</msg>
   <msg key="Deactivate_">Deactivate ...</msg>
@@ -219,6 +222,7 @@
   <msg key="emacs_subject">Subject</msg>
   <msg key="Email">Email</msg>
   <msg key="email">E-mail</msg>
+  <msg key="Email_">Email:</msg>
   <msg key="Email_1">Email</msg>
   <msg key="Email_Cancelled">Email Cancelled</msg>
   <msg key="Email_Members">Email Members</msg>
@@ -240,6 +244,7 @@
   <msg key="First_Line">First Line</msg>
   <msg key="first_line_of_file_must_be">The first line of the file must have the following header line:</msg>
   <msg key="First_Name">First Name</msg>
+  <msg key="First_names_">Firstnames:</msg>
   <msg key="From">From</msg>
   <msg key="fuchsia">fuchsia</msg>
   <msg key="Full">Full</msg>
@@ -297,6 +302,7 @@
   <msg key="Key">Key</msg>
   <msg key="Large">Large</msg>
   <msg key="Last_Name">Last Name</msg>
+  <msg key="Last_name_">Last name:</msg>
   <msg key="Last_Visit">Last Visit:</msg>
   <msg key="Last_visit_over">Number of days since last visit is more than:</msg>
   <description key="Last_visit_over">On the user search form. What follows the text is a select box for the number of days.</description>
@@ -536,13 +542,15 @@
   <msg key="Or">Or</msg>
   <msg key="or_by_RGB_number">or by RGB number</msg>
   <msg key="or_return_to">or, return to</msg>
+  <msg key="OR_upload_a_text_file">Or upload a text file</msg>
   <msg key="Page">Page</msg>
   <msg key="Parent">Parent</msg>
   <msg key="Parent_Type">Parent Type</msg>
   <msg key="Pending">Pending</msg>
   <msg key="Pending_Approval">Pending Approval</msg>
   <msg key="Person_name">Name:</msg>
   <msg key="Personal_home_page">Personal home page:</msg>
+  <msg key="Personal_info">Personal Information</msg>
   <msg key="Personal_Options">Personal Options</msg>
   <msg key="Plain_Text">Plain Text</msg>
   <msg key="Please_type_a_keyword">Please type a keyword
@@ -662,6 +670,7 @@
   <msg key="subcommunity_memberships">%subcommunities_pretty_name% Memberships</msg>
   <msg key="Subject">Subject</msg>
   <msg key="Subject_key">Subject key</msg>
+  <msg key="Support">Support</msg>
   <msg key="teaching_assistant_role_pretty_name">Teaching Assistant</msg>
   <msg key="teaching_assistant_role_pretty_plural">Teaching Assistants</msg>
   <msg key="teal">teal</msg>
@@ -690,6 +699,7 @@
   <msg key="Unknown_Term">Unknown Term</msg>
   <msg key="Update_Password">Update Password</msg>
   <msg key="upload">upload</msg>
+  <msg key="Upload_file_format">File format</msg>
   <msg key="User">User</msg>
   <msg key="user_add_confirm_email_body">You have been added as a user to %system_name% at %system_url%.
             Login: %user_email%
Index: openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml	9 Nov 2008 23:29:23 -0000	1.21
+++ openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml	3 Apr 2009 12:13:49 -0000	1.22
@@ -27,6 +27,7 @@
   <msg key="Add_User">A�adir usuario</msg>
   <msg key="Add_users_to">A�adir usuarios a</msg>
   <msg key="Add_Users_to_Group">A�adir usuarios al grupo</msg>
+  <msg key="Add_your_bio">Su biograf�a</msg>
   <msg key="AddDrop_Memberships">Alta/baja en grupos</msg>
   <msg key="added_community_message">Para visitar la p�gina de la comunidad, vaya con su navegador al %package%, abra una sesi�n, pinche en el enlace   %community_name% dentro del portlet &amp;quot;Grupos&amp;quot;.</msg>
   <msg key="added_community_subject">Ha sido a�adido a la comunidad &amp;quot;%community_name%&amp;quot; en %package%</msg>
@@ -130,6 +131,7 @@
   <msg key="Confirm_1">Confirmar:</msg>
   <msg key="Confirm_Drop">Confirmar borrado</msg>
   <msg key="Confirmation">Confirmaci�n</msg>
+  <msg key="Contact_us">Contactar</msg>
   <msg key="control_panel">Panel de control</msg>
   <msg key="control_panel_accesskey">7</msg>
   <msg key="Copy">Copiar</msg>
@@ -148,6 +150,7 @@
   <msg key="CSV_File_Format">Formato CSV</msg>
   <msg key="Customize_Layout">Personalizar este portal</msg>
   <msg key="Customize_Template">Personalizar plantilla</msg>
+  <msg key="Cut_and_paste_or_type_your_bio_">Corte y pegue o escriba su biograf�a</msg>
   <msg key="database_choked">&lt;p&gt;�Ha ocurrido un error en la base de datos mientras se intentaba crear al ultimo usuario de la lista!&amp;&lt;br&gt;La transacci�n ha sido abortada, no se ha a�adido ning�n usuario y no se ha enviado ning�n correo.&lt;/p&gt;</msg>
   <msg key="datafile_must">&lt;p&gt;El archivo de datos debe de incluir al menos los campos &quot;emails, first_names, last_name&quot;.&lt;p&gt;</msg>
   <msg key="Deactivate_">Desactivar...</msg>
@@ -206,6 +209,7 @@
   <msg key="emacs_subject">Asignatura</msg>
   <msg key="Email">Correo electr�nico:</msg>
   <msg key="email">Correo electr�nico</msg>
+  <msg key="Email_">Email:</msg>
   <msg key="Email_1">Correo electr�nico</msg>
   <msg key="Email_Cancelled">Correo cancelado</msg>
   <msg key="Email_Members">Escribir a los miembros</msg>
@@ -227,6 +231,7 @@
   <msg key="First_Line">Primera L�nea</msg>
   <msg key="first_line_of_file_must_be">La primera l�nea del archivo debe contener el siguiente l�nea de t�tulo:</msg>
   <msg key="First_Name">Nombre</msg>
+  <msg key="First_names_">Nombre:</msg>
   <msg key="From">Desde</msg>
   <msg key="fuchsia">fucsia</msg>
   <msg key="Full">Ilimitado</msg>
@@ -284,6 +289,7 @@
   <msg key="Key">Clave</msg>
   <msg key="Large">Grande</msg>
   <msg key="Last_Name">Apellidos</msg>
+  <msg key="Last_name_">Apellidos:</msg>
   <msg key="Last_Visit">�ltima visita:</msg>
   <msg key="Last_visit_over">�ltima visita despu�s de</msg>
   <msg key="Last_visit_under">�ltima visita antes de</msg>
@@ -489,13 +495,15 @@
   <msg key="Or">o</msg>
   <msg key="or_by_RGB_number">o por n�meros RGB</msg>
   <msg key="or_return_to">o, volver a</msg>
+  <msg key="OR_upload_a_text_file">O suba un fichero de texto</msg>
   <msg key="Page">P�gina</msg>
   <msg key="Parent">Padre</msg>
   <msg key="Parent_Type">Tipo del padre</msg>
   <msg key="Pending">Pendiente</msg>
   <msg key="Pending_Approval">Esperando aprobaci�n</msg>
   <msg key="Person_name">Nombre</msg>
   <msg key="Personal_home_page">P�gina personal:</msg>
+  <msg key="Personal_info">Informaci�n personal</msg>
   <msg key="Personal_Options">Opciones personales</msg>
   <msg key="Plain_Text">Texto plano</msg>
   <msg key="Please_type_a_keyword">Entrar cadena a buscar</msg>
@@ -600,6 +608,7 @@
   <msg key="subcommunity_memberships">Miembros de %subcommunities_pretty_name%</msg>
   <msg key="Subject">Asunto</msg>
   <msg key="Subject_key">Llave de Asignatura</msg>
+  <msg key="Support">Soporte</msg>
   <msg key="teaching_assistant_role_pretty_name">Profesor asociado</msg>
   <msg key="teaching_assistant_role_pretty_plural">Profesores asociados</msg>
   <msg key="teal">turquesa</msg>
@@ -627,6 +636,7 @@
   <msg key="Unknown_Term">Per�odo desconocido</msg>
   <msg key="Update_Password">Actualizar contrase�a</msg>
   <msg key="upload">subir</msg>
+  <msg key="Upload_file_format">Formato del fichero</msg>
   <msg key="User">Usuario</msg>
   <msg key="user_add_confirm_email_body">Ha sido registrado como usuario de %system_name% en %system_url%. Direcci�n de correo: %user_email% Contrase�a: %user_password%</msg>
   <msg key="user_add_confirm_email_subject">Ha sido registrado como usuario de %system_name% en %system_url%</msg>
Index: openacs-4/packages/dotlrn/www/community-member.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-member.adp,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/dotlrn/www/community-member.adp	9 Nov 2008 23:29:23 -0000	1.25
+++ openacs-4/packages/dotlrn/www/community-member.adp	3 Apr 2009 12:13:49 -0000	1.26
@@ -19,60 +19,43 @@
 %>
 
 <master>
-<property name="title">@first_names@ @last_name@</property>
+<property name="title">@user.first_names@ @user.last_name@</property>
 <property name="context">@context;noquote@</property>
 
-<p>
-<a href="@return_url;noquote@" title="Go back" class="button">Go back</a>
-</p>
-#dotlrn.user_has_been_a_member_since#
+<if @portrait_p@>
+  <div style="float: right;">
+    <a href="@portrait_url@" title="#acs-subsite.See_full_size#">
+      <img src="@img_src@" alt="#acs-subsite.lt_Portrait_of_first_last#">
+    </a>
+  </div>
+</if>
 
-<if @member_state@ eq "deleted">
+<div>
+<h1>#dotlrn.Personal_info#</h1>
 
+<if @user.member_state@ eq "deleted">
   <p><strong>#dotlrn.this_user_is_deleted#</strong></p>
-
 </if>
-<else><if @member_state@ eq "banned">
+<else>
+  <if @user.member_state@ eq "banned">
+    <p><strong>#dotlrn.lt_this_user_is_deleted_#</strong></p>
+  </if>
+</else>
 
-  <p><strong>#dotlrn.lt_this_user_is_deleted_#</strong></p>
-
-</if></else>
-
-<if @show_email_p@ eq 1>
   <ul>
-    <li>#dotlrn.email#: <a href="mailto:@email@">@email@</a></li>
+    <li>#dotlrn.First_names_# @first_names@</li>
+    <li>#dotlrn.Last_name_# @last_name@</li>
+    <li>#dotlrn.Email_# @pretty_email;noquote@</li>
+    <li>#dotlrn.Registration_date# @pretty_creation_date@</li>
 
-    <if @url@ not nil>
-      <li>#dotlrn.Personal_home_page# <a href="@homepage_url@">@homepage_url@</a></li>
+    <if @user.url@ not nil>
+      <li>#dotlrn.Personal_home_page# <a href="@user.url@">@user.url@</a></li>
     </if>
-	<if @forums_p@ true>
-	<multiple name="forumss">
-	<li><a href="@forums_url@?forum_id=@forums.forum_id@">@forums.name@</a> - #dotlrn.Latest_post# @forums.lastest_post@
-        </multiple>
-        </if>
-    <if @bio@ not nil>
-      <p> <em>#dotlrn.Biography#</em> @bio;noquote@
-    </if>
   </ul>
-</if>
-<else>
-  <if @url@ not nil>
-    <ul><li>#dotlrn.Personal_home_page# <a href="@url@">@url@</a></li></ul>
-  </if>
-</else>
 
-<if @portrait_p@ eq 1>
-
-  <if @inline_portrait_state@ eq "inline">
-  
-    <a href="/shared/portrait?@portrait_export_vars@"><img src="/shared/portrait-bits?@portrait_export_vars@" align="right" width="@width@" height="@height@"></a><br>
-  
-  </if>
-  <if @inline_portrait_state@ eq "link">
-  
-      <ul><li><a href="/shared/portrait?@portrait_export_vars@">#dotlrn.Portrait_1#</a></li></ul>
-  
-  </if>
+<if @user.bio@ not nil>
+  <h1>#dotlrn.Biography#</h1>
+  @user.bio;noquote@
 </if>
 
-<include src="/packages/dotlrn/lib/bio" user_id="@user_id@" community_id="@community_id@" return_url="@return_url_2;noquote@">
+</div>
Index: openacs-4/packages/dotlrn/www/community-member.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-member.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/dotlrn/www/community-member.tcl	8 Aug 2006 21:26:24 -0000	1.18
+++ openacs-4/packages/dotlrn/www/community-member.tcl	3 Apr 2009 12:13:49 -0000	1.19
@@ -25,7 +25,6 @@
     {community_id ""}
     {return_url ""}
 } -properties {
-    context_bar:onevalue
     portal_id:onevalue
     member_state:onevalue
     first_names:onevalue
@@ -52,107 +51,37 @@
 
 auth::require_login
 
-set verified_user_id [ad_verify_and_get_user_id]
+acs_user::get -user_id $user_id -array user -include_bio
 
-set user_info_sql {
-    select first_names,
-           last_name,
-           email,
-           priv_email,
-           url as homepage_url,
-           creation_date,
-           member_state
-    from cc_users
-    where user_id = :user_id
+foreach name {first_names last_name} {
+    set $name $user($name)
 }
 
-
-if {![db_0or1row user_information $user_info_sql]} {
-    ad_return_error "[_ dotlrn.No_user_found]" [_ dotlrn.no_community_member_with_id [list user_id $user_id]]
-    ad_script_abort
+if { $return_url eq "" } {
+    set return_url [ad_return_url]
 }
 
-set bio [db_string biography {
-    select attr_value
-    from acs_attribute_values
-    where object_id = :user_id
-    and attribute_id = (select attribute_id
-                        from acs_attributes
-                        where object_type = 'person'
-                        and attribute_name = 'bio')
-} -default ""]
+set context [list [_ dotlrn.Community_member]]
+set system_name [ad_system_name]
+set pretty_creation_date [lc_time_fmt $user(creation_date) "%q"]
+set pretty_email [email_image::get_user_email -user_id $user_id -transparent 1 -return_url $return_url]
 
-set weblog_p 0
-#set to check if you are using forums
-if {[apm_package_installed_p "forums"]} {
-    set forums_package_id  [site_node_apm_integration::get_child_package_id  -package_key "forums"]
-    set forums_url "[dotlrn_community::get_url -package_id $forums_package_id]/forum-view"
+set login_export_vars "return_url=[ns_urlencode [acs_community_member_url -user_id $user_id]]"
 
-    db_multirow forums forums {select name, forum_id, to_char(o.last_modified, 'Mon DD, YYYY') as lastest_post from forums_forums_enabled f, acs_objects o where o.object_id = forum_id 
-    and o.creation_user = :user_id and f.package_id = :forums_package_id}
-    set forums_p 1
-}
+# Portrait
 
-set portrait_p 0
-if {[ad_parameter "show_portrait_p" dotlrn] && 0} {
-    set portrait_p 1
-    set inline_portrait_state ""
-    set portrait_export_vars [export_vars user_id]
+set portrait_p [db_0or1row get_item_id {
+    select c.live_revision, c.item_id,
+           cr.description as caption
+    from acs_rels a, cr_items c, cr_revisions cr
+    where a.object_id_two = c.item_id
+      and a.object_id_one = :user_id
+      and a.rel_type = 'user_portrait_rel'
+      and cr.revision_id = c.live_revision}]
 
-    set user_portrait_sql {
-        select images.width,
-               images.height,
-               cr_revisions.title,
-               cr_revisions.description,
-               cr_revisions.publish_date
-        from acs_rels,
-             cr_items,
-             cr_revisions,
-             images
-        where acs_rels.object_id_two = cr_items.item_id
-        and cr_items.live_revision = cr_revisions.revision_id
-        and cr_revisions.revision_id = images.image_id
-        and acs_rels.object_id_one = :user_id
-        and acs_rels.rel_type = 'user_portrait_rel'
-    }
-
-    if {[db_0or1row portrait_info $user_portrait_sql]} {
-        if {![empty_string_p $width] && $width < 300 } {
-            set inline_portrait_state "inline"
-        } else {
-            set inline_portrait_state "link"
-        }
-    }
+if { $portrait_p } {
+    set img_src [export_vars -base "[subsite::get_element -element url]shared/portrait-bits.tcl" { user_id item_id {size thumbnail}}]
+    set portrait_url [export_vars -base "[subsite::get_element -element url]shared/portrait" { user_id return_url }]
 }
 
-set show_email_p 0
-#if { $priv_email <= [ad_privacy_threshold] } {
-#    set show_email_p 1
-#}
-
-db_multirow user_contributions user_contributions {}
-
-set folder_id [dotlrn_fs::get_user_shared_folder -user_id $user_id]
-
-set scope_fs_url "/packages/file-storage/www/folder-chunk"
-set n_past_days ""
-#set url "[site_node_object_map::get_url -object_id $folder_id]index?folder_id=$folder_id&n_past_days=99999"
-
-set context_bar [ad_context_bar "[_ dotlrn.Community_member]"]
-set context [list "Member Page"]
-set system_name [ad_system_name]
-set pretty_creation_date [lc_time_fmt $creation_date "%q"]
-set login_export_vars "return_url=[ns_urlencode [acs_community_member_url -user_id $user_id]]"
-
-set return_url_2 [ad_return_url]
-if {[empty_string_p $return_url]} {
-    set return_url [get_referrer]
-    if {[regexp {\?} $return_url_2]} {
-        append return_url_2 "&return_url=$return_url"
-    } else {
-        append return_url_2 "?return_url=$return_url"
-    }
-}
-
 ad_return_template
-
Index: openacs-4/packages/dotlrn/www/control-panel.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/control-panel.adp,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/dotlrn/www/control-panel.adp	9 Nov 2008 23:29:23 -0000	1.21
+++ openacs-4/packages/dotlrn/www/control-panel.adp	3 Apr 2009 12:13:49 -0000	1.22
@@ -19,7 +19,7 @@
 %>
 
 <master>
-<property name="title">@title@</property>
+<property name="&doc">doc</property>
 <property name="link_control_panel">0</property>
 <property name="context">@context;noquote@</property>
 
@@ -29,74 +29,54 @@
     <div class="portlet-wrapper">
 		<div class="portlet-header">
 			<div class="portlet-title-no-controls">
-				<h1> #acs-subsite.My_Account# </h1>
+				<h1>#acs-subsite.My_Account#</h1>
       		</div>
 		</div>
-		<div class="portlet">
-			<include src="@user_info_template@" />
-			<if @account_status@ eq "closed">
-				#acs-subsite.Account_closed_workspace_msg#
-			</if>
 
-				<if @notifications_url@ not nil>
-					<a href="@notifications_url@" title="#acs-subsite.Manage_your_notifications#" class="button">#acs-subsite.Manage_your_notifications#</a>
-				</if>
 
-				<if @allowed_to_change_site_template_p@>
-					<a href="change-site-template?referer=@dotlrn_url@/control-panel" title="#dotlrn.Customize_Template#" class="button">#dotlrn.Customize_Template#</a>
-				</if>
-				
-				<a href="configure" title="#dotlrn.Customize_Layout#" class="button">#dotlrn.Customize_Layout#</a>
+		<div class="portlet" style="position:relative;">
 
-				<if @change_locale_url@ not nil>
-					<a href="@change_locale_url@" title="#acs-subsite.Change_locale_label#" class="button">#acs-subsite.Change_locale_label#</a>
-				</if>
+          <if @portrait_p@ true>
+            <div style="position: absolute; top: 10px; left: 10px;">
+              <img src="@portrait_image_src@" alt="#acs-subsite.Your_Portrait#">
+            </div>
+          </if>
 
-				<a href="../user/password-update" title="#acs-subsite.Change_my_Password#" class="button">#acs-subsite.Change_my_Password#</a>
+          <include src="@user_info_template@" />
 
-				<if @account_status@ ne "closed">
-					<a href="/pvt/unsubscribe" title="#acs-subsite.Close_your_account#" class="button">#acs-subsite.Close_your_account#</a>
-				</if>
+          <div style="clear: both;">
+            <ul>
+              <li><a href="@community_member_url@">#acs-subsite.lt_What_other_people_see#</a></li>
+            </ul>
 
-		</div> <!-- /portlet -->
-	</div><!-- /portlet-wrapper -->
+            <ul>
+              <li>
+                <a href="@portrait_url@">
+                  <if @portrait_p@ true>#acs-subsite.Manage_Portrait#</if>
+                  <else>#acs-subsite.Upload_Portrait#</else>
+                </a>
+              </li>
 
-    <if @portrait_state@ eq upload>
-		<div class="portlet-wrapper">
-        	<div class="portlet-header">
-				<div class="portlet-title-no-controls">
-          			<h1>#acs-subsite.Your_Portrait#</h1>
-        		</div>
-			</div>
-		
-        	<div class="portlet">
-				<p>#acs-subsite.lt_Show_everyone_else_at#  <a href="@portrait_upload_url@" title="#acs-subsite.upload_a_portrait#">#acs-subsite.upload_a_portrait#</a></p>
-			</div> <!-- /portlet -->
-		</div><!-- /portlet-wrapper -->
-    </if>
+              <li><a href="@edit_bio_url@">#dotlrn.Edit_Biography#</a></li>
 
-    <if @portrait_state@ eq show>
-		<div class="portlet-wrapper">
-        	<div class="portlet-header">
-				<div class="portlet-title-no-controls">
-          			<h1>#acs-subsite.Your_Portrait#</h1>
-        		</div>
-			</div>
-        	<div class="portlet">
-          		<p>#acs-subsite.lt_On_portrait_publish_d#.</p>
-          		<table>
-					<tr valign="top">
-						<td>
-            				<img height=100 src="/shared/portrait-bits.tcl?user_id=@user_id@" alt="#acs-subsite.Portrait#"><p>
-            				<a href="/user/portrait/?return_url=/pvt/home" title="#acs-subsite.Edit#">#acs-subsite.Edit#</a>
-            			</td>
-						<td>@portrait_description@</td>
-					</tr>
-          		</table>
-			</div> <!-- /portlet -->
-		</div><!-- /portlet-wrapper -->
-    </if>
+			  <li><a href="@email_privacy_url@">#acs-subsite.Change_my_email_P#</a></li>
 
+              <if @change_locale_url@ not nil>
+				 <li><a href="@change_locale_url@" title="#acs-subsite.Change_locale_label#">#acs-subsite.Change_locale_label#</a></li>
+			  </if>
+
+			  <li><a href="@change_password_url@" title="#acs-subsite.Change_my_Password#">#acs-subsite.Change_my_Password#</a></li>
+            </ul>
+
+            <ul>
+              <li><a href="@close_account_url@" title="#acs-subsite.Close_your_account#">#acs-subsite.Close_your_account#</a></li>
+
+            </ul>
+          </div>
+
+		</div> <!-- /portlet -->
+	</div><!-- /portlet-wrapper -->
+
 </div>
 </div>
 
@@ -106,44 +86,56 @@
     <div class="portlet-wrapper">
     	<div class="portlet-header">
 			<div class="portlet-title-no-controls">
-				<h1>#acs-subsite.Privacy#</h1>
+				<h1>#dotlrn.Preferences#</h1>
 			</div>
 		</div>
 		<div class="portlet">
-			<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>
-			</ul>
 
+        <!-- Tools -->
+        <if @notifications_url@ not nil>
+          <ul>
+            <li><a href="@notifications_url@" title="#acs-subsite.Manage_your_notifications#">#acs-subsite.Manage_your_notifications#</a></li>
+          </ul>
+        </if>
+
+        <ul>
+          <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></li>
+          </if>
+        </ul>
+
+
+        <!-- who's online -->
         <if @invisible_p@ true>
-          #acs-subsite.Currently_invisible_msg#
+          <p>#acs-subsite.Currently_invisible_msg#</p>
           <ul>
             <li><a href="@make_visible_url@" title="#acs-subsite.Make_yourself_visible_label#">#acs-subsite.Make_yourself_visible_label#</a></li>
-          </ul>
         </if>
         <else>
           #acs-subsite.Currently_visible_msg#
           <ul>
             <li><a href="@make_invisible_url@" title="#acs-subsite.Make_yourself_invisible_label#">#acs-subsite.Make_yourself_invisible_label#</a></li>
-          </ul>
         </else>
+          <li><a href="@whos_online_url@">#acs-subsite.Whos_Online_link_label#</a></li>
+        </ul>
 		</div> <!-- /portlet -->
 	</div><!-- /portlet-wrapper -->
 
 	<div class="portlet-wrapper">
     	<div class="portlet-header">
 			<div class="portlet-title-no-controls">
-				<h1>#dotlrn.General_Site_Help#</h1>
+				<h1>#dotlrn.Support#</h1>
 			</div>
 		</div>
 		<div class="portlet">
 			<ul>
 				<li><a href="@dotlrn_url@/help" title="#dotlrn.help#">#dotlrn.help#</a></li>
-				<li>#dotlrn.Ask_a_question# <a href="mailto:@system_owner@" title="#dotlrn.Ask_a_question#">@system_owner@</a></li>
+				<li><a href="mailto:@system_owner@">#dotlrn.Contact_us#</a></li>
 			</ul>
 		</div> <!-- /portlet -->
 	</div><!-- /portlet-wrapper -->
 
 </div>
-</div>
\ No newline at end of file
+</div>
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"
Index: openacs-4/packages/dotlrn/www/control-panel.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/control-panel.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/www/control-panel.xql	8 Aug 2006 21:26:24 -0000	1.2
+++ openacs-4/packages/dotlrn/www/control-panel.xql	3 Apr 2009 12:13:49 -0000	1.3
@@ -3,10 +3,11 @@
  
 <fullquery name="get_portrait_info">      
   <querytext>
-    select cr.publish_date, cr.title as portrait_title, cr.description as portrait_description
-    from cr_revisions cr, cr_items ci, acs_rels a
-    where cr.revision_id = ci.live_revision
-    and  ci.item_id = a.object_id_two
+    select cr.publish_date, cr.title as portrait_title, cr.description as portrait_description, i.width, i.height, ci.item_id
+    from cr_revisions cr, cr_items ci, acs_rels a, images i
+    where i.image_id = cr.revision_id
+    and cr.revision_id = ci.live_revision
+    and ci.item_id = a.object_id_two
     and a.object_id_one = :user_id
     and a.rel_type = 'user_portrait_rel'
   </querytext>