Merge branch 'develop'

# Conflicts:
#	volume/www/website/www/app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig

volume/www/website/www/app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig

@@ -3,6 +3,7 @@
 {% trans_default_domain 'FOSUserBundle' %}
 
 {% block content %}
+
     <div class="container contentWrapper">
         <div class="row">
             <div class="col push-s3 s6">
@@ -14,8 +15,10 @@
                     </p>
                 {% endif %}
                 <br/><br/>
-                {% if destination_login is defined %}
-                    <a href="{{ destination_login }}" class="btn btn-default">Poursuivre votre vandidature</a>
+                {% if app.request.cookies.get('redirect_register')is defined %}
+                    <div class="center">
+                        <a href="{{ app.request.cookies.get('redirect_register') }}" class="btn btn-default">Poursuivre votre candidature</a>
+                    </div>
                 {% endif %}
             </div>
         </div>
@@ -24,4 +27,4 @@
 
 {% block metarobot %}
     <meta name="robots" content="noindex,nofollow">
-{% endblock %}
+{% endblock %}

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

@@ -53,7 +53,7 @@
                 </p>
                 <h5 class="white-text">Contactez-nous !</h5>
                 <a class="white-text" href="mailto:&#098;&#111;&#110;&#106;&#111;&#117;&#114;&#064;&#116;&#097;&#108;&#101;&#110;&#116;&#115;&#116;&#117;&#098;&#101;&#046;&#099;&#111;&#109;">Par mail</a>
-                <p class="white-text" >02 97 68 14 02</p>
+                <p class="white-text">02 30 05 06 31</p>
                 <p class="footer-newsletter">
                     <a class="btn-large btn-round" href="#" title="Newsletter" data-token="ecea5416671e97e3abfa8195848a9140" onclick="mjOpenPopin(event, this)">
                         <i class="fa fa-envelope-open-o left" aria-hidden="true"></i>
@@ -64,7 +64,11 @@
         </div>
         <div class="row footer-more-links">
             <div class="col s12 center-align">
-                <a class="text-center white-text" href="https://www.e-declic.com" target="_blank" title="Agence Web">&copy;&nbsp;2017 Talents Tube</a>
+                <p class="text-center white-text">Entreprise soutenue par</p>
+                <a href="https://www.bretagne.bzh/"><img src="{{ asset('img/RB_monochrome_blanc.svg')}}" alt="Region Bretagne"></a><br>
+            </div>
+            <div class="col s12 center-align m-t-30">
+                <a class="text-center white-text" href="https://www.e-declic.com" target="_blank" title="Agence Web">&copy;&nbsp;2018 Talents Tube</a>
             </div>
         </div>
     </div>

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

@@ -14,7 +14,6 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Cookie;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
@@ -149,12 +148,14 @@ class AnswerController extends Controller
     {
         if ($object instanceof Ad) {
             $route = "ad_show";
+            $routeStep2 = 'answer_create_ad_step2';
             $routeStep3 = 'answer_create_ad_step3';
             $varReqAnswer = "ad";
             $typeObject = "Ad";
         }
         if ($object instanceof Company) {
             $route = "company_show";
+            $routeStep2 = 'answer_create_company_step2';
             $routeStep3 = 'answer_create_company_step3';
             $varReqAnswer = "company";
             $typeObject = "Company";
@@ -192,11 +193,7 @@ class AnswerController extends Controller
         $session = new Session();
         $session->set('registration_destination', $destination_login);
 
-        $res = new Response();
-        $res->headers->setCookie(new Cookie('redirect_register', $destination_login));
-        // $res->send();
-
-        return $this->render('answer/answer_create_' . $type . '.twig', array(
+        $res = $this->render('answer/answer_create_' . $type . '.twig', array(
             'routeObject' => $route,
             'typeObject' => $typeObject,
             'object' => $object,
@@ -207,6 +204,9 @@ class AnswerController extends Controller
             $varReqAnswer => $object,
             'mustLogin' => $mustLogin,
         ));
+        $redirectReg = $this->generateUrl($routeStep2, array('id' => $object->getId(), 'type' => $type));
+        $res->headers->setCookie(new Cookie('redirect_register', $redirectReg));
+        return $res;
     }
 
     private function createAnonymousUser()