Index: openacs-4/packages/acs-subsite/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.adp,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/acs-subsite/www/index.adp	13 Jan 2005 13:55:49 -0000	1.23
+++ openacs-4/packages/acs-subsite/www/index.adp	18 May 2008 01:38:36 -0000	1.24
@@ -7,15 +7,19 @@
   <tr>
     <td valign="top">
       <div class="portlet">
-        <h2>#acs-subsite.Applications#</h2>
+        <div class="portlet-title">
+          <h2>#acs-subsite.Applications#</h2>
+        </div>
         <div class="portlet-body">
           <include src="/packages/acs-subsite/lib/applications">
         </div>
       </div>
     </td>
     <td valign="top">
       <div class="portlet">
-        <h2>#acs-subsite.Subsites#</h2>
+        <div class="portlet-title">
+          <h2>#acs-subsite.Subsites#</h2>
+        </div>
         <div class="portlet-body">
           <include src="/packages/acs-subsite/lib/subsites">
         </div>
@@ -26,30 +30,32 @@
   <tr>
     <td valign="top" colspan="2">
       <div class="portlet">
-        <if @show_members_page_link_p@>
-          <a href="members/" class="button">#acs-subsite.Members#</a>
-        </if>
-	  <a href="site-map/" class="button">#acs-subsite.UserSiteMap#</a>
-        <if @untrusted_user_id@ ne 0>
-          <if @main_site_p@ false>  
-            <if @group_member_p@ true>
-              <a href="group-leave" class="button" title="#acs-subsite.Leave_this_subsite#">#acs-subsite.Leave_subsite#</a>
-            </if>
-            <else>
-              <if @can_join_p@ true>
-                <if @group_join_policy@ eq "open">
-                  <a href="register/user-join" class="button" title="#acs-subsite.Join_this_subsite">#acs-subsite.Join_subsite#</a>
-                </if>
-                <else>
-                  <a href="register/user-join" class="button" title="#acs-subsite.Req_membership_subs#">#acs-subsite.Request_membership#</a>
-                </else>
+        <div class="portlet-body">
+          <if @show_members_page_link_p@>
+            <a href="members/" class="button">#acs-subsite.Members#</a>
+          </if>
+  	  <a href="site-map/" class="button">#acs-subsite.UserSiteMap#</a>
+          <if @untrusted_user_id@ ne 0>
+            <if @main_site_p@ false>  
+              <if @group_member_p@ true>
+                <a href="group-leave" class="button" title="#acs-subsite.Leave_this_subsite#">#acs-subsite.Leave_subsite#</a>
               </if>
-            </else>
+              <else>
+                <if @can_join_p@ true>
+                  <if @group_join_policy@ eq "open">
+                    <a href="register/user-join" class="button" title="#acs-subsite.Join_this_subsite">#acs-subsite.Join_subsite#</a>
+                  </if>
+                  <else>
+                    <a href="register/user-join" class="button" title="#acs-subsite.Req_membership_subs#">#acs-subsite.Request_membership#</a>
+                  </else>
+                </if>
+              </else>
+            </if>
           </if>
-        </if>
-        <if @admin_p@ true> 
-          <a href="admin/" class="button" title="#acs-subsite.Administer_subsite#">#acs-kernel.common_Administration#</a>
-        </if>
+          <if @admin_p@ true> 
+            <a href="admin/" class="button" title="#acs-subsite.Administer_subsite#">#acs-kernel.common_Administration#</a>
+          </if>
+        </div>
       </div>
     </td>
   </tr>
Index: openacs-4/packages/acs-subsite/www/resources/site-master.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/resources/site-master.css,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/acs-subsite/www/resources/site-master.css	13 Dec 2007 18:19:17 -0000	1.29
+++ openacs-4/packages/acs-subsite/www/resources/site-master.css	18 May 2008 01:38:36 -0000	1.30
@@ -484,25 +484,20 @@
 
 /* Portlets */
 
-.portlet h2 {
-  background: #dddddd; 
-  padding: 2px 8px 2px 8px; 
-  margin: 0;
+.portlet-sidebar {
+  width: 30%;
 }
 
-.portlet-header {
-  background: #dddddd; 
+.portlet {
+  margin: 4px 0px 4px 0px;
 }
 
-.portlet-header h2 {
+.portlet .portlet-title h2 {
+  background: #dddddd; 
   padding: 2px 8px 2px 8px; 
   margin: 0;
 }
 
-.portlet-sidebar {
-  width: 30%;
-}
-
 .portlet .portlet-body {
   border: 1px dotted #999; 
   border-top: 0px;