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.9 -r1.10
--- openacs-4/packages/acs-subsite/www/index.adp	22 Sep 2003 08:21:50 -0000	1.9
+++ openacs-4/packages/acs-subsite/www/index.adp	22 Sep 2003 08:40:04 -0000	1.10
@@ -1,37 +1,50 @@
 <master>
-<property name="title">@subsite_name;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<if @user_id@ ne 0>
-  <if @group_member_p@ true>
-    <span class="button"><a href="group-leave" class="button" title="Leave this group">Leave group</a></span>
-  </if>
-  <else>
-    <if @can_join_p@ true>
-      <if @group_join_policy@ eq "open">
-        <span class="button"><a href="group-join" class="button" title="Join this group">Join group</a></span>
-      </if>
-      <else>
-        <span class="button"><a href="group-join" class="button" title="Request membership of this group">Request membership</a></span>
-      </else>
+<if @user_id@ ne 0 and @main_site_p@ false>
+  <div style="float: right;">
+    <if @group_member_p@ true>
+      <span class="button"><a href="group-leave" class="button" title="Leave this group">Leave group</a></span>
     </if>
-  </else>
+    <else>
+      <if @can_join_p@ true>
+        <if @group_join_policy@ eq "open">
+          <span class="button"><a href="group-join" class="button" title="Join this group">Join group</a></span>
+        </if>
+        <else>
+          <span class="button"><a href="group-join" class="button" title="Request membership of this group">Request membership</a></span>
+        </else>
+      </if>
+    </else>
+  </div>
 </if>
 
-<ul>
- <if @nodes:rowcount@ eq 0> 
-  <li>(no packages)</li>
- </if>
- <else>
-  <multiple name="nodes">
-    <li><a href="@nodes.url@">@nodes.name@</a></li>
-  </multiple>
- </else>
+<table width="100%">
+  <tr>
+    <td valign="top">
+      <h2>Applications</h2>
+      <ul>
+       <if @nodes:rowcount@ eq 0> 
+        <li>(no packages)</li>
+       </if>
+       <else>
+        <multiple name="nodes">
+          <li><a href="@nodes.url@">@nodes.name@</a></li>
+        </multiple>
+       </else>
 
- <if @admin_p@ eq 1> 
-  <p>
-   <li> <a href="admin/">@subsite_name@ Administration</a></li>
-  </p>
- </if>
-</ul>
+       <if @admin_p@ eq 1> 
+        <p>
+         <li> <a href="admin/">@subsite_name@ Administration</a></li>
+        </p>
+       </if>
+      </ul>
+    </td>
+    <td valign="top">
+      <h2>@communities_label@</h2>
+      <include src="/packages/acs-subsite/lib/subsites">
+    </td>
+  </tr>
+</table>
+