Fix : hover color on territory title

volume/www/website/conf/redirect.conf

@@ -11,4 +11,5 @@ rewrite  ^/page/presentation-talent$  https://www.talentstube.com/cv-video perma
 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/recherche/$  https://www.talentstube.com/annonce/recherche permanent;
+rewrite  ^/annonce/recherche/$  https://www.talentstube.com/annonce/recherche permanent;
+rewrite  ^/territoire/1573-communaute-d-agglomeration-castres-mazamet/$  https://www.talentstube.com/territoire/1573-castres-mazamet/ permanent;

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

@@ -133,7 +133,7 @@
                                         {% if t.extra.terType is defined %}
                                         <div class="m-t-15 fs-12 text-100">{{ t.extra.terType|upper }}</div>
                                         {% endif %}
-                                        <div class="m-t-5">
+                                        <div class="m-t-5 hover-none">
                                             <a href="{{ path('territory_show',{'alias': t.alias }) }}" class="color-white td-none">{{ t.brandName|upper }}</a>
                                         </div>
                                     </div>

volume/www/website/www/app/Resources/views/talent/base_dashboard_talent.html.twig

@@ -19,7 +19,6 @@
 {% endblock %}
 
 {% block javascripts %}
-    {{ parent() }}
     <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDYV8IJGtIoWLfXJQQvIuDQ88n2aEuRgpg&libraries=places"></script>
     {% javascripts
     '@vendors'

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

@@ -218,12 +218,12 @@ class TalentController extends Controller
         if ($form->isSubmitted() && $form->isValid()) {
             $userCompany = $this->getUser();
             $message = $form['message']->getData();
-            $htmlView = $this->renderView('email/contact_talent.html.twig', array(
+            $htmlView = $this->renderView('email/contact_default.html.twig', array(
                 'type' => 'html',
                 'message' => $message,
                 'user' => $user{0},
             ));
-            $plainView = $this->renderView('email/contact_talent.html.twig', array(
+            $plainView = $this->renderView('email/contact_default.html.twig', array(
                 'type' => 'plain',
                 'message' => $message,
                 'user' => $user{0},
@@ -249,14 +249,16 @@ class TalentController extends Controller
         $mustLogin = true;
         if ($this->getUser() && $this->getUser()->hasRole('ROLE_TALENT')) {
             $mustLogin = false;
+            if ($this->getUser() && ($this->getUser()->getCompany()->getId() ==  $talent->getId())) {
+                $showRecommendation = false;
+            }
         }
+        
         $showRecommendation = true;
         if ($this->getUser() && !$this->getUser()->hasRole('ROLE_TALENT')) {
             $showRecommendation = false;
         }
-        if ($this->getUser() && ($this->getUser()->getCompany()->getId() ==  $talent->getId())) {
-            $showRecommendation = false;
-        }
+
         $em = $this->getDoctrine()->getManager();
         $recommendations = $em->getRepository('AppBundle:Recommendation')->findBy(
             array('isEnabled'=>true, 'status'=> 'SENDED', 'user'=> $talent->getMainUser()),

volume/www/website/www/src/AppBundle/Form/Admin/TerritoryAdminType.php

@@ -107,7 +107,7 @@ class TerritoryAdminType extends AbstractType
             'data' => $terType,
             'choices' => array(
                 'Région' => 'Région',
-                'Communauté d\'aglgomération' => 'Communauté d\'aglgomération',
+                'Communauté d\'agglomération' => 'Communauté d\'agglomération',
                 'Communauté de commune' => 'Communauté de commune',
                 'Commune' => 'Commune',
                 'Département' => 'Département',

volume/www/website/www/src/AppBundle/Security/Core/User/FOSUBUserProvider.php

@@ -146,7 +146,7 @@ class FOSUBUserProvider extends BaseFOSUBProvider
             $lastname = $data['lastName'];
 
         } else {
-            $userPhoto = 'http://graph.facebook.com/'.$data['id'].'/picture?height=200';
+            $userPhoto = 'https://graph.facebook.com/'.$data['id'].'/picture?height=200';
             if(isset($data['birthday'])){
                 $birthday = \DateTime::createFromFormat ('m/d/Y', $data['birthday']);
             } else {

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

@@ -2800,11 +2800,14 @@
 
 .overlay-hover {
   opacity: 0.7;
-  transition: .5s ease;
+  transition: 0.5s ease;
   backface-visibility: hidden; }
   .overlay-hover:hover {
     opacity: 1; }
 
+.hover-none a:hover {
+  color: #ffffff; }
+
 .color-white {
   color: #FFFFFF; }
 

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

@@ -13159,11 +13159,14 @@ coloring of icons.
 
 .overlay-hover {
   opacity: 0.7;
-  transition: .5s ease;
+  transition: 0.5s ease;
   backface-visibility: hidden; }
   .overlay-hover:hover {
     opacity: 1; }
 
+.hover-none a:hover {
+  color: #ffffff; }
+
 .color-white {
   color: #FFFFFF; }
 
@@ -16658,5 +16661,3 @@ tbody td {
   #talent-show .recommendation-user-infos .recommendation-date {
     font-size: 14px;
     color: #1E2327; }
-
-/*# sourceMappingURL=styles.css.map */

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

@@ -472,9 +472,17 @@
 
 .overlay-hover {
   opacity: 0.7;
-  transition: .5s ease;
+  transition: 0.5s ease;
   backface-visibility: hidden;
   &:hover {
     opacity: 1;
   }
 }
+
+.hover-none {
+  a {
+    &:hover {
+      color: #ffffff;
+    }
+  }
+}