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.11 -r1.12
--- openacs-4/packages/acs-subsite/www/group-master.adp	8 Feb 2004 18:39:06 -0000	1.11
+++ openacs-4/packages/acs-subsite/www/group-master.adp	27 Feb 2004 15:51:25 -0000	1.12
@@ -1,4 +1,4 @@
-<master src="/www/site-master">
+  <master src="/www/site-master">
   <if @title@ not nil>
     <property name="title">@title;noquote@</property>
   </if>
@@ -13,122 +13,95 @@
     <!--<link rel="stylesheet" type="text/css" href="@css_url@" media="all">-->
   </property>
 
-<div id="body">
-  <div id="subsite-name">
-    <if @subsite_url@ not nil><a href="@subsite_url@" class="subsite-name">@subsite_name@</a></if>
-    <else>@subsite_name@</else>
-  </div>
+<div id="subsite-name">
+  <if @subsite_url@ not nil><a href="@subsite_url@" class="subsite-name">@subsite_name@</a></if>
+  <else>@subsite_name@</else>
+</div>
 
-<!-- Context bar -->
-
-  <div id="context-bar">
-    <if @context_bar@ not nil>
-      <div id="breadcrumbs">@context_bar;noquote@</div>
-    </if>
-    <else>
-      <if @context:rowcount@ not nil>
-        <div id="breadcrumbs">
-          <ul>
-            <multiple name="context">
-              <if @context.url@ not nil>
-                <li><a href="@context.url@">@context.label@</a> &#187;</li>
-              </if>
-              <else>
-                <li>@context.label@</li>
-              </else>
-            </multiple>
-          </ul>
-        </div>
-      </if>
-    </else>
-    <div id="subnavbar_links">@subnavbar_link;noquote@</div>
-    <div style="clear: both;"></div>
-  </div>
-
 <!-- Top level navigation -->
 
-  <div id="navbar-div">
-    <div id="navbar-container">
-      <div id="navbar"> 
-        <multiple name="sections">
-          <if @sections.selected_p@ true>
-            <div class="tab" id="navbar-here">
-              <if @sections.link_p@ true>
-                <a href="@sections.url@" title="@sections.title@">@sections.label@</a>
-              </if>
-              <else>        
-                @sections.label@
-              </else>
-            </div>
-          </if>
-          <else>
-            <div class="tab">
-              <if @sections.link_p@ true>
-                <a href="@sections.url@" title="@sections.title@">@sections.label@</a>
-              </if>
-              <else>        
-                @sections.label@
-              </else>
-            </div>
-          </else>
-        </multiple>
-      </div>
+<div id="navbar-div">
+  <div id="navbar-container">
+    <div id="navbar"> 
+      <multiple name="sections">
+        <if @sections.selected_p@ true>
+          <div class="tab" id="navbar-here">
+            <if @sections.link_p@ true>
+              <a href="@sections.url@" title="@sections.title@">@sections.label@</a>
+            </if>
+            <else>        
+              @sections.label@
+            </else>
+          </div>
+        </if>
+        <else>
+          <div class="tab">
+            <if @sections.link_p@ true>
+              <a href="@sections.url@" title="@sections.title@">@sections.label@</a>
+            </if>
+            <else>        
+              @sections.label@
+            </else>
+          </div>
+        </else>
+      </multiple>
     </div>
   </div>
-  <div id="navbar-body">
+</div>
+<div id="navbar-body">
 
 <!-- Second level navigation -->
-  
-    <if @subsections:rowcount@ gt 0>
 
-      <div id="subnavbar-div">
-        <div id="subnavbar-container">
-          <div id="subnavbar">
-            <multiple name="subsections">
-              <if @subsections.selected_p@ true>
-                <div class="tab" id="subnavbar-here">
-                  <if @subsections.link_p@ true>
-                    <a href="@subsections.url@" title="@subsections.title@">@subsections.label@</a>
-                  </if>
-                  <else>        
-                    @subsections.label@
-                  </else>
-                </div>
-              </if>
-              <else>
-                <div class="tab">
-                  <if @subsections.link_p@ true>
-                    <a href="@subsections.url@" title="@subsections.title@">@subsections.label@</a>
-                  </if>
-                  <else>        
-                    @subsections.label@
-                  </else>
-                </div>
-              </else>
-            </multiple>
-          </div>
+  <if @subsections:rowcount@ gt 0>
+
+    <div id="subnavbar-div">
+      <div id="subnavbar-container">
+        <div id="subnavbar">
+          <multiple name="subsections">
+            <if @subsections.selected_p@ true>
+              <div class="tab" id="subnavbar-here">
+                <if @subsections.link_p@ true>
+                  <a href="@subsections.url@" title="@subsections.title@">@subsections.label@</a>
+                </if>
+                <else>        
+                  @subsections.label@
+                </else>
+              </div>
+            </if>
+            <else>
+              <div class="tab">
+                <if @subsections.link_p@ true>
+                  <a href="@subsections.url@" title="@subsections.title@">@subsections.label@</a>
+                </if>
+                <else>        
+                  @subsections.label@
+                </else>
+              </div>
+            </else>
+          </multiple>
         </div>
       </div>
-      <div id="subnavbar-body">
-    </if>
-    <else>
-    </else>
+    </div>
+    <div id="subnavbar-body">
+  </if>
+  <else>
+  </else>
 
 <!-- Page Title -->
 
-      <if @title@ not nil>
-        <h1 class="subsite-page-title">@title@</h1>
-      </if>
+    <if @title@ not nil>
+      <h1 class="page-title">@title@</h1>
+    </if>
 
 <!-- Body -->
 
-      <slave>
-      <div style="clear: both;"></div>
+    <slave>
+    <div style="clear: both;"></div>
 
-    <if @subsections:rowcount@ gt 0>
-      </div>
-    </if>
-  </div>
+  <if @subsections:rowcount@ gt 0>
+    </div>
+  </if>
 </div>
 
+
  
Index: openacs-4/packages/acs-subsite/www/group-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-master.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/www/group-master.tcl	8 Feb 2004 18:39:06 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/group-master.tcl	27 Feb 2004 15:51:25 -0000	1.11
@@ -30,15 +30,6 @@
 # Where to find the stylesheet
 set css_url "/resources/acs-subsite/group-master.css"
 
-# Context bar
-if { [info exists context] } {
-    set context_tmp $context
-    unset context
-} else {
-    set context_tmp {}
-}
-ad_context_bar_multirow -- $context_tmp
-
 if { [string equal [ad_conn url] $subsite_url] } {
     set subsite_url {}
 }