Fix : bad cookie setting

# Conflicts:
#	volume/www/website/www/src/AppBundle/Utils/Services/AdSearcher.php

volume/www/website/conf/redirect.conf

@@ -10,4 +10,5 @@ rewrite  ^/page/les-conseils$  https://www.talentstube.com/accompagnement-entrep
 rewrite  ^/page/presentation-talent$  https://www.talentstube.com/cv-video permanent;
 rewrite  ^/page/la-plateforme$  https://www.talentstube.com/ permanent;
 rewrite ^/tarifs$ https://www.talentstube.com/accompagnement-entreprise permanent;
-rewrite ^/annonce/38-charge-de-projets-developpement-h-f$  https://www.talentstube.com/annonce/38-charge-de-projets-developpement-cosmetique-h-f permanent;
+rewrite ^/annonce/38-charge-de-projets-developpement-h-f$  https://www.talentstube.com/annonce/38-charge-de-projets-developpement-cosmetique-h-f permanent;
+rewrite  ^/annonce/recherche/$  https://www.talentstube.com/annonce/recherche permanent;

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

@@ -3,20 +3,25 @@
 {% trans_default_domain 'FOSUserBundle' %}
 
 {% block content %}
-<div class="container contentWrapper">
-  <div class="row">
-        <div class="col push-s3 s6">
-          <h1 class="m-t-20 alttitle center-align">{{'user.register.title'|trans({},"messages") }}</h1>
-          <p>{{ 'registration.confirmed'|trans({'%username%': user.username}) }}</p>
-          {% if targetUrl %}
-          <p><a href="{{ targetUrl }}">{{ 'registration.back'|trans }}</a></p>
-          {% endif %}
-          <br /><br />
+    <div class="container contentWrapper">
+        <div class="row">
+            <div class="col push-s3 s6">
+                <h1 class="m-t-20 alttitle center-align">{{'user.register.title'|trans({},"messages") }}</h1>
+                <p>{{ 'registration.confirmed'|trans({'%username%': user.username}) }}</p>
+                {% if targetUrl %}
+                    <p>
+                        <a href="{{ targetUrl }}">{{ 'registration.back'|trans }}</a>
+                    </p>
+                {% endif %}
+                <br/><br/>
+                {% if destination_login is defined %}
+                    <a href="{{ destination_login }}" class="btn btn-default">Poursuivre votre vandidature</a>
+                {% endif %}
+            </div>
         </div>
-  </div>
-</div>
+    </div>
 {% endblock %}
 
 {% block metarobot %}
     <meta name="robots" content="noindex,nofollow">
-{% endblock %}
+{% endblock %}

volume/www/website/www/app/Resources/views/company/company_show.html.twig

@@ -90,18 +90,20 @@
                                 <p class="chip">{{ tag }}</p>
                             {% endfor %}
                         </div>
-                        <div class="col s12 m-t-20 ">
-                            {% if not is_granted('ROLE_COMPANY') %}
-                                <p class="item-detail-reply center-align">
-                                    <a href="{{ path('talent_spontaneous_application_create',{'id': company.id}) }}"
-                                       class="btn btn-default">
-                                        Candidature spontanée
-                                    </a>
-                                </p>
-                            {% endif %}
+                    </div>
+                    {% if not is_granted('ROLE_COMPANY') %}
+                    <div class="row bg-bordered row-promoted">
+                        <div class="col s12 center-align">
+                            <h3>Vous souhaitez rejoindre <span class="color-blue1">{{ company.brandname }}</span> ?</h3>
+                            <a href="{{ path('talent_spontaneous_application_create',{'id': company.getId()}) }}"
+                            class="btn btn-default">
+                                Candidature spontanée
+                            </a>
                         </div>
                     </div>
+                    {% endif %}
                 </div>
+                
                 <div id="offers" class="row">
                     <div class="col s12">
                         <h1>Les offres d’emploi pour {{ company.brandname }}</h1>

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

@@ -34,6 +34,15 @@
             </div>
             <div class="row m-b-0 p-b-30">
                 <div class="col s12 m12">
