Merge lp:~openerp-dev/openobject-addons/saas-3-bug-1275532-ptr into lp:~openerp/openobject-addons/saas-3

[Pariket Trivedi(OpenERP)]

hello,

 I have Fixed bug Can not chnage flip cart icon and also change shoping product price icon.

thank you,
ptr

Unmerged revisions

9234. By Pariket Trivedi(OpenERP) on 2014-03-04

[FIX] : cart icon is change and also change in shop product price icon.

=== modified file 'website_sale/views/website_sale.xml'
--- website_sale/views/website_sale.xml	2014-02-28 14:22:33 +0000
+++ website_sale/views/website_sale.xml	2014-03-04 06:12:04 +0000
@@ -21,8 +21,11 @@
   <xpath expr="//header//ul[@id='top_menu']/li" position="before">
       <li t-att-class="(not website_sale_order or not website_sale_order.get_number_of_products()) and 'hidden' or ''">
           <a href="/shop/mycart/">
+            <span style="display: inline-block;">
               <i class="fa fa-shopping-cart"></i>
-              My cart <sup t-attf-class="my_cart_quantity label label-primary"
+              My cart 
+            </span>
+            <sup t-attf-class="my_cart_quantity label label-primary"
                             t-esc="website_sale_order and website_sale_order.get_number_of_products() or ''"/>
           </a>
       </li>
@@ -231,7 +234,9 @@
   <xpath expr="//div[@class='product_price']" position="inside">
       <form action="/shop/add_cart/" method="post" style="display: inline-block;">
           <input name="product_id" t-att-value="product.product_variant_ids[0].id" type="hidden"/>
-          <button type="submit" class="btn btn-default btn-xs fa fa-shopping-cart"/>
+          <span>
+            <button type="submit" class="btn btn-default btn-xs fa fa-shopping-cart"/>
+          </span>
       </form>
   </xpath>
 </template>