Fixes on redesigned catalog

* Reusing code to add zoom to product's images * Changing strings to allow translation * Removing whitespaces (ActionItem2111)

Fixes on redesigned catalog
* Reusing code to add zoom to product's images * Changing strings to allow translation * Removing whitespaces (ActionItem2111)
Daniela Feitosa
1 parent 89a952dc
Showing 7 changed files with 54 additions and 54 deletions Show diff stats
app/helpers/application_helper.rb
app/views/catalog/index.rhtml
app/views/content_viewer/view_page.rhtml
features/browse_catalogs.feature
public/javascripts/catalog.js
public/stylesheets/application.css
test/unit/application_helper_test.rb
@@ -1259,25 +1259,27 @@ module ApplicationHelper
     task.information[:message] % values
   end
+  def add_zoom_to_article_images
+    add_zoom_to_images if environment.enabled?(:show_zoom_button_on_article_images)
+  end
+
   def add_zoom_to_images
-    if environment.enabled?(:show_zoom_button_on_article_images)
-      stylesheet_link_tag('fancybox') +
-      javascript_include_tag('jquery.fancybox-1.3.4.pack') +
-      javascript_tag("jQuery(function($) {
-        $(window).load( function() {
-          $('#article .article-body img').each( function(index) {
-            var original = original_image_dimensions($(this).attr('src'));
-            if ($(this).width() < original['width'] || $(this).height() < original['height']) {
-              $(this).wrap('<div class=\"zoomable-image\" />');
-              $(this).parent('.zoomable-image').attr('style', $(this).attr('style'));
-              $(this).attr('style', '');
-              $(this).after(\'<a href=\"' + $(this).attr('src') + '\" class=\"zoomify-image\"><span class=\"zoomify-text\">%s</span></a>');
-            }
-          });
-          $('.zoomify-image').fancybox();
+    stylesheet_link_tag('fancybox') +
+    javascript_include_tag('jquery.fancybox-1.3.4.pack') +
+    javascript_tag("jQuery(function($) {
+      $(window).load( function() {
+        $('#article .article-body img').each( function(index) {
+          var original = original_image_dimensions($(this).attr('src'));
+          if ($(this).width() < original['width'] || $(this).height() < original['height']) {
+            $(this).wrap('<div class=\"zoomable-image\" />');
+            $(this).parent('.zoomable-image').attr('style', $(this).attr('style'));
+            $(this).attr('style', '');
+            $(this).after(\'<a href=\"' + $(this).attr('src') + '\" class=\"zoomify-image\"><span class=\"zoomify-text\">%s</span></a>');
+          }
         });
-      });" % _('Zoom in'))
-    end
+        $('.zoomify-image').fancybox();
+      });
+    });" % _('Zoom in'))
   end
   def render_dialog_error_messages(instance_name)
@@ -13,14 +13,14 @@
         <li class="product-image-link">
           <% if product.image %>
             <div class="zoomable-image">
-	      <%= link_to_product product, :class => 'product-big', :style => "background-image: url(#{product.default_image(:big)})" %>
-	      <a href='<%= product.default_image(:big).gsub('_big','') %>' class="zoomify-image"><span><%= _('Zoom in') %></span></a>
+              <%= link_to_product product, :class => 'product-big', :style => "background-image: url(#{product.default_image(:big)})" %>
+              <%= link_to content_tag(:span, _('Zoom in')), product.default_image(:big).gsub('_big',''), :class => 'zoomify-image' %>
             </div>
           <% else %>
             <div class="no-image"><%= _('No image') %></div>
           <% end %>
-	  <div class="catalog-item-extras"><%= extra_content.join("\n") %></div>
-	</li>
+          <div class="catalog-item-extras"><%= extra_content.join("\n") %></div>
+        </li>
         <li class="product-link"><%= link_to_product product %></li>
@@ -74,8 +74,10 @@
               <div class="arrow"></div>
               <div class="content" id="inputs-description">
                 <% product.inputs.each do |i| %>
-                  <div><%= "#{i.amount_used} #{i.unit.singular} #{_('of')} " if i.has_all_price_details? %>
-		  <%= "#{i.product_category.name}" %></div>
+                  <div>
+                    <%= _('%{amount_used} %{unit} of') % {:amount_used => i.amount_used, :unit => i.unit.singular} + ' ' if i.has_all_price_details? %>
+                    <%= i.product_category.name %>
+                  </div>
                 <% end %>
               </div>
             </div>
@@ -100,12 +102,4 @@
 <%= pagination_links @products, :params => {:controller => :catalog, :action => :index, :profile => profile.identifier} %>
-<link href="/stylesheets/fancybox.css?1323903734" media="screen" rel="stylesheet" type="text/css" /><script src="/javascripts/jquery.fancybox-1.3.4.pack.js?1323903734" type="text/javascript"></script><script type="text/javascript">
-//<![CDATA[
-jQuery(function($) {
-        $(window).load( function() {
-          $('.zoomify-image').fancybox();
-        });
-      });
-//]]>
-</script>
+<%= add_zoom_to_images %>
@@ -91,4 +91,4 @@
 </div><!-- end class="comments" -->
 </div><!-- end id="article" -->
-<%= add_zoom_to_images %>
+<%= add_zoom_to_article_images %>
@@ -66,7 +66,7 @@ Feature: browse catalogs
       | artebonito | categ1   | Produto1 | 0.00 |
     And I am on /catalog/artebonito
     Then I should see "Produto1" within "li.product-link"
-    And I should not see "0.00" 
+    And I should not see "0.00"
     And I should see "No image" within ".no-image"
     And I should not see "product unavailable"
     And I should not see "description"
@@ -150,7 +150,7 @@ Feature: browse catalogs
     And the "product-description" should be visible
   @selenium
