Download as
Browse Code »

Commit 7c4c517c29bc4d0a7c30d95134a0f0bbd7756e62

Authored by Carlos Coêlho
1 parent 13579ad7
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

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
  Diff comments   View file @7c4c517
... ... @@ -62,9 +62,8 @@
62 62 </ul>
63 63 <ul id="login-menu">
64 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 67 {% else %}
69 68 <li id="user-menu" class="login-item dropdown">
70 69 <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email %} <b class="caret"></b>&nbsp;&nbsp;</a>
... ... @@ -96,21 +95,10 @@
96 95 </a>
97 96 </div>
98 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 99 <fieldset class="LSBox"><legend class="hiddenStructure">Buscar no portal</legend>
112 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 102 <input class="searchButton" type="submit" value="Buscar no portal">
115 103 </fieldset>
116 104 </form>
... ... @@ -147,8 +135,9 @@
147 135 <div id="sobre">
148 136 <ul>
149 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 139 </li>
  140 + {% plugins_menu %}
152 141 <li id="softwarepublico-perguntas-frequentes" class="softwarepublico-item">
153 142 <a href="/social/spb/ajuda" title="Perguntas frequentes">Perguntas frequentes</a>
154 143 </li>
... ...