wip #6193 @7:00

diff --git a/.idea/deployment.xml b/.idea/deployment.xml
index 4cff5f51bddcfec8be2d1259413c26c5390ae20b..4b832573168bc99836a42ae3312981e49fd655ff 100644 (file)
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -1,421 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData" autoUpload="Always" serverName="dev.toolbox.fluidbook.com" remoteFilesAllowedToDisappearOnAutoupload="false" confirmBeforeUploading="false" autoUploadExternalChanges="true">
+  <component name="PublishConfigData" autoUpload="Always" serverName="dev" remoteFilesAllowedToDisappearOnAutoupload="false" confirmBeforeUploading="false" autoUploadExternalChanges="true">
     <option name="confirmBeforeUploading" value="false" />
     <serverData>
-      <paths name="alphaville.cubedesigners.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="demo1.cubedesigners.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="dev-digital.danone.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="dev.ccgm.fr">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="dev.cubedesigners.fr">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="dev.cubjeans.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="dev.detouteslescouleurs.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="dev.enko-running-shoes.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="dev.extranet.cubedesigners.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="dev.fluidbook.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="dev.pm-instrumentation.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="dev.rbcmobilier.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="dev.renversez.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="dev.toolbox.fluidbook.com">
+      <paths name="dev">
         <serverdata>
           <mappings>
             <mapping deploy="/resources/quiz/player/local/mobile" local="$PROJECT_DIR$" web="/" />
           </mappings>
         </serverdata>
       </paths>
-      <paths name="dev.toolbox.fluidbook.com (Host)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="digitaltoolbox.danone.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="etatpur.ei-plateforme1.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="extranet.cubedesigners.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="extranet.preventicom.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="hosting.fluidbook.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="kingkong.cubedesigners.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="m.cubjeans.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="magento.enko-running-shoes.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="odl.cube">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="odl.paris.cubedesigners.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="parrotmail.dev.cubedesigners.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="preview.cubedesigners.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="pro.cubjeans.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="simeox.dev.cubedesigners.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="songbook.enhydra.fr">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="stats3.fluidbook.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="toolbox.fluidbook.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="toolbox.fluidbook.com (Host)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="vps-e87c4d02.vps.ovh.net">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="workshop.fluidbook.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.adangelis.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.animeland.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.ccgm.fr">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.cesaretleonie.fr">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.cfgv.fr">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.cubedesigners.fr">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.cubjeans.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.detouteslescouleurs.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.enko-running-shoes.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.eurofinsadmebioanalyses.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.fluidbook.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.hf-customercare.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.kadreo.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.mdryvescouzy.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.microbas.se">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.mirakl.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.optimed-recrutement.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.pavillonmadeleine.fr">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.physioassist.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.pm-instrumentation.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.preventicom.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.rbcmobilier.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.renversez.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="www.sycomore-am.com (1)">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
     </serverData>
     <option name="myAutoUpload" value="ALWAYS" />
   </component>

diff --git a/js/quiz.resize.js b/js/quiz.resize.js
index b68ab5a8d53693b8a28b56a5efc498e165f590e0..d2e3f0a5b26612e452ee22204cb44e383c6fa1d6 100644 (file)
--- a/js/quiz.resize.js
+++ b/js/quiz.resize.js
@@ -6,9 +6,21 @@ QuizResize.prototype = {
     resize: function () {
         this.ww = $(window).width();
         this.hh = $(window).height();
+        let intro_text_mobile = this.quiz.data.intro_text_mobile
+        let intro_text = this.quiz.data.intro_text
 
         // Exécuter ici toutes opérations qui doivent intervenir lorsque la fenêtre est redimensionnée par le système ou l'utilisateur
+        if(this.ww <= 390) {
+            $("#welcome p").html(this.nl2br(intro_text_mobile))
+        }else {
+            $("#welcome p").html(this.nl2br(intro_text))
+        }
     },
+
+    nl2br: function(str) {
+        if (!str) return str;
+        return str.replace(/(?:\r\n|\r|\n)/g, '<br>');
+    }
 }
 
 module.exports = QuizResize;

diff --git a/style/100-global.sass b/style/100-global.sass
index 763a60da35d230544d1b8acfcb3d1fef2a4b39ad..401aeac5e2d6f6cd00cd9dc2fcb7bf7fe34721bb 100644 (file)
--- a/style/100-global.sass
+++ b/style/100-global.sass
@@ -17,7 +17,7 @@ body
     max-width: 1200px
     min-height: 680px
     margin: 0 auto
