From 645ea5da7d2d2cf4d53d1c348a8dc2a854a96f73 Mon Sep 17 00:00:00 2001 From: Kevin Adametz Date: Thu, 12 Dec 2019 19:53:40 +0100 Subject: [PATCH] new Header --- .../default/admin/fewoGroupImage.html.twig | 2 +- .../views/default/admin/fewoImage.html.twig | 2 +- .../default/admin/lodgingGroupEdit.html.twig | 2 +- .../default/admin/lodgingsEdit.html.twig | 2 +- .../default/components/_header.bak.html.twig | 185 +++ .../views/default/components/header.html.twig | 1115 +++++++++++--- .../default/components/pageBoxImage.html.twig | 4 +- .../views/default/pages/booking.html.twig | 6 +- .../pages/cms/fewoTravelProgram.html.twig | 2 +- trunk/app/config/server_parameters.yml | 19 + trunk/src/AppBundle/Entity/CMSInfo.php | 285 ++++ .../AppBundle/Entity/CMSInfoRepository.php | 25 + trunk/src/AppBundle/Resources/config.codekit3 | 158 +- .../Resources/public/css/header-min.css | 1298 ++++++++++++++++- .../Resources/public/css/my-custom.less | 2 +- trunk/src/AppBundle/Twig/AppExtension.php | 31 +- trunk/web/css/my-custom-blessed1.css | 2 +- trunk/web/css/my-custom.css | 2 +- trunk/web/js/custom-min.js | 37 +- 19 files changed, 2856 insertions(+), 323 deletions(-) create mode 100644 trunk/app/Resources/views/default/components/_header.bak.html.twig create mode 100644 trunk/app/config/server_parameters.yml create mode 100644 trunk/src/AppBundle/Entity/CMSInfo.php create mode 100644 trunk/src/AppBundle/Entity/CMSInfoRepository.php diff --git a/trunk/app/Resources/views/default/admin/fewoGroupImage.html.twig b/trunk/app/Resources/views/default/admin/fewoGroupImage.html.twig index 89650f56..a06c5a2e 100644 --- a/trunk/app/Resources/views/default/admin/fewoGroupImage.html.twig +++ b/trunk/app/Resources/views/default/admin/fewoGroupImage.html.twig @@ -15,7 +15,7 @@ {{ form_row(form.file, {label: 'Bild'}) }} {% else %}
- {{ image.description }} + {{ image.description }}
{% endif %} {{ form_row(form.fileName, {label: 'Name'}) }} diff --git a/trunk/app/Resources/views/default/admin/fewoImage.html.twig b/trunk/app/Resources/views/default/admin/fewoImage.html.twig index 02bf43c0..3078b1a5 100644 --- a/trunk/app/Resources/views/default/admin/fewoImage.html.twig +++ b/trunk/app/Resources/views/default/admin/fewoImage.html.twig @@ -15,7 +15,7 @@ {{ form_row(form.file, {label: 'Bild'}) }} {% else %}
- {{ image.description }} + {{ image.description }}
{% endif %} {{ form_row(form.fileName, {label: 'Name'}) }} diff --git a/trunk/app/Resources/views/default/admin/lodgingGroupEdit.html.twig b/trunk/app/Resources/views/default/admin/lodgingGroupEdit.html.twig index fa337174..17192c4f 100644 --- a/trunk/app/Resources/views/default/admin/lodgingGroupEdit.html.twig +++ b/trunk/app/Resources/views/default/admin/lodgingGroupEdit.html.twig @@ -35,7 +35,7 @@ {% for image in lodgingGroup.images %} {% if image.comp == 'pre' %} - {{ image.description }} + {{ image.description }} {{ image.pos }} {{ image.fileName }} {{ image.description }} diff --git a/trunk/app/Resources/views/default/admin/lodgingsEdit.html.twig b/trunk/app/Resources/views/default/admin/lodgingsEdit.html.twig index 67945e13..7fe21f4f 100644 --- a/trunk/app/Resources/views/default/admin/lodgingsEdit.html.twig +++ b/trunk/app/Resources/views/default/admin/lodgingsEdit.html.twig @@ -301,7 +301,7 @@ {% for image in lodging.images %} - {{ image.description }} + {{ image.description }} {{ image.pos }} {{ image.fileName }} {{ image.description }} diff --git a/trunk/app/Resources/views/default/components/_header.bak.html.twig b/trunk/app/Resources/views/default/components/_header.bak.html.twig new file mode 100644 index 00000000..20968a9a --- /dev/null +++ b/trunk/app/Resources/views/default/components/_header.bak.html.twig @@ -0,0 +1,185 @@ +
+
+
+
+
    +
  • {{ getContextBySlug('uhrzeit-header') }} Uhr +
  • +
  • {{ getContextBySlug('telefon-header') }}
  • +
  • + +
  • +
  • + + + +
  • +
