wip #6533 @0.25

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index dc0ab7c2cc3c90cab4e824d63510dab910225123..a81f5dc701be5f5ecc98e355825c8faea121a596 100644 (file)
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -46,7 +46,7 @@ class Kernel extends \Cubist\Backpack\Console\Kernel
 
         $schedule->command('fluidbook:farm:ping')->everyMinute();
         $schedule->command('fluidbook:loadbalancer:ping --force')->everyMinute();
-        $schedule->command('cubist:magic:precache')->everyFiveMinutes();
+        $schedule->command('cubist:magic:precache')->everyThirtyMinutes();
         $schedule->command('toolbox:precache')->everyThirtyMinutes();
     }
 

diff --git a/app/SubForms/Link/Base.php b/app/SubForms/Link/Base.php
index f24eae5f91dfe79663c06b5f931dbb79c57a9fd9..3607aaec8ab93faefb619b2f022978be73ab8391 100644 (file)
--- a/app/SubForms/Link/Base.php
+++ b/app/SubForms/Link/Base.php
@@ -94,7 +94,8 @@ class Base extends Form
             ['type' => \Fluidbook\Tools\Links\Link::EVENT_OVERLAY, 'label' => __('Capter les évenements'), 'color' => '#ffcc00', 'class' => EventOverlay::class],
             ['type' => \Fluidbook\Tools\Links\Link::ARTICLE, 'label' => __('Article (définition)'), 'color' => '#ACC152', 'class' => Article::class],
             ['type' => \Fluidbook\Tools\Links\Link::LIKE, 'label' => __('Like'), 'color' => '#4267B2', 'class' => Like::class],
-            ['type' => \Fluidbook\Tools\Links\Link::SLIDESHOW, 'label' => __('Diaporama'), 'color' => '#07b57a', 'class' => Slideshow::class],
+            ['type' => \Fluidbook\Tools\Links\Link::SLIDESHOW, 'label' => __('Diaporama') . ' (' . __('popup') . ')', 'color' => '#07b57a', 'class' => Slideshow::class],
+            ['type' => \Fluidbook\Tools\Links\Link::SLIDESHOW_INLINE, 'label' => __('Diaporama') . ' (' . __('intégré') . ')', 'color' => '#C8A7DF', 'class' => SlideshowInline::class],
             ['type' => \Fluidbook\Tools\Links\Link::IFRAME, 'label' => __('iFrame'), 'color' => '#fcae25', 'class' => IFrame::class],
             ['type' => \Fluidbook\Tools\Links\Link::SHOWLINK, 'label' => __('Afficher un lien'), 'color' => '#125C70', 'class' => ShowLink::class],
             ['type' => \Fluidbook\Tools\Links\Link::ZOOMHD, 'label' => __('Zoom HD'), 'color' => '#E80C95', 'class' => ZoomHD::class],

diff --git a/app/SubForms/Link/SlideshowInline.php b/app/SubForms/Link/SlideshowInline.php
new file mode 100644 (file)
index 0000000..1c7ee93
--- /dev/null
+++ b/app/SubForms/Link/SlideshowInline.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\SubForms\Link;
+
+use App\Fluidbook\Link\Link;
+use Cubist\Backpack\Magic\Fields\FilesOrURL;
+
+class SlideshowInline
+{
+
+    public $type = Link::SLIDESHOW_INLINE;
+
+    public function addDestinationField()
+    {
+        $this->addField('to', FilesOrURL::class, __('Images'), $this->getFilesOrURLEntry() + ['accept' => self::$_acceptSlideshow]);
+    }
+}