Compare commits

...

12 Commits

Author SHA1 Message Date
Maxime Thévenot 4518a8a5e2 Fix: set noindex on spontaneous answer 2018-07-25 16:11:32 +02:00
Thomas MONCHICOURT c6a00a24c7 Merge branch 'develop'
# Conflicts:
#	volume/www/website/www/web/css/styles.css.map
2018-07-23 14:59:36 +02:00
Thomas MONCHICOURT 68ca21136a Fix : merge css 2018-07-23 14:55:29 +02:00
Thomas MONCHICOURT d14bea9c1a Fix : Territoires en homepage #6769 @0h10 2018-07-23 14:47:01 +02:00
Thomas MONCHICOURT b2a6e425aa Fix : modif css suite merge 2018-07-23 14:13:21 +02:00
Thomas MONCHICOURT fd48045549 Merge branch 'feat/new-style-title' into develop
# Conflicts:
#	volume/www/website/www/web/css/styles.css.map
2018-07-23 14:12:46 +02:00
Thomas MONCHICOURT 512d269f53 feat : Modification des titles en home #6769 @0h15 2018-07-23 11:07:07 +02:00
Thomas MONCHICOURT 3743166ac2 Feat: modification recherche #6770 @1h20 2018-07-23 10:45:31 +02:00
Thomas MONCHICOURT 72c72a5986 Feat : modification recherche #6770 @0h30 2018-07-20 17:08:08 +02:00
Thomas MONCHICOURT f3e2cb2cf1 Feat : Nouveau bandeau offre pourvu #6779 @0h30 2018-07-20 16:36:18 +02:00
Thomas MONCHICOURT c83832cdc1 Fix : liste annonce territoire 2018-07-10 10:15:14 +02:00
Thomas MONCHICOURT dc4fbb6d63 Fix : calcul nb annonce territoire 2018-07-10 10:12:43 +02:00
19 changed files with 172 additions and 46 deletions
@@ -1,4 +1,7 @@
{% extends 'base.html.twig' %}
{% block metarobot %}<meta name="robots" content="noindex,follow">{% endblock %}
{% block content %}
{% if typeObject == 'Ad' %}
{% set subtitle = 'Candidature à l\'offre d\'emploi:' %}
@@ -27,9 +27,11 @@
<h3>Profil du talent : </h3>
<div class="profil">
<p class="profil-picture">
{% if answer.user.getWebPath() %}
<img src="{{ answer.user.getWebPath() | imagine_filter('profile_square') }}"
alt="{{ answer.user.firstname }} {{ answer.user.lastname }}"
class="circle responsive-img"/>
{% endif %}
</p>
<i class="fa fa-user-circle"
aria-hidden="true"></i> {{ answer.user.firstname }} {{ answer.user.lastname }}
@@ -12,10 +12,12 @@
<span class="playerbtn"></span>
{% endif %}
</a>
{% if a.isPromoted %}
<div class="isPromoted">
OFFRE POURVUE
</div>
{% endif %}
</div>
{% if a.isPromoted %}
<div class="isPromoted"><img src="{{asset('/img/offre-pourvue-gauche.png')}}" alt="promoted"></div>
{% endif %}
<div class="col s12 m8 col-noPadding">
<div class="row row-infos row-noMargin">
<div class="col s4 m4 l5 company-infos col-noPadding">
@@ -47,7 +47,9 @@
</div>
{#{% endif %}#}
{% if ad.isPromoted %}
<div class="isPromoted"><img src="{{asset('/img/offre-pourvue-gauche.png')}}" alt="promoted"></div>
<div class="isPromoted">
OFFRE POURVUE
</div>
{% endif %}
</div>
{% endif %}
@@ -33,7 +33,10 @@
<div id="liste-jobs" class="fuild-container bg-grey-3 button-plus">
<div class="container">
<div class="row center-align">
<div class="col s12"><h2 class="blue-text no-margin-top">Les offres <span>d'emploi</span></h2></div>
<div class="col s12">
<h2 class="blue-text no-margin-top">Les offres d'emploi</h2>
<h3 class="subtitles-homepage">Postulez en CV vidéo ou vidéo de motivation</h3>
</div>
</div>
<div class="row">
<div class="col s12 col-noPadding">
@@ -47,7 +50,7 @@
<div class="row center-align">
<div class="col s12">
<a href="{{ path('ad_search_result') }}" title="Découvrir toutes les offres d'emploi"
class="btn btn-default btn-round btn-all-jobs">Découvrir toutes les offres d'emploi
class="btn btn-default btn-round btn-all-jobs">Voir les offres
</a>
</div>
</div>
@@ -60,9 +63,8 @@
<div class="container">
<div class="row center-align">
<div class="col s12">
<h2 class="blue-text no-margin-top">
La marque employeur des <span>entreprises de talents</span>
</h2>
<h2 class="blue-text no-margin-top">Ils recrutent</h2>
<h3 class="subtitles-homepage">Ils méritent votre candidature spontanée, découvrez leur réalité, leur marque employeur.</h3>
</div>
</div>
<div class="row">
@@ -76,7 +78,7 @@
</div>
<div class="row center-align">
<div class="col s12">
<a href="{{ path('company_list') }}" title="Toutes les entreprise" class="btn btn-default btn-round btn-all-talents">Découvrir toutes les entreprises</a>
<a href="{{ path('company_list') }}" title="Toutes les entreprise" class="btn btn-default btn-round btn-all-talents">Voir les entreprises</a>
</div>
</div>
</div>
@@ -90,8 +92,8 @@
<div id="liste-talents" class="bg-dark2 button-plus">
<div class="container">
<div class="row center-align">
<div class="col s12"><h2 class="blue-text no-margin-top">Les CV vidéo
<span>à la une</span></h2></div>
<div class="col s12"><h2 class="blue-text no-margin-top">Les talents</h2></div>
<h3 class="subtitles-homepage">Découvrez leurs CV vidéo et vidéo de motivation.</h3>
</div>
<div class="row">
<div class="owl-carousel owl-carousel-home home-talent-carousel">
@@ -107,7 +109,8 @@
<div class="container">
<div class="row center-align">
<div class="col s12">
<h2 class="blue-text no-margin-top">Les territoires <span>pour vivre et travailler</span></h2>
<h2 class="blue-text no-margin-top">Les territoires</h2>
<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 %}
@@ -120,8 +123,8 @@
</div>
</div>
<div class="m-t-30">
<a title="territoire de {{ territory.brandname }}" class="btn btn-default" href="{{ path('territory_show',{'alias': territory.alias }) }}">
Voir le territoire de <span>{{ territory.brandname }}</span>
<a title="Voir les territoires" class="btn btn-default" href="{{ path('territory_list') }}">
Voir les territoires</span>
</a>
</div>
</div>
@@ -68,7 +68,7 @@
<a class="td-none color-grey3"
href="{{ path('territory_show',{'alias': c.alias, '_fragment':'offers' }) }}">
{% set nbAds = 0 %}
{% for territoryAd in c.getTerritoryAds if territoryAd.company != null %}
{% for territoryAd in c.getTerritoryAds if territoryAd.ad != null %}
{% set nbAds = nbAds + 1 %}
{% endfor %}
{% if nbAds > 1 %}
@@ -298,11 +298,17 @@ class AdController extends Controller
if ($form->isSubmitted() && $form->isValid()) {
$data = $form->getData();
if (is_null($data['job'])) {
return $this->redirectToRoute('homepage');
//return $this->redirectToRoute('homepage');
$session->remove('jobSearch');
unset($data['job']);
} else {
$session->set('jobSearch', $data['job']);
}
$session->set('jobSearch', $data['job']);
if (!is_null($data['contrat'])) {
$session->set('contratSearch', $data['contrat']);
} else {
$session->remove('contratSearch');
}
$adSearcher = $this->get('app.ad_searcher');
$ads = $adSearcher->process($data);
@@ -319,7 +325,8 @@ class AdController extends Controller
return $this->render('default/ad_search_result.html.twig', [
'ads' => $ads,
'noResults' => $noResults
'noResults' => $noResults,
'isPromotedAds' => $promoted
]);
} else {
@@ -357,6 +364,7 @@ class AdController extends Controller
$ads[] = $ad;
}
}
return $ads;
}
@@ -16,7 +16,7 @@ class AdSearchType extends AbstractType
$builder
->add('job', TextType::class, array(
'label' => false,
'required' => true,
'required' => false,
'attr' => array(
'placeholder' => 'Rechercher une offre d\'emploi vidéo par mots clés',
)
@@ -52,11 +52,12 @@ class AdSearcher
}
$boolQuery = new \Elastica\Query\BoolQuery();
$fieldQuery = new \Elastica\Query\MultiMatch();
$fieldQuery->setQuery($data['job']);
$fieldQuery->setFields(['title', 'publicTag', 'company.brandname']);
$boolQuery->addMust($fieldQuery);
if(isset($data['job'])){
$fieldQuery->setQuery($data['job']);
$fieldQuery->setFields(['title', 'publicTag', 'company.brandname']);
$boolQuery->addMust($fieldQuery);
}
if($data['contrat']){
$fieldQueryContract = new \Elastica\Query\Match();
$fieldQueryContract->setFieldQuery('contract_type', $data['contrat']);
@@ -269,6 +269,24 @@ $(document).ready(function () {
$("#ad_search_location").val(JSON.stringify(gmap_address));
}
}
$("#ad_search_location_gmap").keydown(function (e) {
if (e.keyCode == 13) {
e.preventDefault();
var geocoder = new google.maps.Geocoder();
geocoder.geocode({ 'address': $(this).val()}, function(results, status) {
if (status == google.maps.GeocoderStatus.OK) {
if( results[0]['types'][0] == "locality"){
var gmap_address = {'gmap_address': results[0]}
$("#ad_search_location").val(JSON.stringify(gmap_address));
$("form[name='ad_search']").submit();
}
} else {
Materialize.toast('Aucune position trouvé pour cette ville.', 4000);
}
});
}
});
}
$('.bm-talent').on('click', 'span', function () {
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+43 -9
View File
@@ -14826,7 +14826,8 @@ h1 {
h2 {
font-size: 35px;
margin: 60px 0 45px 0; }
margin: 60px 0 15px 0;
font-weight: 500; }
h2 span {
text-decoration: none;
border-bottom: 1px solid; }
@@ -14847,6 +14848,14 @@ h6 {
font-size: 17px;
margin: 0px 0 10px 0; }
.subtitles-homepage {
margin-bottom: 30px;
color: #999CA2;
font-weight: 400;
font-family: 'Raleway';
font-size: 13px;
margin: 0 0 30px 0; }
.z-depth-2 {
box-shadow: 1px 5px 20px rgba(0, 0, 0, 0.1); }
@@ -15805,18 +15814,37 @@ table.highlight > tbody > tr:hover {
margin: 0 5px 0 20px; }
/* Offre Pourvue */
#adRow,
#adRow .ad-picture {
position: relative; }
#adRow .isPromoted {
font-family: raleway, sans-serif;
font-weight: 600;
font-size: 13px;
color: #1E2327;
letter-spacing: 4px;
background-color: #FCB857;
height: 33px;
line-height: 32px;
width: 100%;
position: absolute;
bottom: 30px;
text-align: center; }
#adVideo {
position: relative; }
#adRow .isPromoted,
#adVideo .isPromoted {
font-family: raleway, sans-serif;
font-weight: 600;
font-size: 13px;
color: #1E2327;
letter-spacing: 4px;
background-color: #FCB857;
height: 33px;
line-height: 32px;
width: 100%;
position: absolute;
top: -3px;
left: -3px; }
#adRow .isPromoted img,
#adVideo .isPromoted img {
width: 101px;
height: 101px; }
top: 0px;
text-align: center; }
.card-image {
position: relative; }
@@ -15852,6 +15880,12 @@ table.highlight > tbody > tr:hover {
#company_show .item-detail-date {
font-size: 13px; }
#company_show #offers h1 {
font-size: 16px;
font-weight: bold;
margin-top: 30px;
margin-bottom: 33px;
text-transform: uppercase; }
#company_show #companies h1 {
font-size: 16px;
font-weight: bold;
margin-top: 70px;
File diff suppressed because one or more lines are too long
+18
View File
@@ -269,6 +269,24 @@ $(document).ready(function () {
$("#ad_search_location").val(JSON.stringify(gmap_address));
}
}
$("#ad_search_location_gmap").keydown(function (e) {
if (e.keyCode == 13) {
e.preventDefault();
var geocoder = new google.maps.Geocoder();
geocoder.geocode({ 'address': $(this).val()}, function(results, status) {
if (status == google.maps.GeocoderStatus.OK) {
if( results[0]['types'][0] == "locality"){
var gmap_address = {'gmap_address': results[0]}
$("#ad_search_location").val(JSON.stringify(gmap_address));
$("form[name='ad_search']").submit();
}
} else {
Materialize.toast('Aucune position trouvé pour ce lieu.', 4000);
}
});
}
});
}
$('.bm-talent').on('click', 'span', function () {
@@ -13,8 +13,8 @@ $grey2: #AAAAAA;
$grey3: #F2F3F5;
$grey4: #333A40;
$grey5 : #535353;
$grey6 : #999CA2;
$orange: #ff9800;
$font-1: "Raleway", sans-serif;
$font-2: "Varela Round", sans-serif;
@@ -69,7 +69,8 @@ h1 {
h2 {
font-size: 35px;
margin: 60px 0 45px 0;
margin: 60px 0 15px 0;
font-weight: 500;
span {
text-decoration: none;
border-bottom: 1px solid;
@@ -96,6 +97,17 @@ h6 {
margin: 0px 0 10px 0;
}
.subtitles-homepage{
margin-bottom : 30px;
color : $grey6;
font-weight: 400;
font-family: 'Raleway';
font-size: 13px;
margin: 0 0 30px 0;
}
.z-depth-2{
box-shadow : 1px 5px 20px rgba(0,0,0,0.1)
}
@@ -97,17 +97,40 @@
/* Offre Pourvue */
#adRow,
#adRow{
.ad-picture{
position: relative;
}
.isPromoted {
font-family: raleway, sans-serif;
font-weight: 600;
font-size: 13px;
color: #1E2327;
letter-spacing : 4px;
background-color : #FCB857;
height : 33px;
line-height: 32px;
width : 100%;
position: absolute;
bottom : 30px;
text-align: center;
}
}
#adVideo {
position: relative;
.isPromoted {
font-family: raleway, sans-serif;
font-weight: 600;
font-size: 13px;
color: #1E2327;
letter-spacing : 4px;
background-color : #FCB857;
height : 33px;
line-height: 32px;
width : 100%;
position: absolute;
top: -3px;
left: -3px;
img {
width: 101px;
height: 101px;
}
top : 0px;
text-align: center;
}
}