gitmedia/sterntours
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* (Temporäres) CMS-Template "jugendreisen" - Übersicht ohne Suchmaske und Angebote in der Sidebar

Browse source 
* Weitere Änderungen an der Nicht-/Anzeige von Sidebar-Widgets
* Behoben: Umlaute-Problem TT-Suchmaske

git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3322 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
uli 2017-03-27 20:46:21 +00:00
parent 28a7ef76d1
commit b742bf7cbc
5 changed files with 34 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/app/Resources/views/default/pages/cms/jugendreisen.html.twig Normal file
View file

@ -0,0 +1 @@
{% include 'overview.html.twig' %}

2
trunk/app/Resources/views/default/pages/cms/travelProgram.html.twig
View file

@ -153,7 +153,7 @@
{% endif %} {% endif %}
{% if travel_program.excluded is not empty %} {% if travel_program.excluded is not empty %}
<h2>Nicht eingeschlossene Leistungen</h2> <h2>Nicht eingeschlossene / zubuchbare Leistungen</h2>
<ul> <ul>
{% for travel_program_service in travel_program.excluded|replace({'*': '<img src="/bundles/app/images/star-mini.png" >'})|split('\n') %} {% 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> <li>{{ travel_program_service|raw }}</li>

2
trunk/src/AppBundle/Controller/BookingController.php
View file

@ -138,6 +138,7 @@ class BookingController extends Controller
'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR, 'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,
'page' => $travelProgramPage, 'page' => $travelProgramPage,
'breadcrumb_entries' => $breadcrumbEntries, 'breadcrumb_entries' => $breadcrumbEntries,
'show_nav_sidebar_widget' => false,
'show_travel_guide_sidebar_widget' => false, 'show_travel_guide_sidebar_widget' => false,
'show_travel_magazine_sidebar_widget' => false, 'show_travel_magazine_sidebar_widget' => false,
'show_offers_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, 'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,
'page' => $travelProgramPage, 'page' => $travelProgramPage,
'breadcrumb_entries' => $breadcrumbEntries, 'breadcrumb_entries' => $breadcrumbEntries,
'show_nav_sidebar_widget' => false,
'show_travel_guide_sidebar_widget' => false, 'show_travel_guide_sidebar_widget' => false,
'show_travel_magazine_sidebar_widget' => false, 'show_travel_magazine_sidebar_widget' => false,
'show_offers_sidebar_widget' => false, 'show_offers_sidebar_widget' => false,

19
trunk/src/AppBundle/Controller/CmsController.php
View file

@ -115,14 +115,27 @@ class CmsController extends Controller
return $this->render('default/pages/cms/travelProgram.html.twig', [ return $this->render('default/pages/cms/travelProgram.html.twig', [
'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR, 'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,
'page' => $page, 'page' => $page,
'show_travel_guide_sidebar_widget' => false,
'show_travel_magazine_sidebar_widget' => false,
'show_offers_sidebar_widget' => false, 'show_offers_sidebar_widget' => false,
'show_feedbacks_sidebar_widget' => false,
'travel_program' => $page->getTravelProgram(), '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) public function sunstarAction(Page $page)
{ {
/** @var SunstarTravelProgram[] $sunstarTravelPrograms */ /** @var SunstarTravelProgram[] $sunstarTravelPrograms */

28
trunk/src/AppBundle/Form/TtSearchRequestType.php
View file

@ -269,20 +269,20 @@ class TtSearchRequestType extends AbstractType
private static $DEPARTURE_CHOICES = [ private static $DEPARTURE_CHOICES = [
'Nord' => 5000, 'Nord' => 5000,
'S\xFCd' => 5001, 'Süd' => 5001,
'West' => 5002, 'West' => 5002,
'Ost' => 5003, 'Ost' => 5003,
'Amsterdam (NL)' => 1, 'Amsterdam (NL)' => 1,
'Basel-Mulhouse (CH)' => 3, 'Basel-Mulhouse (CH)' => 3,
'Berlin Brandenburg' => 141, 'Berlin Brandenburg' => 141,
'Berlin-Sch\xF6nefeld' => 4, 'Berlin-Schönefeld' => 4,
'Berlin-Tegel' => 5, 'Berlin-Tegel' => 5,
'Bremen' => 8, 'Bremen' => 8,
'Br\xFCssel (B)' => 9, 'Brüssel (B)' => 9,
'Br\xFCssel Charleroi (B)' => 67, 'Brüssel Charleroi (B)' => 67,
'Dortmund' => 10, 'Dortmund' => 10,
'Dresden' => 11, 'Dresden' => 11,
'D\xFCsseldorf' => 12, 'Düsseldorf' => 12,
'Eindhoven (NL)' => 73, 'Eindhoven (NL)' => 73,
'Enschede (NL)' => 13, 'Enschede (NL)' => 13,
'Erfurt-Weimar' => 14, 'Erfurt-Weimar' => 14,
@ -298,30 +298,30 @@ class TtSearchRequestType extends AbstractType
'Karlsruhe' => 24, 'Karlsruhe' => 24,
'Kassel-Calden' => 25, 'Kassel-Calden' => 25,
'Klagenfurt (A)' => 27, 'Klagenfurt (A)' => 27,
'K\xF6ln-Bonn' => 28, 'Köln-Bonn' => 28,
'Leipzig/Halle' => 29, 'Leipzig/Halle' => 29,
'Linz (A)' => 30, 'Linz (A)' => 30,
'L\xFCbeck' => 31, 'Lübeck' => 31,
'L\xFCttich (B)' => 32, 'Lüttich (B)' => 32,
'Luxemburg' => 33, 'Luxemburg' => 33,
'Maastricht - Aachen (NL)' => 34, 'Maastricht - Aachen (NL)' => 34,
'Magdeburg Cochstedt' => 139, 'Magdeburg Cochstedt' => 139,
'Memmingen' => 90, 'Memmingen' => 90,
'M\xFCnchen' => 36, 'München' => 36,
'M\xFCnster-Osnabr\xFCck' => 37, 'Münster-Osnabrück' => 37,
'Niederrhein (Weeze)' => 49, 'Niederrhein (Weeze)' => 49,
'N\xFCrnberg' => 38, 'Nürnberg' => 38,
'Paderborn' => 39, 'Paderborn' => 39,
'Rostock' => 40, 'Rostock' => 40,
'Saarbr\xFCcken' => 41, 'Saarbrücken' => 41,
'Salzburg (A)' => 42, 'Salzburg (A)' => 42,
'Schwerin' => 43, 'Schwerin' => 43,
'Strasbourg (F)' => 44, 'Strasbourg (F)' => 44,
'Stuttgart' => 45, 'Stuttgart' => 45,
'Warschau (PL)' => 77, 'Warschau (PL)' => 77,
'Wien (A)' => 46, 'Wien (A)' => 46,
'Z\xFCrich (CH)' => 47, 'Zürich (CH)' => 47,
'Zweibr\xFCcken' => 48, 'Zweibrücken' => 48,
]; ];
public static $DESTINATION_CHOICES = [ public static $DESTINATION_CHOICES = [