wip #1927 @1.5

diff --git a/js/libs/fluidbook/cart/fluidbook.cart.remarkable.js b/js/libs/fluidbook/cart/fluidbook.cart.remarkable.js
index e3e9742395308cdbc220e2347bdfd445bb96a34e..cd2ef9b704c90a0dfce2f41a0a8bdd7fe6ae3ca6 100644 (file)
--- a/js/libs/fluidbook/cart/fluidbook.cart.remarkable.js
+++ b/js/libs/fluidbook/cart/fluidbook.cart.remarkable.js
@@ -114,7 +114,7 @@ FluidbookCartRemarkable.prototype = {
             var ht = item.price * quantity;
             var ttc = ht * (1 + item.tax);
             content += '<tr>';
-            content += '<td class="name">' + item.name + '</td>';
+            content += '<td class="name">' + item.name + '<div class="m">Prix unitaire : ' + $this.formatPrice(item.price, 'HT') + '<br />Prix HT : ' + $this.formatPrice(ht, 'HT') + '<br />Prix TTC : ' + $this.formatPrice(ttc, 'TTC') + '</div></td>';
             content += '<td class="quantity"><input name="' + ref + '" class="cartqty" type="number" min="0" max="100" value="' + quantity + '" step="1" /></td>';
             content += '<td class="price_unit">' + $this.formatPrice(item.price, 'HT') + '</td>';
             content += '<td class="price_excluding_taxes">' + $this.formatPrice(ht, 'HT') + '</td>';
@@ -200,16 +200,22 @@ FluidbookCartRemarkable.prototype = {
         res += '<div class="col col-left">';
         res += '<input type="text" name="firstname" placeholder="Prénom" tabindex="100" required>';
         res += '<input type="text" name="lastname" placeholder="Nom" tabindex="101" required>';
+        res += '</div>';
+
+        res += '<div class="col col-right">';
+        res += '<input type="tel" name="phone" placeholder="Téléphone" tabindex="102" pattern="[0-9\+\.\ \-]+" required>';
+        res += '<input type="email" name="email" placeholder="E-mail" tabindex="103" required>';
+        res += '</div>';
+
+        res += '<div class="col col-left">';
         res += '<p>Adresse de facturation : </p>';
         res += '<input type="text" name="billing_company" placeholder="Nom de la société"  tabindex="104" required>';
         res += '<input type="text" name="billing_address" placeholder="Adresse" tabindex="105" required>';
         res += '<input type="text" name="billing_zip" placeholder="Code postal" pattern="[0-9]{5}" tabindex="106" required>';
         res += '<input type="text" name="billing_city" placeholder="Ville" tabindex="107" required>';
         res += '</div>';
-
+        
         res += '<div class="col col-right">';
-        res += '<input type="tel" name="phone" placeholder="Téléphone" tabindex="102" pattern="[0-9\+\.\ \-]+" required>';
-        res += '<input type="email" name="email" placeholder="E-mail" tabindex="103" required>';
         res += '<p>Adresse de livraison - Enseigne (si différente) : </p>';
         res += '<input type="text" name="shipping_company" placeholder="Nom de la société"  tabindex="108">';
         res += '<input type="text" name="shipping_address" placeholder="Adresse" tabindex="109">';

diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js
index 44898945371364e4609df4d113023c651255d46a..0db9909d55619bc7da0e3b6f54f21beff1c0114d 100644 (file)
--- a/js/libs/fluidbook/fluidbook.menu.js
+++ b/js/libs/fluidbook/fluidbook.menu.js
@@ -407,6 +407,9 @@ FluidbookMenu.prototype = {
                 break;
             case 'cart':
                 w = 1024;
+                if (ww < 1024) {
+                    fullscreen = true;
+                }
                 break;
             case 'bookmarks':
                 var max = Math.floor((ww * 0.8) / 120) * 120 + 40;

diff --git a/style/fluidbook.less b/style/fluidbook.less
index 376334441ae4ac1817c5c5a11b146c1c72eed7cb..29a0a093545eee08632e1c1df6d58c5307ed8ade 100644 (file)
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -864,8 +864,61 @@ a.bookmark {
                padding: 50px;
        }
 
+       &.fs {
+               table {
+                       td {
+                               &.name {
+                                       width: 100%;
+                                       .m {
+                                               display: block;
+                                       }
+                               }
+                               &.price, &.price_excluding_taxes, &.price_unit {
+                                       display: none;
+                               }
+                       }
+               }
+
+               .cart-footer {
+                       clear: both;
+                       width: 100%;
+                       text-align: left;
+                       position: relative;
+                       top: -40px;
+                       p {
+                               float: none;
+                               width: 100%;
+                               font-size: 0.8em;
+                               padding: 0 30px 30px;
+                               margin: 0;
+                       }
+
+                       .fonctions {
+                               float: none;
+                               width: 100%;
+                       }
+               }
+
+               .cart-shipping-form {
+                       margin-top: 30px;
+                       .col {
+                               &.col-left, &.col-right {
+                                       width: 100%;
+                                       left: 0;
+                                       margin-top: 0;
+                                       margin-right: 0;
+                                       padding: 0 30px;
+                               }
+                       }
+                       .cart-footer{
+                               top: 0;
+                       }
+               }
+
+       }
+
        table {
-               width: 1004px;
+               max-width: 1004px;
                margin-left: 10px;
                td {
                        padding: 15px;
@@ -874,6 +927,9 @@ a.bookmark {
                        white-space: nowrap;
                        &.name {
                                white-space: normal;
+                               .m {
+                                       display: none;
+                               }
                        }
                        &.price {
                                font-weight: 700;