From e81680ecd342e507b1ce09336ed4a904fc03c413 Mon Sep 17 00:00:00 2001
From: Graham Triggs <gtriggs@duraspace.org>
Date: Sun, 1 Oct 2017 21:27:30 +0100
Subject: [PATCH] Improve navbar

---
 .../tenderfoot/templates/page/partials/menu.ftl  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/menu.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/menu.ftl
index eaa07cd1..f1c53720 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/menu.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/menu.ftl
@@ -4,6 +4,14 @@
     <div id="nav">
         <div class="container">
             <nav class="navbar navbar-default">
+                <div class="navbar-header pull-right">
+                    <ul class="nav pull-left">
+                        <li>
+                        <#include "search.ftl">
+                        </li>
+                    </ul>
+                </div>
+
                 <button class="navbar-toggle pull-left" type="button" data-toggle="collapse" data-target="#navbarContent" aria-controls="navbarContent" aria-expanded="false" aria-label="Toggle navigation">
                     <span class="button-label">Menu</span>
                     <div class="button-bars">
@@ -12,17 +20,13 @@
                         <span class="icon-bar"></span>
                     </div>
                 </button>
-                <div class="collapse navbar-collapse" id="navbarContent">
+
+                <div class="collapse navbar-collapse navbar-left" id="navbarContent">
                     <ul id="main-nav" role="list" class="nav navbar-nav mr-auto mt-2 mt-md-0">
                     <#list menu.items as item>
                         <li class="nav-item" role="listitem" <#if item.active> class="active" </#if>><a href="${item.url}" title="${item.linkText} ${i18n().menu_item}" class="nav-link">${item.linkText}</a></li>
                     </#list>
                     </ul>
-                    <ul class="nav pull-right navbar-nav">
-                        <li>
-                        <#include "search.ftl">
-                        </li>
-                    </ul>
                 </div>
             </nav>
         </div>