From b28c7db5980f5827f751b884f01d150f38991436 Mon Sep 17 00:00:00 2001 From: adametz Date: Thu, 27 Dec 2018 16:40:23 +0000 Subject: [PATCH] feeback show, header css lazy git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3482 f459cee4-fb09-11de-96c3-f9c5f16c3c76 --- .gitignore | 1 + trunk/app/Resources/views/base.html.twig | 9 +- .../default/components/breadcrumb.html.twig | 21 +- .../components/departuresModal.html.twig | 38 ++- .../default/components/embed/modal.html.twig | 2 +- .../views/default/components/header.html.twig | 37 +-- .../default/components/pageBox.html.twig | 8 +- .../default/components/sidebar.html.twig | 66 +++-- .../views/default/pages/booking.html.twig | 7 +- .../default/pages/cms/feedback.html.twig | 34 +++ .../views/default/pages/cms/offers.html.twig | 2 +- .../pages/cms/overviewCalender.html.twig | 2 +- .../views/default/pages/cms/sunstar.html.twig | 2 +- .../default/pages/cms/travelProgram.html.twig | 234 ++++++++++-------- .../pages/cms/traveltainment.html.twig | 2 +- .../views/default/pages/home.html.twig | 1 - trunk/src/AppBundle/Entity/Page.php | 31 +++ trunk/src/AppBundle/Entity/PageRepository.php | 2 +- .../AppBundle/Resources/public/css/custom.css | 172 ++++++++++++- .../AppBundle/Resources/public/js/custom.js | 87 ++++++- trunk/src/AppBundle/Twig/AppExtension.php | 62 ++++- trunk/web/css/my-custom.css | 2 +- trunk/web/js/custom-min.js | 12 +- trunk/web/js/manifest.json | 49 ++++ 24 files changed, 681 insertions(+), 202 deletions(-) create mode 100644 trunk/app/Resources/views/default/pages/cms/feedback.html.twig create mode 100644 trunk/web/js/manifest.json diff --git a/.gitignore b/.gitignore index 9b2fd327..dc3e1d92 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /trunk/web/uploads /trunk/web/web /trunk/src/AppBundle/Resources/public/js/min +trunk/web/css/images/* diff --git a/trunk/app/Resources/views/base.html.twig b/trunk/app/Resources/views/base.html.twig index 4e5b4f3c..57bfa909 100644 --- a/trunk/app/Resources/views/base.html.twig +++ b/trunk/app/Resources/views/base.html.twig @@ -78,9 +78,9 @@ - + + {% endblock javascripts %} - diff --git a/trunk/app/Resources/views/default/components/breadcrumb.html.twig b/trunk/app/Resources/views/default/components/breadcrumb.html.twig index e85e7166..f12aea1f 100644 --- a/trunk/app/Resources/views/default/components/breadcrumb.html.twig +++ b/trunk/app/Resources/views/default/components/breadcrumb.html.twig @@ -1,21 +1,18 @@ {% if breadcrumb_entries is not empty %} -