Compare commits

...

6 Commits

Author SHA1 Message Date
Thomas MONCHICOURT 57299b841e Fix : check birthday if empty talent 2018-08-23 16:09:03 +02:00
Thomas MONCHICOURT fb11613b7c Feat : rechargement de la dropzone au chargement de video sur les réponse 2018-08-23 15:31:54 +02:00
Thomas MONCHICOURT e13ef32197 Merge branch 'master' into develop 2018-08-23 15:23:18 +02:00
Thomas MONCHICOURT e70c1c7f5e Feat : dropzone reload 2018-08-23 15:19:46 +02:00
Thomas MONCHICOURT 0c9c4f0fc2 Fix : video vimeo pour dev 2018-08-23 15:19:37 +02:00
Thomas MONCHICOURT 5cd78b272a Fix : video égérie talent 2018-08-23 14:56:42 +02:00
7 changed files with 34 additions and 26 deletions
@@ -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">
@@ -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',
@@ -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');
+2 -1
View File
@@ -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;
File diff suppressed because one or more lines are too long
+24 -20
View File
@@ -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 + '%');
@@ -107,6 +107,7 @@
object-fit: cover;
width: auto;
height: auto;
max-height: 100%;
}
}