@@ -3,3 +3,5 @@ services:

         autoconfigure: true

     vonRotenberg\ModalBundle\Controller\FrontendModule\ModalModuleController: ~

+

+    vonRotenberg\ModalBundle\Controller\ContentElement\ModalElementController: ~

@@ -10,8 +10,12 @@ declare(strict_types=1);

  * @license LGPL-3.0-or-later

  */

+use vonRotenberg\ModalBundle\Model\ModalModel;

 $GLOBALS['BE_MOD']['content']['modals'] = array

 (

     'tables'      => array('tl_vr_modal', 'tl_content'),

 );

+

+

+$GLOBALS['TL_MODELS']['tl_vr_modal'] = ModalModel::class;

new file mode 100644

@@ -0,0 +1,25 @@

+<?php

+

+declare(strict_types=1);

+

+/*

+ * This file is part of modal bundle for Contao.

+ *

+ * (c) Benjamin Roth

+ *

+ * @license LGPL-3.0-or-later

+ */

+

+use vonRotenberg\ModalBundle\Controller\ContentElement\ModalElementController;

+

+$GLOBALS['TL_DCA']['tl_content']['palettes'][ModalElementController::TYPE] = '{type_legend},type;{modalconfig_legend},modal_configurations';

+

+

+$GLOBALS['TL_DCA']['tl_content']['fields']['modal_configurations'] = array

+(

+    'exclude'                  => true,

+    'inputType'                => 'select',

+    'foreignKey'               => 'tl_vr_modal.title',

+    'eval'                     => array('mandatory' => true, 'tl_class' => 'w50', 'includeBlankOption' => true, 'chosen' => true),

+    'sql'                      => 'int(10) unsigned NOT NULL default 0'

+);

@@ -12,7 +12,7 @@ declare(strict_types=1);

 use vonRotenberg\ModalBundle\Controller\FrontendModule\ModalModuleController;

-$GLOBALS['TL_DCA']['tl_module']['palettes'][ModalModuleController::TYPE] = '{title_legend},name,type;{config_legend},modal_configurations';

+$GLOBALS['TL_DCA']['tl_module']['palettes'][ModalModuleController::TYPE] = '{title_legend},name,type;{modalconfig_legend},modal_configurations';

 $GLOBALS['TL_DCA']['tl_module']['fields']['modal_configurations'] = array

@@ -20,6 +20,6 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['modal_configurations'] = array

     'exclude'                  => true,

     'inputType'                => 'select',

     'foreignKey'               => 'tl_vr_modal.title',

-    'eval'                     => array('mandatory' => true, 'tl_class' => 'w50', 'insertBlankOption' => true, 'chosen' => true),

+    'eval'                     => array('mandatory' => true, 'tl_class' => 'w50', 'includeBlankOption' => true, 'chosen' => true),

     'sql'                      => 'int(10) unsigned NOT NULL default 0'

 );

