diff options
| author | Cédric Bonhomme <kimble.mandel@gmail.com> | 2013-11-13 21:04:07 +0100 |
|---|---|---|
| committer | Cédric Bonhomme <kimble.mandel@gmail.com> | 2013-11-13 21:04:07 +0100 |
| commit | 069f3762cf0cbfbb663e25c4aa5aa1d53fe0e3ef (patch) | |
| tree | d73b07701bdfabc036ec7bce935f09c6ceec1f25 /pyaggr3g470r/templates | |
| parent | Try to fix the problem with the search box with Chrome and Chromium (it works... (diff) | |
| download | newspipe-069f3762cf0cbfbb663e25c4aa5aa1d53fe0e3ef.tar.gz newspipe-069f3762cf0cbfbb663e25c4aa5aa1d53fe0e3ef.tar.bz2 newspipe-069f3762cf0cbfbb663e25c4aa5aa1d53fe0e3ef.zip | |
Improved search box.
Diffstat (limited to 'pyaggr3g470r/templates')
| -rw-r--r-- | pyaggr3g470r/templates/layout.html | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/pyaggr3g470r/templates/layout.html b/pyaggr3g470r/templates/layout.html index 1be3725c..7ea4c65c 100644 --- a/pyaggr3g470r/templates/layout.html +++ b/pyaggr3g470r/templates/layout.html @@ -22,7 +22,6 @@ <body> - <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <div class="container"> <div class="navbar-header"> @@ -34,17 +33,11 @@ </button> <a class="navbar-brand" href="/">pyAggr3g470r</a> </div> - {% if g.user.is_authenticated() %} + + <!-- Collect the nav links, forms, and other content for toggling --> <div class="collapse navbar-collapse navbar-ex1-collapse"> - <form class="navbar-form pull-right col-lg-4 col-4 col-sm-4" method="get" action="/search/" role="search"> - <div class="input-group"> - <input type="search" class="form-control" name="query" placeholder="Search"/> - <span class="input-group-btn"> - <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button> - </span> - </div> - </form> - <ul class="nav navbar-nav navbar-right"> + <ul class="nav navbar-nav navbar-right"> + {% if g.user.is_authenticated() %} <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Articles <b class="caret"></b></a> <ul class="dropdown-menu"> @@ -63,14 +56,27 @@ <li><a href="/management/">Management</a></li> <li><a href="/about/">About</a></li> <li><a href="{{ url_for('logout') }}">Logout</a></li> - </ul> - </div> - {% endif %} - </div> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + <button class="btn btn-default btn-xs" type="submit"><span class="glyphicon glyphicon-search"></span></button> <b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li> + <form class="navbar-form" method=get action="/search/" role="search"> + <div class="input-group"> + <input type="text" class="form-control" name="query" placeholder="Search"> + </div> + </form> + </li> + </ul> + </li> + {% endif %} + </ul> + </div><!-- /.navbar-collapse --> + </div><!-- /.container --> </nav> - {% block content %}{% endblock %} <!-- Bootstrap core JavaScript --> |