Fix : typo in wording and redirect castre mazamet

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

@@ -165,7 +165,7 @@
                             <a href="#!" data-video="#video2" class="img_content embed-responsive embed-responsive-16by9" style="background:url(/img-cnt/cv_video.jpg);background-size:cover;">
                                 <span class="playerbtn"></span>
                             </a>
-                            <iframe style="display:block;" class="hide" id="video2" src="https://player.vimeo.com/video/215657518?title=0&byline=0&portrait=0" width="100%" height="344" frameborder="0" webkitallowfullscreen="webkitallowfullscreen" mozallowfullscreen="mozallowfullscreen" allowfullscreen="allowfullscreen"></iframe>
+                            <iframe style="display:block;" class="hide" id="video2" src="https://player.vimeo.com/video/286344340?title=0&byline=0&portrait=0" width="100%" height="344" frameborder="0" webkitallowfullscreen="webkitallowfullscreen" mozallowfullscreen="mozallowfullscreen" allowfullscreen="allowfullscreen"></iframe>
                         </div>
                         <div class="col l6 m12 s12 valign-wrapper">
                             <div class="inside-m valign">

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/Form/TalentProfileType.php

@@ -28,7 +28,9 @@ class TalentProfileType extends AbstractType
         $user = $options['data'];
         $user->getCompany()->init();
         $birthday = $options['data']->getBirthday();
-        $options['data']->setBirthday($birthday->format('d/m/Y'));
+        if(!empty($birthday)){
+            $options['data']->setBirthday($birthday->format('d/m/Y'));
+        }
         $builder
             ->add('firstname', null, array(
                 'label' => 'Prénom',

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/src/AppBundle/Utils/Services/MediaManager.php

@@ -134,9 +134,9 @@ class MediaManager
             $thumbnails = array();
             //PUSH VIDEO TO Vimeo
             if ($this->env == "dev") {
-                $uriVimeo = "/videos/215657518";
+                $uriVimeo = "/videos/217844541";
                 $nameVimeo = "name";
-                $linkVimeo = "/videos/215657518";
+                $linkVimeo = "/videos/217844541";
             } else {
                 $urlToPull = $this->mediaVideoUrl . $fileName;
                 $response = $this->vimeo->request('/me/videos', array('type' => 'pull', 'link' => $urlToPull), 'POST');

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

@@ -16098,7 +16098,8 @@ span.titleVideo {
 .dashboardCompanyWrapper .profil-picture .responsive-img {
   object-fit: cover;
   width: auto;
-  height: auto; }
+  height: auto;
+  max-height: 100%; }
 
 #ad_show .profil-picture .responsive-img, #company_show .profil-picture .responsive-img {
   object-fit: cover;

volume/www/website/www/web/js/dropzone.js

@@ -34,30 +34,34 @@ if ($("#dropzone-row").length) {
                 $('.meter').show();
             });
             self.on("success", function (file, response) {
-                $(window).unbind("beforeunload");
-                if (response.success == 200) {
-                    $('#preview_video').html('<div class="green center-align" style="border-radius:10px;padding:20px;color:#FFF;">Votre vidéo a été bien enregistrée.</div>')
-                    //CAS VIDEO NON ATTACHEE
-                    if ($("#form_media").length) {
-                        $("#form_media .id_media").attr('value', response.mediaId);
-                        $("#form_media #submit").removeClass('hide').fadeIn();
-                        if ($("#form_media #submit").hasClass('disabled')) {
-                            $("#form_media #submit").removeClass('disabled');
-                            $("#form_media #submit").addClass('pulse');
-                        }
-                    }
-                    //CAS VIDEO REPONSE CANDIDATURE
-                    if($('#validFormVideo').length){
-                        form['contact_talent_video'] = 1;
-                        if ($("#form_media #submit").hasClass('disabled')) {
-                            if( form['contact_talent_status'] == 1){
-                                $("#validFormVideo .btn").removeClass('disabled');
+                if($('.dashboardCompanyWrapper').length == 0){
+                    location.reload();
+                } else {
+                    if (response.success == 200) {
+                        $('#preview_video').html('<div class="green center-align" style="border-radius:10px;padding:20px;color:#FFF;">Votre vidéo a été bien enregistrée.</div>')
+                        //CAS VIDEO NON ATTACHEE
+                        if ($("#form_media").length) {
+                            $("#form_media .id_media").attr('value', response.mediaId);
+                            $("#form_media #submit").removeClass('hide').fadeIn();
+                            if ($("#form_media #submit").hasClass('disabled')) {
+                                $("#form_media #submit").removeClass('disabled');
+                                $("#form_media #submit").addClass('pulse');
                             }
                         }
+                        //CAS VIDEO REPONSE CANDIDATURE
+                        if($('#validFormVideo').length){
+                            form['contact_talent_video'] = 1;
+                            if ($("#form_media #submit").hasClass('disabled')) {
+                                if( form['contact_talent_status'] == 1){
+                                    $("#validFormVideo .btn").removeClass('disabled');
+                                }
+                            }
+                        }
+                    } else {
+                        $('#preview_video').html('<div class="red" style="margin:0 0 0 20px;padding:20px;color:#FFF;">Une erreur est survenue,<br /> veuillez réessayer, si le problème persiste merci de contacter talentstube.</div>')
                     }
-                } else {
-                    $('#preview_video').html('<div class="red" style="margin:0 0 0 20px;padding:20px;color:#FFF;">Une erreur est survenue,<br /> veuillez réessayer, si le problème persiste merci de contacter talentstube.</div>')
                 }
+                $(window).unbind("beforeunload");
             });
             self.on("totaluploadprogress", function (progress) {
                 $('.determinate').width(progress + '%');

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

@@ -107,6 +107,7 @@
     object-fit: cover;
     width: auto;
     height: auto;
+    max-height: 100%;
   }
 }