@@ -92,7 +92,7 @@ $GLOBALS['TL_DCA']['tl_vr_modal'] = array

     'palettes' => array

     (

         '__selector__'                => array(''),

-        'default'                     => '{title_legend},title;{config_legend},modal_title,delay;{publish_legend},published,start,stop'

+        'default'                     => '{title_legend},title;{config_legend},modal_title,delay,show_once;{publish_legend},published,start,stop'

     ),

     'subpalettes' => array

     (

@@ -104,12 +104,6 @@ $GLOBALS['TL_DCA']['tl_vr_modal'] = array

         (

             'sql'                     => "int(10) unsigned NOT NULL auto_increment"

         ),

-        'pid' => array

-        (

-            'foreignKey'              => 'tl_news_archive.title',

-            'sql'                     => "int(10) unsigned NOT NULL default 0",

-            'relation'                => array('type'=>'belongsTo', 'load'=>'lazy')

-        ),

         'tstamp' => array

         (

             'sorting'                 => true,

@@ -139,9 +133,17 @@ $GLOBALS['TL_DCA']['tl_vr_modal'] = array

             'sorting'                 => true,

             'flag'                    => DataContainer::SORT_ASC,

             'inputType'               => 'text',

-            'eval'                    => array('mandatory'=>true, 'rgxp'=>'natural','maxlength'=>5, 'maxval'=>65535, 'tl_class'=>'w50'),

+            'eval'                    => array('mandatory'=>true, 'rgxp'=>'natural','maxlength'=>5, 'maxval'=>65535, 'tl_class'=>'clr w50'),

             'sql'                     => "smallint(5) unsigned NOT NULL default 0"

         ),

+        'show_once' => array

+        (

+            'exclude'                 => true,

+            'filter'                  => true,

+            'inputType'               => 'checkbox',

+            'eval'                    => array('doNotCopy'=>true, 'tl_class'=>'w50 m12'),

+            'sql'                     => "char(1) NOT NULL default '1'"

+        ),

         'published' => array

         (

             'exclude'                 => true,

@@ -11,8 +11,11 @@ declare(strict_types=1);

  */

 use vonRotenberg\ModalBundle\Controller\FrontendModule\ModalModuleController;

+use vonRotenberg\ModalBundle\Controller\ContentElement\ModalElementController;

 $GLOBALS['TL_LANG']['MOD']['modals'][0] = 'PopUp-Fenster';

 $GLOBALS['TL_LANG']['MOD']['modals'][1] = 'Verwalten von Popup-Konfigurationen';

 $GLOBALS['TL_LANG']['FMD'][ModalModuleController::TYPE][0] = 'Pop-Up';

 $GLOBALS['TL_LANG']['FMD'][ModalModuleController::TYPE][1] = 'Gibt eine Pop-Up Konfiguration aus.';

+$GLOBALS['TL_LANG']['CTE'][ModalElementController::TYPE][0] = 'Pop-Up';

+$GLOBALS['TL_LANG']['CTE'][ModalElementController::TYPE][1] = 'Gibt eine Pop-Up Konfiguration aus.';

new file mode 100644

@@ -0,0 +1,20 @@

+<?php

+

+declare(strict_types=1);

+

+/*

+ * This file is part of modal bundle for Contao.

+ *

+ * (c) Benjamin Roth

+ *

+ * @license LGPL-3.0-or-later

+ */

+

+use Contao\DC_Table;

+use Contao\DataContainer;

+

+$GLOBALS['TL_LANG']['tl_content']['modal_configurations'][0] = 'PopUp-Konfiguration';

+$GLOBALS['TL_LANG']['tl_content']['modal_configurations'][1] = 'Die zu ladende PopUp-Konfiguration.';

+$GLOBALS['TL_LANG']['tl_content']['modal_configurations'][1] = 'Die zu ladende PopUp-Konfiguration.';

+

+$GLOBALS['TL_LANG']['tl_content']['modalconfig_legend'] = 'PopUp-Einstellungen';

new file mode 100644

@@ -0,0 +1,19 @@

+<?php

+

+declare(strict_types=1);

+

+/*

+ * This file is part of modal bundle for Contao.

+ *

+ * (c) Benjamin Roth

+ *

+ * @license LGPL-3.0-or-later

+ */

+

+use Contao\DC_Table;

+use Contao\DataContainer;

+

+$GLOBALS['TL_LANG']['tl_module']['modal_configurations'][0] = 'PopUp-Konfiguration';

+$GLOBALS['TL_LANG']['tl_module']['modal_configurations'][1] = 'Die zu ladende PopUp-Konfiguration.';

+

+$GLOBALS['TL_LANG']['tl_module']['modalconfig_legend'] = 'PopUp-Einstellungen';

@@ -21,3 +21,11 @@ $GLOBALS['TL_LANG']['tl_vr_modal']['modal_title'][0] = 'Titel des Pop-Ups';

 $GLOBALS['TL_LANG']['tl_vr_modal']['modal_title'][1] = 'Der Titel der als Leiste über dem Pop-Up angezeigt wird.';

 $GLOBALS['TL_LANG']['tl_vr_modal']['delay'][0] = 'Anzeigeverzögerung';

 $GLOBALS['TL_LANG']['tl_vr_modal']['delay'][1] = 'Die Zeit, bis das Pop-Up nach dem vollständigen Laden der Seite geöffnet wird.';

+$GLOBALS['TL_LANG']['tl_vr_modal']['show_once'][0] = 'Nur einmal pro Session';

+$GLOBALS['TL_LANG']['tl_vr_modal']['show_once'][1] = 'Das PopUp wird nur einmal wärend der Browser-Sitzung angezeigt.';

+$GLOBALS['TL_LANG']['tl_vr_modal']['published'][0] = 'Veröffentlichen';

+$GLOBALS['TL_LANG']['tl_vr_modal']['published'][1] = 'Aktiviert oder deaktiviert das PopUp.';

+$GLOBALS['TL_LANG']['tl_vr_modal']['start'][0] = 'Anzeigen ab';

+$GLOBALS['TL_LANG']['tl_vr_modal']['start'][1] = 'Wenn das PopUp erst ab einem bestimmten Zeitpunkt angezeigt werden soll, kann hier ein Datum gesetzt werden.';

+$GLOBALS['TL_LANG']['tl_vr_modal']['stop'][0] = 'Anzeigen bis';

+$GLOBALS['TL_LANG']['tl_vr_modal']['stop'][1] = 'Wenn das PopUp bis zu einem bestimmten Zeitpunkt angezeigt werden soll, kann hier ein Datum gesetzt werden.';

new file mode 100644

@@ -0,0 +1 @@

+{% extends '@Contao_VonrotenbergModalBundle/mod_modal_module.html.twig' %}

@@ -0,0 +1,32 @@

+<script>

+    (function($) {

+        $(document).ready(function() {

+            var signpost;

+

+            signpost = new jBox('Modal', {

+                title: '{{ (modal_configuration.modal_title) ?: '' }}',

+                content: $('#modal-content-{{ modal_configuration.id }}').html(),

+                closeButton: 'title',

+                width: 650,

+                theme: 'DurbachLight'{% if not modal_configuration.show_once is empty %},

+                onClose: function() {

+                    localStorage.setItem('popState-{{ modal_configuration.id }}',Date.now());

+                    sessionStorage.setItem('popState-{{ modal_configuration.id }}','shown');

+                }

+                {% endif %}

+

+            });

+

+            {% if not modal_configuration.show_once is empty %}if((localStorage.getItem('popState-{{ modal_configuration.id }}') < Date.now()-3600 && sessionStorage.getItem('popState-{{ modal_configuration.id }}') != 'shown')){

+                {% endif %}setTimeout(function() {

+                    signpost.open();

+                },{{ modal_configuration.delay|number_format * 1000 }});

+            {% if not modal_configuration.show_once is empty %} } {% endif %}

+

+        });

+    })(jQuery);

+</script>

+

+<div style="display: none" id="modal-content-{{ modal_configuration.id }}">

+{{ details|raw }}

+</div>

new file mode 100644

@@ -0,0 +1,66 @@

+<?php

+

+declare(strict_types=1);

+

+/*

+ * This file is part of modal bundle for Contao.

+ *

+ * (c) Benjamin Roth

+ *

+ * @license LGPL-3.0-or-later

+ */

+

+namespace vonRotenberg\ModalBundle\Controller\ContentElement;

+

+use Contao\ContentModel;

+use Contao\Controller;

+use Contao\CoreBundle\Controller\ContentElement\AbstractContentElementController;

+use Contao\CoreBundle\ServiceAnnotation\ContentElement;

+use Contao\Template;

+use Symfony\Component\HttpFoundation\Request;

+use Symfony\Component\HttpFoundation\Response;

+use vonRotenberg\ModalBundle\Model\ModalModel;

+

+/**

+ * @ContentElement(ModalElementController::TYPE, category="miscellaneous")

+ */

+class ModalElementController extends AbstractContentElementController

+{

+    public const TYPE = 'modal_element';

+

+    protected function getResponse(Template $template, ContentModel $model, Request $request): ?Response

+    {

+        if (!$model->modal_configurations || ($modal = ModalModel::findPublishedById($model->modal_configurations)) === null)

+        {

+            return new Response();

+        }

+

+        $id = $modal->id;

+

+        $template->details = function () use ($id)

+        {

+            $strDetails = '';

+            $objElement = ContentModel::findPublishedByPidAndTable($id, 'tl_vr_modal');

+

+            if ($objElement !== null)

+            {

+                while ($objElement->next())

+                {

+                    $strDetails .= Controller::getContentElement($objElement->current());

+                }

+            }

+

+            return $strDetails;

+        };

+

+        $template->hasDetails = static function () use ($id)

+        {

+            return ContentModel::countPublishedByPidAndTable($id, 'tl_vr_modal') > 0;

+        };

+

+        $template->modal_configuration = $modal->row();

+

+        return $template->getResponse();

+    }

+

+}

@@ -12,12 +12,15 @@ declare(strict_types=1);

 namespace vonRotenberg\ModalBundle\Controller\FrontendModule;

+use Contao\ContentModel;

+use Contao\Controller;

 use Contao\CoreBundle\Controller\FrontendModule\AbstractFrontendModuleController;

 use Contao\CoreBundle\ServiceAnnotation\FrontendModule;

 use Contao\ModuleModel;

 use Contao\Template;

 use Symfony\Component\HttpFoundation\Request;

 use Symfony\Component\HttpFoundation\Response;

+use vonRotenberg\ModalBundle\Model\ModalModel;

 /**

  * @FrontendModule(ModalModuleController::TYPE, category="miscellaneous")

@@ -28,6 +31,36 @@ class ModalModuleController extends AbstractFrontendModuleController

     protected function getResponse(Template $template, ModuleModel $model, Request $request): ?Response

     {

+        if (!$model->modal_configurations || ($modal = ModalModel::findPublishedById($model->modal_configurations)) === null)

+        {

+            return new Response();

+        }

+

+        $id = $modal->id;

+

+        $template->details = function () use ($id)

+        {

+            $strDetails = '';

+            $objElement = ContentModel::findPublishedByPidAndTable($id, 'tl_vr_modal');

+

+            if ($objElement !== null)

+            {

+                while ($objElement->next())

+                {

+                    $strDetails .= Controller::getContentElement($objElement->current());

+                }

+            }

+

+            return $strDetails;

+        };

+

+        $template->hasDetails = static function () use ($id)

+        {

+            return ContentModel::countPublishedByPidAndTable($id, 'tl_vr_modal') > 0;

+        };

+

+        $template->modal_configuration = $modal->row();

+

         return $template->getResponse();

     }

new file mode 100644

@@ -0,0 +1,94 @@

+<?php

+

+/*

+ * This file is part of Contao.

+ *

+ * (c) Leo Feyer

+ *

+ * @license LGPL-3.0-or-later

+ */

+

+namespace vonRotenberg\ModalBundle\Model;

+

+use Contao\Date;

+use Contao\Model;

+use Contao\Model\Collection;

+

+/**

+ * Reads and writes image sizes

+ *

+ * @property string|integer      $id

+ * @property string|integer      $tstamp

+ * @property string              $title

+ * @property string              $modal_title

+ * @property string|integer      $delay

+ * @property string|boolean      $show_once

+ * @property string|integer      $start

+ * @property string|integer      $stop

+ *

+ * @method static ModalModel|null findById($id, array $opt=array())

+ * @method static ModalModel|null findByPk($id, array $opt=array())

+ * @method static ModalModel|null findOneBy($col, $val, array $opt=array())

+ * @method static ModalModel|null findOneByTstamp($val, array $opt=array())

+ * @method static ModalModel|null findOneByTitle($val, array $opt=array())

+ * @method static ModalModel|null findOneByModalTitle($val, array $opt=array())

+ * @method static ModalModel|null findOneByDelay($val, array $opt=array())

+ * @method static ModalModel|null findOneByShowOnce($val, array $opt=array())

+ * @method static ModalModel|null findOneByPublished($val, array $opt=array())

+ * @method static ModalModel|null findOneByStart($val, array $opt=array())

+ * @method static ModalModel|null findOneByStop($val, array $opt=array())

+ *

+ * @method static Collection|ModalModel[]|ModalModel|null findByTstamp($val, array $opt=array())

+ * @method static Collection|ModalModel[]|ModalModel|null findByTitle($val, array $opt=array())

+ * @method static Collection|ModalModel[]|ModalModel|null findByModalTitle($val, array $opt=array())

+ * @method static Collection|ModalModel[]|ModalModel|null findByDelay($val, array $opt=array())

+ * @method static Collection|ModalModel[]|ModalModel|null findByShowOnce($val, array $opt=array())

+ * @method static Collection|ModalModel[]|ModalModel|null findByPublished($val, array $opt=array())

+ * @method static Collection|ModalModel[]|ModalModel|null findByStart($val, array $opt=array())

+ * @method static Collection|ModalModel[]|ModalModel|null findByStop($val, array $opt=array())

+ * @method static Collection|ModalModel[]|ModalModel|null findMultipleByIds($val, array $opt=array())

+ * @method static Collection|ModalModel[]|ModalModel|null findBy($col, $val, array $opt=array())

+ * @method static Collection|ModalModel[]|ModalModel|null findAll(array $opt=array())

+ *

+ * @method static integer countById($id, array $opt=array())

+ * @method static integer countByTstamp($val, array $opt=array())

+ * @method static integer countByTitle($val, array $opt=array())

+ * @method static integer countByModalTitle($val, array $opt=array())

+ * @method static integer countByDelay($val, array $opt=array())

+ * @method static integer countByShowOnce($val, array $opt=array())

+ * @method static integer countByPublished($val, array $opt=array())

+ * @method static integer countByStart($val, array $opt=array())

+ * @method static integer countByStop($val, array $opt=array())

+ */

+class ModalModel extends Model

+{

+	/**

+	 * Table name

+	 * @var string

+	 */

+	protected static $strTable = 'tl_vr_modal';

+

+    /**

+     * Find a published modal by its ID

+     *

+     * @param integer $intId      The modal ID

+     * @param array   $arrOptions An optional options array

+     *

+     * @return ModalModel|null The model or null if there is no modal

+     */

+    public static function findPublishedById($intId, array $arrOptions=array())

+    {

+        $t = static::$strTable;

+        $arrColumns = array("$t.id=?");

+

+        if (!static::isPreviewMode($arrOptions))

+        {

+            $time = Date::floorToMinute();

+            $arrColumns[] = "$t.published='1' AND ($t.start='' OR $t.start<='$time') AND ($t.stop='' OR $t.stop>'$time')";

+        }

+

+        return static::findOneBy($arrColumns, $intId, $arrOptions);

+    }

+}

+

+class_alias(ModalModel::class, 'ModalModel');