From 3f3a5215158f184045790a0908284a18ba052997 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Sat, 3 Mar 2012 16:09:11 +0000
Subject: [PATCH] navbar style fixes

---
 Netdisco/public/css/netdisco.css |  6 +++
 Netdisco/views/layouts/main.tt   | 71 +++++++++++++++-----------------
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/Netdisco/public/css/netdisco.css b/Netdisco/public/css/netdisco.css
index 3c90b1b8..ee5da9df 100644
--- a/Netdisco/public/css/netdisco.css
+++ b/Netdisco/public/css/netdisco.css
@@ -11,6 +11,12 @@ body {
   cursor: pointer;
 }
 
+/* for the "logged in as..." text */
+.nd_navbartext {
+  color: #666;
+  padding-top: 11px;
+}
+
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* various styles to adjust the hero box used for homepage + login */
 
diff --git a/Netdisco/views/layouts/main.tt b/Netdisco/views/layouts/main.tt
index fb552a61..4925589a 100644
--- a/Netdisco/views/layouts/main.tt
+++ b/Netdisco/views/layouts/main.tt
@@ -39,47 +39,42 @@
 
 <div class="navbar navbar-fixed-top">
   <div class="navbar-inner">
-    <div class="container" style="width: auto;">
-      <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </a>
+    <div class="container">
       <a class="brand" href="[% uri_for('/') %]">Netdisco</a>
       [% IF session.user %]
-      <div class="nav-collapse">
-        <ul class="nav">
-          <li class="active"><a href="[% uri_for('/') %]">Home</a></li>
-          [% IF more_dd.size %]
-          <li class="dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown">More <b class="caret"></b></a>
-            <ul class="dropdown-menu">
-              [% FOREACH title IN more_dd.keys.sort %]
-              <li><a href="[% uri_for(more_dd.$title) %]">[% title %]</a></li>
-              [% END %]
-            </ul>
-          </li> <!-- /dropdown -->
-          [% END %]
-        </ul>
-        <form class="navbar-search pull-left" method="get" action="[% uri_for('/search') %]">
-          <input placeholder="Find Anything" class="search-query span3" id="nq" name="q" type="text"/>
-          <img id="navsearchgo" class="navbar_icon" src="[% uri_base %]/images/crystalclear_mag.png"/>
-        </form>
-        <ul class="nav pull-right">
-          <li class="menu">
-            <p>Logged in as &nbsp;</p>
-          </li>
-          <li class="dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown">[% session.user %]<b class="caret"></b></a>
-            <ul class="dropdown-menu">
-              [% FOREACH item IN user_dd %]
-              <li><a href="[% uri_for(item.link) %]">[% item.title %]</a></li>
-              [% END %]
-            </ul>
-          </li> <!-- /dropdown -->
-        </ul>
+      <ul class="nav">
+        <li class="active"><a href="[% uri_for('/') %]">Home</a></li>
+        [% IF more_dd.size %]
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+            More <b class="caret"></b>
+          </a>
+          <ul class="dropdown-menu">
+            [% FOREACH title IN more_dd.keys.sort %]
+            <li><a href="[% uri_for(more_dd.$title) %]">[% title %]</a></li>
+            [% END %]
+          </ul>
+        </li> <!-- /dropdown -->
         [% END %]
-      </div>
+      </ul>
+      <form class="navbar-search pull-left" method="get" action="[% uri_for('/search') %]">
+        <input placeholder="Find Anything" class="search-query span3" id="nq" name="q" type="text"/>
+        <img id="navsearchgo" class="navbar_icon" src="[% uri_base %]/images/crystalclear_mag.png"/>
+      </form>
+      <ul class="nav pull-right">
+        <li class="nd_navbartext">Logged in as &nbsp;</li>
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+            [% session.user %] <b class="caret"></b>
+          </a>
+          <ul class="dropdown-menu">
+            [% FOREACH item IN user_dd %]
+            <li><a href="[% uri_for(item.link) %]">[% item.title %]</a></li>
+            [% END %]
+          </ul>
+        </li> <!-- /dropdown -->
+      </ul>
+      [% END %]
     </div>
   </div>
 </div>