From c924b4af152195d5bb17bc6d9545910adbe11325 Mon Sep 17 00:00:00 2001 From: uli Date: Fri, 17 Feb 2017 13:16:15 +0000 Subject: [PATCH] * keywords im content mit Links ersetzen * Links mit Klasse "show-modal" bei Klick in einen JS-Modal laden, statt dem Link zu folgen git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3296 f459cee4-fb09-11de-96c3-f9c5f16c3c76 --- trunk/app/Resources/views/ajax.html.twig | 1 + trunk/app/Resources/views/base.html.twig | 3 + .../default/components/embed/modal.html.twig | 2 +- .../views/default/pages/default.html.twig | 4 +- .../views/default/pages/overview.html.twig | 4 +- .../views/default/pages/search.html.twig | 2 +- .../default/pages/travelProgram.html.twig | 4 +- .../pages/travelProgramOverview.html.twig | 4 +- trunk/app/config/services.yml | 14 +- .../AppBundle/Resources/public/js/custom.js | 80 ++++++- .../Resources/public/js/travelProgram.js | 55 ----- .../src/AppBundle/Service/KeywordService.php | 202 ++++++++++++++++++ trunk/src/AppBundle/Twig/AppExtension.php | 25 ++- trunk/web/app.php | 2 + trunk/web/app_dev.php | 6 + 15 files changed, 333 insertions(+), 75 deletions(-) create mode 100644 trunk/app/Resources/views/ajax.html.twig create mode 100644 trunk/src/AppBundle/Service/KeywordService.php diff --git a/trunk/app/Resources/views/ajax.html.twig b/trunk/app/Resources/views/ajax.html.twig new file mode 100644 index 00000000..16a0d9dc --- /dev/null +++ b/trunk/app/Resources/views/ajax.html.twig @@ -0,0 +1 @@ +{% block body %}{% endblock %} \ No newline at end of file diff --git a/trunk/app/Resources/views/base.html.twig b/trunk/app/Resources/views/base.html.twig index 81f15918..31a1c812 100644 --- a/trunk/app/Resources/views/base.html.twig +++ b/trunk/app/Resources/views/base.html.twig @@ -103,6 +103,9 @@ + +{% embed 'default/components/embed/modal.html.twig' with {id: 'default'} %}{% endembed %} + {% block javascripts %} {% javascripts 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 cb4d75cb..6430de4b 100644 --- a/trunk/app/Resources/views/default/components/embed/modal.html.twig +++ b/trunk/app/Resources/views/default/components/embed/modal.html.twig @@ -3,7 +3,7 @@