Commit 7c4c517c29bc4d0a7c30d95134a0f0bbd7756e62
1 parent
13579ad7
Exists in
master
and in
54 other branches
Working search box field
Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>
Showing
1 changed file
with
6 additions
and
17 deletions
Show diff stats
src/colab_spb_theme/templates/header.html
@@ -62,9 +62,8 @@ | @@ -62,9 +62,8 @@ | ||
62 | </ul> | 62 | </ul> |
63 | <ul id="login-menu"> | 63 | <ul id="login-menu"> |
64 | {% if not user.is_authenticated %} | 64 | {% if not user.is_authenticated %} |
65 | - {% trans 'Login' as login_text %} | ||
66 | - <li class="login-item"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li> | ||
67 | - <li class="login item last-item"><a href="{% url 'login' %}">{% trans "Login" %}</a></li> | 65 | + <li class="login-item"><a href="{% url 'signup' %}">Cadastre-se</a></li> |
66 | + <li class="login item last-item"><a href="{% url 'login' %}">Entrar</a></li> | ||
68 | {% else %} | 67 | {% else %} |
69 | <li id="user-menu" class="login-item dropdown"> | 68 | <li id="user-menu" class="login-item dropdown"> |
70 | <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email %} <b class="caret"></b> </a> | 69 | <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email %} <b class="caret"></b> </a> |
@@ -96,21 +95,10 @@ | @@ -96,21 +95,10 @@ | ||
96 | </a> | 95 | </a> |
97 | </div> | 96 | </div> |
98 | <div id="portal-searchbox"> | 97 | <div id="portal-searchbox"> |
99 | - {% comment %} | ||
100 | - <form action="{% url 'haystack_search' %}" method="GET" id="search-form" class="navbar-form navbar-right hidden-xs hidden-sm" role="search"> | ||
101 | - <div class="form-group"> | ||
102 | - <label class="sr-only" for="header-searchbox">{% trans 'Search here...' %}</label> | ||
103 | - <input name="q" id="header-searchbox" | ||
104 | - class="form-control" value="{{ request.GET.q }}" | ||
105 | - type="search" placeholder="{% trans 'Search here...' %}" /> | ||
106 | - </div> | ||
107 | - <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button> | ||
108 | - </form> | ||
109 | - {% endcomment %} | ||
110 | - <form id="nolivesearchGadget_form" action="/search/"> | 98 | + <form id="nolivesearchGadget_form" action="{% url 'haystack_search' %}"> |
111 | <fieldset class="LSBox"><legend class="hiddenStructure">Buscar no portal</legend> | 99 | <fieldset class="LSBox"><legend class="hiddenStructure">Buscar no portal</legend> |
112 | <label class="hiddenStructure" for="nolivesearchGadget">Buscar no portal</label> | 100 | <label class="hiddenStructure" for="nolivesearchGadget">Buscar no portal</label> |
113 | - <input name="SearchableText" type="text" size="18" title="Buscar no portal" placeholder="Buscar no portal" class="searchField" id="nolivesearchGadget"> | 101 | + <input name="q" type="text" size="18" value="{{ request.GET.q }}" title="Buscar no portal" placeholder="Buscar no portal" class="searchField" id="nolivesearchGadget"> |
114 | <input class="searchButton" type="submit" value="Buscar no portal"> | 102 | <input class="searchButton" type="submit" value="Buscar no portal"> |
115 | </fieldset> | 103 | </fieldset> |
116 | </form> | 104 | </form> |
@@ -147,8 +135,9 @@ | @@ -147,8 +135,9 @@ | ||
147 | <div id="sobre"> | 135 | <div id="sobre"> |
148 | <ul> | 136 | <ul> |
149 | <li id="softwarepublico-groups" class="softwarepublico-item"> | 137 | <li id="softwarepublico-groups" class="softwarepublico-item"> |
150 | - <a href="https://portal.softwarepublico.gov.br/archives/thread/" title="Groups">Groups</a> | 138 | + <a href="{% url 'thread_list' %}" title="Groups">Grupos</a> |
151 | </li> | 139 | </li> |
140 | + {% plugins_menu %} | ||
152 | <li id="softwarepublico-perguntas-frequentes" class="softwarepublico-item"> | 141 | <li id="softwarepublico-perguntas-frequentes" class="softwarepublico-item"> |
153 | <a href="/social/spb/ajuda" title="Perguntas frequentes">Perguntas frequentes</a> | 142 | <a href="/social/spb/ajuda" title="Perguntas frequentes">Perguntas frequentes</a> |
154 | </li> | 143 | </li> |