Index: openacs-4/packages/acs-subsite/www/group-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-master.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/group-master.adp	10 Sep 2003 12:13:07 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/group-master.adp	10 Sep 2003 16:45:49 -0000	1.5
@@ -1,4 +1,4 @@
-<master src="/www/blank-master">
+<master src="/www/site-master">
   <if @title@ not nil>
     <property name="title">@title;noquote@</property>
   </if>
@@ -19,54 +19,11 @@
     <link rel="stylesheet" type="text/css" href="@css_url@" media="all">
   </property>
 
-
-<!-- Header -->
-
-<table cellspacing="0" cellpadding="0" width="100%" class="subsite-header" border="0">
-  <tr class="subsite-header">
-    <td class="system-name" width="34%">
-      <a href="@system_url@" class="system-name">@system_name@</a>
-    </td>
-
-    <td align="center" class="subsite-header" width="33%">
-      <if @user_id@ ne 0>
-        Welcome, @user_name@
-      </if>
-      <else>
-        Not logged in
-      </else>
-    </td>
-
-    <td align="right" class="subsite-header" style="padding-right: 8px;" width="33%">
-      <if @sw_admin_url@ not nil>
-        &nbsp;
-        <span class="button-header"><a href="@sw_admin_url@" title="Visit the site-wide administration pages where you can install new applications on to the system" class="button">Site-Wide Admin</a></span>
-      </if>
-      <if @pvt_home_url@ not nil>
-        &nbsp;
-        <span class="button-header"><a href="@pvt_home_url@" title="You can change your password, portrait, and other information from here" class="button">@pvt_home_name@</a></span>
-      </if>
-      <if @logout_url@ not nil>
-        &nbsp;
-        <span class="button-header"><a href="@logout_url@?return_url=@subsite_url@" title="Logout from @system_name@" class="button">Logout</a></span>
-      </if>
-      <if @login_url@ not nil>
-        &nbsp;
-        <span class="button-header"><a href="@login_url@" title="Log in to @system_name@" class="button">Log in</a></span>
-      </if>
-    </td>
-  </tr>
-</table>
-
-
-<!-- Body -->
-
 <div id="body">
   <div id="subsite-name">
     <a href="@subsite_url@" class="subsite-name">@subsite_name@</a>
   </div>
 
-
 <!-- Top level navigation -->
 
   <div id="navbar"> 
@@ -146,3 +103,4 @@
   </div>
 </div>
 
+