Download as
Browse Code »

Commit 4ab43ff52cfdec5e9c449fad9d90cbc29e71faea

Authored by Gabriela Navarro
Committed by Álvaro Fernando Matos de Souza
1 parent 056acac9
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

Fix search catalog divs(to help in design)

Showing 1 changed file with 35 additions and 36 deletions   Show diff stats
views/search/_software_search_form.html.erb
  Diff comments   View file @4ab43ff
1   -<div class='search-form'>
2   - <h3> <%= _("Search Public Software Catalog") %> </h3>
  1 +<div>
  2 + <div class='search-form'>
  3 + <h3> <%= _("Search Public Software Catalog") %> </h3>
3 4  
4   - <%= form_tag( { :controller => 'search', :action => @asset ? @asset : 'index', :asset => nil, :category_path => ( @category ? @category.path : nil ) },
5   - :method => 'get', :class => 'search_form' ) do %>
  5 + <%= form_tag( { :controller => 'search', :action => @asset ? @asset : 'index', :asset => nil, :category_path => ( @category ? @category.path : nil ) },
  6 + :method => 'get', :class => 'search_form' ) do %>
6 7  
7 8 <div style="margin:0;padding:0;display:inline">
8   - <input name="utf8" type="hidden" value="&#x2713;" /></div>
  9 + <input name="utf8" type="hidden" value="&#x2713;" />
  10 + </div>
9 11 <%= hidden_field_tag :display, params[:display] %>
10 12 <%= hidden_field_tag :filter, params[:filter] %>
11 13  
... ... @@ -18,43 +20,40 @@
18 20 </div>
19 21 <%= render :partial => 'search_form_extra_fields' %>
20 22 <%= render :partial => 'catalog_filter' %>
  23 + <% end %>
  24 + </div>
21 25  
22   - <br />
  26 + <div id="catalog-display-options">
  27 + <div id="catalog-display-options-count">
  28 + <strong id="software-count"><%= "#{@software_count} Software(s)" %></strong>
  29 + </div>
23 30  
24   - <div id="catalog-display-options">
25   - <div id="catalog-display-options-count">
26   - <strong id="software-count"><%= "#{@software_count} Software(s)" %></strong>
  31 + <div id="catalog-display-options-show-and-sort">
  32 + <div id="catalog-display-options-show">
  33 + Show:
  34 + <%= select_tag("software_display",
  35 + options_for_select(['15', '30', '90', 'All'], :selected=>params[:display])
  36 + ) %>
27 37 </div>
28 38  
29   - <div id="catalog-display-options-show-and-sort">
30   - <div id="catalog-display-options-show">
31   - Show:
32   - <%= select_tag("software_display",
33   - options_for_select(['15', '30', '90', 'All'], :selected=>params[:display])
34   - ) %>
35   - </div>
36   -
37   - <div id="catalog-display-options-sort">
38   - Sort by:
39   - <%= select_tag("sort",
40   - options_for_select(
41   - [
42   - [_("Name A-Z"), 'asc'],
43   - [_("Name Z-A"), 'desc'],
44   - [_("Relevance"), 'relevance']
  39 + <div id="catalog-display-options-sort">
  40 + Sort by:
  41 + <%= select_tag("sort",
  42 + options_for_select(
  43 + [
  44 + [_("Name A-Z"), 'asc'],
  45 + [_("Name Z-A"), 'desc'],
  46 + [_("Relevance"), 'relevance']
45 47 ], :selected=>params[:sort])
46   - ) %>
47   - </div>
  48 + ) %>
48 49 </div>
49 50 </div>
50   - <% end %>
  51 + </div>
  52 +</div>
51 53  
52   - <% if @empty_query %>
53   - <% hint = environment.search_hints[@asset] %>
54   - <% if hint and !hint.blank? %>
55   - <div class="search-hint"><%= hint %></div>
56   - <% end %>
  54 +<% if @empty_query %>
  55 + <% hint = environment.search_hints[@asset] %>
  56 + <% if hint and !hint.blank? %>
  57 + <div class="search-hint"><%= hint %></div>
57 58 <% end %>
58   -
59   - <div style="clear: both"></div>
60   -</div>
  59 +<% end %>
... ...