-  Scenario: hide description 
+  Scenario: hide description
     Given the following products
       | owner      | category | name     | price | description                                           |
       | artebonito | categ1   | Produto3 | 12.34 | A small description for a product that doesn't exist. |
@@ -234,7 +234,7 @@ Feature: browse catalogs
       | name  | plural |
       | Liter | Liters |
     And the following input
-      | product  | category | 
+      | product  | category |
       | Vitamina | food     |
     And I am on /catalog/artebonito
     And I reload and wait for the page
@@ -12,6 +12,15 @@ $(document).live(&#39;click&#39;, function() {
   $.each($('#product-list .product .expand-box'), function(index, value) { value.clicked = false; click(value); });
 });
+$(document).click(function (event) {
+   if ($(event.target).parents('.expand-box').length == 0) {
+     $('.expand-box').each(function(index, element){
+       $(element).removeClass('open');
+       $(element).children('div').toggle(false);
+     });
+   }
+});
+
 var rows = {};
 $('#product-list .product').each(function (index, element) {
   obj = rows[$(element).offset().top] || {};
@@ -50,11 +59,4 @@ function hover() {
   jQuery(this).toggleClass('hover');
 }
-jQuery(document).click(function (event) {
-   if (jQuery(event.target).parents('.expand-box').length == 0) {
-     jQuery('.expand-box').each(function(index, element){
-       jQuery(element).removeClass('open');
-       jQuery(element).children('div').toggle(false);
-     });
-   }
-});
+
@@ -2994,12 +2994,9 @@ div#activation_enterprise div {
 #product-list .expand-box {
   background-color: #1EB46D;
   margin-bottom: 3px;
-  -moz-border-radius-topleft: 10px;
-  -moz-border-radius-topright: 0px;
-  -moz-border-radius-bottomright: 0px;
-  -moz-border-radius-bottomleft: 10px;
+  -moz-border-radius: 10px 0px 0px 10px;
   -webkit-border-radius: 10px 0px 0px 10px;
-  border-radius: 10px 0px 0px 10px; 
+  border-radius: 10px 0px 0px 10px;
   width: 202px;
 }
 #product-list .expand-box > span {
@@ -3148,10 +3145,10 @@ div#activation_enterprise div {
   margin: 0;
 }
 #product-list .ui-button-text {
-      color: #D38D5F;
-          font-size: 0.8em;
-              padding: 0.1em 0.3em 0.1em 3em;
-            }
+  color: #D38D5F;
+  font-size: 0.8em;
+  padding: 0.1em 0.3em 0.1em 3em;
+}
 #product-list .product-big span {
   display: none;
 }
@@ -649,13 +649,18 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     env = Environment.default
     env.stubs(:enabled?).with(:show_zoom_button_on_article_images).returns(false)
     stubs(:environment).returns(env)
-    assert_nil add_zoom_to_images
+    assert_nil add_zoom_to_article_images
   end
   should 'return code when :show_zoom_button_on_article_images is enabled in environment' do
     env = Environment.default
     env.stubs(:enabled?).with(:show_zoom_button_on_article_images).returns(true)
     stubs(:environment).returns(env)
+    assert_not_nil add_zoom_to_article_images
+  end
+
+  should 'return code when add_zoom_to_images' do
+    env = Environment.default
     assert_not_nil add_zoom_to_images
   end
	@@ -91,4 +91,4 @@		@@ -91,4 +91,4 @@
91	</div><!-- end class="comments" -->	91	</div><!-- end class="comments" -->
92		92
93	</div><!-- end id="article" -->	93	</div><!-- end id="article" -->
94	-<%= add_zoom_to_images %>	94	+<%= add_zoom_to_article_images %>
	@@ -66,7 +66,7 @@ Feature: browse catalogs		@@ -66,7 +66,7 @@ Feature: browse catalogs
66	\| artebonito \| categ1 \| Produto1 \| 0.00 \|	66	\| artebonito \| categ1 \| Produto1 \| 0.00 \|
67	And I am on /catalog/artebonito	67	And I am on /catalog/artebonito
68	Then I should see "Produto1" within "li.product-link"	68	Then I should see "Produto1" within "li.product-link"
69	- And I should not see "0.00"	69	+ And I should not see "0.00"
70	And I should see "No image" within ".no-image"	70	And I should see "No image" within ".no-image"
71	And I should not see "product unavailable"	71	And I should not see "product unavailable"
72	And I should not see "description"	72	And I should not see "description"
	@@ -150,7 +150,7 @@ Feature: browse catalogs		@@ -150,7 +150,7 @@ Feature: browse catalogs
150	And the "product-description" should be visible	150	And the "product-description" should be visible
151		151
152	@selenium	152	@selenium
153	- Scenario: hide description	153	+ Scenario: hide description
154	Given the following products	154	Given the following products
155	\| owner \| category \| name \| price \| description \|	155	\| owner \| category \| name \| price \| description \|
156	\| artebonito \| categ1 \| Produto3 \| 12.34 \| A small description for a product that doesn't exist. \|	156	\| artebonito \| categ1 \| Produto3 \| 12.34 \| A small description for a product that doesn't exist. \|
	@@ -234,7 +234,7 @@ Feature: browse catalogs		@@ -234,7 +234,7 @@ Feature: browse catalogs
234	\| name \| plural \|	234	\| name \| plural \|
235	\| Liter \| Liters \|	235	\| Liter \| Liters \|
236	And the following input	236	And the following input
237	- \| product \| category \|	237	+ \| product \| category \|
238	\| Vitamina \| food \|	238	\| Vitamina \| food \|
239	And I am on /catalog/artebonito	239	And I am on /catalog/artebonito
240	And I reload and wait for the page	240	And I reload and wait for the page