wait #4321 @1.5

diff --git a/images/symbols/grandvision.svg b/images/symbols/grandvision.svg
index ddff1aa09b7038356cd71eb7209c48686e7edac7..e3bb7600ca73dc8945c795bf61ab2dc905082d40 100644 (file)
--- a/images/symbols/grandvision.svg
+++ b/images/symbols/grandvision.svg
@@ -66,7 +66,7 @@
        c0-5.523,4.477-10,10-10h95c5.523,0,10,4.477,10,10V239.072z M181.391,210.285c-9.602,0-17.386-7.784-17.386-17.385
        c0-9.602,7.784-17.386,17.386-17.386c9.602,0,17.386,7.784,17.386,17.386C198.776,202.501,190.993,210.285,181.391,210.285z"/>
     </symbol>
-    <symbol viewBox="0 0 329.942 329.942">
+    <symbol id="grandvision-mandatory" viewBox="0 0 329.942 329.942">
         <path d="M329.208,126.666c-1.765-5.431-6.459-9.389-12.109-10.209l-95.822-13.922l-42.854-86.837
        c-2.527-5.12-7.742-8.362-13.451-8.362c-5.71,0-10.925,3.242-13.451,8.362l-42.851,86.836l-95.825,13.922
        c-5.65,0.821-10.345,4.779-12.109,10.209c-1.764,5.431-0.293,11.392,3.796,15.377l69.339,67.582L57.496,305.07

