[FIX] Fix ecommerce list

bzr revid: nwi@openerp.com-20130702155953-2wju1hw81j2kmh4w

diff --git a/addons/ecommerce/static/src/css/ecommerce.css b/addons/ecommerce/static/src/css/ecommerce.css
index 3e0e3cf..6443c81 100644 (file)
--- a/addons/ecommerce/static/src/css/ecommerce.css
+++ b/addons/ecommerce/static/src/css/ecommerce.css
@@ -1,12 +1,91 @@
-.oe_website_body .oe_ecommerce .btn.btn-success .oe_txt_empty,
-.oe_website_body .oe_ecommerce .btn.btn-primary .oe_txt,
-.oe_website_body .oe_ecommerce .btn.oe_hidden {
-    display: none;
-}
-.oe_website_body .oe_ecommerce .oe_button_cart,
-.oe_website_body .oe_ecommerce .well.media a {
-    float: right;
-},
-.oe_website_body .oe_ecommerce .well.media {
-    margin-top: 30px;
-}
\ No newline at end of file
+.oe_ecommerce {
+  font-family: "Lato";
+  font-size: 13px;
+}
+.oe_ecommerce .oe_product {
+  text-align: center;
+  vertical-align: top;
+  position: relative;
+  display: inline-block;
+  padding: 5px;
+  width: 230px;
+  height: 300px;
+  margin-top: 0;
+  margin-bottom: 10px;
+  margin-right: 10px;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  -o-border-radius: 5px;
+  -ms-border-radius: 5px;
+  -khtml-border-radius: 5px;
+  border-radius: 5px;
+  border: 1px solid rgba(0, 0, 0, 0.1);
+}
+.oe_ecommerce .oe_product .oe_ecommerce_price {
+  text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.44);
+  text-align: center;
+  font-size: 25px;
+  margin: 10px;
+}
+.oe_ecommerce .oe_product .oe_ecommerce_price span {
+  padding: 10px 15px;
+  margin: 5px;
+  background: rgba(0, 0, 0, 0.2);
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  -o-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -khtml-border-radius: 3px;
+  border-radius: 3px;
+}
+.oe_ecommerce .oe_product .oe_ecommerce_description {
+  display: none;
+}
+.oe_ecommerce .oe_product h4 {
+  height: 50px;
+  text-align: center;
+  text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
+}
+.oe_ecommerce .oe_product img {
+  max-height: 128px;
+  margin: 0 auto;
+  padding-bottom: 20px;
+}
+.oe_ecommerce .oe_product .oe_button_cart {
+  left: 19px;
+  font-size: 11px;
+  position: absolute;
+  bottom: 5px;
+}
+.oe_ecommerce .oe_product .oe_button_cart button {
+  text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.44);
+  overflow: hidden;
+  text-align: center;
+  font-size: 12px;
+  margin: 0 auto;
+  margin-bottom: 5px;
+}
+.oe_ecommerce .oe_product .oe_button_cart button:first-child {
+  background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #aaaaaa), color-stop(100%, #999999));
+  background: -webkit-linear-gradient(#aaaaaa, #999999);
+  background: -moz-linear-gradient(#aaaaaa, #999999);
+  background: -o-linear-gradient(#aaaaaa, #999999);
+  background: -ms-linear-gradient(#aaaaaa, #999999);
+  background: linear-gradient(#aaaaaa, #999999);
+}
+.oe_ecommerce .oe_product .oe_button_cart button:last-child {
+  background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #0088cc), color-stop(100%, #0076b1));
+  background: -webkit-linear-gradient(#0088cc, #0076b1);
+  background: -moz-linear-gradient(#0088cc, #0076b1);
+  background: -o-linear-gradient(#0088cc, #0076b1);
+  background: -ms-linear-gradient(#0088cc, #0076b1);
+  background: linear-gradient(#0088cc, #0076b1);
+}
+.oe_ecommerce .oe_product .oe_button_cart button:last-child.btn-success {
+  background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #51a351), color-stop(100%, #418541));
+  background: -webkit-linear-gradient(#51a351, #418541);
+  background: -moz-linear-gradient(#51a351, #418541);
+  background: -o-linear-gradient(#51a351, #418541);
+  background: -ms-linear-gradient(#51a351, #418541);
+  background: linear-gradient(#51a351, #418541);
+}

diff --git a/addons/ecommerce/static/src/css/ecommerce.sass b/addons/ecommerce/static/src/css/ecommerce.sass
new file mode 100644 (file)
index 0000000..97879e2
--- /dev/null
+++ b/addons/ecommerce/static/src/css/ecommerce.sass
@@ -0,0 +1,56 @@
+@import "compass/css3"
+
+.oe_ecommerce
+  font-family: "Lato"
+  font-size: 13px
+  .oe_product
+    .oe_ecommerce_price
+      +text-shadow(0px 1px 1px rgba(255, 255, 255, 0.44))
+      text-align: center
+      font-size: 25px
+      margin: 10px
+      span
+        padding: 10px 15px
+        margin: 5px
+        background: rgba(0,0,0,.2)
+        +border-radius(3px)
+    .oe_ecommerce_description
+      display: none
+    h4
+      height: 50px
+      text-align: center
+      +text-shadow(0px 1px 1px rgba(0, 0, 0, 0.2))
+    img
+      max-height: 128px
+      margin: 0 auto 
+      padding-bottom: 20px
+    text-align: center 
+    vertical-align: top 
+    position: relative
+    display: inline-block
+    padding: 5px
+    width: 230px
+    height: 300px
+    margin-top: 0
+    margin-bottom: 10px
+    margin-right: 10px
+    +border-radius(5px)
+    border: 1px solid rgba(0,0,0,.1)
+    .oe_button_cart
+      left: 19px
+      font-size: 11px
+      position: absolute
+      bottom: 5px
+      button
+        +text-shadow(0px 1px 1px rgba(0, 0, 0, 0.44))
+        overflow: hidden
+        text-align: center
+        font-size: 12px
+        margin: 0 auto
+        margin-bottom: 5px
+        &:first-child
+          @include background(linear-gradient(#aaaaaa,#999999))
+        &:last-child
+          @include background(linear-gradient(#0088cc,#0076b1))
+          &.btn-success
+            @include background(linear-gradient(#51a351, #418541))

diff --git a/addons/ecommerce/views/ecommerce.xml b/addons/ecommerce/views/ecommerce.xml
index 249c51c..c7ef32b 100644 (file)
--- a/addons/ecommerce/views/ecommerce.xml
+++ b/addons/ecommerce/views/ecommerce.xml
@@ -74,20 +74,18 @@
             <field name="type">qweb</field>
             <field name="arch" type="xml">
                 <div class="media oe_product">
-                    <div class="pull-left" style="width:64px; height:64px;">
-                        <img style="max-width:64px; max-height:64px; margin:auto;" class="media-object" t-att-src="'data:image/png;base64,' + product.image"/>
-                    </div>
+                   <a t-att-href="'/shop/product/%%s' %% product.id"><h4 class="media-heading"><t t-esc="product.name"/></h4></a>
+                    <img class="media-object" t-att-src="'data:image/png;base64,' + product.image"/>
+                    <div class="oe_ecommerce_description"><t t-esc="product.description_sale"/></div>
+                    <div class="oe_ecommerce_price"><span><t t-esc="product.list_price"/>€</span></div>
                     <div class="media-body">
                         <div class="oe_button_cart">
                             <button t-att-class="'btn btn-inverse %%s' %% (not quantity and 'oe_hidden' or '')" t-att-data-id="product.id">Remove one</button>
                             <button t-att-class="'btn %%s' %% (quantity and 'btn-success' or 'btn-primary')" t-att-data-id="product.id">
                                 <span class="oe_txt_empty">Add to cart</span>
-                                <span class="oe_txt">Add one (<span class="oe_quantity"><t t-esc="quantity"/></span> in my cart)</span>
+                                <span class="oe_txt">(<span class="oe_quantity"><t t-esc="quantity"/></span>)</span>
                             </button>
                         </div>
-                        <a t-att-href="'/shop/product/%%s' %% product.id"><h4 class="media-heading"><t t-esc="product.name"/></h4></a>
-                        <t t-esc="product.description_sale"/>
-                        <div><t t-esc="product.list_price"/> €</div>
                     </div>
                 </div>
             </field>