diff --git a/views/search/_catalog_result_list.html.erb b/views/search/_catalog_result_list.html.erb index 3e8c91e..4e64576 100644 --- a/views/search/_catalog_result_list.html.erb +++ b/views/search/_catalog_result_list.html.erb @@ -4,47 +4,45 @@ -
- <% if !search[:results].blank? %> + <% if !search[:results].blank? %> - <% if multiple_search?(@searches) %> -

<%= @names[name] %>

- <% if search[:results].total_entries > SearchController::MULTIPLE_SEARCH_LIMIT %> - <%= link_to(_('see all (%d)') % search[:results].total_entries, params.merge(:action => name), :class => 'see-more' ) %> - <% end %> + <% if multiple_search?(@searches) %> +

<%= @names[name] %>

+ <% if search[:results].total_entries > SearchController::MULTIPLE_SEARCH_LIMIT %> + <%= link_to(_('see all (%d)') % search[:results].total_entries, params.merge(:action => name), :class => 'see-more' ) %> <% end %> + <% end %> - <% display = display_filter(name, params[:display]) %> - -
- -
- <% else %> - <% if multiple_search? %> -

<%= @names[name] %>

- <% end %> + <% display = display_filter(name, params[:display]) %> -
+
+ +
+ <% else %> + <% if multiple_search? %> +

<%= @names[name] %>

+ <% end %> - +
- + -
- <% @selected_categories.each do |category| %> -
- <%= link_to _("#{category.name}") + " (#{category.software_infos.count})", {:controller => :search, :action => :software_infos, :selected_categories_id => [category.id]} %> - <% end %> -
+ - <% end %> -
+
+ <% @selected_categories.each do |category| %> +
+ <%= link_to _("#{category.name}") + " (#{category.software_infos.count})", {:controller => :search, :action => :software_infos, :selected_categories_id => [category.id]} %> + <% end %> +
+ + <% end %> <% end %>
diff --git a/views/search/_full_community.html.erb b/views/search/_full_community.html.erb index 1b6c04d..c7a3544 100644 --- a/views/search/_full_community.html.erb +++ b/views/search/_full_community.html.erb @@ -1,55 +1,53 @@ <% software = community.software_info %> -
  • -
    -
    - <%= profile_image_link community, :portrait, 'div', community.send(@order + '_label') + show_date(community.created_at) %> -
    +
  • +
    + <%= profile_image_link community, :portrait, 'div', community.send(@order + '_label') + show_date(community.created_at) %> +
    -
    +
    -
    - - <% link_name = software.acronym.blank? ? community.name : "#{software.acronym} - #{community.name}" %> -

    - <%= link_to_homepage(link_name, community.identifier) %> -

    -
    - - <% body_stripped = strip_tags(software.finality) %> - <%= excerpt(body_stripped, body_stripped.first(3), 200) if body_stripped %> - -
    +
    + + <% link_name = software.acronym.blank? ? community.name : "#{software.acronym} - #{community.name}" %> +

    + <%= link_to_homepage(link_name, community.identifier) %> +

    +
    + + <% body_stripped = strip_tags(software.finality) %> + <%= excerpt(body_stripped, body_stripped.first(3), 200) if body_stripped %> + +
    + +
    -
    +
    + + + <%= _("Software Categories") %>: + + -
    + <% if !community.categories.empty? %> +
      + <% community.categories.each do |category| %> +
    • + <%= link_to _("#{category.name}"), { + :controller => :search, + :action => :software_infos, + :selected_categories_id => [category.id], + :include_non_public => !community.software_info.public_software? + } %> +
    • + <% end %> +
    + <% else %> - - <%= _("Software Categories") %>: - + <%= _("This software doesn't have categories") %> - - <% if !community.categories.empty? %> -
      - <% community.categories.each do |category| %> -
    • - <%= link_to _("#{category.name}"), { - :controller => :search, - :action => :software_infos, - :selected_categories_id => [category.id], - :include_non_public => !community.software_info.public_software? - } %> -
    • - <% end %> -
    - <% else %> - - <%= _("This software doesn't have categories") %> - - <% end %> -
    + <% end %>
    - -
    + +
  • -- libgit2 0.21.2