Download as
Browse Code »

Commit efb6aa252bc9353977146962278a8315b3fd9139

Authored by Arthur Esposte
2 parents fba92e05 eafc0943
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

Merge branch 'software-catalog'

Showing 4 changed files with 42 additions and 21 deletions   Show diff stats
lib/software_info.rb
  Diff comments   View file @efb6aa2
1 1 class SoftwareInfo < ActiveRecord::Base
2 2 SEARCH_FILTERS = []
3   - SEARCH_DISPLAYS = %w[compact]
  3 + SEARCH_DISPLAYS = %w[full]
4 4  
5 5 def self.default_search_display
6   - 'compact'
  6 + 'full'
7 7 end
8 8  
9 9 attr_accessible :e_mag, :icp_brasil, :intern, :e_ping, :e_arq, :operating_platform
... ...
public/style.css
  Diff comments   View file @efb6aa2
... ... @@ -227,6 +227,11 @@
227 227 border-radius:8px;
228 228 background-color:#e9e8ed;
229 229 padding:3px 6px;
230   - margin:10px 3px;
  230 + margin: 10px 3px;
231 231 color: blue;
  232 +}
  233 +
  234 +.search-results-type-software_info li {
  235 + width: 100% !important;
  236 + display: block !important;
232 237 }
233 238 \ No newline at end of file
... ...
views/search/_catalog_filter.html.erb
  Diff comments   View file @efb6aa2
1 1 <div>
2 2 <div id="catalog-list">
  3 + <br>
3 4 <ul>
4 5 <% @category_filters.each do |filter_id| %>
5 6 <li class="category_box"> <%= _(Category.find(filter_id).name) %>
... ... @@ -10,7 +11,9 @@
10 11 </div>
11 12  
12 13 <div id="catalog-filter">
13   - <span><%= _("Categories filter") %>:</span>
14   - <%= text_field(:software, :catalog, :id=>"software-catalog", :placeholder=>_("Type a category name here")) %>
  14 + <h4>
  15 + <span><%= _("Categories filter") %>:</span>
  16 + <%= text_field(:software, :catalog, :id=>"software-catalog", :placeholder=>_("Type a category name here")) %>
  17 + </h4>
15 18 </div>
16 19 </div>
17 20 \ No newline at end of file
... ...
views/search/_full_community.html.erb
  Diff comments   View file @efb6aa2
... ... @@ -10,44 +10,57 @@
10 10 <div class="search-community-content-block">
11 11 <span>
12 12 <% link_name = software.acronym.blank? ? community.name : "#{software.acronym} - #{community.name}" %>
13   - <%= link_to_homepage(link_name, community.identifier, :class => "search-result-title") %>
  13 + <h4>
  14 + <%= link_to_homepage(link_name, community.identifier) %>
  15 + </h4>
14 16 </span>
15 17  
16   - <p>
  18 + <span>
17 19 <% body_stripped = strip_tags(software.finality) %>
  20 + <b>
  21 + <%= _("Finality") + ":" if body_stripped %>
  22 + </b>
18 23 <%= excerpt(body_stripped, body_stripped.first(3), 200) if body_stripped %>
19   - </p>
  24 + </span>
20 25 </div>
21 26  
22 27 <div class="search-community-content-block">
23 28 <span>
24   - <%= _("Software licence") %>:
25   - <%= link_to(software.license_info.version, software.license_info.link, :target=>"blank", :class => "search-result-title") %>
  29 + <b>
  30 + <%= _("Software licence") %>:
  31 + </b>
  32 + <%= link_to(software.license_info.version, software.license_info.link, :target=>"blank") %>
26 33 </span>
27 34 </div>
28 35  
29 36 <div class="search-community-content-block">
30 37 <span>
31   - <%= _("Link software repository") %>:
32   - <%= link_to(software.repository_link, software.repository_link, :target=>"blank", :class => "search-result-title") %>
  38 + <b>
  39 + <%= _("Link software repository") %>:
  40 + </b>
  41 + <%= link_to(software.repository_link, software.repository_link, :target=>"blank") %>
33 42 </span>
34 43 </div>
35 44  
36 45 <div class="search-community-content-block">
37 46 <span>
38   - <%= _("Software Categories") %>
  47 + <b>
  48 + <%= _("Software Categories") %>:
  49 + </b>
39 50 </span>
40 51  
41   - <% if not community.categories.empty? %>
42   - <ul>
43   - <% community.categories.each do |category| %>
44   - <li> <%= category.name %> </li>
45   - <% end %>
  52 + <% if !community.categories.empty? %>
  53 + <ul id="categories-list">
  54 + <% community.categories.each do |category| %>
  55 + <li>
  56 + <%= category.name %>
  57 + </li>
  58 + <% end %>
46 59 </ul>
47 60 <% else %>
48   - <p>
49   - <span><%= _("This software doesn't has categories") %></span>
50   - </p>
  61 + <span>
  62 + <%= _("This software doesn't have categories") %>
  63 + </span>
51 64 <% end %>
52 65 </div>
53 66 </div>
... ...