From bc38b81b3504a2522ff00f5857413b28d1cbe3e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eva-Marie=20Sch=C3=BCttler?= Date: Wed, 8 Jul 2020 17:14:35 +0200 Subject: [PATCH 1/4] I updated the files and used https://github.com/mapbender/mapbender/blob/release/3.0.7/src/Mapbender/CoreBundle/Template/Fullscreen.php and https://github.com/mapbender/mapbender/blob/master/src/Mapbender/CoreBundle/Component/MapbenderBundle.php to do so. --- .../DemoBundle/Template/DemoFullscreen.php | 31 +++++++++----- .../DemoBundle/WorkshopDemoBundle.php | 40 ++++++++----------- 2 files changed, 38 insertions(+), 33 deletions(-) diff --git a/src/Workshop/DemoBundle/Template/DemoFullscreen.php b/src/Workshop/DemoBundle/Template/DemoFullscreen.php index f50a72e..ab5acb0 100644 --- a/src/Workshop/DemoBundle/Template/DemoFullscreen.php +++ b/src/Workshop/DemoBundle/Template/DemoFullscreen.php @@ -4,19 +4,32 @@ use Mapbender\CoreBundle\Template\Fullscreen; -/** - * Template DemoFullscreen - * - * @author Astrid Emde - */ class DemoFullscreen extends Fullscreen { - protected static $title = 'Fullscreen Template Workshop'; - protected static $css = array( + protected static $title = "Fullscreen Template Workshop"; + protected static $regions = array('toolbar', 'sidepane', 'content', 'footer'); + protected static $regionsProperties = array( + 'sidepane' => array( + 'tabs' => array( + 'name' => 'tabs', + 'label' => 'mb.manager.template.region.tabs.label'), + 'accordion' => array( + 'name' => 'accordion', + 'label' => 'mb.manager.template.region.accordion.label') + ) + ); + protected static $css = array( '@MapbenderCoreBundle/Resources/public/sass/template/fullscreen.scss', '@WorkshopDemoBundle/Resources/public/demo_fullscreen.scss', ); + protected static $js = array( + '@FOMCoreBundle/Resources/public/js/frontend/sidepane.js', + '@FOMCoreBundle/Resources/public/js/frontend/tabcontainer.js', + '@MapbenderCoreBundle/Resources/public/mapbender.container.info.js', + '/components/jquerydialogextendjs/jquerydialogextendjs-built.js', + "/components/vis-ui.js/vis-ui.js-built.js" + ); - public $twigTemplate = 'WorkshopDemoBundle:Template:demo_fullscreen.html.twig'; - + public $twigTemplate = 'DemoDemoBundle:Template:DemoFullscreen.html.twig'; } + diff --git a/src/Workshop/DemoBundle/WorkshopDemoBundle.php b/src/Workshop/DemoBundle/WorkshopDemoBundle.php index e90d2fe..6de9668 100644 --- a/src/Workshop/DemoBundle/WorkshopDemoBundle.php +++ b/src/Workshop/DemoBundle/WorkshopDemoBundle.php @@ -1,41 +1,33 @@ Date: Thu, 9 Jul 2020 09:46:29 +0200 Subject: [PATCH 2/4] Update DemoFullscreen.php Changed name of twig-file. --- src/Workshop/DemoBundle/Template/DemoFullscreen.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Workshop/DemoBundle/Template/DemoFullscreen.php b/src/Workshop/DemoBundle/Template/DemoFullscreen.php index ab5acb0..31bbac4 100644 --- a/src/Workshop/DemoBundle/Template/DemoFullscreen.php +++ b/src/Workshop/DemoBundle/Template/DemoFullscreen.php @@ -30,6 +30,6 @@ class DemoFullscreen extends Fullscreen "/components/vis-ui.js/vis-ui.js-built.js" ); - public $twigTemplate = 'DemoDemoBundle:Template:DemoFullscreen.html.twig'; + public $twigTemplate = 'WorkshopDemoBundle:Template:demo_fullscreen.html.twig'; } From 0a8ae4ff0a45a008b8b753b2291917cfec54365d Mon Sep 17 00:00:00 2001 From: eschuettler <46448870+eschuettler@users.noreply.github.com> Date: Thu, 9 Jul 2020 09:47:29 +0200 Subject: [PATCH 3/4] Update WorkshopDemoBundle.php Changed url. --- src/Workshop/DemoBundle/WorkshopDemoBundle.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Workshop/DemoBundle/WorkshopDemoBundle.php b/src/Workshop/DemoBundle/WorkshopDemoBundle.php index 6de9668..60c69fa 100644 --- a/src/Workshop/DemoBundle/WorkshopDemoBundle.php +++ b/src/Workshop/DemoBundle/WorkshopDemoBundle.php @@ -27,7 +27,7 @@ public function getElements() */ public function getTemplates() { - return array('Workshop\DemoBundle\Template\DemoFullscreen'); + return array('Workshop\DemoBundle\Template\demo_fullscreen'); } } From 430794abdbc97d1f7a8f4a440cd4725cf951b5ea Mon Sep 17 00:00:00 2001 From: eschuettler <46448870+eschuettler@users.noreply.github.com> Date: Thu, 9 Jul 2020 10:08:22 +0200 Subject: [PATCH 4/4] Update WorkshopDemoBundle.php Changed url. --- src/Workshop/DemoBundle/WorkshopDemoBundle.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Workshop/DemoBundle/WorkshopDemoBundle.php b/src/Workshop/DemoBundle/WorkshopDemoBundle.php index 60c69fa..6de9668 100644 --- a/src/Workshop/DemoBundle/WorkshopDemoBundle.php +++ b/src/Workshop/DemoBundle/WorkshopDemoBundle.php @@ -27,7 +27,7 @@ public function getElements() */ public function getTemplates() { - return array('Workshop\DemoBundle\Template\demo_fullscreen'); + return array('Workshop\DemoBundle\Template\DemoFullscreen'); } }