Download as
Browse Code »

Commit 8bc4669ddfed2a8872e9eed708960dd76c2f3463

Authored by Braulio Bhavamitra
1 parent c0ae7ebe
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Single column searchs

Showing 1 changed file with 4 additions and 16 deletions   Show diff stats
app/views/search/_display_results.rhtml
  Diff comments   View file @8bc4669
1 1 <div id="search-results" class="<%= 'only-one-result-box' if @results.size == 1 %>">
2 2  
3   -<%
4   - pos2 = :odd # allow to format in a two columns layout
5   - pos3 = 3 # allow to format in a thre columns layout
6   -%>
7 3 <% @order.each do |name| %>
8 4 <% results = @results[name] %>
9   - <%
10   - pos3 += 1; pos3 = 1 if pos3 > 3
11   - pos2==:odd ? pos2=:even : pos2=:odd
12   - %>
13 5 <% if !results.nil? and !results.empty? %>
14   - <div class="search-results-<%= name %> search-results-box <%= pos2 %> <%= 'col%s_of3' % pos3.to_s %>">
  6 + <div class="search-results-<%= name %> search-results-box">
15 7 <% if @controller.action_name != 'assets' %>
16 8 <% if @results.size != 1 %>
17 9 <h3>
... ... @@ -36,13 +28,9 @@
36 28 <div class="search-results-innerbox search-results-type-<%= partial %> <%= 'common-profile-list-block' if partial == 'profile' %>">
37 29 <div class="search-results-innerbox2"><!-- the innerbox2 is a workarround for MSIE -->
38 30 <ul>
39   - <% hit_pos = 0 %>
40 31 <% results.each do |hit| %>
41   - <% next if hit.respond_to?(:visible) && !hit.visible? %>
42   - <%= render :partial => partial_for_class(hit.class),
43   -
44   - :object => hit,
45   - :locals => { :pos => ( hit_pos += 1 ) } %>
  32 + <% next if hit.respond_to?(:visible) && !hit.visible? %>
  33 + <%= render :partial => partial_for_class(hit.class), :object => hit %>
46 34 <% end %>
47 35 </ul>
48 36 <hr />
... ... @@ -50,7 +38,7 @@
50 38 </div><!-- end class="search-results-innerbox" -->
51 39 </div><!-- end class="search-results-<%= name %>" -->
52 40 <% else %>
53   - <div class="search-results-<%= name %> search-results-empty search-results-box <%= pos2 %> <%= 'col%s_of3' % pos3.to_s %>">
  41 + <div class="search-results-<%= name %> search-results-empty search-results-box">
54 42 <% if @controller.action_name != 'assets' %>
55 43 <% if @results.size != 1 %>
56 44 <h3><%= @names[name] %></h3>
... ...