From 99c251c54b30fd76b6b833e24e8f5ae57fc1adaa Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 26 Sep 2023 14:44:44 +0200 Subject: [PATCH] wip #6304 @0.5 --- .../delivery/contact_manager.blade.php | 10 +- .../delivery/index.blade.php | 170 ++++++++++-------- 2 files changed, 95 insertions(+), 85 deletions(-) diff --git a/resources/views/fluidbook_publication/delivery/contact_manager.blade.php b/resources/views/fluidbook_publication/delivery/contact_manager.blade.php index 03eb9956d..dcc60e481 100644 --- a/resources/views/fluidbook_publication/delivery/contact_manager.blade.php +++ b/resources/views/fluidbook_publication/delivery/contact_manager.blade.php @@ -1,7 +1,3 @@ -@if($mail) - - @endif - {{ $text??__('Contactez votre chef de projet') }} - @if($mail) - -@endif + + {{ $text??__('Contactez votre chef de projet') }} + diff --git a/resources/views/fluidbook_publication/delivery/index.blade.php b/resources/views/fluidbook_publication/delivery/index.blade.php index 5694f42c5..b557072e8 100644 --- a/resources/views/fluidbook_publication/delivery/index.blade.php +++ b/resources/views/fluidbook_publication/delivery/index.blade.php @@ -95,8 +95,9 @@ $cid = $fluidbook->cid; $socialImage = route('social_image',['cid' => $cid]); - if($fluidbook->facebook_image) + if($fluidbook->facebook_image){ $socialImage = $fluidbook->facebook_image; + } $installServerUrl = null; if($fluidbook->install_online) { @@ -111,7 +112,7 @@ } } - $downloadVersions = $fluidbook->getDownloadVersions(); + $downloadVersions = \App\Models\FluidbookPublication::getDownloadVersions(); $prefixDownloadUrl = '/fluidbook-publication/'.$fluidbook->id; $prefixDownloadUrl = $prefixDownloadUrl.'/package'; @@ -122,29 +123,35 @@ $downloadVersions[$key]['icon'] = file_get_contents(url('images/icons/icon-standard-server.svg')); $downloadVersions[$key]['notice_fr'] = "1j4lEk2vqUnenXZQs2ucNZg51aFTLmTOoHPgYolj46m0"; $downloadVersions[$key]['notice_en'] = "1CeLq8R8LMhWjZ0caXrO0HcfxRtzqGQkpaKJvDcYt_ZY"; + $downloadVersions[$key]['enabled'] = $fluidbook->download_online; }elseif ($key === "scorm") { $downloadVersions[$key]['text'] = __("LMS Scorm"); $downloadVersions[$key]['type'] = __("(LMS / SCORM)"); $downloadVersions[$key]['icon'] = file_get_contents(url('images/icons/icon-lms-scorm.svg')); $downloadVersions[$key]['notice_fr'] = "1cZ_dTdehk2av0ZUGryY1xLF5IQoqSyCmgBXPH1OYPu4"; // Pas de notice en Français $downloadVersions[$key]['notice_en'] = "1cZ_dTdehk2av0ZUGryY1xLF5IQoqSyCmgBXPH1OYPu4"; + $downloadVersions[$key]['enabled'] = $fluidbook->download_scorm && $fluidbook->scorm_enable; }elseif ($key === "sharepoint") { $downloadVersions[$key]['text'] = __("SharePoint"); $downloadVersions[$key]['icon'] = file_get_contents(url('images/icons/icon-sharepoint.svg')); $downloadVersions[$key]['notice_fr'] = "1O5EInYbNmNmcqi0VXq0FU7CqeYV6VJeJ0aI-bbgSlBc"; $downloadVersions[$key]['notice_en'] = "1YeBLektflXZZz6yU-EKpYxe7i0fL0Oy13pB1vMdwMgw"; + $downloadVersions[$key]['enabled'] = $fluidbook->download_sharepoint; }elseif ($key === "mac_exe_html") { $downloadVersions[$key]['text'] = __("Version Offline"); $downloadVersions[$key]['type'] = __("(Application MacOS)"); $downloadVersions[$key]['icon'] = file_get_contents(url('images/icons/icon-mac-app.svg'), true); + $downloadVersions[$key]['enabled'] = $fluidbook->download_mac_exe_html; }elseif ($key === "win_ins_html") { $downloadVersions[$key]['text'] = __("Version Offline"); $downloadVersions[$key]['type'] = __("(Application Windows)"); $downloadVersions[$key]['icon'] = file_get_contents(url('images/icons/icon-windows-app.svg')); + $downloadVersions[$key]['enabled'] = $fluidbook->download_win_ins_html; }elseif ($key === "win_cd_html") { $downloadVersions[$key]['text'] = __("Version Offline"); $downloadVersions[$key]['type'] = __("(CD-ROM / Clé USB)"); $downloadVersions[$key]['icon'] = file_get_contents(url('images/icons/icon-cd-usb.svg')); + $downloadVersions[$key]['enabled'] = $fluidbook->download_win_cd_html; } } @@ -164,6 +171,73 @@ ]; $CDPMail = $fluidbook->getProjectManagerEmail(); + + $noticeSVG=' + + + + + + '; + + $downloadSVG=' + + + + + + + '; + + $lockSVG=' + + + + + + '; + + @endphp @section('after_styles') @@ -194,16 +268,16 @@
@@ -282,7 +356,7 @@
@foreach($enabledFeatures as $enabledFeature)
+ class="delivery-feature d-flex align-center text-center flex-column"> @@ -298,7 +372,7 @@
@foreach($disabledFeatures as $disabledFeature)
+ class="delivery-feature disabled-feature d-flex align-center text-center flex-column"> @@ -406,7 +480,7 @@ @else + class="btn bg-default pointer-none disabled">{{ __('Statistiques désactivées') }} @endif
@@ -424,7 +498,7 @@ @else + class="btn bg-default pointer-none disabled">{{ __('Statistiques désactivées') }} {{ __('Voir la notice')}} @endif @@ -497,7 +571,7 @@ @endphp @isset($version['text'])
0 ) ? 'active' : '' }}"> + class="dropdown-element position-relative d-flex align-items-center {{ $version['enabled']?'active':'' }}">
{!! $version['icon'] !!} @@ -506,7 +580,7 @@

{{ $version['text'] }}

- @if((sizeof($winActiveVersion) === sizeof($winVersion) && str_contains($key, "win")) || (sizeof($winActiveVersion) > 1 && str_contains($key, "win") ) || !str_contains($key, "win")) + @if($version['enabled']) @isset($version['type'])

{{ $version['type'] }} @@ -517,77 +591,17 @@

@isset($version['notice_'.$lang]) - - - - - - - + class="mr-1 instruction position-relative">{!! $noticeSVG !!} @endisset - @if($version['install'] || (str_contains($key, "win") && sizeof($winActiveVersion) > 0)) + @if($version['enabled']) - - - - - - - - + {!! $downloadSVG !!} - @else - - - - - - - - + @else + {!! $lockSVG !!} + @endif
-- 2.39.5