From: soufiane Date: Tue, 4 Jul 2023 14:25:23 +0000 (+0200) Subject: wip #6066 @4:00 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=5b658b4d228bab23fc56316b2b5b5de11362ff6f;p=fluidbook-toolbox.git wip #6066 @4:00 --- diff --git a/public/packages/fluidbook/toolbox/css/delivery.css b/public/packages/fluidbook/toolbox/css/delivery.css index 2c433988d..83767ad4d 100644 --- a/public/packages/fluidbook/toolbox/css/delivery.css +++ b/public/packages/fluidbook/toolbox/css/delivery.css @@ -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; } diff --git a/public/packages/fluidbook/toolbox/css/delivery.css.map b/public/packages/fluidbook/toolbox/css/delivery.css.map index 95dcb6a2d..2cdfdbe20 100644 --- a/public/packages/fluidbook/toolbox/css/delivery.css.map +++ b/public/packages/fluidbook/toolbox/css/delivery.css.map @@ -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":"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","file":"delivery.css"} \ No newline at end of file diff --git a/public/packages/fluidbook/toolbox/css/delivery.less b/public/packages/fluidbook/toolbox/css/delivery.less index e3d410b7d..608302b7b 100644 --- a/public/packages/fluidbook/toolbox/css/delivery.less +++ b/public/packages/fluidbook/toolbox/css/delivery.less @@ -35,6 +35,10 @@ html,body { color: rgba(27,42,78,.4); } +.pointer-none { + pointer-events: none; +} + .delivery { &-anchor { margin-bottom: 55px; diff --git a/resources/views/fluidbook_publication/delivery.blade.php b/resources/views/fluidbook_publication/delivery.blade.php index cbff61c79..f7eb57f5f 100644 --- a/resources/views/fluidbook_publication/delivery.blade.php +++ b/resources/views/fluidbook_publication/delivery.blade.php @@ -22,21 +22,26 @@ $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]); @@ -122,9 +127,19 @@ $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') @@ -312,6 +327,7 @@
+ {{ __('Voir la notice') }}
@@ -333,7 +349,13 @@

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...

- Voir les statistiques + @if($fluidbook->stats) + + {{ __('Voir les statistiques') }} + + @else + + @endif @@ -344,7 +366,14 @@

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é.

- Voir la notice + @if($fluidbook->googleAnalytics) + + {{ __('Voir les statistiques') }} + + @else + + Voir la notice + @endif

Vous souhaitez activer Google Analytics dans votre Fluidbook ?

Contactez votre chef de projet @@ -374,7 +403,7 @@

L’adresse d’hébergement a déjà été configurée, vous pouvez mettre votre Fluidbook directement en ligne en cliquant ci-dessous :

- + Installer sur le serveur d’hébergement

{{ $installServerUrl }}

 diff --git a/resources/views/fluidbook_publication/delivery_params.blade.php b/resources/views/fluidbook_publication/delivery_params.blade.php index ca742a677..9d712d6c0 100644 --- a/resources/views/fluidbook_publication/delivery_params.blade.php +++ b/resources/views/fluidbook_publication/delivery_params.blade.php @@ -6,22 +6,20 @@ $key = key($settings[$index]); $value_ = $settings[$index][$key] @endphp - @if($value_) - @if($init === 0 && $loop->iteration < 6) - - -

{{ $key }}

-

{{ $value_ }}

- - - @elseif($init === 5 && $loop->iteration > 5) - - -

{{ $key }}

-

{{ $value_ }}

- - - @endif + @if($init === 0 && $loop->iteration < 6) + + +

{{ $key }}

+

{{ $value_ }}

+ + + @elseif($init === 5 && $loop->iteration > 5) + + +

{{ $key }}

+

{{ $value_ }}

+ + @endif @endforeach