Download as
Browse Code »

Commit 55e9b6c2a49be009b27361b48a527ec1c6356514

Authored by Matheus Fernandes
Committed by Luciano Prestes
1 parent 35abc9f9
Exists in master and in 51 other branches add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, 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_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, header_fix, lxc_settings, margin_fix, mezuro_cookbook, refactor_download_block, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, stable-4.x, theme_header, theme_javascript_refactory, thread_dropdown, update_search_by_categories, update_software_api

Added order filter to search 

Signed-off-by: Matheus Fernandes <matheus.souza.fernandes@gmail.com>
Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com>
Showing 2 changed files with 36 additions and 17 deletions   Show diff stats
src/colab-spb-theme-plugin/colab_spb_theme/static/css/search.css
  Diff comments   View file @55e9b6c
... ... @@ -43,6 +43,10 @@
43 43 font-size: 14px;
44 44 }
45 45  
  46 +.btn:hover {
  47 + color: white;
  48 +}
  49 +
46 50 .search-divisor {
47 51 margin-top: 0px;
48 52 }
... ...
src/colab-spb-theme-plugin/colab_spb_theme/templates/search/search.html
  Diff comments   View file @55e9b6c
... ... @@ -32,35 +32,50 @@
32 32 {% block main-content %}
33 33 <div class="search-results" style="width: 980px;margin: auto;">
34 34  
35   -<div class="container">
36   - <div class="row">
37   - <div class="col-md-12">
38   - <div class="search-form">
39   - <h3 class="search-title"> {% trans "BUSCAR NO PORTAL" %} </h3>
40   -
41   - <form accept-charset="UTF-8" action="/search/" method="get">
  35 +<form accept-charset="UTF-8" action="/search/" method="get">
  36 + <div class="container">
  37 + <div class="row">
  38 + <div class="col-md-12">
  39 + <div class="search-form">
  40 + <h3 class="search-title"> {% trans "BUSCAR NO PORTAL" %} </h3>
42 41 <div class="search-field">
43 42 <span class="formfield">
44 43 <input class="search-input" id="search-input" name="q" value="" type="text">
45 44 </span>
46 45 </div>
47 46 <input class="btn search-blue with-text icon-search submit" name="commit" value="Buscar" type="submit">
48   - </form>
  47 + </div>
49 48 </div>
50 49 </div>
51 50 </div>
52   -</div>
53 51  
54   -<div class="container search-summary">
55   - <div class="row">
56   - <div class="col-xs-6 col-sm-8 col-md-10 col-lg-10">
57   - <p class="text-left search-total">
58   - {% trans "Total de "%}{{ page.paginator.count }}{% trans " respostas na sua pesquisa"%}
59   - </p>
  52 + <div class="container search-summary">
  53 + <div class="row">
  54 + <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6">
  55 + <p class="text-left search-total">
  56 + {% trans "Total de "%}{{ page.paginator.count }}{% trans " respostas na sua pesquisa"%}
  57 + </p>
  58 + </div>
  59 + <div class="col-xs-3 col-sm-2 col-md-2 col-lg-2">
  60 + </div>
  61 + <div class="col-xs-3 col-sm-4 col-md-4 col-lg-4">
  62 + <p class="text-right search-total">{% trans "Ordenar por:" %}
  63 + <select name="order" id="order_option" onchange="this.form.submit()">
  64 + <option value=""></option>
  65 + {% for option, dict_order in order_data.items %}
  66 + {% ifequal request.GET.order option %}
  67 + <option value="{{option}}" selected>{% trans option %}</option>
  68 + {% else %}
  69 + <option value="{{option}}">{% trans option %}</option>
  70 + {% endifequal %}
  71 + {% endfor %}
  72 + </select>
  73 + </p>
  74 + </div>
60 75 </div>
  76 + <hr class="search-divisor" />
61 77 </div>
62   - <hr class="search-divisor" />
63   -</div>
  78 +</form>
64 79  
65 80 <div class="row">
66 81 <div class="col-md-12 col-lg-12">
... ...