Commit efb6aa252bc9353977146962278a8315b3fd9139
Exists in
master
and in
5 other branches
Merge branch 'software-catalog'
Showing
4 changed files
with
42 additions
and
21 deletions
Show diff stats
lib/software_info.rb
| 1 | class SoftwareInfo < ActiveRecord::Base | 1 | class SoftwareInfo < ActiveRecord::Base |
| 2 | SEARCH_FILTERS = [] | 2 | SEARCH_FILTERS = [] |
| 3 | - SEARCH_DISPLAYS = %w[compact] | 3 | + SEARCH_DISPLAYS = %w[full] |
| 4 | 4 | ||
| 5 | def self.default_search_display | 5 | def self.default_search_display |
| 6 | - 'compact' | 6 | + 'full' |
| 7 | end | 7 | end |
| 8 | 8 | ||
| 9 | attr_accessible :e_mag, :icp_brasil, :intern, :e_ping, :e_arq, :operating_platform | 9 | attr_accessible :e_mag, :icp_brasil, :intern, :e_ping, :e_arq, :operating_platform |
public/style.css
| @@ -227,6 +227,11 @@ | @@ -227,6 +227,11 @@ | ||
| 227 | border-radius:8px; | 227 | border-radius:8px; |
| 228 | background-color:#e9e8ed; | 228 | background-color:#e9e8ed; |
| 229 | padding:3px 6px; | 229 | padding:3px 6px; |
| 230 | - margin:10px 3px; | 230 | + margin: 10px 3px; |
| 231 | color: blue; | 231 | color: blue; |
| 232 | +} | ||
| 233 | + | ||
| 234 | +.search-results-type-software_info li { | ||
| 235 | + width: 100% !important; | ||
| 236 | + display: block !important; | ||
| 232 | } | 237 | } |
| 233 | \ No newline at end of file | 238 | \ No newline at end of file |
views/search/_catalog_filter.html.erb
| 1 | <div> | 1 | <div> |
| 2 | <div id="catalog-list"> | 2 | <div id="catalog-list"> |
| 3 | + <br> | ||
| 3 | <ul> | 4 | <ul> |
| 4 | <% @category_filters.each do |filter_id| %> | 5 | <% @category_filters.each do |filter_id| %> |
| 5 | <li class="category_box"> <%= _(Category.find(filter_id).name) %> | 6 | <li class="category_box"> <%= _(Category.find(filter_id).name) %> |
| @@ -10,7 +11,9 @@ | @@ -10,7 +11,9 @@ | ||
| 10 | </div> | 11 | </div> |
| 11 | 12 | ||
| 12 | <div id="catalog-filter"> | 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 | </div> | 18 | </div> |
| 16 | </div> | 19 | </div> |
| 17 | \ No newline at end of file | 20 | \ No newline at end of file |
views/search/_full_community.html.erb
| @@ -10,44 +10,57 @@ | @@ -10,44 +10,57 @@ | ||
| 10 | <div class="search-community-content-block"> | 10 | <div class="search-community-content-block"> |
| 11 | <span> | 11 | <span> |
| 12 | <% link_name = software.acronym.blank? ? community.name : "#{software.acronym} - #{community.name}" %> | 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 | </span> | 16 | </span> |
| 15 | 17 | ||
| 16 | - <p> | 18 | + <span> |
| 17 | <% body_stripped = strip_tags(software.finality) %> | 19 | <% body_stripped = strip_tags(software.finality) %> |
| 20 | + <b> | ||
| 21 | + <%= _("Finality") + ":" if body_stripped %> | ||
| 22 | + </b> | ||
| 18 | <%= excerpt(body_stripped, body_stripped.first(3), 200) if body_stripped %> | 23 | <%= excerpt(body_stripped, body_stripped.first(3), 200) if body_stripped %> |
| 19 | - </p> | 24 | + </span> |
| 20 | </div> | 25 | </div> |
| 21 | 26 | ||
| 22 | <div class="search-community-content-block"> | 27 | <div class="search-community-content-block"> |
| 23 | <span> | 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 | </span> | 33 | </span> |
| 27 | </div> | 34 | </div> |
| 28 | 35 | ||
| 29 | <div class="search-community-content-block"> | 36 | <div class="search-community-content-block"> |
| 30 | <span> | 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 | </span> | 42 | </span> |
| 34 | </div> | 43 | </div> |
| 35 | 44 | ||
| 36 | <div class="search-community-content-block"> | 45 | <div class="search-community-content-block"> |
| 37 | <span> | 46 | <span> |
| 38 | - <%= _("Software Categories") %> | 47 | + <b> |
| 48 | + <%= _("Software Categories") %>: | ||
| 49 | + </b> | ||
| 39 | </span> | 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 | </ul> | 59 | </ul> |
| 47 | <% else %> | 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 | <% end %> | 64 | <% end %> |
| 52 | </div> | 65 | </div> |
| 53 | </div> | 66 | </div> |