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.6 -r1.15.2.7
--- openacs-4/packages/dotlrn/www/control-panel.adp	18 May 2006 19:53:42 -0000	1.15.2.6
+++ openacs-4/packages/dotlrn/www/control-panel.adp	24 May 2006 21:42:26 -0000	1.15.2.7
@@ -61,13 +61,43 @@
   </td>
   <td valign="top">
 
+    <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>
+
     <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>
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 -N -r1.9.2.3 -r1.9.2.4
--- openacs-4/packages/dotlrn/www/control-panel.tcl	18 May 2006 19:53:42 -0000	1.9.2.3
+++ openacs-4/packages/dotlrn/www/control-panel.tcl	24 May 2006 21:42:27 -0000	1.9.2.4
@@ -67,3 +67,16 @@
 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]]
+
+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]