Merge branch 'master' into develop

volume/www/website/conf/redirect.conf

@@ -9,4 +9,5 @@ rewrite  ^/plateforme$  https://www.talentstube.com/ permanent;
 rewrite  ^/page/les-conseils$  https://www.talentstube.com/accompagnement-entreprise permanent;
 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 ^/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;

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

@@ -35,17 +35,17 @@
                 <div class="col s12 m12 l8 xl9">
                     {% if ad.video and ad.status != "CLOSED" %}
                         <div class="row m-b-0" id="adVideo">
-                            {% if ad.id == 38 %}
+                            {#{% if ad.id == 38 %}
                                 <img class="responsive-img" src="{{asset('/img/GROUPE-ROCHER-TT.jpg')}}">
-                            {% else %}
-                                <div class="embed-responsive embed-responsive-16by9">
-                                    <div class="col s12">
-                                        <iframe src="https://player.vimeo.com/video/{{ ad.video.cdnUrl|replace({ "/videos/": ""}) }}"
-                                                width="100%" height="640" frameborder="0" webkitallowfullscreen mozallowfullscreen
-                                                allowfullscreen></iframe>
-                                    </div>
+                            {% else %}#}
+                            <div class="embed-responsive embed-responsive-16by9">
+                                <div class="col s12">
+                                    <iframe src="https://player.vimeo.com/video/{{ ad.video.cdnUrl|replace({ "/videos/": ""}) }}"
+                                            width="100%" height="640" frameborder="0" webkitallowfullscreen mozallowfullscreen
+                                            allowfullscreen></iframe>
                                 </div>
-                            {% endif %}
+                            </div>
+                            {#{% endif %}#}
                             {% if ad.isPromoted %}
                                 <div class="isPromoted"><img src="{{asset('/img/offre-pourvue-gauche.png')}}" alt="promoted"></div>
                             {% endif %}

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

@@ -16,6 +16,9 @@
                     <li>
                         <a class="white-text" href="{{ path('company_list') }}" title="Listes entreprises">Nos entreprises</a>
                     </li>
+                    <li>
+                        <a class="white-text" href="{{ path('territory_list') }}" title="Listes des territoires">Nos territoires</a>
+                    </li>
                     <li>
                         <a class="white-text" href="https://blog.talentstube.com/contact.html" title="Talents Tube ">Contact</a>
                     </li>

volume/www/website/www/app/Resources/views/testimony/testimony_list.html.twig

@@ -1,6 +1,6 @@
 <div id="liste-testimony" class="bg-white">
     <div class="container">
-        <div class="row flexcontainer row-noMargin">
+        <div class="row row-noMargin">
             <div class="owl-carousel owl-carousel-testimony">
                 <div class="item">
                     <div class="row">
@@ -16,6 +16,7 @@
                             Nous avons eu beaucoup d’appréciations positives grâce à cette communication.
                             </p>
                         </div>
+                        <div class="clear"></div>
                     </div> 
                 </div>
                 <div class="item">
@@ -32,6 +33,7 @@
                                 Atout supplémentaire : nos annonces en vidéo ont contribué à développer notre marque employeur !
                             </p>
                         </div>
+                        <div class="clear"></div>
                     </div> 
                 </div>
             </div>

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

@@ -131,23 +131,26 @@ class StatsManager
                 }
             }
         }