+                    <div id="header-resultats">
+                        {% if isPromotedAds %}
+                            <div><span class="color-blue2">{{ ads|length }}</span> offres d'emploi pourvues</div>
+                            <div><span><a href="{{ path('ad_search_result') }}">Voir les offres d'emploi en cours</a></span></div>
+                        {% else %}
+                            <div><span class="color-blue2">{{ ads|length }}</span> offres d'emploi en cours</div>
+                            <div><span><a href="{{ path('ad_search_result', {'promoted': true }) }}">Voir les offres d'emploi pourvues</a></span></div>
+                        {% endif %}
+                    </div>
                     <div id="liste-resultats">
                         {% if ads|length > 0 and noResults == false %}
                             {% include 'default/ad_listing.html.twig' with {'ads':ads} %}

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

@@ -96,16 +96,29 @@
                                         {{ 'ad.talent.isAnswer.label'|trans }}
                                     </div>
                                 {% elseif not is_granted('ROLE_COMPANY') %}
-                                    <p class="item-detail-reply">
-                                        <a href="{{ path('talent_answer_create',{'id': ad.getId()}) }}"
-                                        class="btn btn-default">
-                                            Postuler
-                                        </a>
-                                    </p>
+                                    {% if not ad.isPromoted %}
+                                        <p class="item-detail-reply">
+                                            <a href="{{ path('talent_answer_create',{'id': ad.getId()}) }}"
+                                            class="btn btn-default">
+                                                Postuler
+                                            </a>
+                                        </p>
+                                    {% endif %}
                                 {% endif %}
                             {% endif %}
                         </div>
                     </div>
+                    {% if ad.isPromoted %}
+                    <div class="row bg-bordered row-promoted">
+                        <div class="col s12 center-align">
+                            <h3>Vous souhaitez rejoindre <span class="color-blue1">{{ ad.company.brandname }}</span> ?</h3>
+                            <a href="{{ path('talent_spontaneous_application_create',{'id': ad.company.getId()}) }}"
+                            class="btn btn-default">
+                                Candidature spontanée
+                            </a>
+                        </div>
+                    </div>
+                    {% endif %}
                     <div class="col s12 hide-on-large-only m-b-50">
                     {% include 'default/ad_sidebar.html.twig' with {'ad': ad, 'showBrand': true} %}
                     </div>

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

@@ -56,12 +56,18 @@
                 {{ 'ad.talent.isAnswer.label'|trans }}
             </div>
         {% elseif not is_granted('ROLE_COMPANY') %}
-            <p class="item-detail-reply">
-                <a href="{{ path('talent_answer_create',{'id': ad.getId()}) }}"
-                class="btn btn-default">
-                    Postuler
-                </a>
-            </p>
+            {% if not ad.isPromoted %}
+                <p class="item-detail-reply">
+                    <a href="{{ path('talent_answer_create',{'id': ad.getId()}) }}"
+                    class="btn btn-default">
+                        Postuler
+                    </a>
+                </p>
+            {% else %}
+                <div class="item-detail-ispromoted">
+                    Offre pourvue
+                </div>
+            {% endif %}
         {% endif %}
     {% endif %}
 </div>

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

@@ -1,7 +1,7 @@
 <footer class="page-footer">
     <div class="container">
         <div class="row footer-info">
-            <div class="col xl2 l2 m6 s6">
+            <div class="col xl2 l2 m6 s12 col-footer-logo">
                 <img src="{{ asset('/img/logo-mini-white.svg') }}" alt="Talents Tube 1er job board 100% vidéo">
             </div>
             <div class="col xl3 l3 m6 s6">

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

@@ -288,9 +288,9 @@ class AdController extends Controller
      ***********************/
 
     /**
-     * @Route("/annonce/recherche/", name="ad_search_result")
+     * @Route("/annonce/recherche/{promoted}", defaults={"promoted"=false}, name="ad_search_result")
      */
-    public function adSearchResultAction(Request $request)
+    public function adSearchResultAction(Request $request, $promoted)
     {
         $session = $request->getSession();
         $form = $this->createForm(AdSearchType::class);
@@ -307,7 +307,7 @@ class AdController extends Controller
             $adSearcher = $this->get('app.ad_searcher');
             $ads = $adSearcher->process($data);
             if(empty($ads)){
-                $ads = $this->getPublishedAds();
+                $ads = $this->getPublishedAds($promoted);
                 $noResults = true;
             } else {
                 $noResults = false;
@@ -324,18 +324,19 @@ class AdController extends Controller
 
         } else {
 
-            $ads = $this->getPublishedAds();
+            $ads = $this->getPublishedAds($promoted);
         }
 
         return $this->render('default/ad_search_result.html.twig', [
             'ads' => $ads,
-            'noResults' => false
+            'noResults' => false,
+            'isPromotedAds' => $promoted 
         ]);
 
 
     }
 
