From ce292748fb847f59ccd7168ef348bab768f7e054 Mon Sep 17 00:00:00 2001 From: uli Date: Wed, 22 Feb 2017 12:03:49 +0000 Subject: [PATCH] =?UTF-8?q?*=20Update=20auf=20Twig=202=20(notwendig,=20da?= =?UTF-8?q?=20block()=20bei=20Twig=201=20''=20statt=20null=20zur=C3=BCckgi?= =?UTF-8?q?bt.=20Somit=20kann=20nicht=20unterschieden=20werden,=20ob=20ein?= =?UTF-8?q?=20Block=20nicht=20definiert=20wurde=20oder=20leer=20ist;=20das?= =?UTF-8?q?=20ist=20wiederum=20notwendig,=20damit=20Templates=20die=20Bl?= =?UTF-8?q?=C3=B6cke=20in=20sidebar.html.twig=20auch=20mit=20leerem=20Inha?= =?UTF-8?q?lt=20=C3=BCberschreiben=20k=C3=B6nnen)=20*=20Symfony-Update=20*?= =?UTF-8?q?=20Behoben:=20Reisemagazin/-f=C3=BChrer=20Slider=20zeigt=20deak?= =?UTF-8?q?tivierte=20Seiten=20an;=20Begrenzung=20auf=203=20Eintr=C3=A4ge?= =?UTF-8?q?=20entfernt=20*=20Behoben:=20Angebote=20werden=20nicht=20=C3=BC?= =?UTF-8?q?berall=20angezeigt=20*=20Land=20einer=20Seite=20von=20=C3=BCber?= =?UTF-8?q?geordneten=20Seiten=20erben=20(getEffectiveCountry())=20*=20Sei?= =?UTF-8?q?tentemplate=20"offers":=20Diese=20Seiten=20haben=20unten=20im?= =?UTF-8?q?=20Body=20ein=20Angebots-Karusell=20*=20Templates=20ohne=20Cont?= =?UTF-8?q?roller=20action=20werden=20jetzt=20unterst=C3=BCtzt.=20Falls=20?= =?UTF-8?q?keine=20Action=20existiert,=20wird=20einfach=20ein=20gleichnami?= =?UTF-8?q?ges=20twig-Template=20gerendert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3303 f459cee4-fb09-11de-96c3-f9c5f16c3c76 --- trunk/app/Resources/views/base.html.twig | 7 +- .../views/default/components/header.html.twig | 5 - .../default/components/sidebar.html.twig | 31 +- .../views/default/pages/cms/offers.html.twig | 14 + .../views/default/pages/home.html.twig | 2 +- trunk/composer.json | 5 +- trunk/composer.lock | 576 ++++++++++-------- .../AppBundle/Controller/CmsController.php | 6 +- .../Controller/ComponentController.php | 25 +- .../Controller/DefaultController.php | 23 +- trunk/src/AppBundle/Entity/Page.php | 16 + .../Listener/KernelControllerListener.php | 15 +- trunk/var/SymfonyRequirements.php | 6 +- trunk/web/config.php | 219 ++++++- 14 files changed, 662 insertions(+), 288 deletions(-) create mode 100644 trunk/app/Resources/views/default/pages/cms/offers.html.twig diff --git a/trunk/app/Resources/views/base.html.twig b/trunk/app/Resources/views/base.html.twig index 8799382a..7abd0b40 100644 --- a/trunk/app/Resources/views/base.html.twig +++ b/trunk/app/Resources/views/base.html.twig @@ -106,8 +106,11 @@
{% include 'default/components/sidebar.html.twig' with { - nav_sidebar_widget_block: block('nav_sidebar_widget'), - search_sidebar_widget_block: block('search_sidebar_widget'), + nav_sidebar_widget_block: block('nav_sidebar_widget') ?? null, + search_sidebar_widget_block: block('search_sidebar_widget') ?? null, + travel_guide_sidebar_widget_block: block('travel_guide_sidebar_widget') ?? null, + travel_magazine_sidebar_widget_block: block('travel_magazine_sidebar_widget') ?? null, + offers_sidebar_widget_block: block('offers_sidebar_widget') ?? null, } %}
diff --git a/trunk/app/Resources/views/default/components/header.html.twig b/trunk/app/Resources/views/default/components/header.html.twig index d74937bf..9709453d 100644 --- a/trunk/app/Resources/views/default/components/header.html.twig +++ b/trunk/app/Resources/views/default/components/header.html.twig @@ -75,11 +75,6 @@ Reiseführer -
  • - -