diff --git a/trunk/app/Resources/views/base.html.twig b/trunk/app/Resources/views/base.html.twig index c5cb1b16..41d2c741 100644 --- a/trunk/app/Resources/views/base.html.twig +++ b/trunk/app/Resources/views/base.html.twig @@ -147,9 +147,11 @@ {% if site_loading is defined and page is defined %} {{ render(controller('AppBundle:Component:makeSidebarWidget', {'site_loading': site_loading, 'page': page})) }} + {% elseif site_loading is defined and api is defined %} + {{ render(controller('AppBundle:Component:makeSidebarWidget', {'site_loading': site_loading, 'page': null, 'api': api})) }} {% else %} - {% if site_loading is defined %} - {{ render(controller('AppBundle:Component:makeSidebarWidget', {'site_loading': site_loading, 'page': null, 'search_form': search_form})) }} + {% if site_loading is defined and search_form is defined %} + {{ render(controller('AppBundle:Component:makeSidebarWidget', {'site_loading': site_loading, 'page': null, 'api': null, 'search_form': search_form})) }} {% else %} {{ render(controller('AppBundle:Component:makeSidebarWidget', {'site_loading': 'default'})) }} {% endif %} diff --git a/trunk/app/Resources/views/default/components/embed/modal.html.twig b/trunk/app/Resources/views/default/components/embed/modal.html.twig index 5d5b5dba..49c2972d 100644 --- a/trunk/app/Resources/views/default/components/embed/modal.html.twig +++ b/trunk/app/Resources/views/default/components/embed/modal.html.twig @@ -1,3 +1,8 @@ +
{{ getContextBySlug('verlaengerung-vor') }}
+ {% for country in travel_program.countries %} +{{ country.textBefore }}
+ {% endfor %} + {{ form_widget(form.extraBookingDaysBefore) }} {{ form_errors(form.extraBookingDaysBefore) }}{{ getContextBySlug('verlaengerung-nach') }}
+ {% for country in travel_program.countries %} +{{ country.textAfter }}
+ {% endfor %} {{ form_widget(form.extraBookingDaysAfter) }} {{ form_errors(form.extraBookingDaysAfter) }} diff --git a/trunk/app/Resources/views/default/pages/bookingConfirmation.html.twig b/trunk/app/Resources/views/default/pages/bookingConfirmation.html.twig index 6b41ddd8..ca3bf02c 100644 --- a/trunk/app/Resources/views/default/pages/bookingConfirmation.html.twig +++ b/trunk/app/Resources/views/default/pages/bookingConfirmation.html.twig @@ -356,7 +356,7 @@{{ booking.comments }}
diff --git a/trunk/app/Resources/views/default/pages/cms/iqTravelGuide.html.twig b/trunk/app/Resources/views/default/pages/cms/iqTravelGuide.html.twig new file mode 100644 index 00000000..5cf00bf3 --- /dev/null +++ b/trunk/app/Resources/views/default/pages/cms/iqTravelGuide.html.twig @@ -0,0 +1,96 @@ +{% extends get_base_template() %} + +{% block body %} +{{ child_page.description }}
+{{ fewo_booking_request.notes }}
diff --git a/trunk/app/Resources/views/default/pages/iq/travelGuide.html.twig b/trunk/app/Resources/views/default/pages/iq/travelGuide.html.twig new file mode 100644 index 00000000..2efa3932 --- /dev/null +++ b/trunk/app/Resources/views/default/pages/iq/travelGuide.html.twig @@ -0,0 +1,94 @@ +{% extends get_base_template() %} + +{% block body %} +{{ child_page.description }}
+