]> _ Git - fluidbook-toolbox.git/commitdiff
wip #6066 @4:00
authorsoufiane <soufiane@cubedesigners.com>
Tue, 4 Jul 2023 14:25:23 +0000 (16:25 +0200)
committersoufiane <soufiane@cubedesigners.com>
Tue, 4 Jul 2023 14:25:23 +0000 (16:25 +0200)
public/packages/fluidbook/toolbox/css/delivery.css
public/packages/fluidbook/toolbox/css/delivery.css.map
public/packages/fluidbook/toolbox/css/delivery.less
resources/views/fluidbook_publication/delivery.blade.php
resources/views/fluidbook_publication/delivery_params.blade.php

index 2c433988d0c623557466d135d7a7d0ca4943a1f0..83767ad4d1a0a5a30b1b24074c363503cffce652 100644 (file)
@@ -29,6 +29,9 @@ body {
   border-radius: 4px;
   color: rgba(27, 42, 78, 0.4);
 }
+.pointer-none {
+  pointer-events: none;
+}
 .delivery-anchor {
   margin-bottom: 55px;
 }
index 95dcb6a2daebc496b2c1315a7cc833b4db7d9f36..2cdfdbe20080d105da263d5b9885f40aa8c0aabe 100644 (file)
@@ -1 +1 @@
-{"version":3,"sources":["delivery.less"],"names":[],"mappings":"AAAA;AAAK;EACD,uBAAA;;AAGJ;EACI,qBAAA;;AAGJ,OAAQ;EACJ,iBAAA;;AAGJ;EACI,aAAA;;AACA,OAAC;EACG,4BAA4B,uBAA5B;;AAIR;EACI,QAAA;;AAGJ;EACI,gBAAA;;AAGJ,aAAc;EACV,wCAAA;EACA,sBAAA;EACA,YAAA;EACA,oBAAA;EACA,sBAAA;EACA,kBAAA;EACA,4BAAA;;AAIA,SAAC;EACG,mBAAA;;AADJ,SAAC,OAEG,GAAE,IAAI;EACF,cAAc,kBAAd;;AAHR,SAAC,OAKG,GAAE;EACE,YAAA;EACA,oBAAA;;AAPR,SAAC,OASG;EACI,OAAO,WAAP;;AAGR,SAAC;EACG,mBAAA;;AADJ,SAAC,SAEG;EACI,0CAAA;EACA,aAAA;EACA,aAAA;EACA,uBAAA;EACA,mBAAA;EACA,sBAAA;EACA,oBAAA;EACA,kBAAA;EACA,kBAAA;;AACA,SAZP,SAEG,OAUK;EACG,yBAAA;;AAbZ,SAAC,SAEG,OAaI;EACI,kBAAA;EACA,WAAA;EACA,YAAA;EACA,MAAA;EACA,OAAA;;AApBZ,SAAC,SAuBG;EACI,yCAAA;EACA,kBAAA;EACA,gBAAA;;AA1BR,SAAC,SA4BG;EACI,WAAA;EACA,gBAAA;;AA9BR,SAAC,SAgCG;EACI,WAAA;EACA,gBAAA;;AAlCR,SAAC,SAoCG;EACI,eAAA;;AArCR,SAAC,SAuCG;EACI,kBAAA;;AAGR,SAAC;EACG,gBAAA;EACA,WAAA;EACA,iBAAA;EACA,gBAAA;EACA,SAAA;EACA,wBAAA;EACA,aAAA;;AACA,SARH,aAQI;EACG,cAAA;;AATR,SAAC,aAWG;EACI,aAAA;EACA,kBAAkB,WAAlB;EACA,kBAAA;EACA,mBAAA;EACA,kBAAA;;AAGR,SAAC;EACG,yCAAA;EACA,WAAA;EACA,YAAA;EACA,kBAAA;;AACA,SALH,QAKI;EACG,yBAAA;;AADJ,SALH,QAKI,iBAEG;EACI,2BAAA;;AAHR,SALH,QAKI,iBAKG;EACI,4BAAA;;AAXZ,SAAC,QAcG;EACI,WAAA;EACA,WAAA;EACA,aAAA;EACA,kBAAA;EACA,QAAA;;AAnBR,SAAC,QAqBG;EACI,kBAAA;EACA,eAAA;EACA,cAAA;;AAIR,SAAC;EACG,aAAA;EACA,gBAAA;EACA,kBAAA;;AAHJ,SAAC,aAIG;EACI,WAAA;EACA,YAAA;EACA,kBAAA;EACA,mBAAA;EACA,SAAA;EACA,QAAA;EACA,WAAW,qBAAX;;AAIR,SAAC,aACG;EACI,WAAA;EACA,aAAA;EACA,SAAA;;AAIR,SAAC;EACG,gBAAA;EACA,YAAA;EACA,kBAAA;EACA,gBAAA;;AACA,SALH,SAKI;EACG,YAAY,YAAY,yCAAxB;;AAEI,SARX,SAKI,OAEG,UACK,QAAS;EACN,WAAW,cAAX;;AAEJ,SAXX,SAKI,OAEG,UAIK;EACG,UAAA;EACA,mBAAA;;AAbhB,SAAC,SAqBG,kBAAiB,MAAM;EACnB,yBAAA;EACA,cAAA;;AAvBR,SAAC,SAqBG,kBAAiB,MAAM,OAGnB,MAAM,IAAI;EACN,aAAA;;AAzBZ,SAAC,SAqBG,kBAAiB,MAAM,OAMnB,OAAO,UACH;EACI,aAAA;;AA7BhB,SAAC,SAqBG,kBAAiB,MAAM,OAMnB,OAAO,UAIH,EAAE;EACE,eAAA;;AAKR,SArCP,SAoCG,UACK;EACG,iBAAA;EACA,kBAAA;EACA,wCAAA;EACA,eAAA;;AAEJ,SA3CP,SAoCG,UAOK;EACG,UAAA;EACA,kBAAA;EACA,wBAAA;EACA,sBAAA;;AAEJ,SAjDP,SAoCG,UAaK;EACG,kBAAA;EACA,iBAAA;EACA,kBAAA;;AACA,SArDX,SAoCG,UAaK,QAII;EACG,gBAAA;;AAEJ,SAxDX,SAoCG,UAaK,QAOI;EACG,mBAAA;;AAEJ,SA3DX,SAoCG,UAaK,QAUI,IAAI;EACD,kBAAA;;AAEJ,SA9DX,SAoCG,UAaK,QAaI;EACG,cAAA;EACA,oBAAA;;AAEJ,SAlEX,SAoCG,UAaK,QAiBI,IAAI;EACD,4BAAA;EACA,yBAAA;EACA,qBAAA;;AAHJ,SAlEX,SAoCG,UAaK,QAiBI,IAAI,SAID,MAAM,IAAI;EACN,2BAAA;;AAtBZ,SAjDP,SAoCG,UAaK,QAyBG;EACI,eAAA;;AA1BR,SAjDP,SAoCG,UAaK,QA4BG;EACI,kBAAA;;AA7BR,SAjDP,SAoCG,UAaK,QA+BG,OACI,aACI;EACI,+BAAA;;AAEJ,SArFnB,SAoCG,UAaK,QA+BG,OACI,aAIK,MACG;EACI,MAAM,WAAN;;AAFR,SArFnB,SAoCG,UAaK,QA+BG,OACI,aAIK,MAIG,EAAE;EACE,QAAQ,YAAR;;AAWhC;EACI,mBAAA;;AAGJ;EACI,SAAA;EACA,WAAA;EACA,WAAA;EACA,YAAA;EACA,qBAAA;EACA,kBAAA;;AAGJ;EACI,aAAa,eAAe,6BAA5B;EACA,aAAa,cAAe,2BAA5B;EACA,YAAY,eAAe,6BAA3B;EACA,WAAW,YAAe,uBAA1B;EACA,WAAW,cAAe,2BAA1B;EACA,WAAW,YAAe,uBAA1B;EACA,YAAY,YAAe,uBAA3B;EACA,aAAa,YAAe,uBAA5B;EACA,aAAa,YAAe,uBAA5B;EACA,aAAa,eAAe,6BAA5B;;EAGA,iBAAiB,eAAe,8BAAhC;EACA,gBAAgB,cAAe,gCAA/B;EACA,cAAc,eAAe,4BAA7B;EACA,aAAa,YAAe,6BAA5B;EACA,aAAa,cAAe,2BAA5B;EACA,cAAc,YAAe,yBAA7B;EACA,gBAAgB,YAAe,yBAA/B;EACA,iBAAiB,YAAe,yBAAhC;;EAGA,eAAe,YAAe,gCAA9B","file":"delivery.css"}
\ No newline at end of file
+{"version":3,"sources":["delivery.less"],"names":[],"mappings":"AAAA;AAAK;EACD,uBAAA;;AAGJ;EACI,qBAAA;;AAGJ,OAAQ;EACJ,iBAAA;;AAGJ;EACI,aAAA;;AACA,OAAC;EACG,4BAA4B,uBAA5B;;AAIR;EACI,QAAA;;AAGJ;EACI,gBAAA;;AAGJ,aAAc;EACV,wCAAA;EACA,sBAAA;EACA,YAAA;EACA,oBAAA;EACA,sBAAA;EACA,kBAAA;EACA,4BAAA;;AAGJ;EACI,oBAAA;;AAIA,SAAC;EACG,mBAAA;;AADJ,SAAC,OAEG,GAAE,IAAI;EACF,cAAc,kBAAd;;AAHR,SAAC,OAKG,GAAE;EACE,YAAA;EACA,oBAAA;;AAPR,SAAC,OASG;EACI,OAAO,WAAP;;AAGR,SAAC;EACG,mBAAA;;AADJ,SAAC,SAEG;EACI,0CAAA;EACA,aAAA;EACA,aAAA;EACA,uBAAA;EACA,mBAAA;EACA,sBAAA;EACA,oBAAA;EACA,kBAAA;EACA,kBAAA;;AACA,SAZP,SAEG,OAUK;EACG,yBAAA;;AAbZ,SAAC,SAEG,OAaI;EACI,kBAAA;EACA,WAAA;EACA,YAAA;EACA,MAAA;EACA,OAAA;;AApBZ,SAAC,SAuBG;EACI,yCAAA;EACA,kBAAA;EACA,gBAAA;;AA1BR,SAAC,SA4BG;EACI,WAAA;EACA,gBAAA;;AA9BR,SAAC,SAgCG;EACI,WAAA;EACA,gBAAA;;AAlCR,SAAC,SAoCG;EACI,eAAA;;AArCR,SAAC,SAuCG;EACI,kBAAA;;AAGR,SAAC;EACG,gBAAA;EACA,WAAA;EACA,iBAAA;EACA,gBAAA;EACA,SAAA;EACA,wBAAA;EACA,aAAA;;AACA,SARH,aAQI;EACG,cAAA;;AATR,SAAC,aAWG;EACI,aAAA;EACA,kBAAkB,WAAlB;EACA,kBAAA;EACA,mBAAA;EACA,kBAAA;;AAGR,SAAC;EACG,yCAAA;EACA,WAAA;EACA,YAAA;EACA,kBAAA;;AACA,SALH,QAKI;EACG,yBAAA;;AADJ,SALH,QAKI,iBAEG;EACI,2BAAA;;AAHR,SALH,QAKI,iBAKG;EACI,4BAAA;;AAXZ,SAAC,QAcG;EACI,WAAA;EACA,WAAA;EACA,aAAA;EACA,kBAAA;EACA,QAAA;;AAnBR,SAAC,QAqBG;EACI,kBAAA;EACA,eAAA;EACA,cAAA;;AAIR,SAAC;EACG,aAAA;EACA,gBAAA;EACA,kBAAA;;AAHJ,SAAC,aAIG;EACI,WAAA;EACA,YAAA;EACA,kBAAA;EACA,mBAAA;EACA,SAAA;EACA,QAAA;EACA,WAAW,qBAAX;;AAIR,SAAC,aACG;EACI,WAAA;EACA,aAAA;EACA,SAAA;;AAIR,SAAC;EACG,gBAAA;EACA,YAAA;EACA,kBAAA;EACA,gBAAA;;AACA,SALH,SAKI;EACG,YAAY,YAAY,yCAAxB;;AAEI,SARX,SAKI,OAEG,UACK,QAAS;EACN,WAAW,cAAX;;AAEJ,SAXX,SAKI,OAEG,UAIK;EACG,UAAA;EACA,mBAAA;;AAbhB,SAAC,SAqBG,kBAAiB,MAAM;EACnB,yBAAA;EACA,cAAA;;AAvBR,SAAC,SAqBG,kBAAiB,MAAM,OAGnB,MAAM,IAAI;EACN,aAAA;;AAzBZ,SAAC,SAqBG,kBAAiB,MAAM,OAMnB,OAAO,UACH;EACI,aAAA;;AA7BhB,SAAC,SAqBG,kBAAiB,MAAM,OAMnB,OAAO,UAIH,EAAE;EACE,eAAA;;AAKR,SArCP,SAoCG,UACK;EACG,iBAAA;EACA,kBAAA;EACA,wCAAA;EACA,eAAA;;AAEJ,SA3CP,SAoCG,UAOK;EACG,UAAA;EACA,kBAAA;EACA,wBAAA;EACA,sBAAA;;AAEJ,SAjDP,SAoCG,UAaK;EACG,kBAAA;EACA,iBAAA;EACA,kBAAA;;AACA,SArDX,SAoCG,UAaK,QAII;EACG,gBAAA;;AAEJ,SAxDX,SAoCG,UAaK,QAOI;EACG,mBAAA;;AAEJ,SA3DX,SAoCG,UAaK,QAUI,IAAI;EACD,kBAAA;;AAEJ,SA9DX,SAoCG,UAaK,QAaI;EACG,cAAA;EACA,oBAAA;;AAEJ,SAlEX,SAoCG,UAaK,QAiBI,IAAI;EACD,4BAAA;EACA,yBAAA;EACA,qBAAA;;AAHJ,SAlEX,SAoCG,UAaK,QAiBI,IAAI,SAID,MAAM,IAAI;EACN,2BAAA;;AAtBZ,SAjDP,SAoCG,UAaK,QAyBG;EACI,eAAA;;AA1BR,SAjDP,SAoCG,UAaK,QA4BG;EACI,kBAAA;;AA7BR,SAjDP,SAoCG,UAaK,QA+BG,OACI,aACI;EACI,+BAAA;;AAEJ,SArFnB,SAoCG,UAaK,QA+BG,OACI,aAIK,MACG;EACI,MAAM,WAAN;;AAFR,SArFnB,SAoCG,UAaK,QA+BG,OACI,aAIK,MAIG,EAAE;EACE,QAAQ,YAAR;;AAWhC;EACI,mBAAA;;AAGJ;EACI,SAAA;EACA,WAAA;EACA,WAAA;EACA,YAAA;EACA,qBAAA;EACA,kBAAA;;AAGJ;EACI,aAAa,eAAe,6BAA5B;EACA,aAAa,cAAe,2BAA5B;EACA,YAAY,eAAe,6BAA3B;EACA,WAAW,YAAe,uBAA1B;EACA,WAAW,cAAe,2BAA1B;EACA,WAAW,YAAe,uBAA1B;EACA,YAAY,YAAe,uBAA3B;EACA,aAAa,YAAe,uBAA5B;EACA,aAAa,YAAe,uBAA5B;EACA,aAAa,eAAe,6BAA5B;;EAGA,iBAAiB,eAAe,8BAAhC;EACA,gBAAgB,cAAe,gCAA/B;EACA,cAAc,eAAe,4BAA7B;EACA,aAAa,YAAe,6BAA5B;EACA,aAAa,cAAe,2BAA5B;EACA,cAAc,YAAe,yBAA7B;EACA,gBAAgB,YAAe,yBAA/B;EACA,iBAAiB,YAAe,yBAAhC;;EAGA,eAAe,YAAe,gCAA9B","file":"delivery.css"}
\ No newline at end of file
index e3d410b7d07e7c0d05839c56dc5b596d70ca46be..608302b7bc672d8d7b435b081a7e8f3af5dd01b9 100644 (file)
@@ -35,6 +35,10 @@ html,body {
     color: rgba(27,42,78,.4);
 }
 
