wip #6091 @1.5

diff --git a/app/Jobs/FluidbookCollectionDownload.php b/app/Jobs/FluidbookCollectionDownload.php
index 548b76c733a370e0c39a6826bc50329bb9fdf39d..d9707fa47c39854211784828f6a27f3c47a9f8ce 100644 (file)
--- a/app/Jobs/FluidbookCollectionDownload.php
+++ b/app/Jobs/FluidbookCollectionDownload.php
@@ -237,7 +237,8 @@ class FluidbookCollectionDownload extends DownloadBase
     protected function _jobDownloadFluidbook($id, $version, $dest, $options = [], $async = true, $compilerVersion = 'auto')
     {
         if ($compilerVersion === 'auto') {
-            $compilerVersion = ($id < WorkshopMigration::WS3_BOOK_ID) ? 2 : 3;
+            $fb = FluidbookPublication::withoutGlobalScopes()->find($id);
+            $compilerVersion = $fb->version;
         }
         /** @var $job FluidbookPackage */
         if ($compilerVersion === 2) {

diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php
index 911a4b8404a5ef8d76e43cfb0d1c3e457574088c..2c9083a60e18025d27578fc2f4cfb6d2833a542d 100644 (file)
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@ -665,9 +665,6 @@ class FluidbookPublication extends ToolboxSettingsModel
 
     public function allowsDownload()
     {
-        if ($this->version < 3) {
-            return false;
-        }
         if (can('fluidbook-publication:write')) {
             return true;
         }

diff --git a/public/packages/fluidbook/toolbox/css/context-menu.css b/public/packages/fluidbook/toolbox/css/context-menu.css
new file mode 100644 (file)
index 0000000..5bc1736
--- /dev/null
+++ b/public/packages/fluidbook/toolbox/css/context-menu.css
@@ -0,0 +1,19 @@
+.context-menu-item span.small {
+  display: block;
+}
+.context-menu-item span.small span.grey {
+  opacity: 0.6;
+}
+.btn-swal-context {
+  margin: 0 15px;
+  box-shadow: none !important;
+}
+.swal2-icon.swal2-info {
+  border-color: #9ec400 !important;
+  color: #9ec400 !important;
+}
+.context-menu-subtitle {
+  color: #2f2f2f;
+  font-weight: 600;
+}
+/*# sourceMappingURL=context-menu.css.map */
\ No newline at end of file

diff --git a/public/packages/fluidbook/toolbox/css/context-menu.css.map b/public/packages/fluidbook/toolbox/css/context-menu.css.map
new file mode 100644 (file)
index 0000000..7abe913
--- /dev/null
+++ b/public/packages/fluidbook/toolbox/css/context-menu.css.map
@@ -0,0 +1 @@
+{"version":3,"sources":["context-menu.less"],"names":[],"mappings":"AAAA,kBACI,KAAI;EACA,cAAA;;AAFR,kBACI,KAAI,MAGA,KAAI;EACA,YAAA;;AAKZ;EACI,cAAA;EACA,2BAAA;;AAGJ,WAAW;EACP,qBAAA;EACA,cAAA;;AAGJ;EACI,cAAA;EACA,gBAAA","file":"context-menu.css"}
\ No newline at end of file

diff --git a/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/download.blade.php b/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/download.blade.php
index 0dfa1ab661656249305272e3c43e12d9cfe43289..aa876be0d29732028a7ec1e6194d7b81d97d127d 100644 (file)
--- a/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/download.blade.php
+++ b/resources/views/vendor/backpack/crud/buttons/fluidbook_publication/download.blade.php
@@ -10,12 +10,12 @@
 
 
 
-    $actions['delivery']=[
-                'label'=>__('Page de téléchargement'),
-                'url'=>$base.'/delivery',
-                ];
-
-    $actions['sep_download']='---------';
+//    $actions['delivery']=[
+//                'label'=>__('Page de téléchargement'),
+//                'url'=>$base.'/delivery',
+//                ];
+//
+//    $actions['sep_download']='---------';
     foreach (\App\Models\FluidbookPublication::getDownloadVersions() as $k=>$v) {
         if($k==='scorm'){
             continue;