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 -N -r1.15.2.4 -r1.15.2.5
--- openacs-4/packages/dotlrn/www/control-panel.adp	18 May 2006 00:39:34 -0000	1.15.2.4
+++ openacs-4/packages/dotlrn/www/control-panel.adp	18 May 2006 19:24:28 -0000	1.15.2.5
@@ -25,45 +25,111 @@
 <% set dotlrn_url [dotlrn::get_url] %>
 
 <table>
-	<tr><td width="35%">
-<div class="portlet-wrapper">
-<div class="portlet-title">
-	<span><h2>#dotlrn.General_Site_Help#</h2></span>
-</div>
-<div class="portlet">
-<ul>
-  <li><a href="@dotlrn_url@/help">#dotlrn.help#</a></li>
-  <li>#dotlrn.Ask_a_question# <a href="mailto:@system_owner@">@system_owner@</a></li>
-</ul>
-</div></div>
-<div class="portlet-wrapper">
-<div class="portlet-title">
-        <span><h2>#dotlrn.Personal_Options#</h2></span>
-</div>
-<div class="portlet">
-<ul>
-  <li>
-    <a href="@pvt_home@">#dotlrn.pvt_home_name#</a></li>
+  <tr><td width="35%" valign="top">
 
-  <p><li><a href="configure">#dotlrn.Customize_Layout#</a></li>
-  <p><li><a href="change-site-template?referer=@dotlrn_url@/control-panel">#dotlrn.Customize_Template#</a></li>
+    <div class="portlet-wrapper">
+      <div class="portlet-title">
+        <span><h2> #acs-subsite.My_Account# </h2></span>
+      </div>
+      <div class="portlet">
+        <include src="/packages/acs-subsite/lib/user-info" />
+  	<if @account_status@ eq "closed">
+    	  #acs-subsite.Account_closed_workspace_msg#
+  	</if>
+        <ul>
+          <li><a href="configure">#dotlrn.Customize_Layout#</a></li>
+          <li><a href="change-site-template?referer=@dotlrn_url@/control-panel">#dotlrn.Customize_Template#</a></li>
+          <li><a href="../user/password-update">#acs-subsite.Change_my_Password#</a></li>
 
-<if @admin_p@>
-  <p><li><a href="@admin_url@">@admin_pretty_name@</a></li>
-</if>
-</ul>
+          <if @change_locale_url@ not nil>
+            <li><a href="@change_locale_url@">#acs-subsite.Change_locale_label#</a></li>
+          </if>
 
-</div>
-</div>
+          <if @notifications_url@ not nil>
+            <li><a href="@notifications_url@">#acs-subsite.Manage_your_notifications#</a></li>
+          </if>
 
-    <td valign="top" width="50%">
-<div class="portlet-wrapper">
-<div class="portlet-title">
-  <span><h2>#dotlrn.lt_JoinDrop_Classes_or_C#</h2></span>
-</div>
-<div class="portlet">
-  <include src="dotlrn-main-portlet" show_buttons_p="1" show_archived_p=0 title="Groups" referer="@dotlrn_url@/control-panel">
+          <if @account_status@ ne "closed">
+            <li><a href="unsubscribe">#acs-subsite.Close_your_account#</a></li>
+          </if>
 
-</div>
-</div>
+          <if @admin_p@>
+            <li><a href="@admin_url@">@admin_pretty_name@</a></li>
+          </if>
+        </ul>
+      </div>
+    </div>
+
+  </td>
+  <td valign="top">
+
+    <div class="portlet-wrapper">
+      <div class="portlet-title">
+        <span><h2>#acs-subsite.Privacy#<h2></span>
+      </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>
+
+        <if @invisible_p@ true>
+          #acs-subsite.Currently_invisible_msg#
+          <ul>
+            <li><a href="@make_visible_url@">#acs-subsite.Make_yourself_visible_label#</a></li>
+          </ul>
+        </if>
+        <else>
+          #acs-subsite.Currently_visible_msg#
+          <ul>
+            <li><a href="@make_invisible_url@">#acs-subsite.Make_yourself_invisible_label#</a></li>
+          </ul>
+        </else>
+      </div>
+    </div>
+
+    <div class="portlet-wrapper">
+      <div class="portlet-title">
+        <span><h2>#dotlrn.General_Site_Help#</h2></span>
+      </div>
+      <div class="portlet">
+        <ul>
+          <li><a href="@dotlrn_url@/help">#dotlrn.help#</a></li>
+          <li>#dotlrn.Ask_a_question# <a href="mailto:@system_owner@">@system_owner@</a></li>
+        </ul>
+      </div>
+    </div>
+
+    <if @portrait_state@ eq upload>
+
+      <div class="portlet-wrapper">
+        <div class="portlet-title">
+	  <span><h2>#acs-subsite.Your_Portrait#</h2></span>
+	</div>
+        <div class="portlet">
+	  <p>
+	    #acs-subsite.lt_Show_everyone_else_at#  <a href="@portrait_upload_url@">#acs-subsite.upload_a_portrait#</a>
+	  </p>
+	</div>
+      </div>
+    </if>
+
+    <if @portrait_state@ eq show>
+      <div class="portlet-wrapper">  
+        <div class="portlet-title">
+          <span><h2>#acs-subsite.Your_Portrait#</h2></span>
+        </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="Portrait"><p>
+            <a href="/user/portrait/?return_url=/pvt/home">#acs-subsite.Edit#</a>
+            </td><td>@portrait_description@</td></tr>
+          </table>
+        </div>
+      </div>
+    </if>
+
+  </td></tr>
 </table>