Index: openacs-4/packages/bookshelf/lib/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/lib/master.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bookshelf/lib/master.adp	25 Mar 2004 12:32:20 -0000	1.4
+++ openacs-4/packages/bookshelf/lib/master.adp	11 May 2004 09:27:15 -0000	1.5
@@ -2,9 +2,23 @@
 <property name="title">@title;noquote@</property>
 <property name="header_stuff">
   <style>
-  .bookshelf_navbar { font-family: tahoma,verdana,arial,helvetica; font-size: 70%; font-weight: bold; color: #ccccff; text-decoration: none; }
-  A.bookshelf_navbar { color: white; }
-  .bookshelf_navbar:hover { color: white; text-decoration: underline;  }
+  div.bookshelf_navbar { 
+      text-align: right;
+      font-size: 80%;
+      font-weight: bold;
+      background: #41329c; 
+      padding: 3px 1em 3px 0;
+      color: white;
+  }
+  .bookshelf_navbar a:link,
+  .bookshelf_navbar a:visited {
+      color: white; 
+      text-decoration: none;
+  }
+  .bookshelf_navbar a:hover { 
+      color: white; 
+      text-decoration: underline; 
+  }
   INPUT.bookshelf_navbar { font-family: tahoma,verdana,arial,helvetica; font-weight: bold; font-size: 70%; color: black; }
   .bookshelf_summary { font-size: 70%; font-family: verdana,arial,helvetica; }
   .bookshelf_summary_bold { font-size: 70%; font-family: verdana,arial,helvetica; font-weight: bold; }
Index: openacs-4/packages/bookshelf/lib/nav-bar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/lib/nav-bar.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookshelf/lib/nav-bar.adp	30 Sep 2002 18:10:54 -0000	1.1
+++ openacs-4/packages/bookshelf/lib/nav-bar.adp	11 May 2004 09:27:15 -0000	1.2
@@ -1,13 +1,6 @@
 <if @show_navbar_p@ true>
-  <table border=0" cellspacing="0" cellpadding="2" bgcolor="#41329c" width="100%">
-    <tr>
-      <td align="right">
-        <multiple name="links">
-          <a href="@links.url@" class="bookshelf_navbar">@links.name@</a>
-          <if @links.rownum@ lt @links:rowcount@><span class="bookshelf_navbar">&nbsp;|&nbsp;</span></if>
-        </multiple>
-        &nbsp;&nbsp;
-      </td>
-    </tr>
-  </table>
-</if>
\ No newline at end of file
+  <div class="bookshelf_navbar">
+    <multiple name="links"><a href="@links.url@">@links.name@</a><if @links.rownum@ lt @links:rowcount@>&nbsp;|&nbsp;</if>
+    </multiple>
+  </div>
+</if>
Index: openacs-4/packages/bug-tracker/lib/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/lib/master.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/bug-tracker/lib/master.adp	25 Mar 2004 22:06:25 -0000	1.10
+++ openacs-4/packages/bug-tracker/lib/master.adp	11 May 2004 09:27:16 -0000	1.11
@@ -15,12 +15,5 @@
   </if>
 
 <include src="nav-bar" notification_link="@notification_link;noquote@">
-
-<p>
-
 <slave>
-
-<p>
-
 <include src="nav-bar" notification_link="@notification_link;noquote@">
-
Index: openacs-4/packages/bug-tracker/lib/nav-bar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/lib/nav-bar.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bug-tracker/lib/nav-bar.adp	28 Aug 2003 09:45:29 -0000	1.3
+++ openacs-4/packages/bug-tracker/lib/nav-bar.adp	11 May 2004 09:27:16 -0000	1.4
@@ -1,29 +1,9 @@
-<table border=0" cellspacing="0" cellpadding="2" bgcolor="#41329c" width="100%">
-  <form action="@form_action_url@" method="get" name="navbar_form_@bt_nav_bar_count@">
-    <tr>
-      <td align="left">
-        <table border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td>
-                &nbsp; <a href="@notification_url@" class="bt_navbar" title="@notification_title@">@notification_label@</a>
-            </td>
-          </tr>
-        </table>        
-      </td>
-      <td align="right">
-        <table border="0" cellspacing="0" cellpadding="0">
-          <tr>
-            <td>
-              <multiple name="links">
-                <a href="@links.url@" class="bt_navbar">@links.name@</a><span class="bt_navbar">&nbsp;|&nbsp;</span>
-              </multiple>
-              <input name="bug_number" type="text" size="5" class="bt_navbar" value="@pretty_names.Bug@ #" 
-                onFocus="javascript:document.navbar_form_@bt_nav_bar_count@.bug_number.value='';">
-              <input type="submit" value="Go" class="bt_navbar">
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
+<div class="bt_navbar" style="background: #41329c; text-align: right; padding: 3px;">
+  <div style="float: left; padding: .25em; 1em 0em 1em;"><a href="@notification_url@" class="bt_navbar" title="@notification_title@">@notification_label@</a></div>
+  <multiple name="links"><a href="@links.url@" class="bt_navbar">@links.name@</a>&nbsp;|&nbsp;</multiple>
+  <form style="display: inline" action="@form_action_url@" method="get" name="navbar_form_@bt_nav_bar_count@">
+    <input name="bug_number" type="text" size="5" class="bt_navbar" value="@pretty_names.Bug@ #" 
+      onFocus="javascript:document.navbar_form_@bt_nav_bar_count@.bug_number.value='';">
+      <input type="submit" value="Go" class="bt_navbar">
   </form>
-</table>
+</div>