Commit 22bb663b4fb33c6995fce44ca6a279f2e6ba1075

Authored by Sergio Oliveira
2 parents 7212572c 383ab52e

Merge branch 'master' of github.com:TracyWebTech/colab

src/search/templates/search/search.html
@@ -40,6 +40,20 @@ @@ -40,6 +40,20 @@
40 <hr/> 40 <hr/>
41 41
42 <div class="row"> 42 <div class="row">
  43 +
  44 + <form class="col-xs-12 col-sm-12 col-md-12 hidden-lg" action="{% url "haystack_search" %}">
  45 + <div class="input-group">
  46 + <input type="text" class="form-control" name="q" placeholder="{% trans "Search here" %}"
  47 + {% if request.GET.q %}value="{{ request.GET.q }}"{% endif %} />
  48 + <div class="input-group-btn">
  49 + <button type="submit" class="btn btn-primary">
  50 + <span class="glyphicon glyphicon-search"></span>
  51 + </button>
  52 + </div>
  53 + </div>
  54 + </form>
  55 + <br />
  56 +
43 <div id="filters" class="hidden-xs hidden-sm col-md-2 col-lg-2"> 57 <div id="filters" class="hidden-xs hidden-sm col-md-2 col-lg-2">
44 <h3>{% trans "Filters" %}</h3> 58 <h3>{% trans "Filters" %}</h3>
45 {% include "search/includes/search_filters.html" %} 59 {% include "search/includes/search_filters.html" %}
src/static/css/screen.css
@@ -399,11 +399,3 @@ ul.emails { @@ -399,11 +399,3 @@ ul.emails {
399 span.highlighted { 399 span.highlighted {
400 background-color: yellow; 400 background-color: yellow;
401 } 401 }
402 -  
403 -/* Mobile search form */  
404 -.navbar-nav > li > .mobile-search-form {  
405 - padding-top: 10px;  
406 - padding-bottom: 10px;  
407 - line-height: 20px;  
408 - padding: 5px 15px 5px 15px;  
409 -}  
src/templates/base.html
@@ -63,27 +63,6 @@ @@ -63,27 +63,6 @@
63 <span class="icon-bar"></span> 63 <span class="icon-bar"></span>
64 </button> 64 </button>
65 <a class="navbar-brand" href="/"><img alt="Colab" src="/static/img/logo_nav.png"></a> 65 <a class="navbar-brand" href="/"><img alt="Colab" src="/static/img/logo_nav.png"></a>
66 -  
67 - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".mobile-search">  
68 - <span class="glyphicon glyphicon-search"></span>  
69 - </button>  
70 -  
71 - </div>  
72 -  
73 - <!-- Mobile Search -->  
74 - <div class="collapse mobile-search">  
75 - <ul class="nav navbar-nav hidden-md hidden-lg">  
76 - <li>  
77 - <form action="{% url 'haystack_search' %}" class="search mobile-search-form" role="search">  
78 - <div class="form-group">  
79 - <input name="q" class="form-control"  
80 - value="{{ request.GET.q }}"  
81 - type="search" placeholder="{% trans 'Search here...' %}" />  
82 - </div>  
83 - <button class="btn btn-default">{% trans "Search" %} <span class="glyphicon glyphicon-search"></span></button>  
84 - </form>  
85 - </li>  
86 - </ul>  
87 </div> 66 </div>
88 67
89 <div class="collapse navbar-collapse navbar-main"> 68 <div class="collapse navbar-collapse navbar-main">
@@ -107,6 +86,9 @@ @@ -107,6 +86,9 @@
107 <li><a href="/report">{% trans "View Tickets" %}</a></li> 86 <li><a href="/report">{% trans "View Tickets" %}</a></li>
108 </ul> 87 </ul>
109 </li> 88 </li>
  89 + <li>
  90 + <a href="{% url 'haystack_search' %}?q=">{% trans "Search" %}</a>
  91 + </li>
110 </ul> 92 </ul>
111 93
112 <ul class="nav navbar-nav navbar-right"> 94 <ul class="nav navbar-nav navbar-right">