Download as
Browse Code »

Commit 2f584417b36cfb46bcbebdd4ad7b91d29df2a5d0

Authored by Rafael Martins
1 parent 199ee52f
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

Use fancy box for displaying product's image

Showing 5 changed files with 17 additions and 10 deletions   Show diff stats
app/views/manage_products/_display_image.rhtml
  Diff comments   View file @2f58441
1 <div id='display-product-image'> 1 <div id='display-product-image'>
2 - <%= image_tag (@product.reload.default_image('thumb')), :class => 'product-pic' %> 2 + <%= image_tag (@product.reload.default_image('big')), :class => 'product-pic' %>
3 </div> 3 </div>
4 4
  5 +<% if @product.image %>
  6 + <%= link_to content_tag(:span, _('Zoom in')), @product.image.public_filename,
  7 + :class => 'zoomify-image' %>
  8 +<% end %>
  9 +<%= add_zoom_to_images %>
  10 +
5 <%= edit_product_link_to_remote(@product, 'image', _('Change image')) %> 11 <%= edit_product_link_to_remote(@product, 'image', _('Change image')) %>
app/views/manage_products/show.rhtml
  Diff comments   View file @2f58441
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 </div> 9 </div>
10 10
11 <div id='product-details'> 11 <div id='product-details'>
12 - <div id='product-image'> 12 + <div id='product-image' class="zoomable-image">
13 <%= render :partial => 'manage_products/display_image' %> 13 <%= render :partial => 'manage_products/display_image' %>
14 </div> 14 </div>
15 <div id='product-extra-content'> 15 <div id='product-extra-content'>
app/views/search/_display_results.rhtml
  Diff comments   View file @2f58441
@@ -38,5 +38,7 @@ @@ -38,5 +38,7 @@
38 <% end %> 38 <% end %>
39 39
40 <div style="clear:both"></div> 40 <div style="clear:both"></div>
  41 +
  42 + <%= add_zoom_to_images %>
41 </div><!-- end id="search-results" --> 43 </div><!-- end id="search-results" -->
42 44
app/views/search/_image.rhtml
  Diff comments   View file @2f58441
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 <div class="zoomable-image"> 40 <div class="zoomable-image">
41 <%= link_to '', product_path(image), :class => "search-image-pic", 41 <%= link_to '', product_path(image), :class => "search-image-pic",
42 :style => 'background-image: url(%s)'% image.default_image(:thumb) %> 42 :style => 'background-image: url(%s)'% image.default_image(:thumb) %>
43 - <%= link_to content_tag(:span, _('Zoom in')), image.default_image(:big).gsub('_big',''), 43 + <%= link_to content_tag(:span, _('Zoom in')), image.image.public_filename,
44 :class => 'zoomify-image' %> 44 :class => 'zoomify-image' %>
45 </div> 45 </div>
46 <% else %> 46 <% else %>
@@ -50,4 +50,3 @@ @@ -50,4 +50,3 @@
50 <div class="search-content-type-icon icon-content-<%=image.class.to_s.underscore.dasherize%>"></div> 50 <div class="search-content-type-icon icon-content-<%=image.class.to_s.underscore.dasherize%>"></div>
51 <% end %> 51 <% end %>
52 </div> 52 </div>
53 -<%= add_zoom_to_images %>  
app/views/search/_search_form.rhtml
  Diff comments   View file @2f58441
@@ -30,14 +30,14 @@ @@ -30,14 +30,14 @@
30 <%= _("Type more than 2 characters to start a search") %> 30 <%= _("Type more than 2 characters to start a search") %>
31 </div> 31 </div>
32 </div> 32 </div>
  33 +
  34 + <% end %>
33 35
34 - <% if @empty_query %>  
35 - <% hint = environment.search_hints[@asset] %>  
36 - <% if hint and !hint.blank? %>  
37 - <span class="search-hint"><%= hint %></span>  
38 - <% end %> 36 + <% if @empty_query %>
  37 + <% hint = environment.search_hints[@asset] %>
  38 + <% if hint and !hint.blank? %>
  39 + <div class="search-hint"><%= hint %></div>
39 <% end %> 40 <% end %>
40 -  
41 <% end %> 41 <% end %>
42 42
43 <div style="clear: both"></div> 43 <div style="clear: both"></div>