-    public function getPublishedAds()
+    public function getPublishedAds($promoted)
     {
         $em = $this->getDoctrine()->getManager();
         $repo = $em->getRepository('AppBundle:Ad');
@@ -345,6 +346,17 @@ class AdController extends Controller
             $mediaManager->getThumbnails($ad);
         }
 
+        return $this->filterPromoted($ads, $promoted);
+    }
+
+    public function filterPromoted($result, $promoted = "false")
+    {
+        $ads = array();
+        foreach ($result as $ad) {
+            if ($ad->getIsPromoted() === (boolean)$promoted) {
+                $ads[] = $ad;
+            }
+        }
         return $ads;
     }
 

volume/www/website/www/src/AppBundle/Controller/Admin/UserController.php

@@ -86,7 +86,7 @@ class UserController extends Controller
         $mailer = $this->get('fos_user.mailer');
         $mailer->sendConfirmationEmailMessage($user);
 
-        return $this->redirectToRoute('admin_config_user');
+        return $this->redirectToRoute('admin_config_users');
     }
 
     /**

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

@@ -8,33 +8,30 @@ use AppBundle\Entity\Company;
 use AppBundle\Entity\Message;
 use AppBundle\Form\AnswerType;
 use AppBundle\Form\ContactTalentType;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Cookie;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Session;
-
-use Symfony\Component\EventDispatcher\EventDispatcher,
-    Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken,
-    Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
-
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 
 class AnswerController extends Controller
 {
-     /**
+    /**
      * @Route("/anwser/edit/comment/{id}", name="anwser_edit_comment")
      */
     public function anwserEditCommentAction(Request $request, Answer $answer)
-    {       
-        if($answer) {
+    {
+        if ($answer) {
             $em = $this->getDoctrine()->getManager();
             $answer->setComment($request->get('comment'));
             $em->persist($answer);
             $em->flush();
-        }        
+        }
 
         return new JsonResponse(array('success' => "true"));
     }
@@ -57,15 +54,16 @@ class AnswerController extends Controller
         return $this->finishAnswerAction($request, $company, $answer);
     }
 