diff --git a/js/libs/fluidbook/cart/fluidbook.cart.grandvision.js b/js/libs/fluidbook/cart/fluidbook.cart.grandvision.js
index f2efe935d7a6251f24458a2a811f315c14e7efdb..5c8d5ca5b0ada5bf6941be27ddea48d333210739 100644 (file)
--- a/js/libs/fluidbook/cart/fluidbook.cart.grandvision.js
+++ b/js/libs/fluidbook/cart/fluidbook.cart.grandvision.js
@@ -171,10 +171,12 @@ FluidbookCartGrandVision.prototype = {
         var element = $(c).get(0);
         var options = {
             margin: 0,
-            filename: this.getExportFileName() + 's.pdf',
+            filename: this.getExportFileName() + '.pdf',
             image: {type: 'png'},
-            html2canvas: {dpi: 150, scale: 2.5, letterRendering: false},
-            jsPDF: {unit: 'mm', format: 'A4', orientation: 'portrait'}
+            html2canvas: {
+                dpi: 150, scale: 2.5, letterRendering: false,
+            },
+            jsPDF: {unit: 'mm', format: 'A4', orientation: 'portrait'},
         };
 
         if (print === true) {
@@ -486,10 +488,10 @@ FluidbookCartGrandVision.prototype = {
         selection = '<div class="item" data-ref="' + item + '" data-brand="' + data.BRAND + '" data-category="' + data.Category + '" data-gender="' + data.Gender + '" data-material="' + data.Material + '">';
         selection += '<div class="icons">';
         if (data.ADV === '1') {
-            selection += '<div class="mandatory" data-tooltip="ADV">' + getSpriteIcon('grandvision-adv') + '</div>';
+            selection += '<a nohref class="mandatory" data-tooltip="ADV">' + getSpriteIcon('grandvision-adv', {}, true) + '</a>';
         }
         if (data.Mandatory === '1') {
-            selection += '<div class="adv" data-tooltip="Mandatory">' + getSpriteIcon('grandvision-mandatory') + '</div>';
+            selection += '<a nohref class="adv" data-tooltip="Mandatory">' + getSpriteIcon('grandvision-mandatory', {}, true) + '</a>';
         }
         selection += '</div>';
         selection += '<div class="img" style="background-image: url(\'data/commerce/' + item + '-front.jpg\');"></div>';

diff --git a/js/libs/fluidbook/fluidbook.utils.js b/js/libs/fluidbook/fluidbook.utils.js
index 78a6f6753826bbd5750c8c901bf372be6b66ca9f..dffe061acd7c2cdded1d4903ce45728d83083c2f 100644 (file)
--- a/js/libs/fluidbook/fluidbook.utils.js
+++ b/js/libs/fluidbook/fluidbook.utils.js
@@ -51,7 +51,7 @@ function getBaseURL(removeQuery) {
     return l;
 }
 
-function getSpriteIcon(icon, attrs) {
+function getSpriteIcon(icon, attrs, dimensions) {
     var a = [];
     var iconSymbol = $('svg symbol[id="' + icon + '"]');
     if (iconSymbol.length > 1) {
@@ -70,6 +70,13 @@ function getSpriteIcon(icon, attrs) {
     if (attrs.viewBox == null) {
         attrs.viewBox = iconSymbol.get(0).attributes.viewBox.value;
     }
+    if (dimensions === true) {
+        var vb = attrs.viewBox.split(' ');
+        attrs.x = vb[0];
+        attrs.y = vb[1];
+        attrs.width = vb[2];
+        attrs.height = vb[3];
+    }
     if (attrs.class == null) {
         attrs.class = icon;
     } else {

diff --git a/style/cart/grandvision.less b/style/cart/grandvision.less
index 5d3f1d5058d590ca9a818d0c2ebceb07801dd470..47e0454e25282cc3df77cb759c1052a18e0d6a49 100644 (file)
--- a/style/cart/grandvision.less
+++ b/style/cart/grandvision.less
@@ -11,6 +11,7 @@
 }
 
 .common-box-item() {
+  @bleu: #2459a9;
   position: relative;
   background-color: #fff;
 
@@ -32,6 +33,31 @@
     background-size: cover;
   }
 
+  .icons {
+    @iw: 30px;
+    width: unit(@iw*2, px);
+    height: @iw;
+    position: absolute;
+    right: @iw;
+    z-index: 2;
+
+    > a {
+      cursor: pointer;
+      display: block;
+      width: @iw;
+      height: @iw;
+      background-color: @bleu;
+      color: #fff;
+      padding: 5px;
+      float: right;
+
+      svg {
+        width: @iw - 10px;
+        height: @iw - 10px;
+      }
+    }
+  }
+
   .img-angle {
     display: none;
   }
@@ -245,6 +271,9 @@
           overflow: hidden;
           position: relative;
 
+          .icons {
+            display: none;
+          }
 
           .infos {
             width: 370px;
@@ -569,6 +598,12 @@
 }
 
 #grandvision-pdf {
+  * {
+    box-sizing: border-box;
+  }
+
+  @bleu: #2459a9;
+
   .box {
     padding: 1cm 1cm 0 1cm;
     width: 24cm;
@@ -586,7 +621,7 @@
         display: inline-block;
         width: @w;
         height: unit(@w*0.425, cm);
-        margin:0 2.5cm 1cm;
+        margin: 0 2.5cm 1cm;
         vertical-align: top;
 
         &:nth-child(odd) {
@@ -624,6 +659,8 @@
       }
 
       .item {
+        position: relative;
+
         .img {
           display: none;
         }
@@ -639,6 +676,38 @@
           display: none;
         }
 
+        .icons {
+          @iw: 0.75cm;
+          width: unit(@iw*2, cm);
+          height: @iw;
+          position: absolute;
+          right: unit(-2 * @iw, cm);
+          top: 0;
+          z-index: 2;
+
+          > a {
+            cursor: pointer;
+            display: block;
+            width: @iw;
+            height: @iw;
+            background-color: @bleu;
+            background-size: cover;
+            color: #fff;
+            margin-bottom: unit(@iw/6, cm);
+
+            &.adv{
+              background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDYuMC1jMDA2IDc5LjE2NDY0OCwgMjAyMS8wMS8xMi0xNTo1MjoyOSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIyLjIgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkQ3NTk5QjMxN0REQzExRUJBOEZFRTBGMzVDOTU3NzQ5IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkQ3NTk5QjMyN0REQzExRUJBOEZFRTBGMzVDOTU3NzQ5Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RDc1OTlCMkY3RERDMTFFQkE4RkVFMEYzNUM5NTc3NDkiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RDc1OTlCMzA3RERDMTFFQkE4RkVFMEYzNUM5NTc3NDkiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5aegtcAAAFsklEQVR42uydaYhVZRjH3yk1s6mxcZkcJjItpKDGzCTtQ3u2SJstYrSYjEXkh6IsCTIjG78UhUEUWBQSRDLZVJimQ0GZ1ZcgEyOXsU1snYZxpmbp9H9434HLbeacc+ee89zz3vv/w4/Re+59zvK/7/6cc6uCIDBUdnQULwENoWgIDaFoCA2haAgNoWgIDaFoCEVDaAhFQ2gIRUNoCEVDaAiVFY0qo3M5FjSCGaDB/b8fdIF2sAfsBv/SkPR0PLgV3AIuBGMi3v872Ao2uL/9WTuhKk+zTsSIFWA5qBlhjH3gKfB6lkqNj4bcAF4EdQnF+xIsBV+zUS9Mo8ELoCVBM0TngS/AEpaQ+BoHNoKrUt7PavAEDQmXNNSbFMwY1GPgaRoyvNaB+5X3ebMrkTQkT9eDt2O+t8u1L5vBLvCL69bXg9ngOnBFzHaz041p2tXPWAzJKNXgUBCtPrAWjI8R8zTQEsRTaynOW6OEVIF54GowC5wMqkEHOAB2ujbi27zPSeO6KiL2T+BG10sqRHeBl13PLUwXg4/KpYSI2YvB7pjfyO1gbk7p+CPi/T+CaUUc3zWgN2If27RLSFqBJ4Mtwcj0DGiKUU3NSeA4H4hxPKf6bsh0sC8oTv0R29cmWIp3ROxrpc9tSK2rz6enWMt2uXaoI6F4l4JtIdu3g8t8nTp5JWUzjOvadiQYrw0cDNl+vq9zWQtcXz9tbU66XwM+CNl+nCuR3hmyUumYd6UQM2qmd4pvhsxwYw0NHS5BzHG+GTJfsZo9OoWYmVk5TcqQmYrHXF+CmJ2+GVKvaMjsFGKeG7H9oG+GHKNoyLUJx5P1lrC1ll+NTY7wypA/FQ25EkxLMN4icGLI9k98bEO+U27Uk1rRk9yt1RHv2eqjITuVOyOSi7U4gTjPg6kh23vBmz4asgUcUTZlPbikiM8/Cpoi3vOGcnWcmCHd4FVlQ8YaO+XRNILPSV5Xc8T7BsAa9YFIglPHdeCvoDRqA/Mijm8UWAT2xoz5XDks4d4BXkso1j/gbmNnkON2q/e4Rvgr11WVGqDBjV2kazs5Zpz9xiY5dPlcQgZpTuAbPwBucvGWKZe2btBYquSOtAKvKuKCHAEL8+I9qWSGrLEvKGW2TRJV1iTwkLEZGrm3A5w+wllSGRn/PMTrZ5n0c5FlzuqA+7dUV5ITts51f1VUrCGyTvAZOMWUr95z0zVxL5TM693pron0AjdptiHrg8pQnGpsosuY6cn77D2FXNNiq4D5pjIUNgA9wdikPqnqHnTjnFzdV8iOil2Yqa4QQ2qHmQeTJPBHwISQz9ZoGlKJGuPGR5LmelLSwWlIYdNMtzkjUkt10jKk142ee1L+5p5tbNpO0pIut2S7nJH2hdIwRLLaLwc/KOxL6vJWM3wGjNxt+xsYb6Jvoc7VLN9me8O0QskM4+avlg/xep+xt6rJILbO9Yyk+jlsMiaNEvK98jntH+I1uZX6/byJS1nr+NzYXOTaLDVU5a6WPDNyJQ8PaM7SwVaCIa0R29+hIbqKWtPopCG6aozYfg4N0dUyM3zeVZXrBdIQRUk3913z/+ejyLLwS8au41RUtzcLusDYZL6N7q+Ys9DY9XZDQ0ojecbWkqwfJJ+5SEMoGkJDKBpCQyhfDZmifE4NNCRccrfTBKXzkeXbZ302RGNgKLdMS87SDvB3ivuRh5HNARNTiN1u7HxYTTkYMjhK9jmp7mNj85clB0tyscayUS+9JDniYWPvAJZJyT4akg0dAveCM419qH+QJUO6K8SEoZ7PtRfcbmzOVtgycI+mIW0VYsinIdu+Mfb5wnOHuR5vFbKjYu8PmWpsGs2kMjZDGnTJfo/7kxYXuSpNxkMfGvuTGANahojkaWuPuwMZXUZGyH33crPNGs2q2dcfdClbsZdFQygaQkMoGkJDKBpCQygaQkMoGkLREF/0nwADAL9qbYQPMKcBAAAAAElFTkSuQmCC");
+            }
+            &.mandatory{
+              background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDYuMC1jMDA2IDc5LjE2NDY0OCwgMjAyMS8wMS8xMi0xNTo1MjoyOSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIyLjIgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkMyMDNENDhGN0REQzExRUI5QjBFRDBEODkzQjhGQTk5IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkMyMDNENDkwN0REQzExRUI5QjBFRDBEODkzQjhGQTk5Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzIwM0Q0OEQ3RERDMTFFQjlCMEVEMEQ4OTNCOEZBOTkiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6QzIwM0Q0OEU3RERDMTFFQjlCMEVEMEQ4OTNCOEZBOTkiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz6MufIaAAAE5klEQVR42uydSWgUQRSG37hviEIExYUoTozJRHBDxYsoeFJRzNUFL+LRkxrihl4FwbMIehZxuai4XEQFl4PiHg3R6EFFMWoSEzO+x7xIG2LSS1Wlq+f/4SdDpru6ur5+Vd1dy+SKxSJB6dEwFAGAQAACIBCAAAgEIAACAQiAQAACAYgnGpGBc1jDXqefL7Gv+XwyOc/f9h5hN/b531H2fgBxr2XsO//5bjn7LtoQtzoc8ztEiAVJBNweZJsVA0QQIsSw9hvaBhFiQAvZD0Juu4j9EBFiVwctbYsIsRwdXkaJbxGy19E+iJAQqmE/ljxH3E9OsMB+gggxqwMxYJDucwARYlbVeoXnYu5f1Ah7hggx13bkklx4vrQlPkTIXL2yhydM57dG2itESDI1GoBBmkYjIiSZZrFfGwLSGyVz2C2IkHhqMAijN0oaECHxo0Pq+5GG0+3SdqkFERJN+yzAIE1zHyIkmqZp2zHGUvod2pZ8QISE0x6LMEjT3pPGE0/LqJPRWq/n2VXsnQ6OKcd4z37BfqntVWc5VVkCf7YWeD5Q+HltwHNDXBZFbehfKqQXCkn+vmF3+whEqsCZWtBVetX3fq4kf8eBCYzmfkCJ37J7hhqIXM3S8SMdRvMCBS9/R1F56ZdGVW+195xKHWIPNOqsA5nCPsdeSdBAusXexP5oG8gF9nqUdyhdZG+wCWQS+wvKOZIms7/aeg4Zj/KNrEhlFhXIB70FhMLpTdS3AVGByO3dLlf35J6rW8uqxyYQ0WX2Ziq9NYX6V5eW0eU4D3JxJHda9YDyXxj1WkbkCkgQSgcY/FVHEhhJntSDWk2lqWRjyxxGO5Wm1l1PkoiJ1+/XNSPtgJEMhikgQShtZQijzRQMU1VWUDLv7wp7YpnA+MZeSwbnM5ruMbyrGfwGGOkAEoTyOcMwPtmAYaPKCqpO69WKDMKQO8tHNhK3OcjhkWb8E2CkA0gQSmsGYLTahmG7ygpKunZvsqd7DGMVORg572pc1is9oVbASAeQIJQmj2A0uYThssoKajH7nidAlrDvuzzgUAwlneJRhDjP61AAKXgEpAAgAOJctR4BcZ5X1426XADfyZ/OLOnnmEAGx+6mLUIqya+exbGa58xWWXUePhjWZRlIwUMghSwDqfUQSA0ipIyrLNdT2n6SnanONiUD38aRo+GzLiOkykMYpHnOZ7HK8rH9cF7VAkjK8u4SyAKLaf9Qe9+wuwRi4/ZRGtwTVOoinqufu3yOEFd3WbKUhbzDMrXUkmT6DJUWSm7u810llRbj30LmFiOQdbZkalpnViKk2iCM89rIbusHBun/tuk25w0dU/I+P0tVlomQv0GlXzzYSOHW4H2i267Qfb2otlwBSdIoSp+2DNuUMVFxfn7iju67lpL1jxeyBCROgy4rkcpspKXsqwbycFXTqqd46/dmKkKqI2wri7ns0Kg6SzHWCxnkZuCspr1DjxVWmWpDwhxHRsvv1tcUp8juu6NuPUZejxlmpP6YLAEZaHaRzEA6pLerx8ntImKdesxKzUPbIFWefclziANPZb8u/qt29jF2haM8hHGF5qm9T16b2NNc5MHl63eZ5rZdG3hZue00+11K313NYG/VyHnKPkmOZoX5/sOSmRN+CxdAIAABEAhAAAQCEACBAARAIACBAMQX/RFgAK9gXt21yjchAAAAAElFTkSuQmCC");
+            }
+
+            svg {
+              display: none;
+            }
+          }
+        }
+
         .infos-box {
           width: 100%;
           text-align: center;