Download as
Browse Code »

Commit fd89c27d647eb8e2eb5c27d12a99843cb5dda84c

Authored by Álvaro Fernando Matos de Souza
1 parent 35791d69
Exists in master and in 5 other branches fix_search_by_software_highlight_block, r4, refactor_software_info_365, stable, update_translations

Removing html classes from catalog page - #109 

Removed classes:
div class=”search-results-software_infos search-results-box”
class=”search-profile-item”

Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com>
Signed-off-by: ArthurJahn <stutrzbecher@gmail.com>
Showing 2 changed files with 74 additions and 78 deletions   Show diff stats
views/search/_catalog_result_list.html.erb
  Diff comments   View file @fd89c27
... ... @@ -4,47 +4,45 @@
4 4  
5 5 <input type="hidden" id="empty_result" value="<%= search[:results].blank? %>" />
6 6  
7   - <div class="search-results-<%= name %> search-results-box">
8   - <% if !search[:results].blank? %>
  7 + <% if !search[:results].blank? %>
9 8  
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 %>
  9 + <% if multiple_search?(@searches) %>
  10 + <h3><%= @names[name] %></h3>
  11 + <% if search[:results].total_entries > SearchController::MULTIPLE_SEARCH_LIMIT %>
  12 + <%= link_to(_('see all (%d)') % search[:results].total_entries, params.merge(:action => name), :class => 'see-more' ) %>
15 13 <% end %>
  14 + <% end %>
16 15  
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 %>
  16 + <% display = display_filter(name, params[:display]) %>
32 17  
33   - <div id="search-results-empty"></div>
  18 + <div class="search-results-innerbox search-results-type-<%= name.to_s.singularize %> <%= 'common-profile-list-block' if SearchHelper::COMMON_PROFILE_LIST_BLOCK.include?(name) %>">
  19 + <ul>
  20 + <% search[:results].each do |hit| %>
  21 + <% partial = partial_for_class(hit.class, display) %>
  22 + <% variable_name = partial.gsub("#{display}_", '').to_sym %>
  23 + <%= render :partial => partial, :locals => {variable_name => hit} %>
  24 + <% end %>
  25 + </ul>
  26 + </div>
  27 + <% else %>
  28 + <% if multiple_search? %>
  29 + <h3><%= @names[name] %></h3>
  30 + <% end %>
34 31  
35   - <input type="hidden" id="message-no-catalog-selected" value="<%= _('No software found. Try more general filters') %>" />
  32 + <div id="search-results-empty"></div>
36 33  
37   - <input type="hidden" id="message-catalog-selected" value="<%= _('No software found. Try more general filters or check the software category individually') %>" />
  34 + <input type="hidden" id="message-no-catalog-selected" value="<%= _('No software found. Try more general filters') %>" />
38 35  
39   - <div id="individually-category">
40   - <% @selected_categories.each do |category| %>
41   - <br />
42   - <%= link_to _("#{category.name}") + " (#{category.software_infos.count})", {:controller => :search, :action => :software_infos, :selected_categories_id => [category.id]} %>
43   - <% end %>
44   - </div>
  36 + <input type="hidden" id="message-catalog-selected" value="<%= _('No software found. Try more general filters or check the software category individually') %>" />
45 37  
46   - <% end %>
47   - </div>
  38 + <div id="individually-category">
  39 + <% @selected_categories.each do |category| %>
  40 + <br />
  41 + <%= link_to _("#{category.name}") + " (#{category.software_infos.count})", {:controller => :search, :action => :software_infos, :selected_categories_id => [category.id]} %>
  42 + <% end %>
  43 + </div>
  44 +
  45 + <% end %>
48 46 <% end %>
49 47  
50 48 <div style="clear:both"></div>
... ...
views/search/_full_community.html.erb
  Diff comments   View file @fd89c27
1 1 <% software = community.software_info %>
2   -<li class="search-profile-item">
3   - <div class="search-software-item">
4   - <div class="search-software-item-column-left">
5   - <%= profile_image_link community, :portrait, 'div', community.send(@order + '_label') + show_date(community.created_at) %>
6   - </div>
  2 +<li class="search-software-item">
  3 + <div class="search-software-item-column-left">
  4 + <%= profile_image_link community, :portrait, 'div', community.send(@order + '_label') + show_date(community.created_at) %>
  5 + </div>
7 6  
8   - <div class="search-software-item-column-right">
  7 + <div class="search-software-item-column-right">
9 8  
10   - <div class="search-software-content-block">
11   - <span>
12   - <% link_name = software.acronym.blank? ? community.name : "#{software.acronym} - #{community.name}" %>
13   - <h4>
14   - <%= link_to_homepage(link_name, community.identifier) %>
15   - </h4>
16   - </span>
17   - <span class="search-content-result">
18   - <% body_stripped = strip_tags(software.finality) %>
19   - <%= excerpt(body_stripped, body_stripped.first(3), 200) if body_stripped %>
20   - </span>
21   - </div>
  9 + <div class="search-software-content-block">
  10 + <span>
  11 + <% link_name = software.acronym.blank? ? community.name : "#{software.acronym} - #{community.name}" %>
  12 + <h4>
  13 + <%= link_to_homepage(link_name, community.identifier) %>
  14 + </h4>
  15 + </span>
  16 + <span class="search-content-result">
  17 + <% body_stripped = strip_tags(software.finality) %>
  18 + <%= excerpt(body_stripped, body_stripped.first(3), 200) if body_stripped %>
  19 + </span>
  20 + </div>
  21 +
  22 + <br />
22 23  
23   - <br />
  24 + <div class="search-software-content-block">
  25 + <span>
  26 + <b>
  27 + <%= _("Software Categories") %>:
  28 + </b>
  29 + </span>
24 30  
25   - <div class="search-software-content-block">
  31 + <% if !community.categories.empty? %>
  32 + <ul id="categories-list">
  33 + <% community.categories.each do |category| %>
  34 + <li>
  35 + <%= link_to _("#{category.name}"), {
  36 + :controller => :search,
  37 + :action => :software_infos,
  38 + :selected_categories_id => [category.id],
  39 + :include_non_public => !community.software_info.public_software?
  40 + } %>
  41 + </li>
  42 + <% end %>
  43 + </ul>
  44 + <% else %>
26 45 <span>
27   - <b>
28   - <%= _("Software Categories") %>:
29   - </b>
  46 + <%= _("This software doesn't have categories") %>
30 47 </span>
31   -
32   - <% if !community.categories.empty? %>
33   - <ul id="categories-list">
34   - <% community.categories.each do |category| %>
35   - <li>
36   - <%= link_to _("#{category.name}"), {
37   - :controller => :search,
38   - :action => :software_infos,
39   - :selected_categories_id => [category.id],
40   - :include_non_public => !community.software_info.public_software?
41   - } %>
42   - </li>
43   - <% end %>
44   - </ul>
45   - <% else %>
46   - <span>
47   - <%= _("This software doesn't have categories") %>
48   - </span>
49   - <% end %>
50   - </div>
  48 + <% end %>
51 49 </div>
52   -
53   - <hr class="clearfix" />
54 50 </div>
  51 +
  52 + <hr class="clearfix" />
55 53 </li>
... ...