Merge branch 'develop'

volume/www/website/www/app/Resources/views/default/ad_search_result.html.twig

@@ -48,7 +48,6 @@
             </div>
         </div>
     </div>
-
 {% endblock %}
 
 {% block javascripts %}

volume/www/website/www/app/Resources/views/default/index.html.twig

@@ -15,10 +15,6 @@
                                 Le concept en vidéo    
                                 <img src="{{asset('img/bouton-play.png')}}" />
                             </a>
-                            <a data-target="modal_voeux" href="#!" class="btn btn-default btn-round btn-voeux modal-trigger">
-                                Voeux 2018 en vidéo &nbsp;&nbsp;&nbsp;
-                                <img src="{{asset('img/bouton-play.png')}}" />
-                            </a>
                         </div>
                         <div class="header-video-inner">
                             <video loop="" preload="metadata" autoplay="" id="vid" muted>
@@ -216,17 +212,6 @@
             <a href="#!" class="modal-action modal-close btn btn-default button-round-small">Fermer</a>
         </div>
     </div>
-    <div id="modal_voeux" class="modal modal-fixed-footer">
-        <div class="modal-content">
-            <div class="video-container">
-                <iframe id="iframe_concept" src="" frameborder="0" webkitallowfullscreen mozallowfullscreen
-                        allowfullscreen></iframe>
-            </div>
-        </div>
-        <div class="modal-footer">
-            <a href="#!" class="modal-action modal-close btn btn-default button-round-small">Fermer</a>
-        </div>
-    </div>
 {% endblock %}
 
 {% block javascripts %}

volume/www/website/www/app/Resources/views/default/page.html.twig

@@ -12,4 +12,9 @@
 
 {% block description %}{{ page.description }}{% endblock %}
 
-{% block content %}{{ page.content|raw }}{% endblock %}
+{% block content %}
+{{ page.content|raw }}
+{% if isTestimony %}
+    {% include 'testimony/testimony_list.html.twig' %}
+{% endif %}
+{% endblock %}

volume/www/website/www/src/AppBundle/Controller/PageController.php

@@ -188,7 +188,8 @@ class PageController extends Controller
         $page = $em->getRepository('AppBundle:Page')->findOneByRef('OFFREEMPLOI');
 
         return $this->render('default/page.html.twig', [
-            'page' => $page
+            'page' => $page,
+            'isTestimony' => true
         ]);
     }
 
@@ -201,7 +202,8 @@ class PageController extends Controller
         $page = $em->getRepository('AppBundle:Page')->findOneByRef('MARQUEEMPLOYEUR');
 
         return $this->render('default/page.html.twig', [
-            'page' => $page
+            'page' => $page,
+            'isTestimony' => true
         ]);
     }