Compare commits

...

10 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
Thomas MONCHICOURT f3597146ad Feat : ajout title analitycs annonce #7115 @0h10 2018-08-23 14:15:12 +02:00
Thomas MONCHICOURT f52f49ce9a Fix : css form parent probleme 2018-08-23 13:57:16 +02:00
Thomas MONCHICOURT 0b6a04e8d0 Feat : form validation talent + datepicker 2018-08-23 12:32:30 +02:00
Thomas MONCHICOURT 0dfc9af863 Feat : modification couleur cookie bar 2018-08-22 16:48:40 +02:00
23 changed files with 345 additions and 43 deletions
@@ -9,13 +9,20 @@
{% set text_accept_button = fairlane_cookie_consent.twig.text_accept_button %}
{% endif %}
<div id="fairlane-cookie-consent" {% if fairlane_cookie_consent.useBootstrap == true %}class="navbar navbar-fixed-top"{% endif %}>
<p>
{{ text_info }}
{% if fairlane_cookie_consent.twig.url_additional_info| length > 1 and text_additional_info_link | length > 1 %}
<a href="{{ fairlane_cookie_consent.twig.url_additional_info }}" target="_blank">{{ text_additional_info_link }}</a>
{% endif %}
</p>
<button class="btn btn-default">{{ text_accept_button }}</button>
<div class="container">
<div class="row">
<div class="col s8">
<p>{{ text_info }}
{% if fairlane_cookie_consent.twig.url_additional_info| length > 1 and text_additional_info_link | length > 1 %}
<a href="{{ fairlane_cookie_consent.twig.url_additional_info }}" target="_blank">{{ text_additional_info_link }}</a>
{% endif %}
</p>
</div>
<div class="col s4">
<button class="btn btn-default">{{ text_accept_button }}</button>
</div>
</div>
</div>
</div>
{% if fairlane_cookie_consent.useJquery %}
<script type="text/javascript">
@@ -2,7 +2,7 @@
{% block content %}
<div class="fluid-container bg-grey-3 dashboardWrapper">
<div class="fluid-container bg-grey-3 dashboardWrapper dashboardCompanyWrapper">
<div class="container">
<div class="row flexcontainer">
{% include "company/menu.html.twig" ignore missing %}
@@ -100,7 +100,7 @@
{% elseif not is_granted('ROLE_COMPANY') %}
{% if not ad.isPromoted %}
<p class="item-detail-reply">
<a href="{{ path('talent_answer_create',{'id': ad.getId()}) }}"
<a title="postuler-bottom" href="{{ path('talent_answer_create',{'id': ad.getId()}) }}"
class="btn btn-default">
Postuler
</a>
@@ -58,7 +58,7 @@
{% elseif not is_granted('ROLE_COMPANY') %}
{% if not ad.isPromoted %}
<p class="item-detail-reply">
<a href="{{ path('talent_answer_create',{'id': ad.getId()}) }}"
<a title="postuler-side" href="{{ path('talent_answer_create',{'id': ad.getId()}) }}"
class="btn btn-default">
Postuler
</a>
@@ -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">
@@ -21,4 +21,28 @@
{% block javascripts %}
{{ parent() }}
<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDYV8IJGtIoWLfXJQQvIuDQ88n2aEuRgpg&libraries=places"></script>
{% javascripts
'@vendors'
'@global'
'@talents'
output='assetic/main.dash.talent.js' filter='?uglifyjs2' %}
<script src="{{ asset_url }}"></script>
{% endjavascripts %}
<script type="text/javascript">
$.fn.datepicker.languages['fr-FR'] = {
format: 'dd/mm/yyyy',
days: ['Dimanche', 'Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi'],
daysShort: ['Dim', 'Lun', 'Mar', 'Mer', 'Jeu', 'Ven', 'Sam'],
daysMin: ['Di', 'Lu', 'Ma', 'Me', 'Je', 'Ve', 'Sa'],
weekStart: 1,
months: ['Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Aout', 'Septembre', 'Octobre', 'Novembre', 'Décembre'],
monthsShort: ['Jan', 'Fev', 'Mar', 'Avr', 'Mai', 'Jun', 'Jui', 'Aou', 'Sep', 'Oct', 'Nov', 'Dec']
};
$('.datepicker').datepicker({
language: 'fr-FR'
});
$('form[name="talent_profile"]').validate();
</script>
{% endblock %}
@@ -30,6 +30,10 @@ assetic:
- 'js/company.js'
- 'js/vendors/moment.min.js'
- 'js/vendors/jquery.daterangepicker.min.js'
talents:
inputs:
- 'js/vendors/datepicker.min.js'
- 'js/vendors/jquery.validate.min.js'
admin:
inputs:
- 'admin/AdminLTE/plugins/jQuery/jquery-2.2.3.min.js'
@@ -56,6 +56,8 @@ class TalentController extends Controller
$form = $this->createForm(TalentProfileType::class, $user);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
$birthday = new \DateTime($form->getData()->getBirthday());
$user->setBirthday($birthday);
$companyManager = $this->get('app.company_manager');
$companyManager->updateTalent($user);
$event = new UserEvent($user);
@@ -16,6 +16,7 @@ use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\Extension\Core\Type\DateType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -26,7 +27,10 @@ class TalentProfileType extends AbstractType
{
$user = $options['data'];
$user->getCompany()->init();
$birthday = $options['data']->getBirthday();
if(!empty($birthday)){
$options['data']->setBirthday($birthday->format('d/m/Y'));
}
$builder
->add('firstname', null, array(
'label' => 'Prénom',
@@ -36,11 +40,12 @@ class TalentProfileType extends AbstractType
'label' => 'Nom',
'required' => true,
))
->add('birthday', DateType::class, array(
'widget' => 'single_text',
->add('birthday', TextType::class, array(
'label' => 'Date de naissance',
'attr' => array(
'class' => 'calendar'
'class' => 'datepicker',
'data-date-format' => "dd/mm/yyyy",
'data-toggle'=>"datepicker"
)
))
->add('gender', ChoiceType::class, array(
@@ -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');
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+171 -2
View File
@@ -12649,6 +12649,152 @@ coloring of icons.
color: #49e;
font-weight: 700; }
/*!
* Datepicker v1.0.0
* https://fengyuanchen.github.io/datepicker
*
* Copyright 2014-present Chen Fengyuan
* Released under the MIT license
*
* Date: 2018-08-05T03:02:13.513Z
*/
.datepicker-container {
-moz-user-select: none;
-ms-touch-action: none;
-ms-user-select: none;
-webkit-tap-highlight-color: transparent;
-webkit-touch-callout: none;
-webkit-user-select: none;
background-color: #fff;
direction: ltr;
font-size: 12px;
left: 0;
line-height: 30px;
position: fixed;
top: 0;
touch-action: none;
user-select: none;
width: 210px;
z-index: -1; }
.datepicker-container:after, .datepicker-container:before {
border: 5px solid transparent;
content: " ";
display: block;
height: 0;
position: absolute;
width: 0; }
.datepicker-dropdown {
-webkit-box-shadow: 0 3px 6px #ccc;
-webkit-box-sizing: content-box;
border: 1px solid #ccc;
box-shadow: 0 3px 6px #ccc;
box-sizing: content-box;
position: absolute;
z-index: 1; }
.datepicker-inline {
position: static; }
.datepicker-top-left, .datepicker-top-right {
border-top-color: #39f; }
.datepicker-top-left:after, .datepicker-top-left:before, .datepicker-top-right:after, .datepicker-top-right:before {
border-top: 0;
left: 10px;
top: -5px; }
.datepicker-top-left:before, .datepicker-top-right:before {
border-bottom-color: #39f; }
.datepicker-top-left:after, .datepicker-top-right:after {
border-bottom-color: #fff;
top: -4px; }
.datepicker-bottom-left, .datepicker-bottom-right {
border-bottom-color: #39f; }
.datepicker-bottom-left:after, .datepicker-bottom-left:before, .datepicker-bottom-right:after, .datepicker-bottom-right:before {
border-bottom: 0;
bottom: -5px;
left: 10px; }
.datepicker-bottom-left:before, .datepicker-bottom-right:before {
border-top-color: #39f; }
.datepicker-bottom-left:after, .datepicker-bottom-right:after {
border-top-color: #fff;
bottom: -4px; }
.datepicker-bottom-right:after, .datepicker-bottom-right:before, .datepicker-top-right:after, .datepicker-top-right:before {
left: auto;
right: 10px; }
.datepicker-panel > ul {
margin: 0;
padding: 0;
width: 102%; }
.datepicker-panel > ul:after, .datepicker-panel > ul:before {
content: " ";
display: table; }
.datepicker-panel > ul:after {
clear: both; }
.datepicker-panel > ul > li {
background-color: #fff;
cursor: pointer;
float: left;
height: 30px;
list-style: none;
margin: 0;
padding: 0;
text-align: center;
width: 30px; }
.datepicker-panel > ul > li:hover {
background-color: #e5f2ff; }
.datepicker-panel > ul > li.muted, .datepicker-panel > ul > li.muted:hover {
color: #999; }
.datepicker-panel > ul > li.highlighted {
background-color: #e5f2ff; }
.datepicker-panel > ul > li.highlighted:hover {
background-color: #cce5ff; }
.datepicker-panel > ul > li.picked, .datepicker-panel > ul > li.picked:hover {
color: #39f; }
.datepicker-panel > ul > li.disabled, .datepicker-panel > ul > li.disabled:hover {
background-color: #fff;
color: #ccc;
cursor: default; }
.datepicker-panel > ul > li.disabled.highlighted, .datepicker-panel > ul > li.disabled:hover.highlighted {
background-color: #e5f2ff; }
.datepicker-panel > ul > li[data-view="month next"], .datepicker-panel > ul > li[data-view="month prev"], .datepicker-panel > ul > li[data-view="year next"], .datepicker-panel > ul > li[data-view="year prev"], .datepicker-panel > ul > li[data-view="years next"], .datepicker-panel > ul > li[data-view="years prev"], .datepicker-panel > ul > li[data-view=next] {
font-size: 18px; }
.datepicker-panel > ul > li[data-view="month current"], .datepicker-panel > ul > li[data-view="year current"], .datepicker-panel > ul > li[data-view="years current"] {
width: 150px; }
.datepicker-panel > ul[data-view=months] > li, .datepicker-panel > ul[data-view=years] > li {
height: 52.5px;
line-height: 52.5px;
width: 52.5px; }
.datepicker-panel > ul[data-view=week] > li, .datepicker-panel > ul[data-view=week] > li:hover {
background-color: #fff;
cursor: default; }
.datepicker-hide {
display: none; }
/*Base
---------------------------------------------------*/
/*************************** VARIABLES ***************************/
@@ -13307,8 +13453,8 @@ a.link-white-underline {
position: fixed;
bottom: 0;
width: 100%;
background: rgba(255, 255, 255, 0.8);
text-align: center;
background: rgba(0, 0, 0, 0.8);
color: #FFF;
padding: 20px;
font-size: 12px; }
@@ -14811,6 +14957,17 @@ textarea.materialize-textarea:focus:not([readonly]) {
box-shadow: 0 1px 0 0 #1689fb;
outline: none; }
form[name=talent_profile] div.col label.error {
color: red;
position: absolute;
top: 20px;
left: 0; }
form[name=talent_profile] div.col label.error.active {
color: red; }
form[name=talent_profile] .bg-bordered .col div {
position: relative; }
body {
font-size: 16px;
font-family: "Raleway", sans-serif;
@@ -15938,6 +16095,18 @@ span.titleVideo {
text-decoration: none;
color: #000; }
.dashboardCompanyWrapper .profil-picture .responsive-img {
object-fit: cover;
width: auto;
height: auto;
max-height: 100%; }
#ad_show .profil-picture .responsive-img, #company_show .profil-picture .responsive-img {
object-fit: cover;
width: auto;
height: auto;
max-height: 100%; }
/*tableaux*/
thead {
border-bottom: solid 2px #232323;
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 + '%');
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -272,8 +272,8 @@
position: fixed;
bottom: 0;
width: 100%;
background: rgba(255,255,255,0.8);
text-align: center;
background: rgba(0,0,0,0.8);
color: #FFF;
padding: 20px;
font-size:12px;
}
@@ -73,4 +73,19 @@ textarea.materialize-textarea:focus:not([readonly]){
box-shadow: 0 1px 0 0 $blue2;
outline: none;
}
}
form[name=talent_profile] div.col label.error{
color: red;
position: absolute;
top: 20px;
left: 0;
&.active{
color: red;
}
}
form[name=talent_profile] .bg-bordered .col div{
position: relative;
}
@@ -100,4 +100,22 @@
text-decoration: none;
color: #000;
}
}
.dashboardCompanyWrapper{
.profil-picture .responsive-img {
object-fit: cover;
width: auto;
height: auto;
max-height: 100%;
}
}
#ad_show,#company_show{
.profil-picture .responsive-img {
object-fit: cover;
width: auto;
height: auto;
max-height: 100%;
}
}
@@ -11,6 +11,7 @@
@import "vendors/videojs.record";
@import "vendors/tooltipster/tooltipster";
@import "vendors/daterangepicker.min";
@import "vendors/datepicker.min";
/*Base
---------------------------------------------------*/
@import 'base/variables';
+9
View File
@@ -0,0 +1,9 @@
/*!
* Datepicker v1.0.0
* https://fengyuanchen.github.io/datepicker
*
* Copyright 2014-present Chen Fengyuan
* Released under the MIT license
*
* Date: 2018-08-05T03:02:13.513Z
*/.datepicker-container{-moz-user-select:none;-ms-touch-action:none;-ms-user-select:none;-webkit-tap-highlight-color:transparent;-webkit-touch-callout:none;-webkit-user-select:none;background-color:#fff;direction:ltr;font-size:12px;left:0;line-height:30px;position:fixed;top:0;touch-action:none;user-select:none;width:210px;z-index:-1}.datepicker-container:after,.datepicker-container:before{border:5px solid rgba(0,0,0,0);content:" ";display:block;height:0;position:absolute;width:0}.datepicker-dropdown{-webkit-box-shadow:0 3px 6px #ccc;-webkit-box-sizing:content-box;border:1px solid #ccc;box-shadow:0 3px 6px #ccc;box-sizing:content-box;position:absolute;z-index:1}.datepicker-inline{position:static}.datepicker-top-left,.datepicker-top-right{border-top-color:#39f}.datepicker-top-left:after,.datepicker-top-left:before,.datepicker-top-right:after,.datepicker-top-right:before{border-top:0;left:10px;top:-5px}.datepicker-top-left:before,.datepicker-top-right:before{border-bottom-color:#39f}.datepicker-top-left:after,.datepicker-top-right:after{border-bottom-color:#fff;top:-4px}.datepicker-bottom-left,.datepicker-bottom-right{border-bottom-color:#39f}.datepicker-bottom-left:after,.datepicker-bottom-left:before,.datepicker-bottom-right:after,.datepicker-bottom-right:before{border-bottom:0;bottom:-5px;left:10px}.datepicker-bottom-left:before,.datepicker-bottom-right:before{border-top-color:#39f}.datepicker-bottom-left:after,.datepicker-bottom-right:after{border-top-color:#fff;bottom:-4px}.datepicker-bottom-right:after,.datepicker-bottom-right:before,.datepicker-top-right:after,.datepicker-top-right:before{left:auto;right:10px}.datepicker-panel>ul{margin:0;padding:0;width:102%}.datepicker-panel>ul:after,.datepicker-panel>ul:before{content:" ";display:table}.datepicker-panel>ul:after{clear:both}.datepicker-panel>ul>li{background-color:#fff;cursor:pointer;float:left;height:30px;list-style:none;margin:0;padding:0;text-align:center;width:30px}.datepicker-panel>ul>li:hover{background-color:#e5f2ff}.datepicker-panel>ul>li.muted,.datepicker-panel>ul>li.muted:hover{color:#999}.datepicker-panel>ul>li.highlighted{background-color:#e5f2ff}.datepicker-panel>ul>li.highlighted:hover{background-color:#cce5ff}.datepicker-panel>ul>li.picked,.datepicker-panel>ul>li.picked:hover{color:#39f}.datepicker-panel>ul>li.disabled,.datepicker-panel>ul>li.disabled:hover{background-color:#fff;color:#ccc;cursor:default}.datepicker-panel>ul>li.disabled.highlighted,.datepicker-panel>ul>li.disabled:hover.highlighted{background-color:#e5f2ff}.datepicker-panel>ul>li[data-view="month next"],.datepicker-panel>ul>li[data-view="month prev"],.datepicker-panel>ul>li[data-view="year next"],.datepicker-panel>ul>li[data-view="year prev"],.datepicker-panel>ul>li[data-view="years next"],.datepicker-panel>ul>li[data-view="years prev"],.datepicker-panel>ul>li[data-view=next]{font-size:18px}.datepicker-panel>ul>li[data-view="month current"],.datepicker-panel>ul>li[data-view="year current"],.datepicker-panel>ul>li[data-view="years current"]{width:150px}.datepicker-panel>ul[data-view=months]>li,.datepicker-panel>ul[data-view=years]>li{height:52.5px;line-height:52.5px;width:52.5px}.datepicker-panel>ul[data-view=week]>li,.datepicker-panel>ul[data-view=week]>li:hover{background-color:#fff;cursor:default}.datepicker-hide{display:none}