-    public function finishAnswerAction($request, $object, $answer) {
+    public function finishAnswerAction($request, $object, $answer)
+    {
         $securityContext = $this->container->get('security.authorization_checker');
-        if($object instanceof Ad) {
+        if ($object instanceof Ad) {
             $route = "ad_show";
             $varReqAnswer = "ad";
             $contact = $object->getCreator();
             $title = $answer->getAd()->getTitle();
         }
-        if($object instanceof Company) {
+        if ($object instanceof Company) {
             $route = "company_show";
             $varReqAnswer = "company";
             $contact = $object->getMainUser();
@@ -74,7 +72,7 @@ class AnswerController extends Controller
         if (!$securityContext->isGranted('IS_AUTHENTICATED_FULLY')) {
             return $this->redirectToRoute($route, array('alias' => $object->getAlias()));
         }
-        if($answer) {
+        if ($answer) {
             $em = $this->getDoctrine()->getManager();
             $existAnswer = $em->getRepository('AppBundle:Answer')->findOneBy(array('user' => $this->getUser(), $varReqAnswer => $object));
             if (!$this->getUser()->hasRole('ROLE_TALENT')) {
@@ -82,7 +80,7 @@ class AnswerController extends Controller
                 $session = new Session();
                 $session->getFlashBag()->add('popup_answer_not_allowed', true);
             } else {
-                if($existAnswer && ($existAnswer->getId() !== $answer->getid())){
+                if ($existAnswer && ($existAnswer->getId() !== $answer->getid())) {
                     $em->remove($answer);
                     $session = new Session();
                     $session->getFlashBag()->add('popup_answer_already_send', true);
@@ -91,31 +89,31 @@ class AnswerController extends Controller
                     $session->getFlashBag()->add('popup_answer_already_send', false);
                     $answer->setStatus('SENDED');
                     $em->persist($answer);
-    
+
                     $mediaManager = $this->get('media_manager');
                     $mediaManager->getThumbnails($answer);
                     $thumbnailsArray = $answer->getVideo()->getThumbnails();
                     $img = $thumbnailsArray[0]['sizes'][3]['link'];
                     $mailManager = $this->get('app.mail_manager');
-                    $link = $this->generateUrl('company_answer_show', array('id' => $answer->getId()),UrlGeneratorInterface::ABSOLUTE_URL);
+                    $link = $this->generateUrl('company_answer_show', array('id' => $answer->getId()), UrlGeneratorInterface::ABSOLUTE_URL);
                     $mailManager->sendMail(
                         'Candidature TalentsTube ',
                         '<div style="margin:0 auto;max-width:600px;background:#FFFFFF;"><table class="" cellpadding="0" cellspacing="0" style="width:100%;font-size:0px;background:#FFFFFF;" align="center"><tbody><tr><td style="text-align:center;vertical-align:top;font-size:0;padding:0px;"><!--[if mso]>
                         <table border="0" cellpadding="0" cellspacing="0"><tr><td style="width:600px;">
-                        <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:0px;" align="center"><table cellpadding="0" cellspacing="0" style="border-collapse:collapse;border-spacing:0px;" align="center"><tbody><tr><td><img alt="" src="'.$img.'" style="border:none;display:block;outline:none;text-decoration:none;width:100%;max-width:600px;height:auto;" width="600" height="auto"></td></tr></tbody></table></td></tr></tbody></table></div><!--[if mso]>
+                        <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:0px;" align="center"><table cellpadding="0" cellspacing="0" style="border-collapse:collapse;border-spacing:0px;" align="center"><tbody><tr><td><img alt="" src="' . $img . '" style="border:none;display:block;outline:none;text-decoration:none;width:100%;max-width:600px;height:auto;" width="600" height="auto"></td></tr></tbody></table></td></tr></tbody></table></div><!--[if mso]>
                         </td></tr></table>
                         <![endif]--></td></tr></tbody></table></div>
-                        
+
                         <div style="margin:0 auto;max-width:600px;background:#FFFFFF;"><table class="" cellpadding="0" cellspacing="0" style="width:100%;font-size:0px;background:#FFFFFF;" align="center"><tbody><tr><td style="text-align:center;vertical-align:top;font-size:0;padding:0px;"><!--[if mso]>
                         <table border="0" cellpadding="0" cellspacing="0"><tr><td style="width:600px;">
-                        <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:20px 35px 20px 35px;" align="left"><div class="mj-content" style="cursor:auto;color:#534F4F;font-family:Trebuchet,Helvetica,sans-serif;font-size:14px;line-height:22px;"><p>Bonjour '.$contact->getLastname().' '.$contact->getFirstname().',</p>
-                            <p>Le talent '.$answer->getUser()->getFirstname().' '.$answer->getUser()->getLastname().' a répondu à votre annonce '.$title.'.</p></div></td></tr></tbody></table></div><!--[if mso]>
+                        <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:20px 35px 20px 35px;" align="left"><div class="mj-content" style="cursor:auto;color:#534F4F;font-family:Trebuchet,Helvetica,sans-serif;font-size:14px;line-height:22px;"><p>Bonjour ' . $contact->getLastname() . ' ' . $contact->getFirstname() . ',</p>
+                            <p>Le talent ' . $answer->getUser()->getFirstname() . ' ' . $answer->getUser()->getLastname() . ' a répondu à votre annonce ' . $title . '.</p></div></td></tr></tbody></table></div><!--[if mso]>
                         </td></tr></table>
                         <![endif]--></td></tr></tbody></table></div>
-                    
+
                         <div style="margin:0 auto;max-width:600px;background:#FFFFFF;"><table class="" cellpadding="0" cellspacing="0" style="width:100%;font-size:0px;background:#FFFFFF;" align="center"><tbody><tr><td style="text-align:center;vertical-align:top;font-size:0;padding:0px 0px 40px 0px;"><!--[if mso]>
                         <table border="0" cellpadding="0" cellspacing="0"><tr><td style="width:600px;">
-                        <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:15px 30px;" align="center"><table cellpadding="0" cellspacing="0" style="border:none;border-radius:30px;" align="center"><tbody><tr><td style="background:#1689FB;border-radius:30px;color:#FFFFFF;cursor:auto;" align="center" valign="middle" bgcolor="#1689FB"><a class="mj-content" href="'.$link.'" style="display:inline-block;text-decoration:none;background:#1689FB;border:1px solid #1689FB;border-radius:30px;color:#FFFFFF;font-family:Trebuchet,Helvetica,sans-serif;font-size:14px;font-weight:normal;padding:15px 30px;" target="_blank">Découvrir le talent</a></td></tr></tbody></table></td></tr></tbody></table></div><!--[if mso]>
+                        <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:15px 30px;" align="center"><table cellpadding="0" cellspacing="0" style="border:none;border-radius:30px;" align="center"><tbody><tr><td style="background:#1689FB;border-radius:30px;color:#FFFFFF;cursor:auto;" align="center" valign="middle" bgcolor="#1689FB"><a class="mj-content" href="' . $link . '" style="display:inline-block;text-decoration:none;background:#1689FB;border:1px solid #1689FB;border-radius:30px;color:#FFFFFF;font-family:Trebuchet,Helvetica,sans-serif;font-size:14px;font-weight:normal;padding:15px 30px;" target="_blank">Découvrir le talent</a></td></tr></tbody></table></td></tr></tbody></table></div><!--[if mso]>
                         </td></tr></table>
                         <![endif]--></td></tr></tbody></table></div>',
                         $contact,
@@ -123,9 +121,9 @@ class AnswerController extends Controller
                     );
                 }
             }
-            
-            $session->getFlashBag()->add('popup_answer_send', true);    
-            $em->flush();   
+
+            $session->getFlashBag()->add('popup_answer_send', true);
+            $em->flush();
         }
 
         return $this->redirect($this->generateUrl($route, array('alias' => $object->getAlias())));
@@ -147,14 +145,15 @@ class AnswerController extends Controller
         return $this->generateStep2($request, $company, $type);
     }
 
-    public function generateStep2(Request $request, $object, $type) {
-        if($object instanceof Ad) {
+    public function generateStep2(Request $request, $object, $type)
+    {
+        if ($object instanceof Ad) {
             $route = "ad_show";
             $routeStep3 = 'answer_create_ad_step3';
             $varReqAnswer = "ad";
             $typeObject = "Ad";
         }
-        if($object instanceof Company) {
+        if ($object instanceof Company) {
             $route = "company_show";
             $routeStep3 = 'answer_create_company_step3';
             $varReqAnswer = "company";
@@ -162,7 +161,7 @@ class AnswerController extends Controller
         }
         $securityContext = $this->container->get('security.authorization_checker');
         if (!$securityContext->isGranted('IS_AUTHENTICATED_FULLY')) {
-                return $this->redirectToRoute($route, array('alias' => $object->getAlias()));
+            return $this->redirectToRoute($route, array('alias' => $object->getAlias()));
         }
         $em = $this->getDoctrine()->getManager();
         $user = $this->getUser();
@@ -182,18 +181,22 @@ class AnswerController extends Controller
         }
 
         if ($form->isSubmitted() && $form->isValid()) {
-            if(!$mustLogin){
-                return $this->redirect($this->generateUrl($routeStep3, array($varReqAnswer => $object->getId(), 'answer'=> $answer->getId())));
+            if (!$mustLogin) {
+                return $this->redirect($this->generateUrl($routeStep3, array($varReqAnswer => $object->getId(), 'answer' => $answer->getId())));
             }
         }
 
-        /*Definition des urls de destination pour ouath login et register*/
-        $destination_login = $this->generateUrl($routeStep3, array($varReqAnswer => $object->getId(), 'answer'=> $answer->getId()));
+        /*Definition des urls de destination pour oauth login et register*/
+        $destination_login = $this->generateUrl($routeStep3, array($varReqAnswer => $object->getId(), 'answer' => $answer->getId()));
         $this->get('twig')->addGlobal('destination_login', $destination_login);
         $session = new Session();
         $session->set('registration_destination', $destination_login);
 
-        return $this->render('answer/answer_create_'.$type.'.twig', array(
+        $res = new Response();
+        $res->headers->setCookie(new Cookie('redirect_register', $destination_login));
+        $res->send();
+
+        return $this->render('answer/answer_create_' . $type . '.twig', array(
             'routeObject' => $route,
             'typeObject' => $typeObject,
             'object' => $object,
@@ -202,23 +205,24 @@ class AnswerController extends Controller
             'video' => $video,
             'videos' => $videos,
             $varReqAnswer => $object,
-            'mustLogin' => $mustLogin
+            'mustLogin' => $mustLogin,
         ));
     }
 
-    private function createAnonymousUser() {
+    private function createAnonymousUser()
+    {
         $userManager = $this->get('fos_user.user_manager');
         $user = $userManager->createUser();
         $uniqId = uniqId();
-        $user->setUsername("anonym_".$uniqId);
+        $user->setUsername("anonym_" . $uniqId);
         $user->setFirstname("anonym");
         $user->setLastname("anonym");
-        $user->setEmail("anonym_".$uniqId."@talentstube.com");
+        $user->setEmail("anonym_" . $uniqId . "@talentstube.com");
         $user->setPlainPassword($uniqId);
         $user->setEnabled(false);
         $user->setRoles(array('ROLE_TALENT_TMP'));
         $company = new Company();
-        $company->setAlias("anonym_".$uniqId);
+        $company->setAlias("anonym_" . $uniqId);
         $company->setType("TALENT_TMP");
         $user->setCompany($company);
         $userManager->updateUser($user);
@@ -267,7 +271,7 @@ class AnswerController extends Controller
             'answer' => $answer,
             'object' => $company,
             'mustLogin' => $mustLogin,
-            'route_videotheque' => $route_videotheque
+            'route_videotheque' => $route_videotheque,
         ));
     }
 
@@ -306,7 +310,7 @@ class AnswerController extends Controller
             'answer' => $answer,
             'object' => $ad,
             'mustLogin' => $mustLogin,
-            'route_videotheque' => $route_videotheque
+            'route_videotheque' => $route_videotheque,
         ));
     }
 
@@ -368,7 +372,7 @@ class AnswerController extends Controller
         $answers = $em->getRepository('AppBundle:Answer')->getAnswerByCompany($user->getCompany()->getId());
         return $this->render('company/answer_list.html.twig', [
             'answers' => $answers,
-            'type' => 'answer'
+            'type' => 'answer',
         ]);
     }
 
@@ -382,7 +386,7 @@ class AnswerController extends Controller
         $answers = $em->getRepository('AppBundle:Answer')->findBy(array('company' => $user->getCompany()->getId(), 'status' => 'SENDED'));
         return $this->render('company/answer_list.html.twig', [
             'answers' => $answers,
-            'type' => 'spontaneous'
+            'type' => 'spontaneous',
 
         ]);
     }
@@ -423,7 +427,7 @@ class AnswerController extends Controller
     {
         $message = array('success' => 200,
             'filename' => null,
-            'originalFilename' => null
+            'originalFilename' => null,
         );
         foreach ($request->files as $uploadedFile) {
             $mediaManager = $this->get('media_manager');
@@ -447,5 +451,4 @@ class AnswerController extends Controller
         return new JsonResponse(array('success' => "true"));
     }
 
-
-}
+}

volume/www/website/www/src/AppBundle/Utils/Services/AdSearcher.php

@@ -96,7 +96,7 @@ class AdSearcher
     {
         $ads = array();
         foreach ($result as $ad) {
-            if ($ad->getStatus() == "PUBLISHED" && $ad->getIsPrivate() != true) {
+            if ($ad->getStatus() == "PUBLISHED" && $ad->getIsPrivate() != true && $ad->getIsPromoted() != true) {
                 $ads[] = $ad;
             }
         }

volume/www/website/www/web/assetic/global.js

@@ -1,3 +1,8 @@
+window.onresize = resize;
+var w = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
+function resize() { 
+    w = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
+}
 $(document).ready(function () {
     //Slide sur tags
     if($('.frame').length) {
@@ -172,10 +177,18 @@ $(document).ready(function () {
     /*owl carousel*/
     if( $(".territory-carousel").length ) {
         //Carousel territoire
+        console.log("carousel =="+w);
+        if(w <= 640){
+            var marginValue = 20;
+            var paddingValue = 10;
+        } else {
+            var marginValue = 150;
+            var paddingValue = 100;
+        }
         $(".territory-carousel").owlCarousel({
             items:1,
-            margin: 150,
-            stagePadding: 100,
+            margin: marginValue,
+            stagePadding: paddingValue,
             nav: true,
             loop: true,
             center:true,
@@ -337,12 +350,6 @@ $(document).ready(function () {
     });
   
 });
-
-window.onresize = resize;
-var w = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
-function resize() { 
-    w = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
-}
 $('.roleUser').click(function(){
     $('.roleUser').removeClass('btn-default');
     $('.roleUser').addClass('btn-dark');

volume/www/website/www/web/css/styles.css

@@ -13096,6 +13096,11 @@ a.link-white-underline {
   .blocs-texte-video .btn {
     margin-bottom: 15px; }
 
+@media screen and (max-width: 420px) {
+  .blocs-texte-video h2 {
+    font-size: 20px; }
+  .blocs-texte-video a {
+    font-size: 10px; } }
 /*Détail*/
 .btn-logo-company {
   padding: 10px;
@@ -13129,7 +13134,7 @@ a.link-white-underline {
   padding-top: 10px; }
 
 .profil-company {
-  padding: 0 40px; }
+  padding: 0 20px; }
 
 /*************************** FLEX ****************************/
 .flexcontainer {
@@ -13308,15 +13313,29 @@ a.link-white-underline {
 
 #liste-jobs {
   padding-bottom: 40px; }
+  @media screen and (max-width: 420px) {
+    #liste-jobs h2 {
+      font-size: 20px; } }
 
 #liste-talents {
   padding: 120px 0 40px 0; }
+  @media screen and (max-width: 420px) {
+    #liste-talents h2 {
+      font-size: 20px; } }
 
 #liste-company {
   padding: 120px 0 40px 0; }
+  @media screen and (max-width: 420px) {
+    #liste-company h2 {
+      font-size: 20px; } }
 
 #liste-territoires {
   padding: 120px 0 40px 0; }
+  @media screen and (max-width: 420px) {
+    #liste-territoires h2 {
+      font-size: 20px; }
+    #liste-territoires a {
+      font-size: 10px; } }
 
 /*Blocs fixes accueil*/
 #endScroll {
@@ -13622,6 +13641,13 @@ a.link-white-underline {
 .blocs-texte-video .inside-m {
   padding: 40px 40px 40px 80px; }
 
+@media screen and (max-width: 420px) {
+  .blocs-texte-video .inside-m {
+    padding: 10px 10px 30px 10px; }
+
+  .row-bloc-video-2 {
+    display: flex;
+    flex-direction: column-reverse; } }
 .no-margin-top {
   margin-top: 0px; }
 
@@ -13986,6 +14012,16 @@ a.link-white-underline {
 .items-list-dark .item-list p.item-list-name, .items-list-dark .item-list p.item-list-city {
   border-color: #AAAAAA; }
 
+#header-resultats {
+  display: flex;
+  flex-direction: row;
+  justify-items: flex-end;
+  justify-content: space-between;
+  margin-bottom: 15px;
+  font-size: 1rem; }
+  #header-resultats a {
+    color: #000; }
+
 #liste-resultats .item-list-bis {
   margin-bottom: 20px;
   background: #FFFFFF;
@@ -14587,6 +14623,11 @@ footer {
   footer .footer-more-links {
     margin-top: 80px;
     font-size: 13px; }
+  @media screen and (max-width: 420px) {
+    footer .col-footer-logo {
+      text-align: center; }
+    footer.page-footer {
+      padding: 10px 0 20px 0; } }
 
 /*onglets*/
 .tabs {
@@ -15691,7 +15732,8 @@ table.highlight > tbody > tr:hover {
   font-size: 13px; }
 #ad_show .brandImage {
   position: relative;
-  margin: 2px; }
+  margin: 2px;
+  margin-top: 15px; }
   #ad_show .brandImage a {
     display: block; }
     #ad_show .brandImage a img {
@@ -15769,6 +15811,21 @@ table.highlight > tbody > tr:hover {
       width: 101px;
       height: 101px; }
 
+.item-detail-ispromoted {
+  display: block;
+  text-align: center;
+  padding: 10px 20px;
+  color: #ff9800;
+  border: 1px solid #ff9800;
+  border-radius: 6px;
+  text-transform: uppercase;
+  font-size: 1.1rem; }
+
+#ad_show .row-promoted {
+  padding-bottom: 40px; }
+  #ad_show .row-promoted h3 span {
+    text-decoration: none; }
+
 #company_show .chip {
   font-size: 14px; }
 #company_show h3 {
@@ -15788,6 +15845,11 @@ table.highlight > tbody > tr:hover {
   font-size: 16px;
   margin: 20px 0; }
 
+#company_show .row-promoted {
+  padding-bottom: 40px; }
+  #company_show .row-promoted h3 span {
+    text-decoration: none; }
+
 #page-static {
   font-size: 14px;
   /***** OLD STEP *****/ }

volume/www/website/www/web/js/global.js

@@ -1,3 +1,8 @@
+window.onresize = resize;
+var w = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
+function resize() { 
+    w = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
+}
 $(document).ready(function () {
     //Slide sur tags
     if($('.frame').length) {
@@ -172,10 +177,18 @@ $(document).ready(function () {
     /*owl carousel*/
     if( $(".territory-carousel").length ) {
         //Carousel territoire
+        console.log("carousel =="+w);
+        if(w <= 640){
+            var marginValue = 20;
+            var paddingValue = 10;
+        } else {
+            var marginValue = 150;
+            var paddingValue = 100;
+        }
         $(".territory-carousel").owlCarousel({
             items:1,
-            margin: 150,
-            stagePadding: 100,
+            margin: marginValue,
+            stagePadding: paddingValue,
             nav: true,
             loop: true,
             center:true,
@@ -336,10 +349,4 @@ $(document).ready(function () {
         $('#modal_voeux').find("iframe").attr('src',"");  
     });
   
-});
-
-window.onresize = resize;
-var w = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
-function resize() { 
-    w = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
-}
+});

volume/www/website/www/web/sass/modules/_app.scss

@@ -23,6 +23,16 @@
     margin-bottom: 15px;
   }
 }
+@media screen and (max-width: 420px){
+  .blocs-texte-video{
+    h2{
+      font-size: 20px;
+    }
+    a{
+      font-size: 10px;
+    }
+  }
+}
 
 /*Détail*/
 
@@ -70,7 +80,7 @@
 }
 
 .profil-company {
-  padding: 0 40px;
+  padding: 0 20px;
 }
 
 /*************************** FLEX ****************************/

volume/www/website/www/web/sass/modules/_contenu.scss

@@ -49,18 +49,41 @@
 
 #liste-jobs {
   padding-bottom: 40px;
+  @media screen and (max-width: 420px){
+    h2{
+      font-size: 20px;
+    }
+  }
 }
 
 #liste-talents {
   padding: 120px 0 40px 0;
+  @media screen and (max-width: 420px){
+    h2{
+      font-size: 20px;
+    }
+  }
 }
 
 #liste-company {
   padding: 120px 0 40px 0;
+  @media screen and (max-width: 420px){
+    h2{
+      font-size: 20px;
+    }
+  }
 }
 
 #liste-territoires {
   padding: 120px 0 40px 0;
+  @media screen and (max-width: 420px){
+    h2{
+      font-size: 20px;
+    }
+    a{
+      font-size: 10px;
+    }
+  }
 }
 
 /*Blocs fixes accueil*/

