From b742bf7cbc6300d50a6abe291c9f9c35c7eca008 Mon Sep 17 00:00:00 2001
From: uli <uli@f459cee4-fb09-11de-96c3-f9c5f16c3c76>
Date: Mon, 27 Mar 2017 20:46:21 +0000
Subject: [PATCH] =?UTF-8?q?*=20(Tempor=C3=A4res)=20CMS-Template=20"jugendr?=
 =?UTF-8?q?eisen"=20-=20=C3=9Cbersicht=20ohne=20Suchmaske=20und=20Angebote?=
 =?UTF-8?q?=20in=20der=20Sidebar=20*=20Weitere=20=C3=84nderungen=20an=20de?=
 =?UTF-8?q?r=20Nicht-/Anzeige=20von=20Sidebar-Widgets=20*=20Behoben:=20Uml?=
 =?UTF-8?q?aute-Problem=20TT-Suchmaske?=
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@3322 f459cee4-fb09-11de-96c3-f9c5f16c3c76
---
 .../default/pages/cms/jugendreisen.html.twig  |  1 +
 .../default/pages/cms/travelProgram.html.twig |  2 +-
 .../Controller/BookingController.php          |  2 ++
 .../AppBundle/Controller/CmsController.php    | 19 +++++++++++--
 .../AppBundle/Form/TtSearchRequestType.php    | 28 +++++++++----------
 5 files changed, 34 insertions(+), 18 deletions(-)
 create mode 100644 trunk/app/Resources/views/default/pages/cms/jugendreisen.html.twig

diff --git a/trunk/app/Resources/views/default/pages/cms/jugendreisen.html.twig b/trunk/app/Resources/views/default/pages/cms/jugendreisen.html.twig
new file mode 100644
index 00000000..069dccc5
--- /dev/null
+++ b/trunk/app/Resources/views/default/pages/cms/jugendreisen.html.twig
@@ -0,0 +1 @@
+{% include 'overview.html.twig' %}
\ No newline at end of file
diff --git a/trunk/app/Resources/views/default/pages/cms/travelProgram.html.twig b/trunk/app/Resources/views/default/pages/cms/travelProgram.html.twig
index 5f5e3280..a0c46875 100644
--- a/trunk/app/Resources/views/default/pages/cms/travelProgram.html.twig
+++ b/trunk/app/Resources/views/default/pages/cms/travelProgram.html.twig
@@ -153,7 +153,7 @@
                     {% endif %}
 
                     {% if travel_program.excluded is not empty %}
-                        <h2>Nicht eingeschlossene Leistungen</h2>
+                        <h2>Nicht eingeschlossene / zubuchbare Leistungen</h2>
                         <ul>
                             {% for travel_program_service in travel_program.excluded|replace({'*': '<img src="/bundles/app/images/star-mini.png" >'})|split('\n') %}
                                 <li>{{ travel_program_service|raw }}</li>
diff --git a/trunk/src/AppBundle/Controller/BookingController.php b/trunk/src/AppBundle/Controller/BookingController.php
index 344dd905..3222629a 100644
--- a/trunk/src/AppBundle/Controller/BookingController.php
+++ b/trunk/src/AppBundle/Controller/BookingController.php
@@ -138,6 +138,7 @@ class BookingController extends Controller
                     'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,
                     'page' => $travelProgramPage,
                     'breadcrumb_entries' => $breadcrumbEntries,
+                    'show_nav_sidebar_widget' => false,
                     'show_travel_guide_sidebar_widget' => false,
                     'show_travel_magazine_sidebar_widget' => false,
                     'show_offers_sidebar_widget' => false,
@@ -154,6 +155,7 @@ class BookingController extends Controller
                 'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,
                 'page' => $travelProgramPage,
                 'breadcrumb_entries' => $breadcrumbEntries,
+                'show_nav_sidebar_widget' => false,
                 'show_travel_guide_sidebar_widget' => false,
                 'show_travel_magazine_sidebar_widget' => false,
                 'show_offers_sidebar_widget' => false,