+.pointer-none {
+    pointer-events: none;
+}
+
 .delivery {
     &-anchor {
         margin-bottom: 55px;
index cbff61c799963530d9bc523056be29c272750b78..f7eb57f5f3050941a00c1436185d757b515ad34d 100644 (file)
     $settings = [
         ['Titre' => $fluidbook->title],
         ['Nombre de pages' => $totalPages. ' pages'],
-        ['Langue principale' => $fluidbook->locale],
-        ['Date de création' => $fluidbook->created_at],
-        ['Dernière modification' => $fluidbook->updated_at],
-        ['Mode de navigation' => getMobileTransitionName($fluidbook->mobileTransitions)],
-        ['SEO' => $fluidbook->seoVersion],
-        ['SCORM (e-learning)' => $fluidbook->scorm_version],
-        ['Statistiques Fluidbook' => $fluidbook->stats],
-        ['Google Analytics' => $fluidbook->googleTagManager]
+        ['Langue principale' => renameSettings($fluidbook->locale)],
+        ['Date de création' => ( new \Carbon\Carbon($fluidbook->created_at))->isoFormat('DD/MM/Y') ],
+        ['Dernière modification' => ( new \Carbon\Carbon($fluidbook->updated_at))->isoFormat('DD/MM/Y') ],
+        ['Mode de navigation' => renameSettings($fluidbook->mobileTransitions)],
+        ['SEO' => renameSettings($fluidbook->seoVersion)],
+        ['SCORM (e-learning)' => $fluidbook->scorm_enabled ? 'SCORM '.$fluidbook->getSCORMVersion() : __('Désactivé')],
+        ['Statistiques Fluidbook' => renameSettings($fluidbook->stats, true)],
+        ['Google Analytics' => $fluidbook->googleAnalytics ? $fluidbook->googleTagManager : __('Désactivé')]
     ];
 
-    function getMobileTransitionName($transition) {
-        return match ($transition) {
-            'flip3d' => 'Flip',
-            'fade' => 'R',
-            default => $transition
+    function renameSettings($v, $fem = false) {
+        $e = $fem ? 'e' : '';
+        return match ($v) {
+            'flip3d','flip' => 'Flip',
+            'fade' => 'Air',
+            '1' => __('Activé'.($e)),
+            '0','',null => __('Désactivé'.($e)),
+            'fr' => __('Français'),
+            'en' => __('Anglais'),
+            default => ucfirst($v)
         };
     }
 
@@ -66,7 +71,7 @@
 
     $icons = App\Models\FluidbookIconset::get('icons')->toArray();
 
-    $statUrl = str_replace('preview','stats',$fluidbook->getPreviewUrl());
+    $statUrl = route('stats', ['fluidbook_id' => $fluidbook->id, 'hash' => $fluidbook->hash]);
     $cid = $fluidbook->cid;
 
     $socialImage = route('social_image',['cid' => $cid]);
 
     $objectMail = "[Fluidbook #".$fluidbook->id."]";
 
-    $paramsArray = [
-        ''
+    $lang = app()->getLocale();
+
+    $noticesUrls = [
+        'fr' => [
+            'widget' => "https://docs.google.com/document/d/1ezbBxEWqmTbWgBwGXmJUefCpRsRFuF6VAFRh5rDIJUQ/edit?usp=drive_link",
+            'ga' => "https://docs.google.com/document/d/1ycKxPWOtXUFyaPB2Eltfnq-Y5yn_XwwVue1TKwh4Kbk/edit?usp=drive_link"
+        ],
+        'en' => [
+            'widget' => "https://docs.google.com/document/d/1J8xEY727rhdoAgD5mk96BZOuBES4sFvctuwomyIXWKI/edit?usp=drive_link",
+            'ga' => "https://docs.google.com/document/d/1dus2uWddT8VY8MIoEnx6KOfJWRQq_AYRGhYLtd2dYgI/edit?usp=drive_link"
+        ],
     ];
+
 @endphp
 
 @section('after_styles')
                             </div>
                             <div class="col-md-4">
                                 <iframe src="{{ $fluidbook->getPreviewURL() }}"></iframe>
+                                <a href="{{ $noticesUrls[$lang]['widget'] }}" target="_blank" rel="noopener">{{ __('Voir la notice') }}</a>
                             </div>
                         </div>
                     </div>
                                         <p>Avec notre module de statistiques intégré, vous savez combien de personnes ont vu
                                             votre Fluidbook, quelles pages les ont le plus intéressé, quels mots-clés ils ont
                                             cherché, etc...</p>
-                                        <a href="{{ $statUrl }}" class="btn btn-primary">Voir les statistiques</a>
+                                        @if($fluidbook->stats)
+                                            <a href="{{ $statUrl }}" class="btn btn-primary" target="_blank" rel="noopener">
+                                                {{ __('Voir les statistiques') }}
+                                            </a>
+                                        @else
+                                            <button class="btn bg-default pointer-none disabled">{{ __('Statistiques désactivées') }}</button>
+                                        @endif
                                     </div>
                                 </div>
                             </div>
                                         <p>Fluidbook est conçu pour fonctionner avec Google Analytics et Google Tag Manager
                                             (GTM) pour vous donner accès à l'un des outils de statistiques gratuits les plus
                                             puissants du marché.</p>
-                                        <a href="https://docs.google.com/document/d/1HRNueaaoWs-RPmkN0F_KmXD8B-BzwzF90KhC5XV4x4s/edit" class="btn bg-default" target="_blank" rel="noopener">Voir la notice</a>
+                                        @if($fluidbook->googleAnalytics)
+                                            <a href="https://analytics.google.com/" class="btn btn-primary" target="_blank" rel="noopener">
+                                                {{ __('Voir les statistiques') }}
+                                            </a>
+                                        @else
+                                            <button class="btn bg-default pointer-none disabled">{{ __('Statistiques désactivées') }}</button>
+                                            <a href="{{ $noticesUrls[$lang]['ga'] }}" class="btn bg-default ml-2" target="_blank" rel="noopener">Voir la notice</a>
+                                        @endif
                                         <div class="mt-3">
                                             <p class="m-0">Vous souhaitez activer Google Analytics dans votre Fluidbook ?</p>
                                             <a href="mailto:?subject={{ $objectMail }}">Contactez votre chef de projet</a>
                         <p>L’adresse d’hébergement a déjà été configurée, vous pouvez mettre votre Fluidbook directement en ligne en
                             cliquant ci-dessous :</p>
                         <div class="btn-install">
-                            <a href="{{ $installServerUrl }}" class="btn btn-primary" target="_blank" rel="noopener">
+                            <a href="{{ $prefixDownloadUrl.'/install/online' }}" class="btn btn-primary" target="_blank" rel="noopener">
                                 Installer sur le serveur d’hébergement
                                 <p class="m-0 mt-1 font-xs font-weight-normal">{{ $installServerUrl }}</p>
                             </a>
index ca742a6777b169cf88dbe79564f11b79aca79581..9d712d6c0090394ac4c696d9553ca9eb7e38143c 100644 (file)
@@ -6,22 +6,20 @@
             $key = key($settings[$index]);
             $value_ = $settings[$index][$key]
         @endphp
-        @if($value_)
-            @if($init === 0 && $loop->iteration < 6)
-                <tr class="odd">
-                    <td class="dtr-control d-flex justify-content-between">
-                        <p class="m-0">{{ $key }}</p>
-                        <p class="m-0">{{ $value_ }}</p>
-                    </td>
-                </tr>
-            @elseif($init === 5 && $loop->iteration > 5)
-                <tr class="odd">
-                    <td class="dtr-control d-flex justify-content-between">
-                        <p class="m-0">{{ $key }}</p>
-                        <p class="m-0">{{ $value_ }}</p>
-                    </td>
-                </tr>
-            @endif
+        @if($init === 0 && $loop->iteration < 6)
+            <tr class="odd">
+                <td class="dtr-control d-flex justify-content-between">
+                    <p class="m-0">{{ $key }}</p>
+                    <p class="m-0">{{ $value_ }}</p>
+                </td>
+            </tr>
+        @elseif($init === 5 && $loop->iteration > 5)
+            <tr class="odd">
+                <td class="dtr-control d-flex justify-content-between">
+                    <p class="m-0">{{ $key }}</p>
+                    <p class="m-0">{{ $value_ }}</p>
+                </td>
+            </tr>
         @endif
     @endforeach
     </tbody>