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.18 -r1.19
--- openacs-4/packages/acs-subsite/www/index.adp	22 Dec 2003 22:03:55 -0000	1.18
+++ openacs-4/packages/acs-subsite/www/index.adp	30 Dec 2003 22:03:57 -0000	1.19
@@ -1,50 +1,59 @@
 <master>
 <property name="context">@context;noquote@</property>
 
-<if @user_id@ ne 0>
-  <div style="float: right;">
-    <if @main_site_p@ false>  
-      <if @group_member_p@ true>
-        <span class="button"><a href="group-leave" class="button"
-          title="#acs-subsite.Leave_this_subsite#">#acs-subsite.Leave_subsite#</a></span>
-      </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>
-        </if>
-      </else>
-    </if>
-    <if @admin_p@ true> 
-      <a href="admin/" class="button" title="#acs-subsite.Administer_subsite#">#acs-kernel.common_Administration#</a>
-    </if>
-  </div>
-</if>
 
 <table width="100%">
   <tr>
     <td valign="top">
-      <h2>#acs-subsite.Applications#</h2>
-      <include src="/packages/acs-subsite/lib/applications">
+      <div class="portlet">
+        <h2>#acs-subsite.Applications#</h2>
+        <div class="portlet-body">
+          <include src="/packages/acs-subsite/lib/applications">
+        </div>
+      </div>
     </td>
     <td valign="top">
-      <h2>#acs-subsite.Subsites#</h2>
-      <include src="/packages/acs-subsite/lib/subsites">
+      <div class="portlet">
+        <h2>#acs-subsite.Subsites#</h2>
+        <div class="portlet-body">
+          <include src="/packages/acs-subsite/lib/subsites">
+        </div>
+      </div>
     </td>
   </tr>
-  <if @show_members_page_link_p@>
+
   <tr>
     <td valign="top" colspan="2">
-      <p> <b>&raquo;</b> <a href="members/">#acs-subsite.Members#</a> </p>
+      <div class="portlet">
+        <if @show_members_page_link_p@>
+          <a href="members/" class="button">#acs-subsite.Members#</a>
+        </if>
+
+        <if @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>
+                </if>
+              </else>
+            </if>
+            <if @admin_p@ true> 
+              <a href="admin/" class="button" title="#acs-subsite.Administer_subsite#">#acs-kernel.common_Administration#</a>
+            </if>
+          </div>
+        </if>
+
+      </div>
     </td>
   </tr>
-  </if>
 </table>