Download as
Browse Code »

Commit 741f0c2af442952457ab179328d3506efcd536f2

Authored by Fabio Teixeira
Committed by Luciano Prestes
1 parent bb84c3e5
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

Add translation to empty catalog search 

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Showing 2 changed files with 45 additions and 1 deletions   Show diff stats
views/search/_catalog_result_list.html.erb 0 → 100644
  Diff comments   View file @741f0c2
... ... @@ -0,0 +1,44 @@
  1 +<div id="search-results" class="<%= !multiple_search? ? 'only-one-result-box' : 'multiple-results-boxes' %>">
  2 + <% @assets.each do |name| %>
  3 + <% search = @searches[name] %>
  4 +
  5 + <input type="hidden" id="empty_result" value="<%= search[:results].blank? %>" />
  6 +
  7 + <div class="search-results-<%= name %> search-results-box">
  8 + <% if !search[:results].blank? %>
  9 +
  10 + <% if multiple_search?(@searches) %>
  11 + <h3><%= @names[name] %></h3>
  12 + <% if search[:results].total_entries > SearchController::MULTIPLE_SEARCH_LIMIT %>
  13 + <%= link_to(_('see all (%d)') % search[:results].total_entries, params.merge(:action => name), :class => 'see-more' ) %>
  14 + <% end %>
  15 + <% end %>
  16 +
  17 + <% display = display_filter(name, params[:display]) %>
  18 +
  19 + <div class="search-results-innerbox search-results-type-<%= name.to_s.singularize %> <%= 'common-profile-list-block' if SearchHelper::COMMON_PROFILE_LIST_BLOCK.include?(name) %>">
  20 + <ul>
  21 + <% search[:results].each do |hit| %>
  22 + <% partial = partial_for_class(hit.class, display) %>
  23 + <% variable_name = partial.gsub("#{display}_", '').to_sym %>
  24 + <%= render :partial => partial, :locals => {variable_name => hit} %>
  25 + <% end %>
  26 + </ul>
  27 + </div>
  28 + <% else %>
  29 + <% if multiple_search? %>
  30 + <h3><%= @names[name] %></h3>
  31 + <% end %>
  32 +
  33 + <div id="search-results-empty"></div>
  34 +
  35 + <input type="hidden" id="message-no-catalog-selected" value="<%= _('No software found. Try more general filters') %>" />
  36 + <input type="hidden" id="message-catalog-selected" value="<%= _('No software found. Try more general filters or check the software category individually') %>" />
  37 + <% end %>
  38 + </div>
  39 + <% end %>
  40 +
  41 + <div style="clear:both"></div>
  42 +
  43 + <%= add_zoom_to_images %>
  44 +</div>
... ...
views/search/software_infos.html.erb
  Diff comments   View file @741f0c2
... ... @@ -3,7 +3,7 @@
3 3  
4 4 <%= render :partial => 'software_search_form', :locals => { :hint => _("Type words about the %s you're looking for") % @asset.to_s.singularize } %>
5 5  
6   - <%= display_results(@searches, @asset) %>
  6 + <%= render partial:"catalog_result_list" %>
7 7  
8 8 <div id="software-pagination">
9 9 <% if params[:display] != 'map' %>
... ...