add a search input in top bar

diff --git a/panikweb_templates/static/css/specifics.css b/panikweb_templates/static/css/specifics.css
index 6957a59af11042fbef6569ec41682a96df93207e..4fd6d076b8ad77c932c4f7c2ab7534345340c6d1 100644 (file)
--- a/panikweb_templates/static/css/specifics.css
+++ b/panikweb_templates/static/css/specifics.css
@@ -228,9 +228,24 @@ body{
 #metaNav ul li.active span.iconLabel {
 }
 
+#metaNav li#nav-search a {
+       display: inline;
+}
+
+#metaNav form {
+       display: inline;
+}
+
+#metaNav input {
+       border: 1px solid #ececec;
+}
+
 @media screen and (max-width:600px){
        #metaNav .iconLabel {display:none;}
        #metaNav ul li a span.nav-icon { display: inline-block; }
+       #metaNav form {
+               display: none;
+       }
 }
 
 /****************************************************/
@@ -300,6 +315,13 @@ body{
                padding-top: 40px;
        }
 
+       #metaNav {
+               padding-top: 2px;
+       }
+       #metaNav .nav-icon {
+               display: none !important;
+       }
+
        #Player #CurrentlyPlaying {
                margin-top: 50px;
        }

diff --git a/panikweb_templates/static/js/specifics.js b/panikweb_templates/static/js/specifics.js
index 8dbf0b1839717299a5009ae4538ea43d10f250ef..a21336e7c484d88eb50a540af7daeff02708bf4e 100644 (file)
--- a/panikweb_templates/static/js/specifics.js
+++ b/panikweb_templates/static/js/specifics.js
@@ -391,6 +391,27 @@ $(function() {
                });
                ticker_interval = setInterval(function(){tick();  }, 20000);/**/
 
+               function navsearch_click(event) {
+                       event.preventDefault();
+                       var query = $('#nav-search input').val();
+                       var form = $('#nav-search form');
+                       var href = '';
+                       if (query == '') {
+                               href = $(form).attr('action');
+                       } else {
+                               href = $(form).attr('action') + '?' + $(form).serialize();
+                       }
+                       if (event.which == 2) {
+                               window.open(href, '_blank');
+                       } else {
+                               $(this).addClass('loading');
+                               loadPage(href);
+                       }
+                       return false;
+               }
+               $('#nav-search a').unbind('click').on('click', navsearch_click);
+               $('#nav-search a').unbind('submit').on('submit', navsearch_click);
+
        }
        init();
 });

diff --git a/panikweb_templates/templates/includes/metaNav.html b/panikweb_templates/templates/includes/metaNav.html
index 8cd13f50df60996c5e8ebbe06917d78b0c491fa7..f85c019ada5b97a378d8a47bd4983fdad9053d25 100644 (file)
--- a/panikweb_templates/templates/includes/metaNav.html
+++ b/panikweb_templates/templates/includes/metaNav.html
@@ -24,7 +24,9 @@
                        <li id="nav-search" class="{% if sectionName = "Search" %}active{% endif %}"><a href="{% url 'search' %}">
                                <span class="nav-icon icon-search resymbol" ></span>
                                <span class="iconLabel">{% trans 'Search' %}</span>
-                       </a></li>
+                       </a>
+                       <form action="{% url 'search' %}"><input name="q" type="search"></input></form>
+                       </li>
     
                </ul>
 </nav>