Download as
Browse Code »

Commit e6aac9aea3c4f4843dde6764a0ecf9c36d12ed18

Authored by Braulio Bhavamitra
1 parent 2837298a
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

Fix css clearing for all searches

Showing 18 changed files with 90 additions and 83 deletions   Show diff stats
app/views/search/_article.rhtml
  Diff comments   View file @e6aac9a
... ... @@ -6,5 +6,6 @@
6 6 <div class="search-content-second-column">
7 7  
8 8 </div>
9   - <br class="clear"/>
  9 +
  10 + <div style="clear:both"></div>
10 11 </li>
... ...
app/views/search/_blog.rhtml
  Diff comments   View file @e6aac9a
... ... @@ -19,5 +19,5 @@
19 19 <%= render :partial => 'article_last_change', :object => blog %>
20 20 </div>
21 21  
22   - <br class="clear"/>
  22 + <div style="clear: both;"/></div>
23 23 </li>
... ...
app/views/search/_display_results.rhtml
  Diff comments   View file @e6aac9a
1 1 <div id="search-results" class="<%= 'only-one-result-box' if @results.size == 1 %>">
2 2  
3   -<% @order.each do |name| %>
4   - <% results = @results[name] %>
5   - <% if !results.nil? and !results.empty? %>
6   - <div class="search-results-<%= name %> search-results-box">
7   -
8   - <% if @results.size > 1 %>
9   - <h3><%= @names[name] %></h3>
10   - <%= link_to(results.respond_to?(:total_entries) ? _('see all (%d)') % results.total_entries : _('see all...'),
11   - params.merge(:action => name), :class => 'see-more' ) %>
12   - <% end %>
13   -
14   - <% partial = partial_for_class(results.first.class.class_name.constantize) %>
15   - <div class="search-results-innerbox search-results-type-<%= partial %> <%= 'common-profile-list-block' if partial == 'profile' %>">
16   - <div class="search-results-innerbox2"><!-- the innerbox2 is a workarround for MSIE -->
17   - <ul>
18   - <% results.each do |hit| %>
19   - <%= render :partial => partial_for_class(hit.class), :object => hit %>
20   - <% end %>
21   - </ul>
  3 + <% @order.each do |name| %>
  4 + <% results = @results[name] %>
  5 + <% if !results.nil? and !results.empty? %>
  6 + <div class="search-results-<%= name %> search-results-box">
  7 +
  8 + <% if @results.size > 1 %>
  9 + <h3><%= @names[name] %></h3>
  10 + <%= link_to(results.respond_to?(:total_entries) ? _('see all (%d)') % results.total_entries : _('see all...'),
  11 + params.merge(:action => name), :class => 'see-more' ) %>
  12 + <% end %>
  13 +
  14 + <% partial = partial_for_class(results.first.class.class_name.constantize) %>
  15 + <div class="search-results-innerbox search-results-type-<%= partial %> <%= 'common-profile-list-block' if partial == 'profile' %>">
  16 + <div class="search-results-innerbox2"><!-- the innerbox2 is a workarround for MSIE -->
  17 + <ul>
  18 + <% results.each do |hit| %>
  19 + <%= render :partial => partial_for_class(hit.class), :object => hit %>
  20 + <% end %>
  21 + </ul>
  22 + <hr />
  23 + </div><!-- end class="search-results-innerbox2" -->
  24 + </div><!-- end class="search-results-innerbox" -->
  25 +
  26 + </div><!-- end class="search-results-<%= name %>" -->
  27 + <% else %>
  28 + <div class="search-results-<%= name %> search-results-empty search-results-box">
  29 + <% if @results.size > 1 %>
  30 + <h3><%= @names[name] %></h3>
  31 + <% end %>
  32 + <div class="search-results-innerbox search-results-type-empty">
  33 + <div> <%= _('None') %> </div>