-    padding: 24px 24px
+    +padding-container()
     position: relative
 
 .btn
@@ -84,3 +84,14 @@ body
         height: 100%
         width: 100%
         z-index: 0
+        img.mobile
+            display: inline
+            height: 100%
+            width: 100%
+            object-fit: cover
+            +above(391px)
+                display: none
+        img:not(.mobile)
+            display: none
+            +above(391px)
+                display: inline

diff --git a/style/101-header-footer.sass b/style/101-header-footer.sass
index d4a269eb07104a2c7b25633cc07ead94f31537c2..c3c63845bf7d7976e1c06446030dad18dd000991 100644 (file)
--- a/style/101-header-footer.sass
+++ b/style/101-header-footer.sass
@@ -45,13 +45,17 @@ header
     left: 0
     width: 100%
     z-index: 2
-    +flex-config(space-between,false,row,center)
+    +flex-config(center,false,row,center)
     +padding-container()
+    +breakpoint(md)
+        +flex-config(space-between,false,row,center)
+
 
     .btn.primary
         width: 100%
         max-width: 400px
-        position: absolute
-        left: 50%
-        bottom: 24px
-        transform: translateX(-50%)
+        +breakpoint(md)
+            position: absolute
+            left: 50%
+            bottom: 24px
+            transform: translateX(-50%)

diff --git a/style/102-intro.sass b/style/102-intro.sass
index f6d3b322135de6302615588b4535e9e12ed61c67..d0057c145e883c0182ce60b015dd0a83193a7b6c 100644 (file)
--- a/style/102-intro.sass
+++ b/style/102-intro.sass
@@ -1,7 +1,9 @@
 #welcome
     max-width: 590px
     margin: 0 auto
-    top: 160px
+    top: 138px
+    +breakpoint(md)
+        top: 160px
     h2
         margin: 0 0 12px
         +font-size(20)
@@ -10,7 +12,7 @@
     p
         +font-size(16)
         clip-path: polygon(0 0, 100% 0, 100% 100%, 0% 100%)
-
+        white-space: pre-wrap
         .word
             opacity: 0
             transform: translateY(100px)

diff --git a/views/index.blade.php b/views/index.blade.php
index 1a501d7e153353846c88df79307260e97d209e49..88b61a07452bb2ccebbad3ad7d2dffc0dc7785d5 100644 (file)
--- a/views/index.blade.php
+++ b/views/index.blade.php
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, shrink-to-fit=no">
+    <meta name="viewport" content="width=390, user-scalable=no, initial-scale=1.0, shrink-to-fit=no" id="myViewport">
     <meta name="width" content="1024">
     <meta name="height" content="768">
     <title>{{$data->title}}</title>
@@ -28,5 +28,17 @@
     </div>
 </div>
 <script src="js/quiz.js"></script>
+<script>
+    function changeViewportSize () {
+        const mvp = document.getElementById('myViewport');
+        if (screen.width > 390) {
+            mvp.setAttribute('content','width=device-width, user-scalable=no, initial-scale=1.0, shrink-to-fit=no');
+        }else {
+            mvp.setAttribute('content','width=390, user-scalable=no, initial-scale=1.0, shrink-to-fit=no');
+        }
+    }
+    window.addEventListener("onload", changeViewportSize)
+    window.addEventListener("resize", changeViewportSize)
+</script>
 </body>
 </html>

diff --git a/views/screens/intro.blade.php b/views/screens/intro.blade.php
index fdb718c983d54d592d6ab6377042c7c163cf2bd7..639213bbb11ef8bb916f4b11e2fa5197f64e0125 100644 (file)
--- a/views/screens/intro.blade.php
+++ b/views/screens/intro.blade.php
@@ -4,11 +4,12 @@
 <div class="container-screen active-screen next" id="welcome-screen">
     @include('header_title', ['data', $data])
     <div class="screen" id="welcome">
-        <h2 class="none">Mobile local {{$data->intro_title}}</h2>
+        <h2 class="none">{{$data->intro_title}}</h2>
         <p class="none">{{$data->intro_text}}</p>
     </div>
     <div class="screen-image">
         <img src="{{$data->theme->introImage}}" />
+        <img class="mobile" src="{{$data->theme->introImageMobile}}" />
     </div>
     <footer class="footer">
         <a id="start" class="btn primary">{{$data->intro_button}}</a>