diff --git a/trunk/src/AppBundle/Controller/CmsController.php b/trunk/src/AppBundle/Controller/CmsController.php
index c08b1d29..03d982e6 100644
--- a/trunk/src/AppBundle/Controller/CmsController.php
+++ b/trunk/src/AppBundle/Controller/CmsController.php
@@ -115,14 +115,27 @@ class CmsController extends Controller
         return $this->render('default/pages/cms/travelProgram.html.twig', [
             'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,
             'page' => $page,
-            'show_travel_guide_sidebar_widget' => false,
-            'show_travel_magazine_sidebar_widget' => false,
             'show_offers_sidebar_widget' => false,
-            'show_feedbacks_sidebar_widget' => false,
             'travel_program' => $page->getTravelProgram(),
         ]);
     }
 
+    /**
+     * @param Page $page
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @todo This is actually the same as overview, but with different sidebar. Utilize cmsSettings field of page entity for such requirements
+     */
+    public function jugendreisenAction(Page $page)
+    {
+        return $this->render('default/pages/cms/overview.html.twig', [
+            'page' => $page,
+            'show_search_sidebar_widget' => false,
+            'show_offers_sidebar_widget' => false,
+        ]);
+    }
+
     public function sunstarAction(Page $page)
     {
         /** @var SunstarTravelProgram[] $sunstarTravelPrograms */
diff --git a/trunk/src/AppBundle/Form/TtSearchRequestType.php b/trunk/src/AppBundle/Form/TtSearchRequestType.php
index eb088804..737df994 100644
--- a/trunk/src/AppBundle/Form/TtSearchRequestType.php
+++ b/trunk/src/AppBundle/Form/TtSearchRequestType.php
@@ -269,20 +269,20 @@ class TtSearchRequestType extends AbstractType
 
     private static $DEPARTURE_CHOICES = [
         'Nord' => 5000,
-        'S\xFCd' => 5001,
+        'Süd' => 5001,
         'West' => 5002,
         'Ost' => 5003,
         'Amsterdam (NL)' => 1,
         'Basel-Mulhouse (CH)' => 3,
         'Berlin Brandenburg' => 141,
-        'Berlin-Sch\xF6nefeld' => 4,
+        'Berlin-Schönefeld' => 4,
         'Berlin-Tegel' => 5,
         'Bremen' => 8,
-        'Br\xFCssel (B)' => 9,
-        'Br\xFCssel Charleroi (B)' => 67,
+        'Brüssel (B)' => 9,
+        'Brüssel Charleroi (B)' => 67,
         'Dortmund' => 10,
         'Dresden' => 11,
-        'D\xFCsseldorf' => 12,
+        'Düsseldorf' => 12,
         'Eindhoven (NL)' => 73,
         'Enschede (NL)' => 13,
         'Erfurt-Weimar' => 14,
@@ -298,30 +298,30 @@ class TtSearchRequestType extends AbstractType
         'Karlsruhe' => 24,
         'Kassel-Calden' => 25,
         'Klagenfurt (A)' => 27,
-        'K\xF6ln-Bonn' => 28,
+        'Köln-Bonn' => 28,
         'Leipzig/Halle' => 29,
         'Linz (A)' => 30,
-        'L\xFCbeck' => 31,
-        'L\xFCttich (B)' => 32,
+        'Lübeck' => 31,
+        'Lüttich (B)' => 32,
         'Luxemburg' => 33,
         'Maastricht - Aachen (NL)' => 34,
         'Magdeburg Cochstedt' => 139,
         'Memmingen' => 90,
-        'M\xFCnchen' => 36,
-        'M\xFCnster-Osnabr\xFCck' => 37,
+        'München' => 36,
+        'Münster-Osnabrück' => 37,
         'Niederrhein (Weeze)' => 49,
-        'N\xFCrnberg' => 38,
+        'Nürnberg' => 38,
         'Paderborn' => 39,
         'Rostock' => 40,
-        'Saarbr\xFCcken' => 41,
+        'Saarbrücken' => 41,
         'Salzburg (A)' => 42,
         'Schwerin' => 43,
         'Strasbourg (F)' => 44,
         'Stuttgart' => 45,
         'Warschau (PL)' => 77,
         'Wien (A)' => 46,
-        'Z\xFCrich (CH)' => 47,
-        'Zweibr\xFCcken' => 48,
+        'Zürich (CH)' => 47,
+        'Zweibrücken' => 48,
     ];
 
     public static $DESTINATION_CHOICES = [