-
-        ksort($arrayRecords['ad']);
-        foreach ($arrayRecords['ad'] as $recordAd) {
-            $count = 0;
-            foreach ($recordAd as $countView) {
-                $count = $count + $countView;
+        if (isset($arrayRecords['ad'])) {
+            ksort($arrayRecords['ad']);
+            foreach ($arrayRecords['ad'] as $recordAd) {
+                $count = 0;
+                foreach ($recordAd as $countView) {
+                    $count = $count + $countView;
+                }
+                $arrDatasetsAd[] = $count;
             }
-            $arrDatasetsAd[] = $count;
         }
 
-        ksort($arrayRecords['company']);
-        foreach ($arrayRecords['company'] as $recordCompany) {
-            $count = 0;
-            foreach ($recordCompany as $countView) {
-                $count = $count + $countView;
+        if (isset($arrayRecords['company'])) {
+            ksort($arrayRecords['company']);
+            foreach ($arrayRecords['company'] as $recordCompany) {
+                $count = 0;
+                foreach ($recordCompany as $countView) {
+                    $count = $count + $countView;
+                }
+                $arrDatasetsCompany[] = $count;
             }
-            $arrDatasetsCompany[] = $count;
         }
 
         sort($lineDatesLabel, SORT_NATURAL | SORT_FLAG_CASE);

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

@@ -50,15 +50,17 @@ $(document).ready(function () {
     var $window = jQuery(window);
     if($('#homeTeaser').length) {
         $window.scroll(function () {
-            var position = $('#homeTeaser').position();
-            if ( $(window).scrollTop() > ((position.top + $('#homeTeaser').height()) - 125) ) {
-                $('.homeSearchWrapper').addClass("fix-search");
-                $('.row_search').removeClass("z-depth-5");
-                $('#liste-jobs').css('padding-top',65);
-            } else {
-                $('.homeSearchWrapper').removeClass("fix-search");
-                $('.row_search').addClass("z-depth-5");
-                $('#liste-jobs').css('padding-top',0);
+            if(w > 960) {
+                var position = $('#homeTeaser').position();
+                if ( $(window).scrollTop() > ((position.top + $('#homeTeaser').height()) - 125) ) {
+                    $('.homeSearchWrapper').addClass("fix-search");
+                    $('.row_search').removeClass("z-depth-5");
+                    $('#liste-jobs').css('padding-top',65);
+                } else {
+                    $('.homeSearchWrapper').removeClass("fix-search");
+                    $('.row_search').addClass("z-depth-5");
+                    $('#liste-jobs').css('padding-top',0);
+                }
             }
         });
     }
@@ -335,6 +337,12 @@ $(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

@@ -14325,7 +14325,7 @@ a.link-white-underline {
     top: 50%;
     left: 50%;
     transform: translate(-50%, -50%);
-    width: 110%;
+    width: 90vw;
     display: block;
     text-align: center;
     color: #000;
@@ -14334,45 +14334,46 @@ a.link-white-underline {
     .owl-carousel .owl-nav i {
       font-size: 30px; }
     .owl-carousel .owl-nav .owl-prev {
-      backgound: none;
       float: left; }
       .owl-carousel .owl-nav .owl-prev .left-arrow {
-        background: url(../img/left_light.png) no-repeat;
-        height: 113px;
-        width: 41px;
+        background: url(../img/arrowleft.svg) no-repeat #1E2327;
+        height: 48px;
+        width: 48px;
+        border-radius: 50%;
         display: block;
         background-position: center center; }
-        .owl-carousel .owl-nav .owl-prev .left-arrow:hover {
-          background: url(../img/left_light_rollover.png) no-repeat; }
     .owl-carousel .owl-nav .owl-next {
-      backgound: none;
       float: right; }
       .owl-carousel .owl-nav .owl-next .right-arrow {
-        background: url(../img/right_light.png) no-repeat;
-        height: 113px;
-        width: 41px;
+        background: url(../img/arrowright.svg) no-repeat #1E2327;
+        height: 48px;
+        width: 48px;
+        border-radius: 50%;
         display: block;
         background-position: center center; }
-        .owl-carousel .owl-nav .owl-next .right-arrow:hover {
-          background: url(../img/right_light_rollover.png) no-repeat; }
 
 .bg-dark2 .owl-carousel .owl-nav .owl-prev .left-arrow {
-  background: url(../img/left_dark.png) no-repeat;
-  background-position: center center; }
-  .bg-dark2 .owl-carousel .owl-nav .owl-prev .left-arrow:hover {
-    background: url(../img/left_dark_rollover.png) no-repeat; }
-.bg-dark2 .owl-carousel .owl-nav .owl-next {
-  backgound: none;
-  float: right; }
-  .bg-dark2 .owl-carousel .owl-nav .owl-next .right-arrow {
-    background: url(../img/right_dark.png) no-repeat;
-    background-position: center center; }
-    .bg-dark2 .owl-carousel .owl-nav .owl-next .right-arrow:hover {
-      background: url(../img/right_dark_rollover.png) no-repeat; }
+  background-color: #32373D; }
+.bg-dark2 .owl-carousel .owl-nav .owl-next .right-arrow {
+  background-color: #32373D; }
 
-@media (max-width: 600px) {
+.bg-dark1 .owl-carousel .owl-nav .owl-prev .left-arrow {
+  background-color: #292E32; }
+.bg-dark1 .owl-carousel .owl-nav .owl-next .right-arrow {
+  background-color: #292E32; }
+
+@media (max-width: 1024px) {
   .owl-carousel .owl-nav {
-    display: none; } }
+    position: relative;
+    margin-top: 50px;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center; }
+    .owl-carousel .owl-nav .owl-prev, .owl-carousel .owl-nav .owl-next {
+      float: none; }
+    .owl-carousel .owl-nav .owl-prev {
+      margin-right: 40px; } }
 #liste-jobs .card .card-action {
   height: auto; }
   #liste-jobs .card .card-action a.btn-tags {
@@ -14405,7 +14406,7 @@ a.link-white-underline {
   .territory-carousel h2 a:hover {
     text-decoration: none; }
   .territory-carousel .owl-nav {
-    top: 55%; }
+    top: 50%; }
 
 @media (min-width: 600px) and (max-width: 700px) {
   .owl-carousel .owl-item .card-content-company .col-logo {
@@ -14424,7 +14425,10 @@ a.link-white-underline {
 
   .owl-carousel .owl-item .card-company .card-content-company .col-infos {
     font-size: 14px; } }
-@media (min-width: 1136px) and (max-width: 1226px) {
+@media (min-width: 1136px) {
+  .owl-carousel .owl-nav {
+    width: 110%; }
+
   .owl-carousel .owl-item .card-company .card-content-company .col-infos {
     font-size: 14px; } }
 #liste-testimony .item .row {

volume/www/website/www/web/img/arrowleft.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 48.2 (47327) - http://www.bohemiancoding.com/sketch -->
+    <title>icon/arrowleft</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/arrowleft">
+            <polygon id="Shape" points="0 0 24 0 24 24 0 24"></polygon>
+            <path d="M15.90375,4.24975 C15.582,3.91675 15.0465,3.91675 14.7135,4.24975 C14.39175,4.5715 14.39175,5.107 14.7135,5.428 L20.74875,11.46325 L0.83325,11.46325 C0.369,11.464 0,11.833 0,12.29725 C0,12.7615 0.369,13.1425 0.83325,13.1425 L20.74875,13.1425 L14.7135,19.1665 C14.39175,19.4995 14.39175,20.03575 14.7135,20.35675 C15.0465,20.68975 15.58275,20.68975 15.90375,20.35675 L23.36775,12.89275 C23.70075,12.571 23.70075,12.0355 23.36775,11.7145 L15.90375,4.24975 Z" fill="#FFFFFF" fill-rule="nonzero" transform="translate(11.808750, 12.303250) scale(-1, 1) translate(-11.808750, -12.303250) "></path>
+        </g>
+    </g>
+</svg>

volume/www/website/www/web/img/arrowright.svg

@@ -0,0 +1 @@
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="m0 0h24v24h-24z"/><path d="m15.90375 4.24975c-.32175-.333-.85725-.333-1.19025 0-.32175.32175-.32175.85725 0 1.17825l6.03525 6.03525h-19.9155c-.46425.00075-.83325.36975-.83325.834s.369.84525.83325.84525h19.9155l-6.03525 6.024c-.32175.333-.32175.86925 0 1.19025.333.333.86925.333 1.19025 0l7.464-7.464c.333-.32175.333-.85725 0-1.17825z" fill="#fff" fill-rule="nonzero"/></g></svg>

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

@@ -50,15 +50,17 @@ $(document).ready(function () {
     var $window = jQuery(window);
     if($('#homeTeaser').length) {
         $window.scroll(function () {
-            var position = $('#homeTeaser').position();
-            if ( $(window).scrollTop() > ((position.top + $('#homeTeaser').height()) - 125) ) {
-                $('.homeSearchWrapper').addClass("fix-search");
-                $('.row_search').removeClass("z-depth-5");
-                $('#liste-jobs').css('padding-top',65);
-            } else {
-                $('.homeSearchWrapper').removeClass("fix-search");
-                $('.row_search').addClass("z-depth-5");
-                $('#liste-jobs').css('padding-top',0);
+            if(w > 960) {
+                var position = $('#homeTeaser').position();
+                if ( $(window).scrollTop() > ((position.top + $('#homeTeaser').height()) - 125) ) {
+                    $('.homeSearchWrapper').addClass("fix-search");
+                    $('.row_search').removeClass("z-depth-5");
+                    $('#liste-jobs').css('padding-top',65);
+                } else {
+                    $('.homeSearchWrapper').removeClass("fix-search");
+                    $('.row_search').addClass("z-depth-5");
+                    $('#liste-jobs').css('padding-top',0);
+                }
             }
         });
     }
@@ -334,4 +336,10 @@ $(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/_carousel.scss

@@ -192,7 +192,7 @@
     top: 50%;
     left: 50%;
     transform: translate(-50%,-50%);
-    width: 110%;
+    width: 90vw;
     display: block;
     text-align: center;
     color:#000;
@@ -203,31 +203,25 @@
     }
 
     .owl-prev {
-      backgound:none;
       float: left;
       .left-arrow{
-        background: url(../img/left_light.png) no-repeat;
-        height: 113px;
-        width: 41px;
+        background: url(../img/arrowleft.svg) no-repeat #1E2327;
+        height: 48px;
+        width: 48px;
+        border-radius: 50%;
         display: block;
         background-position: center center;
-        &:hover{
-          background: url(../img/left_light_rollover.png) no-repeat;
-        }
       }
     }
     .owl-next {
-      backgound:none;
       float: right;
       .right-arrow{
-        background: url(../img/right_light.png) no-repeat;
-        height: 113px;
-        width: 41px;
+        background: url(../img/arrowright.svg) no-repeat #1E2327;
+        height: 48px;
+        width: 48px;
+        border-radius: 50%;
         display: block;
         background-position: center center;
-        &:hover{
-          background: url(../img/right_light_rollover.png) no-repeat;
-        }
       }
     }
   }
@@ -236,29 +230,45 @@
   .owl-carousel .owl-nav{
     .owl-prev {
       .left-arrow{
-        background: url(../img/left_dark.png) no-repeat;
-        background-position: center center;
-        &:hover{
-          background: url(../img/left_dark_rollover.png) no-repeat;
-        }
+        background-color:#32373D;
       }
     }
     .owl-next {
-      backgound:none;
-      float: right;
       .right-arrow{
-        background: url(../img/right_dark.png) no-repeat;
-        background-position: center center;
-        &:hover{
-          background: url(../img/right_dark_rollover.png) no-repeat;
-        }
+        background-color:#32373D;
       }
     }
   }
 }
-@media (max-width: 600px){
+.bg-dark1{
   .owl-carousel .owl-nav{
-    display: none;
+    .owl-prev {
+      .left-arrow{
+        background-color:#292E32;
+      }
+    }
+    .owl-next {
+      .right-arrow{
+        background-color:#292E32;
+      }
+    }
+  }
+}
+
+@media (max-width: 1024px){
+  .owl-carousel .owl-nav{
+    position: relative;
+    margin-top: 50px;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    .owl-prev,.owl-next{
+      float: none;
+    }
+    .owl-prev{
+      margin-right: 40px;
+    }
   }
 }
 
@@ -312,7 +322,7 @@
   }
   position: relative;
   .owl-nav {
-    top: 55%;
+    top: 50%;
   }
 }
 
@@ -341,7 +351,10 @@
     font-size: 14px;
   }
 }
-@media (min-width: 1136px) and (max-width: 1226px){
+@media (min-width: 1136px){
+  .owl-carousel .owl-nav{
+    width: 110%;
+  }
   .owl-carousel .owl-item .card-company .card-content-company .col-infos {
     font-size: 14px;
   }

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

@@ -212,4 +212,3 @@
     }
   }
 }
-