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.25 -r1.26
--- openacs-4/packages/acs-subsite/www/index.adp	18 May 2008 23:07:06 -0000	1.25
+++ openacs-4/packages/acs-subsite/www/index.adp	28 May 2008 20:38:44 -0000	1.26
@@ -6,21 +6,25 @@
 <table>
   <tr>
     <td valign="top">
-      <div class="portlet">
-        <div class="portlet-title">
-          #acs-subsite.Applications#
+      <div class="portlet-wrapper">
+        <div class="portlet-header">
+          <div class="portlet-title">
+            <h1>#acs-subsite.Applications#</h1>
+          </div>
         </div>
-        <div class="portlet-body">
+        <div class="portlet">
           <include src="/packages/acs-subsite/lib/applications">
         </div>
       </div>
     </td>
     <td valign="top">
-      <div class="portlet">
-        <div class="portlet-title">
-          #acs-subsite.Subsites#
+      <div class="portlet-wrapper">
+        <div class="portlet-header">
+          <div class="portlet-title">
+            <h1>#acs-subsite.Subsites#</h1>
+          </div>
         </div>
-        <div class="portlet-body">
+        <div class="portlet">
           <include src="/packages/acs-subsite/lib/subsites">
         </div>
       </div>
@@ -29,34 +33,32 @@
 
   <tr>
     <td valign="top" colspan="2">
-      <div class="portlet">
-        <div class="portlet-body">
+      <ul class="compact">
           <if @show_members_page_link_p@>
-            <a href="members/" class="button">#acs-subsite.Members#</a>
+            <li><a href="members/" class="button">#acs-subsite.Members#</a></li>
           </if>
-  	  <a href="site-map/" class="button">#acs-subsite.UserSiteMap#</a>
+  	  <li><a href="site-map/" class="button">#acs-subsite.UserSiteMap#</a></li>
           <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>
+               <li><a href="group-leave" class="button" title="#acs-subsite.Leave_this_subsite#">#acs-subsite.Leave_subsite#</a></li>
               </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>
+                    <li><a href="register/user-join" class="button" title="#acs-subsite.Join_this_subsite">#acs-subsite.Join_subsite#</a></li>
                   </if>
                   <else>
-                    <a href="register/user-join" class="button" title="#acs-subsite.Req_membership_subs#">#acs-subsite.Request_membership#</a>
+                    <li><a href="register/user-join" class="button" title="#acs-subsite.Req_membership_subs#">#acs-subsite.Request_membership#</a></li>
                   </else>
                 </if>
               </else>
             </if>
           </if>
           <if @admin_p@ true> 
-            <a href="admin/" class="button" title="#acs-subsite.Administer_subsite#">#acs-kernel.common_Administration#</a>
+            <li><a href="admin/" class="button" title="#acs-subsite.Administer_subsite#">#acs-kernel.common_Administration#</a></li>
           </if>
-        </div>
-      </div>
+      </ul>
     </td>
   </tr>
 </table>
Index: openacs-4/packages/acs-templating/tcl/tag-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tag-init.tcl,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/acs-templating/tcl/tag-init.tcl	12 Feb 2008 16:03:34 -0000	1.29
+++ openacs-4/packages/acs-templating/tcl/tag-init.tcl	28 May 2008 20:38:45 -0000	1.30
@@ -907,10 +907,9 @@
     set title [ns_set iget $params title]
 
     template::adp_append_code "append __adp_output \"                           
-<div class=\\\"portlet-wrapper\\\">                                             
-<div class=\\\"portlet-header\\\">                                              
-<div class=\\\"portlet-title-no-controls\\\">                                   
-<h1>$title</h1>                                                                 
+<div class=\\\"portlet\\\">                                             
+<div class=\\\"portlet-title\\\">                                              
+$title                                                                 
 </div>                                                                          
 </div>                                                                          
 <div class=\\\"portlet\\\">\""
Index: openacs-4/packages/openacs-default-theme/www/resources/styles/default-master.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-default-theme/www/resources/styles/default-master.css,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/openacs-default-theme/www/resources/styles/default-master.css	18 May 2008 23:07:06 -0000	1.6
+++ openacs-4/packages/openacs-default-theme/www/resources/styles/default-master.css	28 May 2008 20:38:45 -0000	1.7
@@ -638,29 +638,61 @@
 
 /* END OF LISTS */
 
+/* PORTLETS */
 
-/* Portlets */
-
 .portlet-sidebar {
   width: 30%;
 }
 
-.portlet {
+.portlet-wrapper {
   margin: 4px 4px 4px 4px;
 }
 
-.portlet .portlet-title {
-  background: #dddddd; 
-  padding: 2px 8px 2px 8px; 
-  margin: 0;
+.portlet-header {
+    padding: 2px 8px 2px 8px; 
+    border-top: 1px solid #fff;
+    background: #ddd; 
+    height: 21px;
 }
 
-.portlet .portlet-body {
+.portlet-title {
+    float: left; /* comment out if portlet-controls display:none */
+    display: inline;
+}
+
+.portlet-title h1 {
+    margin: 0px;
+    font-size: 1em;
+    font-weight:bold;
+    color:#000;
+}
+    
+.portlet-controls {
+    display: block; /* future development */
+    padding-top: 2px;
+    text-align: right;    
+}
+
+.portlet-controls img {
+    border: 0px;
+}
+
+.portlet-controls a:link {
+    color: #fff;
+}
+
+.portlet-controls a:hover {
+    color: #000;
+}
+
+.portlet {
   border: 1px dotted #999; 
-  border-top: 0px; 
+  border-top: 0px;
   padding: 6px 8px 6px 8px;
+  clear:left;
 }
 
+/* END OF PORTLETS */
 
 /**********************************************************************
 /* DEPRECATED CLASSES