Merge pull request #453 from srophe/issue433b

Update navbar location

Author: wsalesky

resources/components/navbar.html

@@ -0,0 +1,76 @@
+<nav xmlns="http://www.w3.org/1999/xhtml" class="navbar navbar-default navbar-fixed-top" role="navigation">
+    <div class="navbar-header">
+        <button type="button" class="navbar-toggle" data-toggle="collapse"
+            data-target="#navbar-collapse-1">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"/>
+            <span class="icon-bar"/>
+            <span class="icon-bar"/>
+        </button>
+        <a class="navbar-brand banner-container" href="/index.html">
+            <span class="syriaca-icon syriaca-mss banner-icon"><span class="path1"/><span class="path2"/><span class="path3"/><span class="path4"/></span>
+            <span class="banner-text">Syriac Manuscripts in the British Library 3</span>
+        </a>
+    </div>
+    <div class="navbar-collapse collapse pull-right nav-right" id="navbar-collapse-1">
+        <ul class="nav navbar-nav">
+            <li>
+                <a href="/browse.html" class="nav-text">Browse</a>
+            </li>
+            <li>
+                <a href="/search.html" class="nav-text">Advanced Search</a>
+            </li>
+            <li>
+                <div id="search-wrapper">
+                    <form class="navbar-form navbar-right search-box" role="search"
+                        action="/search.html" method="get">
+                        <div class="form-group">
+                            <input type="text" class="form-control keyboard" placeholder="search"
+                                name="keyword" id="keywordNav"/>
+                            <span data-template-input-id="keywordNav">
+                                <span class="keyboard-menu"><button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Select Keyboard">
+                                    &nbsp;<span class="syriaca-icon syriaca-keyboard">&nbsp; </span><span class="caret"></span></button>
+                                    <ul class="dropdown-menu">
+                                        <li><a href="#" class="keyboard-select" id="syriac-phonetic" data-keyboard-id="keywordNav">Syriac Phonetic</a></li>
+                                        <li><a href="#" class="keyboard-select" id="syriac-standard" data-keyboard-id="keywordNav">Syriac Standard</a></li>
+                                        <li><a href="#" class="keyboard-select" id="ms-Arabic (101)" data-keyboard-id="keywordNav">Arabic Mod. Standard</a></li>
+                                        <li><a href="#" class="keyboard-select" id="qwerty" data-keyboard-id="keywordNav">English QWERTY</a></li>
+                                    </ul></span>
+                            </span>
+                            <button class="btn btn-default search-btn" id="searchbtn" type="submit"
+                                title="Search">
+                                <span class="glyphicon glyphicon-search"/>
+                            </button>
+                        </div>
+                    </form>
+                </div>
+            </li>
+            <li>
+                <div class="btn-nav">
+                    <button class="btn btn-default navbar-btn" id="font" data-toggle="dropdown"
+                        aria-haspopup="true" aria-expanded="false" title="Select Font">
+                        <span class="glyphicon glyphicon-font"/>
+                    </button>
+                    <ul class="dropdown-menu dropdown-menu-right" id="swap-font">
+                        <li>
+                            <a href="#" class="swap-font" id="DefaultSelect" data-font-id="EstrangeloEdessa">Default</a>
+                        </li>
+                        <li>
+                            <a href="#" class="swap-font" id="EstrangeloEdessaSelect" data-font-id="SyrCOMTalada">Estrangela Talada</a>
+                        </li>
+                        <li>
+                            <a href="#" class="swap-font" id="EastSyriacAdiabeneSelect" data-font-id="SyrCOMAdiabene">East Syriac Adiabene</a>
+                        </li>
+                        <li>
+                            <a href="#" class="swap-font" id="SertoBatnanSelect" data-font-id="SyrCOMAntioch">Serto Antioch</a>
+                        </li>
+                        <li>
+                            <a href="$app-root/documentation/wiki.html?wiki-page=/How-to-view-Syriac-script&amp;wiki-uri=https://github.com/srophe/srophe-app-data/wiki">Help <span class="glyphicon glyphicon-question-sign"></span>
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+            </li>
+        </ul>
+    </div>
+</nav>

resources/js/navbar-search.js

@@ -1,6 +1,6 @@
 // Navbar search functionality
 $(document).ready(function() {
-$('#navbar-container').load('/siteGenerator/components/navbar.html', function() {
+$('#navbar-container').load('/resources/components/navbar.html', function() {
 
     $('[data-toggle="tooltip"]').tooltip({ container: 'body' });