22 34 <hr />
23   - </div><!-- end class="search-results-innerbox2" -->
24   - </div><!-- end class="search-results-innerbox" -->
25   -
26   - </div><!-- end class="search-results-<%= name %>" -->
27   - <% else %>
28   - <div class="search-results-<%= name %> search-results-empty search-results-box">
29   - <% if @results.size > 1 %>
30   - <h3><%= @names[name] %></h3>
31   - <% end %>
32   - <div class="search-results-innerbox search-results-type-empty">
33   - <div> <%= _('None') %> </div>
34   - <hr />
35   - </div><!-- end class="search-results-innerbox" -->
36   - </div><!-- end class="search-results-<%= name %>" -->
  35 + </div><!-- end class="search-results-innerbox" -->
  36 + </div><!-- end class="search-results-<%= name %>" -->
  37 + <% end %>
37 38 <% end %>
38   -<% end %>
39   -
40   -<div style="clear:both"></div>
  39 +
  40 + <div style="clear:both"></div>
41 41 </div><!-- end id="search-results" -->
42 42  
... ...
app/views/search/_event.rhtml
  Diff comments   View file @e6aac9a
... ... @@ -19,5 +19,6 @@
19 19  
20 20 <%= render :partial => 'article_common', :object => event %>
21 21 </div>
22   - <br class="clear"/>
  22 +
  23 + <div style="clear: both;"/></div>
23 24 </li>
... ...
app/views/search/_folder.rhtml
  Diff comments   View file @e6aac9a
... ... @@ -15,5 +15,6 @@
15 15  
16 16 <%= render :partial => 'article_common', :object => folder %>
17 17 </div>
18   - <br class="clear"/>
  18 +
  19 + <div style="clear:both"></div>
19 20 </li>
... ...
app/views/search/_forum.rhtml
  Diff comments   View file @e6aac9a
... ... @@ -16,5 +16,5 @@
16 16 <%= render :partial => 'article_common', :object => forum %>
17 17 </div>
18 18  
19   - <br class="clear"/>
  19 + <div style="clear:both"></div>
20 20 </li>
... ...
app/views/search/_gallery.rhtml
  Diff comments   View file @e6aac9a
... ... @@ -6,5 +6,7 @@
6 6 <div class="search-content-second-column">
7 7 <%= render :partial => 'article_common', :object => gallery %>
8 8 </div>
9   - <br class="clear"/>
  9 +
  10 + <div style="clear: both"></div>
10 11 </li>
  12 +
... ...
app/views/search/_google_maps.rhtml
  Diff comments   View file @e6aac9a
1   -<br style="clear: both;"/>
  1 +<div style="clear: both;"/></div>
2 2 <div style='text-align: center;'>
3 3 <div id="map"></div>
4 4 </div>
... ...
app/views/search/_search_form.rhtml
  Diff comments   View file @e6aac9a
1 1 <div class='search-form'>
2 2  
3   -<% form_tag( { :controller => 'search', :action => @asset ? @asset : 'index', :asset => nil, :category_path => ( @category ? @category.explode_path : [] ) },
4   - :method => 'get', :class => 'search_form' ) do %>
5   -
6   - <%= hidden_field_tag :display, params[:display] %>
7   -
8   - <div class="search-field">
9   - <span class="formfield">
10   - <%= text_field_tag 'query', @query, :id => 'search-input', :size => 50 %>
11   - <%= javascript_tag "jQuery('#search-input').attr('title', \"#{hint}\").hint()" if defined?(hint) %>
12   - <%= javascript_tag "jQuery('.search_form').submit(function() {
13   - if (jQuery('#search-input').val().length < 3) {
14   - jQuery('#search-empty-query-error').slideDown(200).delay(2500).slideUp(200);
15   - return false;
16   - }
17   - });" %>
18   - </span>
19   -
20   - <%= submit_button(:search, _('Search')) %>
21   -
22   - <div id="search-empty-query-error">
23   - <%= _("Type more than 2 characters to start a search") %>
  3 + <% form_tag( { :controller => 'search', :action => @asset ? @asset : 'index', :asset => nil, :category_path => ( @category ? @category.explode_path : [] ) },
  4 + :method => 'get', :class => 'search_form' ) do %>
  5 +
  6 + <%= hidden_field_tag :display, params[:display] %>
  7 +
  8 + <div class="search-field">
  9 + <span class="formfield">
  10 + <%= text_field_tag 'query', @query, :id => 'search-input', :size => 50 %>
  11 + <%= javascript_tag "jQuery('#search-input').attr('title', \"#{hint}\").hint()" if defined?(hint) %>
  12 + <%= javascript_tag "jQuery('.search_form').submit(function() {
  13 + if (jQuery('#search-input').val().length < 3) {
  14 + jQuery('#search-empty-query-error').slideDown(200).delay(2500).slideUp(200);
  15 + return false;
  16 + }
  17 + });" %>
  18 + </span>
  19 +
  20 + <%= submit_button(:search, _('Search')) %>
  21 +
  22 + <div id="search-empty-query-error">
  23 + <%= _("Type more than 2 characters to start a search") %>
  24 + </div>
