Index: openacs-4/contrib/packages/portal/lib/tabbed-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/tabbed-master.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/portal/lib/tabbed-master.adp	17 Mar 2004 02:15:52 -0000	1.1
+++ openacs-4/contrib/packages/portal/lib/tabbed-master.adp	18 Mar 2004 00:31:32 -0000	1.2
@@ -23,28 +23,50 @@
 <div id="navbar-div">
   <div id="navbar-container">
     <div id="navbar"> 
+      <if @package_id@ ne "">
+        <multiple name="portal_pages">
+          <if @page_num@ not nil and @portal_pages.page_num@ eq @page_num@
+            and @portal_id@ not nil and @portal_pages.portal_id@ eq @portal_id@>
+            <div class="tab" id="@which_navbar@-here">
+              @portal_pages.name@
+            </div>
+          </if>
+          <else>
+            <div class="tab">
+               <a href="@portal_pages.url@" title="@portal_pages.name@">@portal_pages.name@</a>
+            </div>
+          </else>
+        </multiple>
+      </if>
       <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 @portal_url@ not nil and @sections.url@ ne @portal_url@.>
+          <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>
         </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>
+      <if @application@ not nil>
+        <div class="tab" id="@which_navbar@-here">
+          @application@
+        </div>
+      </if>
     </div>
   </div>
 </div>