Download as
Browse Code »

Commit baf90832bf5ba942f0c6acd11b4f3b5fd6a0f1c9

Authored by Braulio Bhavamitra
1 parent 719f909f
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Fix "Display in map" search view

Showing 7 changed files with 25 additions and 10 deletions   Show diff stats
app/helpers/search_helper.rb
  Diff comments   View file @baf9083
... ... @@ -85,7 +85,7 @@ module SearchHelper
85 85 content_tag('table',
86 86 content_tag('tr',
87 87 content_tag('td', content_tag('div', image_tag(product.image ? product.image.public_filename(:thumb) : '/images/icons-app/product-default-pic-portrait.png'), :class => 'profile-info-picture')) +
88   - content_tag('td', content_tag('strong', link_to(product.name, :controller => 'catalog', :profile => product.enterprise.identifier, :action => 'show', :id => product)) + '<br/>' + data)
  88 + content_tag('td', content_tag('strong', link_to(product.name, :controller => 'catalog', :profile => product.enterprise.identifier, :id => product.id)) + '<br/>' + data)
89 89 ), :class => 'profile-info')
90 90 end
91 91  
... ...
app/views/search/_results_header.rhtml
  Diff comments   View file @baf9083
1 1 <div class="results-header">
2 2 <%= label_total_found(asset, results.total_entries) %>
3   - <span class="current-page"><%= _("Showing page %s of %s") % [results.current_page, results.total_pages] %></div>
  3 + <% if params[:display] != 'map' %>
  4 + <span class="current-page"><%= _("Showing page %s of %s") % [results.current_page, results.total_pages] %></span>
  5 + <% end %>
  6 +
4 7 <%= facets_unselect_menu(asset) %>
5   - <%= order_by(asset) %>
  8 +
  9 + <%= order_by(asset) if params[:display] != 'map' %>
6 10 </div>
... ...
app/views/search/communities.rhtml
  Diff comments   View file @baf9083
... ... @@ -21,7 +21,9 @@
21 21 <%# FIXME ARMENGUE %>
22 22 <%= display_results(false) %>
23 23  
24   - <%= pagination_links @results.values.first %>
  24 + <% if params[:display] != 'map' %>
  25 + <%= pagination_links @results.values.first %>
  26 + <% end %>
25 27 </div>
26 28  
27 29 <br style="clear:both" />
... ...
app/views/search/enterprises.rhtml
  Diff comments   View file @baf9083
... ... @@ -34,6 +34,8 @@
34 34 </div><!-- class="has_cat_list" -->
35 35 <% end %>
36 36  
37   -<%= pagination_links @results[:enterprises] %>
  37 +<% if params[:display] != 'map' %>
  38 + <%= pagination_links @results[:enterprises] %>
  39 +<% end %>
38 40  
39 41 <br style="clear:both" />
... ...
app/views/search/people.rhtml
  Diff comments   View file @baf9083
... ... @@ -15,6 +15,8 @@
15 15 <%# FIXME ARMENGUE %>
16 16 <%= display_results(false) %>
17 17  
18   -<%= pagination_links @results.values.first %>
  18 +<% if params[:display] != 'map' %>
  19 + <%= pagination_links @results.values.first %>
  20 +<% end %>
19 21  
20 22 <br style="clear:both" />
... ...
app/views/search/products.rhtml
  Diff comments   View file @baf9083
... ... @@ -24,6 +24,8 @@
24 24 </div><!-- class="has_cat_list" -->
25 25 <% end %>
26 26  
27   -<%= pagination_links @results[:products] %>
  27 +<% if params[:display] != 'map' %>
  28 + <%= pagination_links @results[:products] %>
  29 +<% end %>
28 30  
29 31 <br style="clear:both" />
... ...
public/stylesheets/application.css
  Diff comments   View file @baf9083
... ... @@ -1890,6 +1890,9 @@ input.disabled {
1890 1890 #map {
1891 1891 height: 500px;
1892 1892 }
  1893 +.map {
  1894 + clear: both;
  1895 +}
1893 1896 /***********************************************************
1894 1897 * style for blocks
1895 1898 ***********************************************************/
... ... @@ -4615,7 +4618,7 @@ float: right;
4615 4618 overflow: auto;
4616 4619 }
4617 4620  
4618   -.search-results-type-product li.product-item {
  4621 +li.product-item {
4619 4622 position: relative;
4620 4623 height: 60px;
4621 4624 overflow: hidden;
... ... @@ -6313,7 +6316,7 @@ float: right;
6313 6316 color: #007788;
6314 6317 font-size: 1.2em;
6315 6318 }
6316   -.controller-search #content #search-results .search-results-type-product li.product-item {
  6319 +li.product-item {
6317 6320 display:block;
6318 6321 float:none
6319 6322 overflow:visible;
... ... @@ -6323,7 +6326,7 @@ float: right;
6323 6326 height:auto;
6324 6327 max-height:none;
6325 6328 }
6326   -.controller-search .search-results-innerbox li.product-item hr {
  6329 +li.product-item hr {
6327 6330 display:block;
6328 6331 margin:0;
6329 6332 clear: both;
... ...