diff --git a/trunk/app/Resources/views/default/pages/booking.html.twig b/trunk/app/Resources/views/default/pages/booking.html.twig
index 064292a9..a785f4a9 100644
--- a/trunk/app/Resources/views/default/pages/booking.html.twig
+++ b/trunk/app/Resources/views/default/pages/booking.html.twig
@@ -79,7 +79,7 @@
| Reisezeitraum |
- {{ travel_date.start|date }} - {{ travel_date.end|date }} ({{ travel_date.name }}) |
+ {{ travel_date.start|date }} - {{ travel_date.end|date }}
({{ travel_date.name }}) |
| {{ form_label(form.departure, 'Abflugort') }} |
@@ -301,10 +301,13 @@
{% if departure.flightTime[travel_date.startWeekday] is defined %}
Von {{ departure.name }}
- {# travel_date.end|date #}
- {# travel_date.end|date #}
- {{ departure.flightTime[travel_date.startWeekday] }}
-
+
+ {% for flightTime in departure.flightTime[travel_date.startWeekday]|split('\n') %}
+ {% if flightTime != "" %}
+ - {{ flightTime|raw }}
+ {% endif %}
+ {% endfor %}
+
{% endif %}
diff --git a/trunk/src/AppBundle/Pdf.php b/trunk/src/AppBundle/Pdf.php
index 25056b5a..3d21b8c6 100644
--- a/trunk/src/AppBundle/Pdf.php
+++ b/trunk/src/AppBundle/Pdf.php
@@ -38,7 +38,7 @@ class Pdf extends TCPDF
public function Footer()
{
- $footerDir = $this->webDir.'/assetic/'.$this->getFileName('footerText');
+ $footerDir = $this->webDir.'/assetic/footerPDF.svg';
$this->ImageSVG($footerDir, 0, 228, 210, '');
diff --git a/trunk/src/AppBundle/Resources/public/css/booking.css b/trunk/src/AppBundle/Resources/public/css/booking.css
index e9f8d697..05596cb6 100644
--- a/trunk/src/AppBundle/Resources/public/css/booking.css
+++ b/trunk/src/AppBundle/Resources/public/css/booking.css
@@ -20,3 +20,39 @@
content: " *";
}
+.radio label {
+ white-space: normal;
+}
+
+.checkbox label {
+ white-space: normal;
+}
+
+.btn.dropdown-toggle.btn-white {
+ white-space: normal;
+}
+
+@media (max-width: 786px) {
+ .booking_form .table > tbody > tr > td {
+ display: block;
+ width: 99%;
+ }
+
+ .booking_form .table.first-table .bootstrap-select:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn) {
+ width: 99%;
+ }
+
+
+ .content-copy p {
+ line-height: 1.4em;
+ white-space: normal;
+ }
+
+ .c1 li {
+ white-space: normal;
+ }
+ .st-traveller-index {
+ white-space: normal;
+ height: auto !important;
+ }
+}
\ No newline at end of file
diff --git a/trunk/src/AppBundle/Resources/public/js/booking.js b/trunk/src/AppBundle/Resources/public/js/booking.js
index 74a00fb9..2f9081ee 100644
--- a/trunk/src/AppBundle/Resources/public/js/booking.js
+++ b/trunk/src/AppBundle/Resources/public/js/booking.js
@@ -153,7 +153,7 @@ $(document).ready(function() {
var roomIndexSelector = travelerSelector+' .st-traveller-index';
//var currentRoomIndex = $(travelerSelector).attr("data-room-index");
$(travelerSelector).show().find('input,select').prop('required', true);
- $(roomIndexSelector).text(counter + ".) Reiseteilnehmer | Einzelzimmer | 1. Erwachsender");
+ $(roomIndexSelector).text(counter + ".) Reiseteilnehmer | Einzelzimmer 1. Erwachsender");
counter ++;
}
}
diff --git a/trunk/src/AppBundle/Resources/public/js/bootstrap-select-1.12.0.js b/trunk/src/AppBundle/Resources/public/js/bootstrap-select-1.12.0.js
index 4146f722..08bd5846 100644
--- a/trunk/src/AppBundle/Resources/public/js/bootstrap-select-1.12.0.js
+++ b/trunk/src/AppBundle/Resources/public/js/bootstrap-select-1.12.0.js
@@ -513,13 +513,13 @@
''
: '';
var drop =
- '