[IMP]Improved code for fixed topbar navigation menu.

bzr revid: bth@tinyerp.com-20130829062918-12dvjv0e8y0lkrty

3 files changed, 8 insertions, 10 deletions

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 00724eae9ae..bfea9600568 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -181,6 +181,9 @@ header.navbar-fixed-top {
 h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   font-weight: 900;
 }
+.navbar {
+    margin-bottom: 0px;
+}
 .navbar-form {
   padding: 0;
   margin-top: 0;
@@ -191,12 +194,13 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
 }
 header {
   margin-bottom: 0px;
+  margin-top: -10px;
   min-height: 40px;
 }
 header .collapse ul {
   margin-top: 5px;
 }
-.navbar-nav>li>a {
+#website-top-view .navbar-nav>li>a {
   padding:10px 15px 10px;
 }
 /* -- Hack for nav header -- */
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 0761f92ea0a..ea835d0280c 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -3,7 +3,7 @@
 -->
 <templates id="template" xml:space="preserve">
     <t t-name="website.editorbar">
-        <nav class="navbar-inverse navbar-fixed-top" role="navigation">
+        <div class="navbar-inverse navbar-fixed-top">
             <div id="website-top-view">
                 <form class="navbar-form navbar-left">
                     <button data-action="edit" class="btn btn-primary">Edit</button>
@@ -24,7 +24,6 @@
                     </li>
                 </ul>
             </div>
-
             <div id="website-top-edit">
                 <form class="navbar-form navbar-left">
                     <button data-action="save" class="btn btn-primary">Save</button>
@@ -34,7 +33,7 @@
                     <li><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
                 </ul>
             </div>
-        </nav>
+        </div>
     </t>
 
     <t t-name="website.mobile_preview">
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index afc5cb222b0..cd49c52d1b6 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -49,14 +49,9 @@
                             <div class="navbar navbar-default navbar-static-top">
                                 <div class="container">
                                     <div class="navbar-header">
-                                        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                                            <span class="icon-bar"></span>
-                                            <span class="icon-bar"></span>
-                                            <span class="icon-bar"></span>
-                                        </button>
                                         <a class="navbar-brand" href="/page/website.homepage"><em>Open</em><b>ERP</b></a>
                                     </div>
-                                    <div class="navbar-collapse collapse">
+                                    <div class="navbar-collapse">
                                         <ul class="nav navbar-nav navbar-right" id="top_menu">
                                             <li><a href="/page/website.contactus">Contact us</a></li>
                                             <li><a href="/admin">Sign in</a></li>