diff --git a/app/views/catalog/index.rhtml b/app/views/catalog/index.rhtml
index a17ec83..b317ab3 100644
--- a/app/views/catalog/index.rhtml
+++ b/app/views/catalog/index.rhtml
@@ -10,16 +10,17 @@
">
- <% if product.image %>
- -
+
-
+ <% if product.image %>
-
- <% else %>
- - <%= _('No image') %>
- <% end %>
+ <% else %>
+ <%= _('No image') %>
+ <% end %>
+
+
<%= link_to_product product %>
@@ -88,11 +89,9 @@
<% end %>
<% extra_content_list.map do |content| %>
- <%= content %>
+
<% end %>
- <%= extra_content.join("\n") %>
-
<%= _('product unavailable') unless product.available %>
diff --git a/features/browse_catalogs.feature b/features/browse_catalogs.feature
index f27bf11..0f75613 100644
--- a/features/browse_catalogs.feature
+++ b/features/browse_catalogs.feature
@@ -26,7 +26,7 @@ Feature: browse catalogs
| artebonito | categ1 |
And I am on /catalog/artebonito
Then I should see "categ1" within "li.product-link"
- And I should see "No image" within "li.product-big"
+ And I should see "No image" within ".no-image"
And I should not see "unit" within "#product-list"
And I should not see "product unavailable"
And I should not see "description"
@@ -39,7 +39,7 @@ Feature: browse catalogs
| artebonito | categ1 | Produto1 |
And I am on /catalog/artebonito
Then I should see "Produto1" within "li.product-link"
- And I should see "No image" within "li.product-big"
+ And I should see "No image" within ".no-image"
And I should not see "unit" within "#product-list"
And I should not see "product unavailable"
And I should not see "description"
@@ -54,7 +54,7 @@ Feature: browse catalogs
Then I should see "Produto1" within "li.product-link"
And I should see "50.00" within "span.product-price"
And I should see "unit" within "span.product-unit"
- And I should see "No image" within "li.product-big"
+ And I should see "No image" within ".no-image"
And I should not see "product unavailable"
And I should not see "description"
And I should not see "qualifiers"
@@ -67,7 +67,7 @@ Feature: browse catalogs
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 see "No image" within "li.product-big"
+ And I should see "No image" within ".no-image"
And I should not see "product unavailable"
And I should not see "description"
And I should not see "qualifiers"
@@ -108,7 +108,7 @@ Feature: browse catalogs
| owner | category | name | price | img |
| artebonito | categ1 | Agrotox | 12.34 | agrotox |
And I am on /catalog/artebonito
- When I follow "Agrotox" within "#product-image-link"
+ When I follow "Agrotox" within ".product-image-link"
Then I should be taken to "Agrotox" product page
Scenario: display product with discount
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 58222a3..9453653 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -3131,19 +3131,40 @@ div#activation_enterprise div {
#product-list .search-product-input-price {
background-color: #DCFFD7;
}
+
+#product-list .catalog-item-extras {
+ position: absolute;
+ bottom: 0px;
+ right: 0px;
+}
#product-list .product-big {
+ background-repeat: no-repeat;
+ background-position: 50% 50%;
display: block;
width: 200px;
height: 160px;
+}
+#product-list .ui-button {
+ margin: 0;
+}
+#product-list .ui-button-text {
+ color: #D38D5F;
+ font-size: 0.8em;
+ padding: 0.1em 0.3em 0.1em 3em;
+ }
+#product-list .product-big span {
+ display: none;
+}
+#product-list .product-image-link {
+ position: relative;
+ width: 200px;
+ height: 160px;
border: 1px solid #BFBFBF;
-/* background-repeat: no-repeat;
- background-position: 50% 50%; */
position: relative; /* work arround msie bug */
text-align: center;
- display: table-cell;
vertical-align: middle;
}
-#product-list .product-big.no-image {
+#product-list .product-image-link .no-image {
line-height: 145px;
text-align: center;
color: #777;
@@ -3156,9 +3177,6 @@ div#activation_enterprise div {
-khtml-user-select: none;
-webkit-user-select: none;
}
-#product-list .product-big span {
- display: none;
-}
#product-list li.product-unavailable {
text-transform: uppercase;
color: #FF6261;
--
libgit2 0.21.2