Index: openacs-4/packages/acs-subsite/lib/home.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/home.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/lib/home.adp	21 Nov 2007 14:08:43 -0000	1.3
+++ openacs-4/packages/acs-subsite/lib/home.adp	18 May 2008 17:06:21 -0000	1.4
@@ -1,108 +1,120 @@
-<table> <tr valign="top"> 
-<td style="width:35%">
-<div class="portlet-wrapper">
-	<div class="portlet-title">
-	<h2>#acs-subsite.Edit_Options#</h2>
-	</div>
-	<div class="portlet">
-  <ul>
-    <li><a href="../user/password-update">#acs-subsite.Change_my_Password#</a></li>
+<table>
+  <tr valign="top"> 
+    <td style="width:35%">
 
-    <if @change_locale_url@ not nil>
-      <li><a href="@change_locale_url@">#acs-subsite.Change_locale_label#</a></li>
-    </if>
+      <div class="portlet">
+        <div class="portlet-title">
+          <h2>#acs-subsite.Edit_Options#</h2>
+        </div>
+        <div class="portlet-body">
+          <ul>
+            <li><a href="../user/password-update">#acs-subsite.Change_my_Password#</a></li>
 
-    <if @notifications_url@ not nil>
-      <li><a href="@notifications_url@">#acs-subsite.Manage_your_notifications#</a></li>
-    </if>
+            <if @change_locale_url@ not nil>
+              <li><a href="@change_locale_url@">#acs-subsite.Change_locale_label#</a></li>
+            </if>
 
-    <if @account_status@ ne "closed">
-      <li><a href="unsubscribe">#acs-subsite.Close_your_account#</a></li>
-    </if>
+            <if @notifications_url@ not nil>
+              <li><a href="@notifications_url@">#acs-subsite.Manage_your_notifications#</a></li>
+            </if>
 
-  </ul>
-</div>
-</div>
+            <if @account_status@ ne "closed">
+              <li><a href="unsubscribe">#acs-subsite.Close_your_account#</a></li>
+            </if>
 
+          </ul>
+        </div>
+      </div>
 
-<div class="portlet-wrapper">
-  <div class="portlet-title">
-  <h2>#acs-subsite.Privacy#</h2>
-  </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>
+      <div class="portlet">
+        <div class="portlet-title">
+          <h2>#acs-subsite.Privacy#</h2>
+        </div>
+        <div class="portlet-body">
+          <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>
+          <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>
 
-</td>
-<td>
+    </td>
+    <td>
 
-<div class="portlet-wrapper">
-	<div class="portlet-title">
-	<h2> #acs-subsite.My_Account# </h2>
-	</div>
+      <div class="portlet">
+        <div class="portlet-title">
+          <h2> #acs-subsite.My_Account# </h2>
+        </div>
+        <div class="portlet-body">
+          <include src="@user_info_template@" />
+          <if @account_status@ eq "closed">
+            #acs-subsite.Account_closed_workspace_msg#
+          </if>
+        </div>
+      </div>
+
+      <if @portrait_state@ eq upload>
         <div class="portlet">
-  	<include src="@user_info_template@" />
-  	<if @account_status@ eq "closed">
-    	#acs-subsite.Account_closed_workspace_msg#
-  	</if>
-</div>
-</div>
+          <div class="portlet-title">
+            <h2>#acs-subsite.Your_Portrait#</h2>
+          </div>
+          <div class="portlet-body">
+            <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">  
+          <div class="portlet-title">
+            <h2>#acs-subsite.Your_Portrait#</h2>
+          </div>
+          <div class="portlet-body">
+            <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>
+                  </p>
+                </td>
+                <td>@portrait_description@</td>
+              </tr>
+            </table>
+          </div>
+        </div>
+      </if>
 
-  <if @portrait_state@ eq upload>
-
-<div class="portlet-wrapper">
+      <div class="portlet">
         <div class="portlet-title">
-	     <h2>#acs-subsite.Your_Portrait#</h2>
-	</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">
-             <h2>#acs-subsite.Your_Portrait#</h2>
-  </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>
+          <h2>#acs-subsite.Groups#</h2>
+        </div>
+        <div class="portlet-body">
+          <list name="fragments">
+            @fragments:item;noquote@
+          </list>
+        </div>
+      </div>
+    </td>
+  </tr>
 </table>
-</div>
-</div>
-  </if>
-
-<div class="portlet-wrapper">
-  	<list name="fragments">
-    	@fragments:item;noquote@
-  	</list>
-</div>
-</td></tr>
-</table>