24 25 </div>
25   - </div>
26   -
27   - <% if @empty_query %>
28   - <% hint = environment.search_hints[@asset] %>
29   - <% if hint and !hint.blank? %>
30   - <span class="search-hint"><%= hint %></span>
  26 +
  27 + <% if @empty_query %>
  28 + <% hint = environment.search_hints[@asset] %>
  29 + <% if hint and !hint.blank? %>
  30 + <span class="search-hint"><%= hint %></span>
  31 + <% end %>
31 32 <% end %>
  33 +
32 34 <% end %>
33 35  
34 36 <div style="clear: both"></div>
35   -
36   -<% end %>
37   -
38   -</div> <!-- id="search-form" -->
  37 +</div>
... ...
app/views/search/_text_article.rhtml
  Diff comments   View file @e6aac9a
... ... @@ -6,5 +6,6 @@
6 6 <div class="search-content-second-column">
7 7 <%= render :partial => 'article_common', :object => text_article %>
8 8 </div>
9   - <br class="clear"/>
  9 +
  10 + <div style="clear: both"></div>
10 11 </li>
... ...
app/views/search/_uploaded_file.rhtml
  Diff comments   View file @e6aac9a
... ... @@ -32,5 +32,6 @@
32 32 <%= render :partial => 'article_categories', :object => uploaded_file.categories %>
33 33 <%= render :partial => 'article_last_change', :object => uploaded_file %>
34 34 </div>
35   - <br style="clear: both"/>
  35 +
  36 + <div style="clear:both"></div>
36 37 </li>
... ...
app/views/search/articles.rhtml
  Diff comments   View file @e6aac9a
... ... @@ -16,4 +16,4 @@
16 16 <% end %>
17 17 </div>
18 18  
19   -<br style="clear:both" />
  19 +<div style="clear: both"></div>
... ...
app/views/search/communities.rhtml
  Diff comments   View file @e6aac9a
... ... @@ -21,5 +21,5 @@
21 21 <%= pagination_links @results.values.first %>
22 22 </div>
23 23  
24   -<br style="clear:both" />
  24 +<div style="clear: both"></div>
25 25  
... ...
app/views/search/enterprises.rhtml
  Diff comments   View file @e6aac9a
... ... @@ -25,4 +25,4 @@
25 25 <% end %>
26 26 </div>
27 27  
28   -<br style="clear:both" />
  28 +<div style="clear: both"></div>
... ...
app/views/search/index.rhtml
  Diff comments   View file @e6aac9a
... ... @@ -25,4 +25,5 @@
25 25 </div>
26 26  
27 27 </div>
28   -<br style="clear:both" />
  28 +
  29 +<div style="clear: both"></div>
... ...
app/views/search/people.rhtml
  Diff comments   View file @e6aac9a
... ... @@ -16,4 +16,4 @@
16 16 <% end %>
17 17 </div>
18 18  
19   -<br style="clear:both" />
  19 +<div style="clear: both"></div>
... ...
app/views/search/products.rhtml
  Diff comments   View file @e6aac9a
... ... @@ -21,5 +21,4 @@
21 21 <% end %>
22 22 </div>
23 23  
24   -
25   -<br style="clear:both" />
  24 +<div style="clear: both"></div>
... ...
app/views/search/tag.rhtml
  Diff comments   View file @e6aac9a
... ... @@ -18,4 +18,5 @@
18 18 </div>
19 19 <%= pagination_links @tagged, :param_name => 'npage' %>
20 20  
  21 + <div style="clear: both"></div>
21 22 <% end %>
... ...