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.7 -r1.8
--- openacs-4/packages/acs-subsite/www/group-master.adp	22 Sep 2003 09:17:44 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/group-master.adp	30 Dec 2003 22:06:36 -0000	1.8
@@ -25,24 +25,32 @@
     <else>@subsite_name@</else>
   </div>
 
+<!-- Context bar -->
+
+    <div class="subsite-context-bar">
+      @context_bar;noquote@&nbsp;
+    </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="navbar-selected">
+        <div class="tab" id="navbar-here">
           <if @sections.link_p@ true>
-            <a href="@sections.url@" title="@sections.title@" class="navbar-selected">@sections.label@</a>
+            <a href="@sections.url@" title="@sections.title@">@sections.label@</a>
           </if>
           <else>        
             @sections.label@
           </else>
         </div>
       </if>
       <else>
-        <div class="navbar-unselected">
+        <div class="tab">
           <if @sections.link_p@ true>
-            <a href="@sections.url@" title="@sections.title@" class="navbar-unselected">@sections.label@</a>
+            <a href="@sections.url@" title="@sections.title@">@sections.label@</a>
           </if>
           <else>        
             @sections.label@
@@ -51,33 +59,32 @@
       </else>
     </multiple>
   </div>
+  </div>
+  </div>
   <div id="navbar-body">
 
-<!-- Context bar -->
-
-    <div class="subsite-context-bar">
-      @context_bar;noquote@&nbsp;
-    </div>
-
 <!-- 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="subnavbar-selected">
+            <div class="tab" id="subnavbar-here">
               <if @subsections.link_p@ true>
-                <a href="@subsections.url@" title="@subsections.title@" class="subnavbar-selected">@subsections.label@</a>
+                <a href="@subsections.url@" title="@subsections.title@">@subsections.label@</a>
               </if>
               <else>        
                 @subsections.label@
               </else>
             </div>
           </if>
           <else>
-            <div class="subnavbar-unselected">
+            <div class="tab">
               <if @subsections.link_p@ true>
-                <a href="@subsections.url@" title="@subsections.title@" class="subnavbar-unselected">@subsections.label@</a>
+                <a href="@subsections.url@" title="@subsections.title@">@subsections.label@</a>
               </if>
               <else>        
                 @subsections.label@
@@ -86,7 +93,12 @@
           </else>
         </multiple>
       </div>
+      </div>
+      </div>
     </if>
+    <else>
+      <div id="subnavbar-div"></div>
+    </else>
     <div id="subnavbar-body">
 
 <!-- Page Title -->