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.11 -r1.12
--- openacs-4/packages/acs-subsite/www/index.adp	2 Oct 2003 10:34:45 -0000	1.11
+++ openacs-4/packages/acs-subsite/www/index.adp	2 Oct 2003 22:04:46 -0000	1.12
@@ -1,44 +1,34 @@
 <master>
 <property name="context">@context;noquote@</property>
 
-<if @user_id@ ne 0 and @main_site_p@ false>
+<if @user_id@ ne 0>
   <div style="float: right;">
-    <if @group_member_p@ true>
-      <span class="button"><a href="group-leave" class="button" title="Leave this community">Leave community</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 community">Join community</a></span>
-        </if>
-        <else>
-          <span class="button"><a href="group-join" class="button" title="Request membership of this community">Request membership</a></span>
-        </else>
+    <if @main_site_p@ false>  
+      <if @group_member_p@ true>
+        <span class="button"><a href="group-leave" class="button" title="Leave this community">Leave community</a></span>
       </if>
-    </else>
+      <else>
+        <if @can_join_p@ true>
+          <if @group_join_policy@ eq "open">
+            <a href="group-join" class="button" title="Join this community">Join community</a>
+          </if>
+          <else>
+            <a href="group-join" class="button" title="Request membership of this community">Request membership</a>
+          </else>
+        </if>
+      </else>
+    </if>
+    <if @admin_p@ true> 
+      <a href="admin/" class="button" title="Administer @subsite_name@">Admin</a>
+    </if>
   </div>
 </if>
 
 <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>
+      <include src="/packages/acs-subsite/lib/applications">
     </td>
     <td valign="top">
       <h2>@communities_label@</h2>