From b9c3d78e501cd0107d2ed90cfdc0ddd3cd854f34 Mon Sep 17 00:00:00 2001
From: Cédric Bonhomme <kimble.mandel@gmail.com>
Date: Mon, 11 Nov 2013 23:37:06 +0100
Subject: Added search form in the nav bar.

---
 pyaggr3g470r/templates/layout.html | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'pyaggr3g470r')

diff --git a/pyaggr3g470r/templates/layout.html b/pyaggr3g470r/templates/layout.html
index 7a2b804a..b5804553 100644
--- a/pyaggr3g470r/templates/layout.html
+++ b/pyaggr3g470r/templates/layout.html
@@ -15,7 +15,6 @@
     <!-- Add custom CSS here -->
     <style>
         body {margin-top: 60px;}
-        .input-group {margin-top:10px;}
     </style>
 
   </head>
@@ -37,7 +36,7 @@
 
         <!-- Collect the nav links, forms, and other content for toggling -->
         <div class="collapse navbar-collapse navbar-ex1-collapse">
-          <ul class="nav navbar-nav navbar-right">
+          <ul class="nav navbar-nav navbar-left">
             {% if g.user.is_authenticated() %}
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">Articles <b class="caret"></b></a>
@@ -57,16 +56,16 @@
                 <li><a href="/management/">Management</a></li>
                 <li><a href="/about/">About</a></li>
                 <li><a href="{{ url_for('logout') }}">Logout</a></li>
-                <li>
-                    <div class="input-group">
-                        <input type="text" class="form-control" placeholder="Search articles" maxlength=2048 autocomplete="on">
-                        <span class="input-group-btn">
-                            <button class="btn btn-default" type="button"><span class="glyphicon glyphicon-search"></span></button>
-                        </span>
-                    </div><!-- /input-group -->
-                </li>
             {% endif %}
           </ul>
+          <form class="navbar-form navbar-right" role="search">
+            <div class="input-group">
+                <input type="text" class="form-control" placeholder="Search">
+                <span class="input-group-btn">
+                    <button class="btn btn-default" type="submit"><span class="glyphicon glyphicon-search"></span></button>
+                </span>
+            </div>
+          </form>
         </div><!-- /.navbar-collapse -->
       </div><!-- /.container -->
     </nav>
-- 
cgit