Fix: recherceh url

# 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/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/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;
 }