* 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

@@ -0,0 +1 @@
+{% block body %}{% endblock %}

trunk/app/Resources/views/base.html.twig

@@ -103,6 +103,9 @@
 
 </div><!-- end wrapper -->
 
+<!-- default modal -->
+{% embed 'default/components/embed/modal.html.twig' with {id: 'default'} %}{% endembed %}
+
 {% block javascripts %}
     <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
     {% javascripts

trunk/app/Resources/views/default/components/embed/modal.html.twig

@@ -3,7 +3,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title">{{ title }}</h4>
+                <h4 class="modal-title">{{ title ?? '' }}</h4>
             </div>
             <div class="modal-body">
                 {% block body %}{% endblock %}

trunk/app/Resources/views/default/pages/default.html.twig

@@ -1,7 +1,7 @@
-{% extends 'base.html.twig' %}
+{% extends get_base_template() %}
 
 {% block body %}
     <section class="clearfix">
-        {{ page.content|raw }}
+        {{ page.content|raw|keywords }}
     </section>
 {% endblock %}

trunk/app/Resources/views/default/pages/overview.html.twig

@@ -1,4 +1,4 @@
-{% extends 'base.html.twig' %}
+{% extends get_base_template() %}
 
 {#
 {% block nav_sidebar_widget %}
@@ -21,6 +21,6 @@
     </section>
 
     <section class="clearfix">
-        {{ page.content|raw }}
+        {{ page.content|raw|keywords }}
     </section>
 {% endblock %}

trunk/app/Resources/views/default/pages/search.html.twig

@@ -1,4 +1,4 @@
-{% extends 'base.html.twig' %}
+{% extends get_base_template() %}
 
 {% block body %}
     <section class="clearfix">

trunk/app/Resources/views/default/pages/travelProgram.html.twig

@@ -1,5 +1,5 @@
 {# @var travel_program \AppBundle\Entity\TravelProgram #}
-{% extends 'base.html.twig' %}
+{% extends get_base_template() %}
 
 {% block javascripts %}
     {{ parent() }}
@@ -116,7 +116,7 @@
 
                 <div role="tabpanel" class="tab-pane active" id="travel-description-content-tab">
 
-                    {{ travel_program.htmlDescription|raw }}
+                    {{ travel_program.htmlDescription|raw|keywords }}
 
                     {% if travel_program.advices is not empty %}
                         <h3>Hinweise</h3>

trunk/app/Resources/views/default/pages/travelProgramOverview.html.twig

@@ -1,4 +1,4 @@
-{% extends 'base.html.twig' %}
+{% extends get_base_template() %}
 
 {% block body %}
     <section class="clearfix">
@@ -32,6 +32,6 @@
     </section>
 
     <section class="clearfix">
-        {{ page.content|raw }}
+        {{ page.content|keywords|raw }}
     </section>
 {% endblock %}

trunk/app/config/services.yml

@@ -11,8 +11,8 @@ services:
   app.controller_listener:
     class: AppBundle\Listener\KernelControllerListener
     arguments:
-      - "@doctrine.orm.entity_manager"
-      - "@controller_resolver"
+      - '@doctrine.orm.entity_manager'
+      - '@controller_resolver'
     tags:
       - { name: kernel.event_listener, event: kernel.controller, method: onKernelController }
 
@@ -21,6 +21,8 @@ services:
     #public: false
     arguments:
       - '@twig'
+      - '@app.keyword_service'
+      - '@request_stack'
     tags:
       - { name: twig.extension }
 
@@ -29,7 +31,7 @@ services:
     arguments:
       - '@monolog.logger'
 
-  app.booking_request_validator:
-    class: AppBundle\Validator\BookingRequestValidator
-    tags:
-      - {name: validator.constraint_validator }
+  app.keyword_service:
+    class: AppBundle\Service\KeywordService
+    arguments:
+      - '@doctrine.orm.entity_manager'