Merge branch 'develop' of https://git.e-declic.net/talents-tube/website into develop

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

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

@@ -122,19 +122,17 @@
                         <h3 class="subtitles-homepage">Venez vivre et travailler chez nous.</h3>
                         {% if territories %}
                             <div class="owl-carousel owl-carousel-home territory-carousel">
-                                {% for territory in territories if territory.presentationVideo and territory.isPrivate != true %}
+                                {% for t in territories if t.presentationVideo and t.isPrivate != true %}
                                     <div class="item">
-                                        <div class="embed-responsive embed-responsive-16by9">
-                                            <div class="col s12">
-                                                <iframe src="https://player.vimeo.com/video/{{ territory.presentationVideo.cdnUrl|replace({ "/videos/": ""}) }}" width="100%" height="640" frameborder="0" webkitallowfullscreen="webkitallowfullscreen" mozallowfullscreen="mozallowfullscreen" allowfullscreen="allowfullscreen"></iframe>
-                                                <span class="playerbtn"></span>
-                                            </div>
-                                        </div>
-                                        {% if territory.extra.terType is defined %}
-                                        <div class="m-t-15 fs-12 text-100">{{ territory.extra.terType|upper }}</div>
+                                        {% if t.presentationVideo.thumbnails.0. sizes is defined %}
+                                            <a href="{{ path('territory_show',{'alias': t.alias }) }}" title="{{ t.brandname }}">
+                                                <img src="{{ t.presentationVideo.thumbnails.0.sizes.4.link }}" alt="{{ t.brandName }}" class="overlay-hover"/>
+                                                <span class="playerbtn" style="margin-top: -55px;"></span>
+                                            </a>
                                         {% endif %}
+                                        <div class="m-t-15 fs-12 text-100">{{ t.extra.terType|upper }}</div>
                                         <div class="m-t-5">
-                                            <a href="{{ path('territory_show',{'alias': territory.alias }) }}" class="color-white td-none">{{ territory.brandName|upper }}</a>
+                                            <a href="{{ path('territory_show',{'alias': t.alias }) }}" class="color-white td-none">{{ t.brandName|upper }}</a>
                                         </div>
                                     </div>
                                 {% endfor %}

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

@@ -36,11 +36,6 @@ class DefaultController extends Controller
             }
         }
 
-        $arrayTerritory = array();
-        foreach ($territories as $territory) {
-            $arrayTerritory[] = $territory;
-        }
-
         $mediaManager = $this->get('media_manager');
         foreach ($ads as $ad) {
             $mediaManager->getThumbnails($ad);
@@ -50,6 +45,10 @@ class DefaultController extends Controller
             $mediaManager->getThumbnails($company);
         }
 
+        foreach ($territories as $t) {
+            $mediaManager->getThumbnails($t);
+        }
+
         $form = $this->createForm(AdSearchType::class);
 
         return $this->render(
@@ -57,7 +56,7 @@ class DefaultController extends Controller
                 'ads' => $ads,
                 'companies' => $arrayCompany,
                 'talents' => $arrayTalents,
-                'territories' => $arrayTerritory,
+                'territories' => $territories,
                 'searchform' => $form->createView(),
             ]
         );

volume/www/website/www/web/css/admin.css

@@ -2798,6 +2798,13 @@
 .text-100 {
   font-weight: 100; }
 
+.overlay-hover {
+  opacity: 0.7;
+  transition: .5s ease;
+  backface-visibility: hidden; }
+  .overlay-hover:hover {
+    opacity: 1; }
+
 .color-white {
   color: #FFFFFF; }
 

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

@@ -13011,6 +13011,13 @@ coloring of icons.
 .text-100 {
   font-weight: 100; }
 
+.overlay-hover {
+  opacity: 0.7;
+  transition: .5s ease;
+  backface-visibility: hidden; }
+  .overlay-hover:hover {
+    opacity: 1; }
+
 .color-white {
   color: #FFFFFF; }
 
@@ -16442,5 +16449,3 @@ tbody td {
   #talent-show .recommendation-user-infos .recommendation-user-name {
     text-transform: uppercase;
     font-weight: bold; }
-
-/*# sourceMappingURL=styles.css.map */

volume/www/website/www/web/sass/base/_mtgenerics.scss

@@ -467,5 +467,14 @@
 }
 
 .text-100 {
-    font-weight: 100;
+  font-weight: 100;
+}
+
+.overlay-hover {
+  opacity: 0.7;
+  transition: .5s ease;
+  backface-visibility: hidden;
+  &:hover {
+    opacity: 1;
   }
+}