+
+
+
+ + +
\ No newline at end of file diff --git a/trunk/app/Resources/views/default/components/header.html.twig b/trunk/app/Resources/views/default/components/header.html.twig index 20968a9a..2ae617bf 100644 --- a/trunk/app/Resources/views/default/components/header.html.twig +++ b/trunk/app/Resources/views/default/components/header.html.twig @@ -1,185 +1,930 @@ -
-
-
-
-
    -
  • {{ getContextBySlug('uhrzeit-header') }} Uhr -
  • -
  • {{ getContextBySlug('telefon-header') }}
  • -
  • - -
  • -
  • - - - -
  • -
-
-
-
- - -
\ No newline at end of file + + +
+
+ + + + + + + +
+
+ + + \ No newline at end of file diff --git a/trunk/app/Resources/views/default/components/pageBoxImage.html.twig b/trunk/app/Resources/views/default/components/pageBoxImage.html.twig index ce9dbfc3..2bf00131 100644 --- a/trunk/app/Resources/views/default/components/pageBoxImage.html.twig +++ b/trunk/app/Resources/views/default/components/pageBoxImage.html.twig @@ -5,7 +5,7 @@ {% set image_url = 'uploads/travel_program/' ~ page.travelProgram.previewImage.fileNameWithExtension %} {% set image_alt = page.title %} {% elseif page.fewoLodging is not empty and page.fewoLodging.images is not empty and page.fewoLodging.images[0] is not empty %} - {% set image_url = 'uploads/images/' ~ page.fewoLodging.images[0].file %} + {% set image_url = '_uploads/images/' ~ page.fewoLodging.images[0].file %} {% set image_alt = page.title %} {% else %} {% set image_url = asset('/bundles/app/images/no-picture.png')%} @@ -13,5 +13,5 @@ {% endif %}
\ No newline at end of file diff --git a/trunk/app/Resources/views/default/pages/booking.html.twig b/trunk/app/Resources/views/default/pages/booking.html.twig index 7ab55000..9ea98455 100644 --- a/trunk/app/Resources/views/default/pages/booking.html.twig +++ b/trunk/app/Resources/views/default/pages/booking.html.twig @@ -718,7 +718,7 @@
{{ travel_program.organizer.legalRights|raw }} - + {{ getContextBySlug('informationen-formblatt') }} @@ -751,11 +751,11 @@ {{ getContextBySlug('reisebedingungen-check-1') }} {% if travel_program.isMediated %} - + {{ getContextBySlug('reisebedingungen-link-1') }} {{ travel_program.organizer.name }} {% else %} - + {{ getContextBySlug('reisebedingungen-link-2') }} {{ travel_program.organizer.name }} {% endif %} diff --git a/trunk/app/Resources/views/default/pages/cms/fewoTravelProgram.html.twig b/trunk/app/Resources/views/default/pages/cms/fewoTravelProgram.html.twig index d8c97fdb..77098ee2 100644 --- a/trunk/app/Resources/views/default/pages/cms/fewoTravelProgram.html.twig +++ b/trunk/app/Resources/views/default/pages/cms/fewoTravelProgram.html.twig @@ -29,7 +29,7 @@