volume/www/website/www/web/sass/modules/_footer.scss

@@ -51,4 +51,12 @@ footer{
     margin-top:80px;
     font-size:13px;
   }
+  @media screen and (max-width: 420px){
+    .col-footer-logo{
+      text-align: center;  
+    }
+    &.page-footer{
+      padding: 10px 0 20px 0;
+    }
+  }
 }

volume/www/website/www/web/sass/modules/_gutter.scss

@@ -20,6 +20,17 @@
     padding:40px 40px 40px 80px;
   }
 }
+@media screen and (max-width: 420px){
+  .blocs-texte-video{
+    .inside-m{
+      padding: 10px 10px 30px 10px;
+    }
+  }
+  .row-bloc-video-2{
+    display: flex;
+    flex-direction: column-reverse;
+  }
+}
 .no-margin-top{
   margin-top:0px;
 }

volume/www/website/www/web/sass/modules/_list.scss

@@ -55,6 +55,17 @@
   }
 }
 
+#header-resultats{
+  display: flex;
+  flex-direction: row;
+  justify-items: flex-end;
+  justify-content: space-between;
+  margin-bottom: 15px;
+  font-size: 1rem;
+  a{
+    color: #000;
+  }
+}
 #liste-resultats {
   .item-list-bis {
     margin-bottom: 20px;

volume/www/website/www/web/sass/pages/_ad-show.scss

@@ -28,6 +28,7 @@
   .brandImage {
     position: relative;
     margin: 2px;
+    margin-top: 15px;
     a {
       display: block;
       img {
@@ -122,3 +123,23 @@
     }
   }
 }
+
+.item-detail-ispromoted{
+  display: block;
+  text-align: center;
+  padding: 10px 20px;
+  color: $orange;
+  border: 1px solid $orange;
+  border-radius: 6px;
+  text-transform: uppercase;
+  font-size: 1.1rem;
+}
+
+#ad_show  .row-promoted{
+  h3{
+    span{
+      text-decoration: none;
+    }
+  }
+  padding-bottom: 40px;
+}

volume/www/website/www/web/sass/pages/_company-show.scss

@@ -28,4 +28,13 @@
       margin: 20px 0;
     }
   }
+}
+
+#company_show  .row-promoted{
+  h3{
+    span{
+      text-decoration: none;
+    }
+  }
+  padding-bottom: 40px;
 }