Feat : rechargement de la dropzone au chargement de video sur les réponse

Merge branch 'master' into develop
Feat : dropzone reload
2018-08-23 15:31:54 +02:00 · 2018-08-23 15:23:18 +02:00 · 2018-08-23 15:19:46 +02:00 · 2018-08-23 15:19:37 +02:00 · 2018-08-23 14:56:42 +02:00 · 2018-08-23 14:15:12 +02:00
841 changed files with 60030 additions and 13200 deletions
@@ -8,3 +8,5 @@
 /backup
 /conf/env/*.env
 volume/www/website/.idea
+/volume/www/website/store/themes/talentstube-20170413/cache/*
+/volume/www/website/store/img/tmp/*
@@ -84,7 +84,7 @@ db-restore-website:

 db-restore-store:
 	@echo "Restoring file to database (backup/store-mysql.sql)"
-	@docker exec -i $(CLIENT).mysql.$(ENV) mysql -uroot database < backup/store-mysql.sql
+	@docker exec -i $(CLIENT).store-mysql.$(ENV) mysql -uroot database < backup/store-mysql.sql

 cc:
 	@echo "Clearing symfony cache"
@@ -10,6 +10,8 @@ RUN rm /etc/nginx/conf.d/default.conf \
 	&& sed -i 's|include /etc/nginx/conf.d/\*.conf;|include /etc/nginx/conf.d/\*.conf;\ninclude /etc/nginx/sites-enabled/\*.conf;\n|' /etc/nginx/nginx.conf

 COPY log_format.conf /etc/nginx/conf.d/
+COPY tt-dev.crt /etc/nginx/ssl/server.crt
+COPY tt-dev.key /etc/nginx/ssl/server.key

 RUN apt-get clean \
 	&& rm -rf /var/lib/apt/lists/
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDrjCCApYCCQD0c9mokUtilTANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMC
+RlIxDDAKBgNVBAgMA0JaSDEOMAwGA1UEBwwFQXVyYXkxGTAXBgNVBAoMEHRhbGVu
+dHN0dWJlLnRlc3QxETAPBgNVBAsMCGUtZGVjbGljMRkwFwYDVQQDDBB0YWxlbnRz
+dHViZS50ZXN0MSIwIAYJKoZIhvcNAQkBFhN0aG9tYXNAZS1kZWNsaWMuY29tMB4X
+DTE4MDQzMDA5MTkwMVoXDTE5MDQzMDA5MTkwMVowgZgxCzAJBgNVBAYTAkZSMQww
+CgYDVQQIDANCWkgxDjAMBgNVBAcMBUF1cmF5MRkwFwYDVQQKDBB0YWxlbnRzdHVi
+ZS50ZXN0MREwDwYDVQQLDAhlLWRlY2xpYzEZMBcGA1UEAwwQdGFsZW50c3R1YmUu
+dGVzdDEiMCAGCSqGSIb3DQEJARYTdGhvbWFzQGUtZGVjbGljLmNvbTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBANVTxapL6RtTjEoO4wWTswIqTW/zTI4B
+bETbPHYOeb8+kgLTxH04ETmVzPYz0b5RfkotY0EZzwntv3c5JsLnqqrQAXN4fcl3
+iIXCXMKUo1Nrbp0yAMGzGDmnpmvABE/nkg0ZJ3YeKV9xkEYcyMCU+DhUuazd1W3d
+odjMs/BHeuoZau9HRE+6lE+/tqWhHrmgRghP8g2Z2g8lrHak5BuQNwnvVmg6oJae
+94DWygKV7ZJ3vBHRkLIOaG+mVI8FRjrlHQke/tFStD2dd3TgsqvzYBM3f1VBm85y
+qhyIxr2s+xgOl2/Z0VZzmVgI2jAPhvN8VNvXtlFM6BOkyHAFwm7jCtcCAwEAATAN
+BgkqhkiG9w0BAQsFAAOCAQEAjlPu5wtZwW0jP0cBBBvZWLRe9+Wlz9uJXiOb2AMF
+ibYeKgcGNbruY8Ayvmm++C/mMpkm50NG5ycEiO5rB/1665zB5ibWAswRD+F5rjzx
+8qM4YsUVDkiuW5ul0RI2KO6llAbdQaCfaqXtsCZ+b/XVwe41S1ZkvigLaL99pscU
+ghgD9yz/RY6C7PHPS+8dF0Uc+YND3vqWfAhUQCXdXetXndPMxwBOXnT08RQOWMBK
+lTSHIsFACFhynL3wfQ6xH4+/TQkquxzqqh3MeB1LpqHiFChCoNmBPKWf7ZvFkg/p
+4DzXTkLs6G6/WM7DuBmwB6e5tevJfe/BSkzCLaJKABDaOA==
+-----END CERTIFICATE-----
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDVU8WqS+kbU4xK
+DuMFk7MCKk1v80yOAWxE2zx2Dnm/PpIC08R9OBE5lcz2M9G+UX5KLWNBGc8J7b93
+OSbC56qq0AFzeH3Jd4iFwlzClKNTa26dMgDBsxg5p6ZrwARP55INGSd2HilfcZBG
+HMjAlPg4VLms3dVt3aHYzLPwR3rqGWrvR0RPupRPv7aloR65oEYIT/INmdoPJax2
+pOQbkDcJ71ZoOqCWnveA1soCle2Sd7wR0ZCyDmhvplSPBUY65R0JHv7RUrQ9nXd0
+4LKr82ATN39VQZvOcqociMa9rPsYDpdv2dFWc5lYCNowD4bzfFTb17ZRTOgTpMhw
+BcJu4wrXAgMBAAECggEACj5ikIHiqLBDXU8Hsb3c666yVzzcoTkKROguKBEb4YYU
+ptQabFTj5tr9o5jranMpWFCDop2lpnlnJ0d0SAmt1VP1reDMUX9O6/VgVOukSB4x
+ipTbGnIKKMKXKDdpPZkGF2Ds1ywtmmqund9F+JFute3DmLxyQjtRSULTJSeZjGIj
+kk4mUHIZr71q2KocBEhDZhoaf6aiM3tfyXIlg0C6GzcfGKk4a2C6Ia7D24icPLa7
+JE4Omh6w8duQsme8YeFbbixLlwm+74qvo7k8ubqZAvvODQlKz4xiT1App4cTq6nm
+PbAuFvLX0DtkndBSgAUa3h8iuchdv15M2FkUWkenaQKBgQD7iup0vZqqIFh6Sk08
+k3Skbit6TXwMt4yjP9/JTgMaIO5LfZiht2xyxN4gN2XVp6k4Jn5SPxGuGV+e5QSr
+9R04x5wN6NwZAprL70UuztHZdXpzNVogF4hF4LdGDT8CbeFF5ciiTQaAKwX9euOT
+HRf6RGT80qiKVcZ+C3zhR6CxAwKBgQDZG39+6DzdGetLzls7B6R1PPV7RLOn6bts
+jbxSkx/VksHkS1Q4lG1fXM2q/VdSTFg/gNNKzLCADDVrO9KonvVrvMZlshiSLXTJ
+GVgfe+UGSL7VjbH4G4bAqznK5zK8ADI1BRyCU3UrzFqRHoV9h9e2qIfjJrK4taX7
+G5KAukDUnQKBgQC6GBLOnTtgY5+xkWjEyP6Ba7QkvlBpBB465FWGk31+BiDlnpyd
+/5pu6jC/OtzPDUQG84t/A4Pr/n+ciShEo4mj6SENtVmn8yJcf776Gy5rKBuYQj9U
+ALTjpZVRcRlNjccctBwT3tJRXgMHfbQBsYN8tr7TwHHKLh00QQF5lUlPywKBgB2a
+SkAbmnDrX9HuSTI7UIlLzo0ISRbUH+IlUVBRDz4nzJg8TTeJxYADP2fZM1bdYgsG
+ncjNMCPFhmMgvRCQ3BXcn5CuP/tuh0YEVqe0VP4OXTbxIxsZZb5Pmom4DIrl2/Ku
+x7xddNSMAK1Y5ArBwv/86spmNGhLHF6o28kBnGVhAoGAOcGzpJi1l0BzNUKBS512
+XlLUYswFW6OqcEk1iGTvEFUzZ9Agp2Yc7HZ3MrmCAjugx37tAfNKQglF2/AJ9Uuy
+yoUpPtdXX6CuPTMkzCkvAYbRGohE/cw7ZjI6vTqoEPiyrQA1lJYTIMQm3FYivjJl
+z84K0Vlv64BeiIpJrvzW+2A=
+-----END PRIVATE KEY-----
@@ -5,6 +5,7 @@ services:
  nginx:
    ports:
      - "80:80"
+      - "443:443"
    volumes:
      - ../volume/www:/home/www:cached
    restart: "no"
@@ -0,0 +1,13 @@
+version: '3'
+
+services:
+  nginx:
+    networks:
+      - default
+      - frontnginx_front
+
+networks:
+  default:
+    driver: bridge
+  frontnginx_front:
+    external: true
@@ -8,11 +8,14 @@ upstream store_php {
 }

 server {
-
+    listen 80;
+    listen 443 ssl;
    server_name talentstube.test;
    root /home/www/website/www/web;
    client_max_body_size 500M;
    sendfile off;
+    ssl_certificate /etc/nginx/ssl/server.crt;
+    ssl_certificate_key /etc/nginx/ssl/server.key;

    # DEV
    location / {
@@ -1,44 +1,22 @@
-
 upstream website_php-preprod {
-    server tt.website-preprod:9000;
+    server tt-website.php.preprod:9000;
 }

 upstream store_php-preprod {
-    server tt.store-preprod:9000;
+    server tt-website.store-php.preprod:9000;
 }

 server {
-       listen 80;
-       server_name pp.talentstube.com;
-       return 301 https://pp.talentstube.com$request_uri;
-}
-
-server {
-    listen 443 ssl http2;
+    listen 80;
    server_name pp.talentstube.com;

    client_max_body_size 500M;
+    root /home/www/website/www/web;

-    root /home/www/pp.talentstube.com/www/web;
+    access_log /home/www/website/log/access.log vhosts;
+    error_log  /home/www/website/log/error.log;

-    access_log /home/www/pp.talentstube.com/log/access.log vhosts;
-    error_log  /home/www/pp.talentstube.com/log/error.log;
-
-    ssl on;
-    ssl_certificate /etc/ssl/private/talentstube.com.chain.crt;
-    ssl_certificate_key /etc/ssl/private/talentstube.com.key;
-
-    ssl_session_timeout 24h;
-    ssl_session_cache shared:SSL:10m;
-
-    ssl_dhparam /etc/ssl/dhparam.pem;
-
-    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-    ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA';
-    ssl_prefer_server_ciphers on;
- 
    location / {
-        # try to serve file directly, fallback to app.php
        try_files $uri /app.php$is_args$args;
    }

@@ -85,7 +63,7 @@ server {
    # ---- PRESTASHOP ----
    location ^~ /store/ {

-        root /home/www/pp.talentstube.com;
+        root /home/www/website;
        index index.php;
        try_files $uri $uri/ /www/index.php;

@@ -115,6 +93,6 @@ server {

    sendfile off;

-    include /home/www/pp.talentstube.com/conf/redirect.conf;
-    include /home/www/pp.talentstube.com/conf/expires.conf;
+    include /home/www/website/conf/redirect.conf;
+    include /home/www/website/conf/expires.conf;
 }
@@ -9,4 +9,6 @@ rewrite  ^/plateforme$  https://www.talentstube.com/ permanent;
 rewrite  ^/page/les-conseils$  https://www.talentstube.com/accompagnement-entreprise permanent;
 rewrite  ^/page/presentation-talent$  https://www.talentstube.com/cv-video permanent;
 rewrite  ^/page/la-plateforme$  https://www.talentstube.com/ permanent;
-rewrite ^/tarifs$ https://www.talentstube.com/accompagnement-entreprise 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;
@@ -1,5 +1,5 @@
 <?php
-define('_DB_SERVER_', 'tt-website.store-php.prod');
+define('_DB_SERVER_', 'tt-website.store-mysql.prod');
 define('_DB_NAME_', 'database');
 define('_DB_USER_', 'user');
 define('_DB_PASSWD_', 'O}lk|45&J,kT+DDM{uk[');
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?><rss version="2.0" xml:base="https://www.prestashop.com/fr/blog/feed.xml" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:og="http://ogp.me/ns#" xmlns:article="http://ogp.me/ns/article#" xmlns:book="http://ogp.me/ns/book#" xmlns:profile="http://ogp.me/ns/profile#" xmlns:video="http://ogp.me/ns/video#" xmlns:product="http://ogp.me/ns/product#" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:sioc="http://rdfs.org/sioc/ns#" xmlns:sioct="http://rdfs.org/sioc/types#" xmlns:skos="http://www.w3.org/2004/02/skos/core#" xmlns:xsd="http://www.w3.org/2001/XMLSchema#">
-  <channel>
-    <title>Blog Feed</title>
-    <link>https://www.prestashop.com/fr/blog/feed.xml</link>
-    <description></description>
-    <language>fr</language>
-     <atom:link href="https://www.prestashop.com/fr/blog/feed.xml" rel="self" type="application/rss+xml" />
-      <item>
-    <title>4 moyens d’augmenter votre taux de conversion grâce à votre page de paiement</title>
-    <link>https://www.prestashop.com/fr/4-moyens-daugmenter-votre-taux-de-conversion-grace-a-votre-page-de-paiement-6</link>
-    <description>Par 
-Dernier contact entre un marchand et son client, nous savons que le check-out est un passage délicat dans le tunnel de conversion.
-</description>
-     <pubDate>Thu, 20 Jul 2017 16:30:04 +0200</pubDate>
- <dc:creator>Anonymous</dc:creator>
- <guid isPermaLink="false">https://www.prestashop.com/fr/4-moyens-daugmenter-votre-taux-de-conversion-grace-a-votre-page-de-paiement-6</guid>
-  </item>
-  <item>
-    <title>Comment une agence de développement web peut-elle vous être utile ?</title>
-    <link>https://www.prestashop.com/fr/comment-une-agence-de-developpement-web-peut-elle-vous-etre-utile</link>
-    <description>Par 
-Lorsqu’un marchand nous contacte pour la première fois, l’une des questions récurrentes est : &quot;Pourquoi confier ses développements à une agence ?&quot;. Puis, à propos de PrestaShop: &quot;Puisque le logiciel est gratuit, ai-je vraiment besoin d&#039;un prestataire technique ?&quot;.
-</description>
-     <pubDate>Thu, 20 Jul 2017 14:46:24 +0200</pubDate>
- <dc:creator>Anonymous</dc:creator>
- <guid isPermaLink="false">https://www.prestashop.com/fr/comment-une-agence-de-developpement-web-peut-elle-vous-etre-utile</guid>
-  </item>
-  <item>
-    <title>Rencontrez Nicolas, Ambassadeur du mois | Juillet 2017</title>
-    <link>https://www.prestashop.com/fr/blog/prestashop-ambassadors/rencontrez-nicolas-ambassadeur-du-mois-juillet-2017-2</link>
-    <description>CreaNico est notre Ambassadeur à Montpellier, France, et est très actif dans la région.</description>
-     <pubDate>Tue, 18 Jul 2017 17:27:38 +0200</pubDate>
- <dc:creator>Manon Plommet</dc:creator>
- <guid isPermaLink="false">https://www.prestashop.com/fr/blog/prestashop-ambassadors/rencontrez-nicolas-ambassadeur-du-mois-juillet-2017-2</guid>
-  </item>
-  <item>
-    <title>Zoom sur l&amp;#039;e-commerce italien</title>
-    <link>https://www.prestashop.com/fr/blog/tendances-e-commerce/zoom-sur-le-commerce-italien</link>
-    <description>Avec un taux de croissance des ventes de 18% en 2016, une base d’acheteurs en ligne de 18 millions de personnes et un panier moyen en augmentation, le e-commerce italie</description>
-     <pubDate>Mon, 17 Jul 2017 18:34:12 +0200</pubDate>
- <dc:creator>vMartelli</dc:creator>
- <guid isPermaLink="false">https://www.prestashop.com/fr/blog/tendances-e-commerce/zoom-sur-le-commerce-italien</guid>
-  </item>
-  <item>
-    <title>Rentrée, Black Friday, Noël : Téléchargez votre guide e-commerce de fin d&amp;#039;année</title>
-    <link>https://www.prestashop.com/fr/blog/actualites-prestashop/rentree-black-friday-noel-telechargez-votre-guide-e-commerce-de-fin-dannee-1</link>
-    <description>La rentrée, Black Friday, Noël : en quelques mois seulement se joue la majeure partie du chiffre d’affaires de l’activité e-commerce.</description>
-     <pubDate>Mon, 17 Jul 2017 14:28:47 +0200</pubDate>
- <dc:creator>Cécile Dubouis</dc:creator>
- <guid isPermaLink="false">https://www.prestashop.com/fr/blog/actualites-prestashop/rentree-black-friday-noel-telechargez-votre-guide-e-commerce-de-fin-dannee-1</guid>
-  </item>
-  <item>
-    <title>Lutte contre la fraude à la TVA, allègement de la loi</title>
-    <link>https://www.prestashop.com/fr/blog/actualites-prestashop/lutte-fraude-tva-allegement-loi</link>
-    <description>Suite à notre article Conformité à l’articl</description>
-     <pubDate>Mon, 26 Jun 2017 10:10:00 +0200</pubDate>
- <dc:creator>Mohammed Bellamine</dc:creator>
- <guid isPermaLink="false">https://www.prestashop.com/fr/blog/actualites-prestashop/lutte-fraude-tva-allegement-loi</guid>
-  </item>
-  <item>
-    <title>Planning et astuces pour créer des promotions efficaces sur PrestaShop</title>
-    <link>https://www.prestashop.com/fr/blog/conseils-e-commerce/planning-et-astuces-pour-creer-des-promotions-efficaces-sur-prestashop</link>
-    <description>Été, rentrée, Black Friday, Noël… Les promotions de fin d’année sont primordiales en e-commerce, mais leur préparation peut être chronophage.</description>
-     <pubDate>Mon, 19 Jun 2017 11:24:19 +0200</pubDate>
- <dc:creator>Cécile Dubouis</dc:creator>
- <guid isPermaLink="false">https://www.prestashop.com/fr/blog/conseils-e-commerce/planning-et-astuces-pour-creer-des-promotions-efficaces-sur-prestashop</guid>
-  </item>
-  <item>
-    <title>10 ans – 10 interviews « portrait » : Keiko ITO, développeuse web au Japon  </title>
-    <link>https://www.prestashop.com/fr/blog/actualites-prestashop/10-ans-10-interviews-portrait-keiko-ito-developpeuse-web-au-japon</link>
-    <description>Le pitch / Originaire de Kobe, au Japon, Keiko est passionnée par le web et la France.</description>
-     <pubDate>Fri, 16 Jun 2017 16:17:35 +0200</pubDate>
- <dc:creator>Mpierrot</dc:creator>
- <guid isPermaLink="false">https://www.prestashop.com/fr/blog/actualites-prestashop/10-ans-10-interviews-portrait-keiko-ito-developpeuse-web-au-japon</guid>
-  </item>
-  <item>
-    <title>Rencontrez Claudia, Ambassadrice du mois | Juin 2017</title>
-    <link>https://www.prestashop.com/fr/blog/prestashop-ambassadors/clone-of-meet-claudia-ambassador-of-the-month-june-2017</link>
-    <description>Claudia est notre Ambassadrice à Monterrey, Mexique, et y organise des meetups très régulièrement. Elle est toujours partante pour parler de PrestaShop !</description>
-     <pubDate>Fri, 16 Jun 2017 11:38:21 +0200</pubDate>
- <dc:creator>Manon Plommet</dc:creator>
- <guid isPermaLink="false">https://www.prestashop.com/fr/blog/prestashop-ambassadors/clone-of-meet-claudia-ambassador-of-the-month-june-2017</guid>
-  </item>
-  <item>
-    <title>10 ans – 10 interviews « portrait » : Corinne Lejbowicz, CEO de PrestaShop</title>
-    <link>https://www.prestashop.com/fr/blog/actualites-prestashop/10-ans-10-interviews-portrait-corinne-lejbowicz-ceo-de-prestashop</link>
-    <description>Le pitch / En 2007, Corinne Lejbowicz est CEO de LeGuide.com, où elle rencontre le jeune Bruno Lévêque.</description>
-     <pubDate>Wed, 14 Jun 2017 15:06:02 +0200</pubDate>
- <dc:creator>Mpierrot</dc:creator>
- <guid isPermaLink="false">https://www.prestashop.com/fr/blog/actualites-prestashop/10-ans-10-interviews-portrait-corinne-lejbowicz-ceo-de-prestashop</guid>
-  </item>
-  </channel>
-</rss>
@@ -261,7 +261,7 @@
 </tab>
 <tab class_name="AdminPayment" display_type="default_list">
 <module name="secureframe" position="1"/>
-<module name="paypalmx" position="2"/>
+<module name="paypal" position="13"/>
 <module name="mercadopagobr" position="3"/>
 <module name="payulatam" position="4"/>
 <module name="dotpay" position="5"/>
@@ -272,14 +272,14 @@
 <module name="simplifycommerce" position="10"/>
 <module name="klarnaofficial" position="11"/>
 <module name="spsrsmartsepa" position="12"/>
-<module name="oyst" position="13"/>
-<module name="ewayrapid" position="14"/>
-<module name="fcpayone" position="15"/>
-<module name="pagseguro" position="16"/>
-<module name="ewayrapid" position="17"/>
-<module name="hipay" position="18"/>
-<module name="ogone" position="19"/>
-<module name="payplug" position="20"/>
+<module name="payplug" position="2"/>
+<module name="oyst" position="14"/>
+<module name="ewayrapid" position="15"/>
+<module name="fcpayone" position="16"/>
+<module name="pagseguro" position="17"/>
+<module name="ewayrapid" position="18"/>
+<module name="hipay" position="19"/>
+<module name="ogone" position="20"/>
 <module name="realexredirect" position="21"/>
 <module name="stripe_official" position="22"/>
 <module name="skrill" position="23"/>
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<modules_list><modules type="untrusted"><module name="blockreinsurance"/><module name="etransactions"/><module name="trackingfront"/></modules></modules_list>
@@ -1,2 +0,0 @@
-@charset "UTF-8";
-@media only print{#header .nav,#header .banner,#header .row > div{display:none}#header .row div#header_logo{display:block}#center_column{width:100% !important}#left_column,#right_column{display:none}.no-print,#quantity_wanted_p > a,a.quick-view{display:none !important}div.selector,div.selector span,div.selector select{background:none}#thumbs_list li a:hover,#thumbs_list li a.shown{border-color:#fff}.product_attributes,.box-cart-bottom{-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none}.pb-left-column #views_block{margin-top:10px;width:278px !important}#thumbs_list_frame,#thumbs_list{width:100% !important;height:100% !important}#thumbs_list li,#thumbs_list li:first-child{margin:4px;width:82px;height:82px}#view_scroll_left,#view_scroll_right,.view_scroll_spacer{display:none !important}.bx-wrapper{width:100% !important;max-width:100% !important}.bx-viewport{height:auto !important}#bxslider,#bxslider1,#crossselling_list_car{width:100% !important;height:auto !important;overflow:visible !important}#bxslider1 .product-box{min-height:200px}.bx-controls-direction{display:none}#footer .row > div,#footer .row > section{display:none}#footer .row > div#block_contact_infos,#footer .row > section#block_contact_infos{display:block;width:100%;border-left:none;border-top:1px solid #515151;padding-top:20px}.footer-container #footer h4:after{display:none}}
@@ -51,7 +51,8 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
 			<meta name="keywords" content="{$meta_keywords|escape:'html':'UTF-8'}" />
 		{/if}
 		<meta name="generator" content="PrestaShop" />
-		<meta name="robots" content="{if isset($nobots)}no{/if}index,{if isset($nofollow) && $nofollow}no{/if}follow" />
+		<!-- <meta name="robots" content="{if isset($nobots)}no{/if}index,{if isset($nofollow) && $nofollow}no{/if}follow" /> -->
+		<meta name="robots" content="noindex, nofollow" />
 		<meta name="viewport" content="width=device-width, minimum-scale=0.25, maximum-scale=1.6, initial-scale=1.0" />
 		<meta name="apple-mobile-web-app-capable" content="yes" />
 		<link rel="icon" type="image/vnd.microsoft.icon" href="{$favicon_url}?{$img_update_time}" />
@@ -48,6 +48,9 @@ class AppKernel extends Kernel
            //oAuth
            new Http\HttplugBundle\HttplugBundle(),
            new HWI\Bundle\OAuthBundle\HWIOAuthBundle(),
+
+            //CookieBar
+            new Fairlane\CookieConsentBundle\FairlaneCookieConsentBundle(),
        ];

        if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
@@ -3,18 +3,26 @@
 {% trans_default_domain 'FOSUserBundle' %}

 {% block content %}
-<div class="container contentWrapper">
-  <div class="row">
-        <div class="col push-s3 s6">
-          <h1 class="m-t-20 alttitle center-align">{{'user.register.title'|trans({},"messages") }}</h1>
-          <p>{{ 'registration.confirmed'|trans({'%username%': user.username}) }}</p>
-          {% if targetUrl %}
-          <p><a href="{{ targetUrl }}">{{ 'registration.back'|trans }}</a></p>
-          {% endif %}
-          <br /><br />
+
+    <div class="container contentWrapper">
+        <div class="row">
+            <div class="col push-s3 s6">
+                <h1 class="m-t-20 alttitle center-align">{{'user.register.title'|trans({},"messages") }}</h1>
+                <p>{{ 'registration.confirmed'|trans({'%username%': user.username}) }}</p>
+                {% if targetUrl %}
+                    <p>
+                        <a href="{{ targetUrl }}">{{ 'registration.back'|trans }}</a>
+                    </p>
+                {% endif %}
+                <br/><br/>
+                {% if app.request.cookies.get('redirect_register')is defined %}
+                    <div class="center">
+                        <a href="{{ app.request.cookies.get('redirect_register') }}" class="btn btn-default">Poursuivre votre candidature</a>
+                    </div>
+                {% endif %}
+            </div>
        </div>
-  </div>
-</div>
+    </div>
 {% endblock %}

 {% block metarobot %}
@@ -0,0 +1,46 @@
+{% if fairlane_cookie_consent.active == true and app.request.cookies.get('fairlane-cookie-consent') != 'ok'%}
+    {% if fairlane_cookie_consent.translate == true %}
+        {% set text_info = fairlane_cookie_consent.twig.text_info | trans %}
+        {% set text_additional_info_link = fairlane_cookie_consent.twig.text_additional_info_link | trans %}
+        {% set text_accept_button = fairlane_cookie_consent.twig.text_accept_button | trans %}
+    {% else %}
+        {% set text_info = fairlane_cookie_consent.twig.text_info %}
+        {% set text_additional_info_link = fairlane_cookie_consent.twig.text_additional_info_link %}
+        {% 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 %}>
+        <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">
+        jQuery(document).ready(function() {
+            jQuery("#fairlane-cookie-consent button").click(function(){
+                jQuery.ajax({
+                    async: true,
+                    type: 'POST',
+                    url: '{{ url('fairlane_cookie_consent_accept') }}',
+                    data: JSON.stringify({'cookie-consent': 'ok'}),
+                    success: function(data) {
+                        jQuery("#fairlane-cookie-consent").fadeOut("fast");
+                    },
+                    contentType: "application/json",
+                    dataType: 'json'
+                });
+            })
+        });
+        </script>
+    {% endif %}
+{% endif %}
@@ -59,6 +59,34 @@
            <trans-unit id="DECLINED">
                <source>DECLINED</source>
                <target>Refusée</target>
+            </trans-unit>
+             <trans-unit id="NEW">
+                <source>NEW</source>
+                <target>Nouveau</target>
+            </trans-unit>
+            <trans-unit id="VIEWED">
+                <source>VIEWED</source>
+                <target>Visionnée</target>
+            </trans-unit>
+            <trans-unit id="NEGATIVE">
+                <source>NEGATIVE</source>
+                <target>Négatif</target>
+            </trans-unit>
+            <trans-unit id="POSITIVE">
+                <source>POSITIVE</source>
+                <target>Positif</target>
+            </trans-unit>
+            <trans-unit id="INFOS">
+                <source>INFOS</source>
+                <target>Demande d’informations</target>
+            </trans-unit>
+            <trans-unit id="CONTACTED">
+                <source>CONTACTED</source>
+                <target>Demande d’informations</target>
+            </trans-unit>
+            <trans-unit id="CONTACTED.RDV">
+                <source>CONTACTED.RDV</source>
+                <target>Convocation entretien</target>
            </trans-unit>
            <!-- MENU COMPANY-->
            <trans-unit id="profile.territory.brandname">
@@ -79,7 +107,11 @@
            </trans-unit>
            <trans-unit id="company.menu.ads.label">
                <source>company.menu.ads.label</source>
-                <target>Mes annonces</target>
+                <target>Espace offres d'emploi</target>
+            </trans-unit>
+            <trans-unit id="company.title.ads.label">
+                <source>company.title.ads.label</source>
+                <target>Mes offres d'emploi</target>
            </trans-unit>
            <trans-unit id="company.menu.bookmark.label">
                <source>company.menu.bookmark.label</source>
@@ -87,7 +119,11 @@
            </trans-unit>
            <trans-unit id="company.menu.answers.label">
                <source>company.menu.answers.label</source>
-                <target>Réponses</target>
+                <target>Candidatures</target>
+            </trans-unit>
+            <trans-unit id="company.menu.spontaneous.label">
+                <source>company.menu.spontaneous.label</source>
+                <target>Candidatures spontanées</target>
            </trans-unit>
            <trans-unit id="company.menu.videotheque.label">
                <source>company.menu.videotheque.label</source>
@@ -193,7 +229,7 @@
            <!-- ANNONCE-->
            <trans-unit id="ad.company.add.label">
                <source>ad.company.add.label</source>
-                <target>Ajouter une annonce</target>
+                <target>Ajouter une offre</target>
            </trans-unit>
            <trans-unit id="ad.company.video.edit.label">
                <source>ad.company.video.edit.label</source>
@@ -233,7 +269,7 @@
            </trans-unit>
            <trans-unit id="ad.company.list.status">
                <source>ad.company.list.status</source>
-                <target>Statuts</target>
+                <target>Statut</target>
            </trans-unit>
            <trans-unit id="ad.save.extension.title">
                <source>ad.save.extension.title</source>
@@ -260,6 +296,14 @@
            <trans-unit id="profile.talent.account.title">
                <source>profile.talent.account.title</source>
                <target>Informations de compte</target>
+            </trans-unit>
+                        <trans-unit id="talent.menu.answers.label">
+                <source>talent.menu.answers.label</source>
+                <target>Mes candidatures</target>
+            </trans-unit>
+            <trans-unit id="talent.menu.recommandations.label">
+                <source>talent.menu.recommandations.label</source>
+                <target>Mes recommandations</target>
            </trans-unit>
            <!-- TALENT -->
            <trans-unit id="ad.talent.answer.label">
@@ -394,7 +438,122 @@
                        
                        Talents Tube
                </target>
-            </trans-unit> 
+            </trans-unit>
+            <!-- Recommendations -->
+            <trans-unit id="label.recommendations">
+                <source>label.recommendations</source>
+                <target>Recommandations</target>
+            </trans-unit>
+            <trans-unit id="label.button.recommendation">
+                <source>label.button.recommendation</source>
+                <target>Je recommande</target>
+            </trans-unit>
+            <trans-unit id="label.link.readmore">
+                <source>label.link.readmore</source>
+                <target>Lire la suite</target>
+            </trans-unit>
+            <trans-unit id="label.choice.imtheboss">
+                <source>label.choice.imtheboss</source>
+                <target>%{name} était sous votre responsabilité</target>
+            </trans-unit>
+            <trans-unit id="label.choice.sheistheboss">
+                <source>label.choice.sheistheboss</source>
+                <target>Vous étiez sous la responsabilité de %{name} </target>
+            </trans-unit>
+            <trans-unit id="label.choice.sheismyscollege">
+                <source>label.choice.sheismyscollege</source>
+                <target>Vous avez travaillé avec %{name} dans la même entreprise</target>
+            </trans-unit>
+            <trans-unit id="label.front.imtheboss">
+                <source>label.front.imtheboss</source>
+                <target>%{name2} était responsable de %{name}</target>
+            </trans-unit>
+            <trans-unit id="label.front.sheistheboss">
+                <source>label.front.sheistheboss</source>
+                <target>%{name2} était sous la responsabilité de %{name}</target>
+            </trans-unit>
+            <trans-unit id="label.front.sheismyscollege">
+                <source>label.front.sheismyscollege</source>
+                <target>%{name} et %{name2} étaient collègues</target>
+            </trans-unit>
+            <trans-unit id="recommendation.email.message.html">
+                <source>recommendation.email.message.html</source>
+                <target><![CDATA[
+                        <div style="margin:0 auto;max-width:600px;background:#FFFFFF;"><table class="" cellpadding="0" cellspacing="0" style="width:100%;font-size:0px;background:#FFFFFF;" align="center"><tbody><tr><td style="text-align:center;vertical-align:top;font-size:0;padding:0px;"><!--[if mso]>
+                        <table border="0" cellpadding="0" cellspacing="0"><tr><td style="width:600px;">
+                        <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:40px 35px 20px 35px;" align="left"><div class="mj-content" style="cursor:auto;color:#534F4F;font-family:Trebuchet,Helvetica,sans-serif;font-size:14px;line-height:22px;"><p>Bonjour %firstname% %lastname%,</p>
+                            <p>Vous avez reçu une recommandation vidéo de %firstname_sender% %lastname_sender%.</p>
+                            <p>La recommandation est inactive par défaut, vous pouvez l’activer dans votre espace recommandations.</p>
+                        </div></td></tr></tbody></table></div><!--[if mso]>
+                        </td></tr></table>
+                        <![endif]--></td></tr></tbody></table></div>
+                        <div style="margin:0 auto;max-width:600px;background:#FFFFFF;"><table class="" cellpadding="0" cellspacing="0" style="width:100%;font-size:0px;background:#FFFFFF;" align="center"><tbody><tr><td style="text-align:center;vertical-align:top;font-size:0;padding:0px;"><!--[if mso]>
+                        <table border="0" cellpadding="0" cellspacing="0"><tr><td style="width:600px;">
+                        <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:15px 30px;" align="center"><table cellpadding="0" cellspacing="0" style="border:none;border-radius:30px;" align="center"><tbody><tr><td style="background:#1689FB;border-radius:30px;color:#FFFFFF;cursor:auto;" align="center" valign="middle" bgcolor="#1689FB"><a class="mj-content" href="%recommendationUrl%" style="display:inline-block;text-decoration:none;background:#1689FB;border:1px solid #1689FB;border-radius:30px;color:#FFFFFF;font-family:Trebuchet,Helvetica,sans-serif;font-size:14px;font-weight:normal;padding:15px 30px;" target="_blank">Voir la recommandation</a></td></tr></tbody></table></td></tr></tbody></table></div><!--[if mso]>
+                        </td></tr></table>
+                        ]]>
+                </target>
+            </trans-unit>
+            <!-- Dashboard -->
+            <trans-unit id="global.datereception.label">
+                <source>global.datereception.label</source>
+                <target>Date de reception </target>
+            </trans-unit>
+            <!-- Réponse en vidéo -->
+            <trans-unit id="label.message">
+                <source>label.message</source>
+                <target>MESSAGE : </target>
+            </trans-unit>
+            <trans-unit id="label.noMessage">
+                <source>label.noMessage</source>
+                <target>Aucun message</target>
+            </trans-unit>
+            <trans-unit id="label.offers">
+                <source>label.offers</source>
+                <target>Offres d'emploi</target>
+            </trans-unit>
+            <trans-unit id="label.answer">
+                <source>label.answer</source>
+                <target>Réponse : </target>
+            </trans-unit>
+            <trans-unit id="label.sended">
+                <source>label.sended</source>
+                <target>Envoyé : </target>
+            </trans-unit>
+            <trans-unit id="label.received">
+                <source>label.received</source>
+                <target>Recu : </target>
+            </trans-unit>
+             <trans-unit id="label.history.link">
+                <source>label.history.link</source>
+                <target>Afficher l'historique</target>
+            </trans-unit>
+            <trans-unit id="label.history.talent.link">
+                <source>label.history.talent.link</source>
+                <target>Historique des message recus</target>
+            </trans-unit>
+            <trans-unit id="label.webcam.answer.step1">
+                <source>label.webcam.answer.step1</source>
+                <target>Enregistrer ma vidéo</target>
+            </trans-unit>
+            <trans-unit id="label.webcam.answer.step2">
+                <source>label.webcam.answer.step2</source>
+                <target>Importer ma vidéo</target>
+            </trans-unit>
+            <trans-unit id="label.webcam.answer.step3">
+                <source>label.webcam.answer.step3</source>
+                <target>Définir le type de réponse</target>
+            </trans-unit>
+            <trans-unit id="label.webcam.answer.videotheque">
+                <source>label.webcam.answer.videotheque</source>
+                <target>Choisir une vidéo de réponse</target>
+            </trans-unit>
+            <trans-unit id="label.answer.history.title">
+                <source>label.answer.history.title</source>
+                <target>Historique des messages envoyés</target>
+            </trans-unit>
+            
+            
        </body>
    </file>
 </xliff>
@@ -3,7 +3,8 @@
        <div class="row center-align">
            <div class="col s12">
                <div class="owl-carousel territory-carousel">
-                {% for territory in territories %}
+                    
+                {% for territory in territories if territory.territory.isPrivate != true %}
                    {% set territory = territory.territory %}
                    <div class="item">
                        <h2 class="blue-text no-margin-top">
@@ -19,6 +19,7 @@
        <div class="box box-primary">
            <div class="box-header">
                <h3 class="box-title">{{ ad.title }}</h3>
+                <br/><i class="fa fa-link"></i>Url : {{ path("ad_show",{'alias':ad.alias})}}<br />
            </div>
            <div class="box-body">
                {{ form_errors(form) }}
@@ -41,7 +42,7 @@
                <h3 class="box-title">Informations</h3>
            </div>
            <div class="box-body">
-                {{ form_row(form.status) }} {{ form_row(form.isPromoted) }} {{ form_row(form.isVerified) }}
+                {{ form_row(form.status) }} {{ form_row(form.isPromoted) }} {{ form_row(form.isVerified) }} {{ form_row(form.isPrivate) }}
            </div>
        </div>
    </div>
@@ -66,6 +66,10 @@
                                   title="Modifier">
                                    <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
                                </a>
+                                <a href="{{ path('admin_ad_refresh_img',{'id':ad.id}) }}" data-toggle="tooltip"
+                                   title="Mise à jour image vimeo">
+                                    <i class="fa fa-picture-o" aria-hidden="true"></i>
+                                </a>
                            </td>
                        </tr>
                    {% endfor %}
@@ -13,7 +13,10 @@
    <link rel="stylesheet" href="{{ asset('admin/AdminLTE/dist/css/AdminLTE.min.css') }}">
    <link rel="stylesheet" href="{{ asset('admin/AdminLTE/dist/css/skins/skin-blue.min.css') }}">
    <link rel="stylesheet" href="{{ asset('admin/AdminLTE/plugins/datatables/dataTables.bootstrap.css') }}">
+    <link rel="stylesheet" href="{{ asset('admin/AdminLTE/plugins/datatables/dataTables.bootstrap.css') }}">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/3.3.2/jquery-confirm.min.css">
    <script type="text/javascript" defer="defer" src="https://extend.vimeocdn.com/ga/64189815.js"></script>
+    <link href="https://gitcdn.github.io/bootstrap-toggle/2.2.2/css/bootstrap-toggle.min.css" rel="stylesheet">

    {% block css %}

@@ -69,6 +72,7 @@ output='assetic/admin.backend.js' filter='?uglifyjs2' %}
        $('[data-toggle="tooltip"]').tooltip();
    });
 </script>
+<script src="https://gitcdn.github.io/bootstrap-toggle/2.2.2/js/bootstrap-toggle.min.js"></script>
 {% block javascripts %}

 {% endblock %}
@@ -22,9 +22,11 @@
                <div class="box-header">
                    <h3 class="box-title">{{ company.brandName }}</h3>
                    <br><span>{{ company.mainUser.email }}</span>
+                    <br/><i class="fa fa-link"></i>Url : {{ path("company_show",{'alias':company.alias})}}<br />
                </div>
                <div class="box-body">
                    {{ form_errors(form) }}
+                    {{ form_row(form.isPrivate) }}
                    {{ form_row(form.emphasis) }}
                    {{ form_row(form.emphasisOrder) }}
                    {{ form_row(form.brandName) }}
@@ -58,6 +58,10 @@
                                   style="margin-left: 5px;">
                                    <i class="fa fa-cart-plus" aria-hidden="true"></i>
                                </a>
+                                <a href="{{ path('admin_company_refresh_img',{'id':company.id}) }}" data-toggle="tooltip"
+                                   title="Mise à jour image vimeo">
+                                    <i class="fa fa-picture-o" aria-hidden="true"></i>
+                                </a>
                                {% if is_granted('ROLE_ALLOWED_TO_SWITCH') %}
                                    <a href="{{ path('company_dashboard',{'_switch_user':company.MainUser.username}) }}"
                                       data-toggle="tooltip" title="Se connecter avec ce compte"
@@ -88,7 +92,7 @@
                "language": {
                    "url": "https://cdn.datatables.net/plug-ins/1.10.11/i18n/French.json"
                },
-                "order": [[1, 'desc']],
+                "order": [[0, 'desc']],
                "columnDefs": [
                    {"targets": 0, "searchable": true, "orderable": true},
                    {"targets": 1, "searchable": true, "orderable": true},
@@ -0,0 +1,176 @@
+{% extends 'admin/base_admin.html.twig' %}
+
+{% block contentHeader %}
+    <h1>
+        Recommandations
+        <small>Liste</small>
+    </h1>
+    <ol class="breadcrumb">
+        <li>
+            <a href="{{ path('admin_dashboard') }}">
+                <i class="fa fa-dashboard"></i>
+                Dashboard</a>
+        </li>
+        <li class="active">Recommandations</li>
+    </ol>
+{% endblock %}
+
+{% block content %}
+
+    <div class="box box-primary">
+        <div class="box-body">
+            <table id="reco_list_table" class="table table-hover table-bordered">
+                <thead>
+                    <tr>
+                        <th class="col-xs-2">Date de création</th>
+                        <th>De</th>
+                        <th>Pour</th>
+                        <th>Status</th>
+                        <th>Player</th>
+                        <th>Action</th>
+                    </tr>
+                </thead>
+
+                <tbody>
+                    {% for r in recos %}
+                        <tr>
+                            <td data-order="{{ r.cTime|date('U') }}">{{ r.cTime|date('d/m/Y') }}</td>
+                            <td>
+                                {{ r.sender.lastname }}
+                                {{ r.sender.firstname }}
+                            </td>
+                            <td>
+                                {{ r.user.lastname }}
+                                {{ r.user.firstname }}
+                            </td>
+                            <td>
+                                {% if r.isRemoved %}
+                                    <span class="label pull-right bg-red">supprimée</span>
+                                {% elseif r.isEnabled %}
+                                    <span class="label pull-right bg-green">Visible</span>
+                                {% endif %}
+                            </td>
+                            <td>
+                                {% if r.video != null %}
+                                <i class="fa fa-eye modalBtn c-pointer hover-blue1" data-url="{{ r.video.cdnUrl }}"></i>
+                                {% endif %}
+                            </td>
+                            <td>
+                                <input class="visibilityToggle" {% if r.isVisible == false %} checked="checked" {% endif %} type="checkbox" data-toggle="toggle" data-size="mini" data-onstyle="danger" data-on="Desactivée" data-off="Activée" data-recid="{{ r.id }}">
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    {# <div id="modal_video" class="modal">
+        <div class="modal-content">
+            <h4>Vidéo de la recommendation</h4>
+            <div class="videoContainer" style="text-align:center;">Loading...</div>
+        </div>
+        <div class="modal-footer">
+            <button class="modal-action modal-close waves-effect waves-green btn-flat">Fermer</button>
+        </div>
+    </div> #}
+
+    <div id="modal_video" class="modal fade" tabindex="-1" role="dialog">
+        <div class="modal-dialog" role="document" style="width:800px;">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span></button>
+                    <h4 class="modal-title">Vidéo de la recommendation</h4>
+                </div>
+                <div class="modal-body">
+                    <div class="videoContainer" style="text-align:center;">Loading...</div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Fermer</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+{% endblock %}
+
+{% block javascripts %}
+    {{ parent() }}
+    <script>
+        $(function () {
+            $('#reco_list_table').DataTable({
+                "paging": true,
+                "lengthChange": true,
+                "searching": true,
+                "ordering": true,
+                "info": true,
+                "autoWidth": false,
+                "language": {
+                    "url": "https://cdn.datatables.net/plug-ins/1.10.11/i18n/French.json"
+                },
+                "columnDefs": [
+                    {
+                        "targets": 0,
+                        "searchable": true,
+                        "orderable": true
+                    }, {
+                        "targets": 1,
+                        "searchable": true,
+                        "orderable": true
+                    }, {
+                        "targets": 2,
+                        "searchable": true,
+                        "orderable": true
+                    }, {
+                        "targets": 3,
+                        "searchable": true,
+                        "orderable": true,
+                        "className": "text-center"
+                    }, {
+                        "targets": 4,
+                        "searchable": false,
+                        "orderable": false,
+                        "className": "text-center"
+                    }, {
+                        "targets": 5,
+                        "searchable": true,
+                        "orderable": true,
+                        "className": "text-center"
+                    }
+                ],
+                "order": [
+                    [0, "desc"]
+                ]
+            });
+        });
+    </script>
+
+    <script src="https://player.vimeo.com/api/player.js"></script>
+    <script type="text/javascript">
+        $('.modalBtn').click(function () {
+            $('.videoContainer').html('');
+            $('#modal_video').modal();
+            var urlVideo = $(this).data("url");
+            urlVideo = urlVideo.replace('videos', 'video');
+            var player = '<div data-vimeo-url="https://vimeo.com' + urlVideo + '" id="player_vimeo"></div>';
+            $('.videoContainer').html(player);
+            var player_vimeo = new Vimeo.Player('player_vimeo');
+        });
+    </script>
+    <script>
+        $('.visibilityToggle').change(function () {
+            var recId = $(this).data('recid');
+            var route = '/admin/config/recommandation/' + recId + '/toggle';
+            $.ajax({
+                type: "POST",
+                url: route,
+                dataType: "json",
+                success: function (msg) {
+                    console.log(msg);
+                }
+            });
+        });
+    </script>
+
+{% endblock %}
@@ -53,9 +53,14 @@
                    <i class="fa fa-user-circle" aria-hidden="true"></i><span>Talents</span>
                </a>
            </li>
+            <li>
+                <a href="{{ path('admin_config_recommendations') }}">
+                    <i class="fa fa-thumbs-up" aria-hidden="true"></i><span>Recommandations</span>
+                </a>
+            </li>
            <li>
                <a href="{{ path('admin_config_territory') }}">
-                    <i class="fa fa-map-marker" aria-hidden="true"></i><span>Territoire</span>
+                    <i class="fa fa-map-marker" aria-hidden="true"></i><span>Territoires</span>
                </a>
            </li>
            <li>
@@ -94,7 +94,7 @@
                        {"targets": 4, "searchable": true, "orderable": true, "className": "text-center"},
                        {"targets": 5, "searchable": false, "orderable": false, "className": "text-center"},
                    ],
-                    "order": [[1, "asc"]]
+                    "order": [[0, "desc"]]
                });
            });
        </script>
@@ -22,13 +22,17 @@
                <div class="box-header">
                    <h3 class="box-title">{{ territory.brandName }}</h3>
                    <br><span>{{ territory.mainUser.email }}</span>
+                    <br/><i class="fa fa-link"></i>Url : {{ path("territory_show",{'alias':territory.alias})}}<br />
                </div>
                <div class="box-body">
                    {{ form_errors(form) }}
+                    {{ form_row(form.isPrivate) }}
                    {{ form_row(form.emphasis) }}
                    {{ form_row(form.emphasisOrder) }}
                    {{ form_row(form.brandName) }}
+                    {{ form_row(form.terType) }}
                    {{ form_row(form.description) }}
+                    {{ form_row(form.descriptionAdmin) }}
                    {{ form_row(form.website) }}
                    {{ form_row(form.tagsComma) }}
                    {{ form_row(form.file) }}
@@ -60,11 +64,24 @@
    </div>
    {{ form_end(form) }}
 {% endblock %}
-
+{% block css %}
+    <link rel="stylesheet" href="{{ asset('codemirror/lib/codemirror.css') }}">
+{% endblock %}
 {% block javascripts %}
    <script>
        $(document).ready(function () {
            $('[data-toggle="popover"]').popover();
        });
    </script>
-{% endblock %}
+    <script src="{{ asset('codemirror/lib/codemirror.js') }}"></script>
+    <script src="{{ asset('codemirror/mode/xml/xml.js') }}"></script>
+    <script src="{{ asset('codemirror/mode/javascript/javascript.js') }}"></script>
+    <script src="{{ asset('codemirror/mode/css/css.js') }}"></script>
+    <script src="{{ asset('codemirror/mode/vbscript/vbscript.js') }}"></script>
+    <script src="{{ asset('codemirror/mode/htmlmixed/htmlmixed.js') }}"></script>
+    <script>
+        var myCodeMirror = CodeMirror.fromTextArea(document.getElementById('territory_admin_descriptionAdmin'), {
+            lineNumbers: true,
+        });
+    </script>
+{% endblock %}
@@ -100,7 +100,7 @@
                        {"targets": 3, "searchable": true, "orderable": true, "className": "text-center"},
                        {"targets": 4, "searchable": false, "orderable": false, "className": "text-center"},
                    ],
-                    "order": [[1, "asc"]]
+                    "order": [[0, "desc"]]
                });
            });
        </script>
@@ -0,0 +1,147 @@
+{% extends 'admin/base_admin.html.twig' %}
+
+{% block contentHeader %}
+    <h1>
+        Utilisateurs
+        <small>Liste</small>
+    </h1>
+    <ol class="breadcrumb">
+        <li>
+            <a href="{{ path('admin_dashboard') }}">
+                <i class="fa fa-dashboard"></i>
+                Dashboard</a>
+        </li>
+        <li>Secret</li>
+        <li class="active">Utilisateurs</li>
+    </ol>
+{% endblock %}
+
+{% block content %}
+
+    <div class="box box-primary">
+        <div class="box-body">
+            <table id="user_list_table" class="table table-hover table-bordered">
+                <thead>
+                    <tr>
+                        <th class="col-md-2">Nom</th>
+                        <th class="col-md-2">Prénom</th>
+                        <th class="col-md-3">Email</th>
+                        <th class="col-md-1">Rôle</th>
+                        <th class="col-md-3">Etat</th>
+                        <th class="col-md-1">Action</th>
+                    </tr>
+                </thead>
+
+                <tbody>
+                    {% for u in users %}
+                        <tr>
+                            <td>{{ u.lastname }}</td>
+                            <td>{{ u.firstname }}</td>
+                            <td>{{ u.email }}</td>
+                            <td>
+                                {% for r in u.roles %}
+                                    {% if r != "ROLE_USER" and r == "ROLE_TALENT" %}
+                                        <span class="badge bg-blue" style="font-weight: 400;">{{ r }}</span>
+                                    {% elseif r != "ROLE_USER" and r == "ROLE_COMPANY" %}
+                                        <span class="badge bg-orange" style="font-weight: 400;">{{ r }}</span>
+                                    
+                                    {% endif %}
+                                {% endfor %}
+                            </td>
+                            <td>
+                                {% if u.enabled %}
+                                    Activé
+                                {% else %}
+                                    Désactivé
+                                    <br/>
+                                    <a href="{{ path('admin_user_resend',{'id':u.id}) }}">Renvoyer le mail de confirmation</a>
+                                {% endif %}
+                            </td>
+
+                            <td>
+                                <a class="delete-user" href="{{ path('admin_user_delete',{'id':u.id}) }}" data-toggle="tooltip" title="Supprimer">
+                                    <i class="fa fa-trash"></i>
+                                </a>
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+{% endblock %}
+
+{% block javascripts %}
+    <script>
+        $(function () {
+            $('#user_list_table').DataTable({
+                "paging": true,
+                "lengthChange": true,
+                "searching": true,
+                "ordering": true,
+                "info": true,
+                "autoWidth": false,
+                "language": {
+                    "url": "https://cdn.datatables.net/plug-ins/1.10.11/i18n/French.json"
+                },
+                "columnDefs": [
+                    {
+                        "targets": 0,
+                        "searchable": true,
+                        "orderable": true
+                    }, {
+                        "targets": 1,
+                        "searchable": true,
+                        "orderable": true
+                    }, {
+                        "targets": 2,
+                        "searchable": true,
+                        "orderable": true
+                    }, {
+                        "targets": 3,
+                        "searchable": true,
+                        "orderable": true,
+                        "className": "text-center"
+                    }, {
+                        "targets": 4,
+                        "searchable": false,
+                        "orderable": false,
+                        "className": "text-center"
+                    }, {
+                        "targets": 5,
+                        "searchable": false,
+                        "orderable": false,
+                        "className": "text-center"
+                    }
+                ]
+            });
+        });
+
+        $(document).ready(function () {
+            $('[data-toggle="popover"]').popover();
+
+            $(".delete-user").confirm({
+                title: "Êtes vous sûr de supprimer cet utilisateur ?",
+                content: "Supprimer cet utilisateur supprimera, son compte, son entreprise, ses réponses, médias",
+                type: 'red',
+                boxWidth: '30%',
+                useBootstrap: false,
+                buttons: {
+                    confirm: {
+                        text: 'Confirmer',
+                        action: function () {
+                            console.log(this.$target);
+                            location.href = this.$target.attr('href');
+                            return true;
+                        }
+                    },
+                    cancel: {
+                        text: 'Annuler'
+                    }
+                }
+            });
+        });
+    </script>
+
+{% endblock %}
@@ -52,7 +52,7 @@
                </div>
                <div class="row m-t-40">
                    <div class="col s10 offset-s1 center-align">
-                        <button id="submit" class=" btn btn-large btn-default disabled"  type="submit">
+                        <button title="import-candidature" id="submit" class=" btn btn-large btn-default disabled"  type="submit">
                        Envoyer ma candidature
                        </button><br /><br />
                        <a class="color-grey5" href="{{ path(routeObject,{'alias': object.alias }) }}">Annuler</a>
@@ -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:' %}
@@ -88,7 +88,7 @@
                </div>
                <div class="row m-t-40">
                    <div class="col s10 offset-s1 center-align">
-                        <button id="submit" class=" btn btn-large btn-default disabled"  type="submit">
+                        <button title="webcam-candidature" id="submit" class=" btn btn-large btn-default disabled"  type="submit">
                        Envoyer ma candidature
                        </button><br /><br />
                        <a class="color-grey5" href="{{ path(routeObject,{'alias': object.alias }) }}">Annuler</a>
@@ -21,7 +21,7 @@
    <script type="text/javascript" defer="defer" src="https://extend.vimeocdn.com/ga/64189815.js"></script>

    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title>{% block title %}Talents Tube : Le 1er job board 100% vidéo{% endblock %}</title>
+    <title>{% block title %}Talents Tube : La 1ère plateforme pour l’emploi 100% vidéo{% endblock %}</title>

    <link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}"/>
    {% block metarobot %}<meta name="robots" content="index,follow">{% endblock %}
@@ -54,9 +54,7 @@
    {% endif %}
    {# CSS #}
    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Raleway:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i,800,800i,900,900i&amp;subset=latin-ext"
-          rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Varela+Round" : rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Raleway:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i,800,800i,900,900i|Varela+Round" rel="stylesheet">
    <link rel="stylesheet" href="{{ asset('css/styles.css') }}">
    {% block stylesheets %}
    {% endblock %}
@@ -83,5 +81,6 @@
    <script src="{{ asset_url }}"></script>
    {% endjavascripts %}
 {% endblock %}
+{{ include('FairlaneCookieConsentBundle::cookie-info.html.twig') }}
 </body>
 </html>
@@ -35,8 +35,7 @@
          href="{% block urlCanonical %}{{  url(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')) }}"{% endblock %}>
    {# CSS #}
    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Raleway:300,300i,400,400i,700,700i" rel=“stylesheet”>
-    <link href="https://fonts.googleapis.com/css?family=Varela+Round" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Raleway:100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i,800,800i,900,900i|Varela+Round" rel="stylesheet">
    <link rel="stylesheet" href="{{ asset('css/styles.css') }}">
    {% block stylesheets %}
    {% endblock %}
@@ -2,41 +2,58 @@


 {% block dashContent %}
+    {% if type == "spontaneous" %}
+        {% include 'company/job_submenu.html.twig' with {
+            'tab' : 3
+        } %}
+        {% else %}
+        {% include 'company/job_submenu.html.twig' with {
+            'tab' : 2
+        } %}
+    {% endif %}
    <div class="row bg-bordered p-20">
-        {% set first = answers|first %}
-        <h1 class="alttitle">Réponses pour : {{ first.ad.title }}</h1>
-        {% include 'company/tabs.html.twig' with {'tab':2} %}
+        {% include 'company/ad_breadcrumb.html.twig' with {'step': 2,'ad': ad} %}
        <div id="reponses" class="col s12">
            <table id="table-answers" class="bordered highlight responsive-table">
                <thead>
                <tr>
-                    <th> {{ 'profile.talent.firstname'|trans }} - {{ 'profile.talent.lastname'|trans }}</th>
-                    <th>{{ 'global.intitule.label'|trans }}</th>
-                    <th>{{ 'global.date.label'|trans }}</th>
-                    <th>{{ 'note.title'|trans }}</th>
+                    <th>{{ 'profile.talent.lastname'|trans }} {{ 'profile.talent.firstname'|trans }}</th>
+                    <th>{{ 'global.datereception.label'|trans }}</th>
+                    <th>{{ 'ad.company.list.status'|trans }}</th>
+                    <th class="center-align">{{ 'ad.company.list.actions'|trans }}</th>
                </tr>
                </thead>
                <tbody>
                {% for answer in answers %}
                    <tr>
                        <td>
-                            <a href="{{ path('company_answer_show',{'id':answer.id }) }}">{{ answer.user.firstname }} {{ answer.user.lastname }}</a>
+                            <a href="{{ path('company_answer_show',{'id':answer.id }) }}">{{ answer.user.lastname }} {{ answer.user.firstname }}</a>
                        </td>
-                        <td>{{ answer.ad.title }}</td>
-                        <td>{{ answer.uTime()|date('d-m-Y') }}</td>
-                        <td>
-                            {#{% if answer.notes|length <= 0 %}#}
-                            <a href="#" class="note-action c-pointer" data-func="add" data-answer="{{ answer.id }}">
-                                <i class="fa fa-plus " aria-hidden="true"></i>
+                        <td>{{ answer.sendTime()|date('d/m/Y') }}</td>
+                        {% if answer.firstMessage %}
+                            <td>{{ answer.firstMessage.status|trans }}</td>
+                        {% else %}
+                            {% if answer.isViewed %}
+                                {% if answer.isViewed.status == "DRAFT" %}
+                                    <td>{{ 'VIEWED'|trans }}</td>
+                                {% endif %}
+                            {% else %}
+                                <td>{{ 'NEW'|trans }}</td>
+                            {% endif %}
+                        {% endif %}
+                        <td class="center-align">
+                            <a title="{{ad.title}}" href="{{ path('company_answer_show',{'id':answer.id }) }}">
+                                <i class="fa fa-eye"></i>
+                            </a>
+                            <a href="#" class="note-action c-pointer" data-func="add" data-answer="{{ answer.id }}">
+                                <i class="fa fa-sticky-note"></i>
                            </a>
-                            {#{% else %}#}
                            {% for note in answer.notes %}
                                <a class="tooltipped note-action c-pointer" data-position="top" data-delay="50"
                                   data-tooltip="{{ note.content }}" data-note="{{ note.id }}" data-func="edit">
                                    <i class="fa fa-commenting" aria-hidden="true"></i>
                                </a>
                            {% endfor %}
-                            {#{% endif %}#}
                        </td>
                    </tr>
                {% endfor %}
@@ -0,0 +1,19 @@
+<div class="col s12" id="breadcrumb">
+    <a href="{{ path('company_ad') }}">
+        <span>{% trans %}label.offers{% endtrans %}</span>
+    </a>
+    {% if step > 1 %}
+    <span class="sepa-breadcrumb">></span>
+    <a href="{{ path('company_ad_answer_list',{'id':ad.id}) }}">
+        <span {% if step == 2 %}class="active"{% endif %}>{{ ad.title }}</span>
+    </a>
+    {% endif %}
+    {% if step > 2 %}
+    <span class="sepa-breadcrumb">></span>
+    <span class="active">{{ firstname }} {{ lastname }}</span>
+    {% endif %}
+    <div class="border-breadcrumb"></div>
+</div>
+
+
+
@@ -1,16 +1,20 @@
 {% extends 'company/base_dashboard_company.html.twig' %}

-{% block title %} Mes annonces {% endblock %}
+{% block title %}
+    Mes annonces
+{% endblock %}

 {% block dashContent %}
    {% include 'default/flash_message.html.twig' %}

-    {#<h1 class="alttitle">Espace offres d'emploi</h1>#}
-    <div class="bg-bordered p-20">
-        {% include 'company/tabs.html.twig' with {'tab':1} %}
-        {% include 'company/ad_table_listing.html.twig' with {'ads':ads} %}
-        <p class="center-align">
-            <a href="{{ path('company_ad_create') }}" class="btn btn-default">{{ 'ad.company.add.label'|trans }}</a>
-        </p>
+    {% include 'company/job_submenu.html.twig' with {
+        'tab' : 1
+    } %}
+
+    <div class="row bg-bordered p-20">
+        {% include 'company/ad_breadcrumb.html.twig' with {'step': 1} %}
+        {% include 'company/ad_table_listing.html.twig' with {
+            'ads' : ads
+        } %}
    </div>
-{% endblock %}
+{% endblock %}
@@ -1,5 +1,5 @@
 <table id="ads-table" class="bordered highlight responsive-table">
-        <thead>
+    <thead>
        <tr>
            <th>{{ 'ad.company.list.title'|trans }}</th>
            <th class="tdCount">{{ 'ad.company.list.answers'|trans }}</th>
@@ -7,15 +7,23 @@
            <th>{{ 'ad.company.list.status'|trans }}</th>
            <th>{{ 'ad.company.list.actions'|trans }}</th>
        </tr>
-        </thead>
-        <tbody>
+    </thead>
+    <tbody>
        {% for ad in ads %}
            <tr>
-                <td>{{ ad.title }}</td>
+                <td>
+                    {% if ad.countAnswers > 0 %}
+                        <a href="{{ path('company_ad_answer_list',{'id':ad.id}) }}">
+                            {{ ad.title }}
+                        </a>
+                    {% else %}
+                        {{ ad.title }}
+                    {% endif %}
+                </td>
                <td class="tdCount">
                    {% if ad.countAnswers > 0 %}
                        <a href="{{ path('company_ad_answer_list',{'id':ad.id}) }}">
-                            {{ ad.countAnswers }}
+                            <i class="fa fa-eye"></i>&nbsp; {{ ad.countAnswers }}
                        </a>
                    {% else %}
                        0
@@ -23,13 +31,12 @@
                </td>
                <td class="tdCount">
                    {% if arrayByAds is defined %}
-                    {{ arrayByAds[ad.id]["count"] }}
+                        {{ arrayByAds[ad.id]["count"] }}
                    {% endif %}
                </td>
                <td align="center" valign="center">
                    {% if ad.getStatus() == "DECLINED" %}
-                        <div class="tooltipped" data-position="top" data-delay="50"
-                                data-tooltip="{{ ad.moderationText }}">
+                        <div class="tooltipped" data-position="top" data-delay="50" data-tooltip="{{ ad.moderationText }}">
                            <span class="">{{ ad.getStatus()|trans }}</span>
                            <i class="c-pointer fa fa-info-circle color-red" aria-hidden="true"></i>
                        </div>
@@ -40,57 +47,43 @@
                <td>
                    {% if ad.getStatus() == "DRAFT" or ad.getStatus() == "DECLINED" %}
                        {#Edit#}
-                        <a class="tooltipped td-none" data-position="top" data-delay="0"
-                           data-tooltip="{{ 'ad.company.edit.label'|trans }}"
-                           href="{{ path('company_ad_edit', { 'id': ad.id }) }}" style="margin-right: 10px">
+                        <a class="tooltipped td-none" data-position="top" data-delay="0" data-tooltip="{{ 'ad.company.edit.label'|trans }}" href="{{ path('company_ad_edit', { 'id': ad.id }) }}" style="margin-right: 10px">
                            <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
                        </a>
                    {% else %}
                        {#Soft Edit#}
-                        <a class="tooltipped td-none" data-position="top" data-delay="0"
-                           data-tooltip="{{ 'ad.company.edit.label'|trans }}"
-                           href="{{ path('company_ad_soft_edit', { 'id': ad.id }) }}"
-                           style="margin-right: 10px">
+                        <a class="tooltipped td-none" data-position="top" data-delay="0" data-tooltip="{{ 'ad.company.edit.label'|trans }}" href="{{ path('company_ad_soft_edit', { 'id': ad.id }) }}" style="margin-right: 10px">
                            <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
                        </a>
                    {% endif %}

                    {% if ad.getStatus() == "DRAFT" or ad.getStatus() == "DECLINED" %}
                        {#Video#}
-                        <a class="tooltipped td-none" data-position="top" data-delay="0"
-                           data-tooltip="{{ 'ad.company.video.edit.label'|trans }}"
-                           href="{{ path('create_media', { 'id': ad.id }) }}">
+                        <a class="tooltipped td-none" data-position="top" data-delay="0" data-tooltip="{{ 'ad.company.video.edit.label'|trans }}" href="{{ path('create_media', { 'id': ad.id }) }}">
                            <i class="fa fa-video-camera" aria-hidden="true"></i>
                        </a>
                    {% endif %}

-                    {% if  ad.getStatus() == "PUBLISHED" %}
+                    {% if ad.getStatus() == "PUBLISHED" %}
                        {#Extension#}
-                        <a class="tooltipped td-none" data-position="top" data-delay="0"
-                           data-tooltip="{{ 'ad.company.dates.extension.label'|trans }}"
-                           href="{{ path('company_ad_extension', { 'id': ad.id }) }}"
-                           style="margin-right: 10px">
+                        <a class="tooltipped td-none" data-position="top" data-delay="0" data-tooltip="{{ 'ad.company.dates.extension.label'|trans }}" href="{{ path('company_ad_extension', { 'id': ad.id }) }}" style="margin-right: 10px">
                            <i class="fa fa-calendar" aria-hidden="true"></i>
                        </a>
                        {#Force ending#}
-                        <a class="tooltipped td-none" data-position="top" data-delay="0"
-                           data-tooltip="{{ 'ad.company.closed.label'|trans }}"
-                           href="{{ path('company_ad_closed', { 'id': ad.id }) }}" style="margin-right: 10px">
+                        <a class="tooltipped td-none" data-position="top" data-delay="0" data-tooltip="{{ 'ad.company.closed.label'|trans }}" href="{{ path('company_ad_closed', { 'id': ad.id }) }}" style="margin-right: 10px">
                            <i class="fa fa-window-close-o" aria-hidden="true"></i>
                        </a>
                    {% endif %}

                    {% if ad.getStatus() == "TO_PUBLISH" or ad.getStatus() == "VALIDATED" or ad.getStatus() == "CLOSED" or ad.getStatus() == "EXPIRED" %}
                        {#Edit Dates#}
-                        <a class="tooltipped td-none" data-position="top" data-delay="0"
-                           data-tooltip="{{ 'ad.company.dates.edit.label'|trans }}"
-                           href="{{ path('company_ad_step3', { 'id': ad.id }) }}" style="margin-right: 10px">
+                        <a class="tooltipped td-none" data-position="top" data-delay="0" data-tooltip="{{ 'ad.company.dates.edit.label'|trans }}" href="{{ path('company_ad_step3', { 'id': ad.id }) }}" style="margin-right: 10px">
                            <i class="fa fa-calendar" aria-hidden="true"></i>
                        </a>
                    {% endif %}
                </td>
-                
+
            </tr>
        {% endfor %}
-        </tbody>
-    </table>
+    </tbody>
+</table>
@@ -1,53 +1,86 @@
 {% extends 'company/base_dashboard_company.html.twig' %}

-
 {% block dashContent %}
+    {% include 'company/job_submenu.html.twig' with {'tab' : 2} %}
    <div class="row bg-bordered p-20">
-
-        {% if type == "spontaneous" %}
-            {% include 'company/tabs.html.twig' with {'tab':3} %}
-        {% else %}
-            {% include 'company/tabs.html.twig' with {'tab':2} %}
-        {% endif %}
-
-        <div id="reponses" class="col s12">
-            <table id="table-answers" class="bordered highlight responsive-table">
-                <thead>
-                <tr>
-                    <th> {{ 'profile.talent.firstname'|trans }} - {{ 'profile.talent.lastname'|trans }}</th>
-                    <th>{{ 'global.intitule.label'|trans }}</th>
-                    <th>{{ 'global.date.label'|trans }}</th>
-                    <th>{{ 'note.title'|trans }}</th>
-                </tr>
-                </thead>
-                <tbody>
-                {% for answer in answers %}
-                    <tr>
-                        <td>
-                            <a href="{{ path('company_answer_show',{'id':answer.id }) }}">{{ answer.user.firstname }} {{ answer.user.lastname }}</a>
-                        </td>
-                        <td>{% if answer.ad != null %}{{ answer.ad.title }} {% endif %}</td>
-                        <td>{{ answer.cTime()|date('d-m-Y') }}</td>
-                        <td>
-                            {#{% if answer.notes|length <= 0 %}#}
-                            <a href="#" class="note-action c-pointer" data-func="add" data-answer="{{ answer.id }}">
-                                <i class="fa fa-plus " aria-hidden="true"></i>
-                            </a>
-                            {#{% else %}#}
-                            {% for note in answer.notes %}
-                                <a class="tooltipped note-action c-pointer" data-position="top" data-delay="50"
-                                   data-tooltip="{{ note.content }}" data-note="{{ note.id }}" data-func="edit">
-                                    <i class="fa fa-commenting" aria-hidden="true"></i>
-                                </a>
-                            {% endfor %}
-                            {#{% endif %}#}
-                        </td>
-                    </tr>
-                {% endfor %}
-            </table>
+        <div class="col s12">
+            <h4 class="title-table">{{ 'company.menu.answers.label'|trans }}</h4>
        </div>
-    </div>
-
-    <div id="note-modal"></div>
-{% endblock %}
-
+        <div id="reponses" class="col s12">
+                <table id="table-answers" class="bordered highlight responsive-table">
+                    <thead>
+                    <tr>
+                        <th>{{ 'profile.talent.lastname'|trans }} {{ 'profile.talent.firstname'|trans }}</th>
+                        <th>{{ 'global.datereception.label'|trans }}</th>
+                        <th>{{ 'ad.company.list.title'|trans }}</th>
+                        <th class="center-align">{{ 'ad.company.list.actions'|trans }}</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    {% for answer in answers %}
+                        <tr>
+                            <td>
+                                <a href="{{ path('company_answer_show',{'id':answer.id }) }}">{{ answer.user.lastname }} {{ answer.user.firstname }}</a>
+                            </td>
+                            <td>{{ answer.sendTime()|date('d/m/Y') }}</td>
+                            <td>{{ answer.ad.title }}</td>
+                            <td class="center-align">
+                                <a title="{{answer.ad.title}}" href="{{ path('company_answer_show',{'id':answer.id }) }}">
+                                    <i class="fa fa-eye"></i>
+                                </a>
+                                <a href="#" class="note-action c-pointer" data-func="add" data-answer="{{ answer.id }}">
+                                    <i class="fa fa-sticky-note"></i>
+                                </a>
+                                {% for note in answer.notes %}
+                                    <a class="tooltipped note-action c-pointer" data-position="top" data-delay="50"
+                                        data-tooltip="{{ note.content }}" data-note="{{ note.id }}" data-func="edit">
+                                        <i class="fa fa-commenting" aria-hidden="true"></i>
+                                    </a>
+                                {% endfor %}
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </table>
+            </div>
+        </div>
+        <div class="row bg-bordered p-20">
+            <div class="col s12">
+                <h4 class="title-table">{{ 'company.menu.spontaneous.label'|trans }}</h4>
+            </div>
+            <div id="spontaneous" class="col s12">
+                <table id="table-answers" class="bordered highlight responsive-table">
+                    <thead>
+                    <tr>
+                        <th>{{ 'profile.talent.lastname'|trans }} {{ 'profile.talent.firstname'|trans }}</th>
+                        <th>{{ 'global.datereception.label'|trans }}</th>
+                        <th class="center-align">{{ 'ad.company.list.actions'|trans }}</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    {% for answer in spontaneous %}
+                        <tr>
+                            <td>
+                                <a href="{{ path('company_answer_show',{'id':answer.id }) }}">{{ answer.user.lastname }} {{ answer.user.firstname }}</a>
+                            </td>
+                            <td>{{ answer.sendTime()|date('d/m/Y') }}</td>
+                            <td class="center-align">
+                                <a title="" href="{{ path('company_answer_show',{'id':answer.id }) }}">
+                                    <i class="fa fa-eye"></i>
+                                </a>
+                                <a href="#" class="note-action c-pointer" data-func="add" data-answer="{{ answer.id }}">
+                                    <i class="fa fa-sticky-note"></i>
+                                </a>
+                                {% for note in answer.notes %}
+                                    <a class="tooltipped note-action c-pointer" data-position="top" data-delay="50"
+                                        data-tooltip="{{ note.content }}" data-note="{{ note.id }}" data-func="edit">
+                                        <i class="fa fa-commenting" aria-hidden="true"></i>
+                                    </a>
+                                {% endfor %}
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </table>
+            </div>
+        </div>
+        <div id="note-modal"></div>
+    {% endblock %}
@@ -2,93 +2,245 @@


 {% block dashContent %}
+    {% if type == "spontaneous" %}
+        {% include 'company/job_submenu.html.twig' with {
+            'tab' : 3
+        } %}
+    {% else %}
+        {% include 'company/job_submenu.html.twig' with {
+            'tab' : 2
+        } %}
+    {% endif %}
    <div class="row bg-bordered p-20">
-        <h1 class="alttitle">Réponse de {{ answer.user.firstname }} {{ answer.user.lastname }}</h1>
-        {% if type == "spontaneous" %}
-            {% include 'company/tabs.html.twig' with {'tab':3} %}
-        {% else %}
-            {% include 'company/tabs.html.twig' with {'tab':2} %}
-        {% endif %}
-
-        <div class="col s12 m6 l6 col-padding-right">
-            <div class="bg-bordered inside-m">
-                <span>Réponse émise le : {{ answer.cTime|date('d-m-Y') }}</span><br/>
+        {% include 'company/ad_breadcrumb.html.twig' with {'step': 3,'ad': answer.ad,'firstname':answer.user.firstname ,'lastname':answer.user.lastname} %}
+        <div class="col s12 m6">
+            <div id="mini-profil-block">
+                {% include 'talent/talent_picture.html.twig' with {
+                    'user' : answer.user
+                } %}
                <div>
-                    <iframe src="https://player.vimeo.com/video/{{ answer.video.cdnUrl|replace({ "/videos/": ""}) }}"
-                            width="100%" height="300" frameborder="0" webkitallowfullscreen mozallowfullscreen
-                            allowfullscreen></iframe>
+                    <div class="mini-profil-picture-name">{{ answer.user.firstname }} {{ answer.user.lastname }}</div>
+                    <div>Recu le {{ answer.sendTime|date('d/m/Y') }}</div>
                </div>
-                <div>
-                    {% if answer.comment %}
-                        <strong>Message du talent :</strong>
-                        <p>{{ answer.comment }}</p>
-                    {% endif %}
-                </div>
-                <h3>Profil du talent : </h3>
-                <div class="profil">
-                    <p class="profil-picture">
-                        <img src="{{ answer.user.getWebPath() | imagine_filter('profile_square') }}"
-                             alt="{{ answer.user.firstname }} {{ answer.user.lastname }}"
-                             class="circle responsive-img"/>
-                    </p>
-                    <i class="fa fa-user-circle"
-                       aria-hidden="true"></i> {{ answer.user.firstname }} {{ answer.user.lastname }}
-                    {% if answer.user.gender == "female" %}
-                        <i class="fa fa-mars" aria-hidden="true"></i>
-                    {% else %}
-                        <i class="fa fa-venus" aria-hidden="true"></i>
-                    {% endif %}
-                    <br/>
-                    <i class="fa fa-birthday-cake" aria-hidden="true"></i> {{ answer.user.birthday|date('d-m-Y') }}<br/>
-                </div>
-
+            </div>
+            <div class="embed-responsive embed-responsive-16by9">
+                <iframe src="https://player.vimeo.com/video/{{ answer.video.cdnUrl|replace({ "/videos/": ""}) }}"
+                width="100%" height="auto" frameborder="0" webkitallowfullscreen mozallowfullscreen
+                allowfullscreen></iframe>
            </div>
        </div>
-        <div class="col s12 m6 l6 col-padding-left">
-            <div class="col s12 m12 l12">
-                <div class="bg-bordered inside-m">
-                    <h4 class="no-margin-top">
-                        Contacter le talent
-                    </h4>
-                    <p>
-                        Expéditeur : {{ app.user.firstname }} {{ app.user.lastname }}
-                    </p>
+        <div class="col s12 m6">
+            {% if answer.comment %}
+            <strong>{% trans %}label.message{% endtrans %}</strong>
+            <p class="message-answer">{{ answer.comment }}</p>
+            {% else %}
+                {% trans %}label.noMessage{% endtrans %}
+            {% endif %}
+        </div>
+        <div class="col s12">
+            <h4 class="no-margin-top bordered">Contacter {{ answer.user.firstname }} {{ answer.user.lastname }} par : </h4>
+        </div>
+        <div class="col s12 col-actions">
+            <a class="btn btn-default btn-active bnt-choice-message" data-value="message">Message</a><a class="btn btn-default bnt-choice-message" data-value="video">Vidéo</a>
+        </div>
+        <div class="col s12">
+            <div class="col-bordered">
+                <div class="blockanswer blockanswer-video">
+                    <a class="btn btn-default bnt-choice-video" data-value="webcam" href="#">Enregistrer une vidéo</a>
+                    <a class="btn btn-default bnt-choice-video" data-value="upload" href="#">Importer une vidéo</a>
+                    <a class="btn btn-default bnt-choice-video" data-value="videotheque" ref="#">Choisir depuis la videothèque</a>
+                </div>
+                <div class="blockanswer blockanswer-message">
+                    <div class="sender">De : {{ app.user.firstname }} {{ app.user.lastname }}</div>
                    {{ form_start(form) }}
                    {{ form_rest(form) }}
-                    <button type="submit" class="btn btn-default">Envoyer</button>
+                    <div class="bottom-form">
+                        <button type="submit" class="btn btn-default disabled">Envoyer</button>
+                    </div>
                    {{ form_end(form) }}
                </div>
+                {{ form_start(formVideo) }}
+                <div id="blockanswer-video-webcam" class="panel-hide">
+                    {% include 'message/message_create_webcam.twig' %}
+                </div>
+                <div id="blockanswer-video-upload" class="panel-hide">
+                    {% include 'message/message_create_import.twig' %}
+                </div>
+                <div id="blockanswer-video-videotheque" class="panel-hide">
+                    {% include 'message/message_create_videotheque.twig' %}
+                </div>
+                <div id="validFormVideo" class="panel-hide">
+                    {{ form_widget(formVideo._token, { 'id': 'token_video' }) }}
+                    {{ form_widget(formVideo.status, { 'id': 'contact_talent_status_video' }) }}
+                    {{ form_rest(formVideo) }}
+                    <div class="bottom-form">
+                        <button type="submit" class="btn btn-default disabled">Envoyer</button>
+                    </div>
+                </div>
+                {{ form_end(formVideo) }}
            </div>
-            {#{% if answer.contactMessage %}
-
-                <div class="col s12 m12 l12 m-t-20">
-                    <div class="bg-bordered inside-m">
-                        <h4 class="no-margin-top">
-                            Réponse
-                        </h4>
-                        <p>
-                            {{ answer.contactMessage|nl2br }}
-                        </p>
-                    </div>
-                </div>
-                </div>
-            {% endif %}#}
-
+        </div>
+        <div class="col s12">
+            <h4 class="no-margin-top bordered">{% trans %}label.answer.history.title{% endtrans %}</h4>
+        </div>
+        <div class="col s12">            
            {% if answer.messages %}
-                {% for message in answer.messages %}
-                    <div class="col s12 m12 l12 m-t-20">
-                        <div class="bg-bordered inside-m">
-                            <h4 class="no-margin-top">
-                                Réponse : {{ message.status }}
-                            </h4>
-                            <p>
-                                {{ message.content|nl2br }}
-                            </p>
-                        </div>
+                {% for message in answer.messages if message.status != "DRAFT" %}
+                {% set class = '' %}
+                {% if loop.index > 1 %}
+                    {% set class = 'history-hidden' %}
+                {% endif %}
+                <div class="blockanswer-answer {{class}}">
+                    <div class="title-answer">
+                        {% trans %}label.answer{% endtrans %}{{ message.status|trans }}
+                        <span class="date-answer">{% trans %}label.sended{% endtrans %}{{ message.uTime|date('d-m-Y') }}</span>
                    </div>
+                    <div class="description-answer">
+                        {% if message.video %}
+                        <div class="embed-responsive embed-responsive-16by9">
+                            <iframe src="https://player.vimeo.com/video/{{ message.video.cdnUrl|replace({ "/videos/": ""}) }}"
+                            width="100%" height="300" frameborder="0" webkitallowfullscreen mozallowfullscreen
+                            allowfullscreen></iframe>
+                        </div>
+                        {% endif %}
+                        {{ message.content|nl2br }}
+                    </div>
+                </div>
                {% endfor %}
            {% endif %}
        </div>
+        <div class="col s12 center-align m-t-30">
+            <a class="bnt btn-round btn-grey-2 link-history-more" href="#" title="{% trans %}label.history.link{% endtrans %}">{% trans %}label.history.link{% endtrans %}</a>
+        </div>
    </div>
 {% endblock %}

+{% block javascripts %}
+    {{ parent() }}
+    <script type="text/javascript">
+        var urlDropzone = '{{ path("upload_media_message", {"id": message.getId()}) }}';
+        var urlDelete = '{{ path("delete_media_message", {"id": message.getId() }) }}'
+        var idObject = null;
+        var typeObject = "answer";
+        var videoExist =  false;
+    </script>
+    <script src="{{ asset('/js/dropzone.js') }}"></script>
+    <script src="{{ asset('/js/vendors/video.min.js') }}"></script>
+    <script src="{{ asset('/js/vendors/RecordRTC.js') }}"></script>
+    <script src="{{ asset('/js/vendors/videojs.record.js') }}"></script>
+    <script src="{{ asset('/js/vendors/jquery.browser.min.js') }}"></script>
+    <script src="{{ asset('/js/vendors/readmore.min.js') }}"></script>
+    <script src="{{ asset('/js/answer.js') }}"></script>
+    <script type="text/javascript">
+        $(".card-action").click(function(){
+            var idVideo = $(this).data("id");
+            var titleVideo = $(this).data("title");
+            var imgVideo = $(this).data("img");
+            var urlVideo = $(this).data("url");
+            var elem = $(this);
+            form['contact_talent_video'] = 1;
+            $.ajax({
+                type: 'POST',
+                url: '{{ path("link_media_message", {"id": message.getId()}) }}',
+                data: "idVideo="+idVideo,
+                dataType: 'html',
+                success: function (response) {
+                    $(".card-action").removeClass('active');
+                    elem.addClass('active');
+                    Materialize.toast('Vidéo bien associé à la réponse', 4000);
+                    if($("#submit").hasClass('disabled')){
+                        $("#submit").removeClass('disabled');
+                        $("#submit").addClass('pulse');
+                    }
+                },
+                error: function (response, xhr, ajaxOptions, thrownError) {
+                    Materialize.toast('Erreur lors de l\'association de la vidéo!', 4000);
+                }
+            });
+        });
+        $('.bnt-choice-message').on('click',function(){
+            var type = $(this).data('value');
+            $('.bnt-choice-message').removeClass('btn-active');
+            $('.bnt-choice-video').removeClass('active');
+            $(this).addClass('btn-active');
+            $(".panel-hide").removeClass('active');
+            $(".panel-hide").stop().fadeOut();
+            $('.blockanswer').stop().fadeOut('normal',function(){
+                $('.blockanswer-'+type).stop().fadeIn();
+                if(type == 'video'){
+                    $('.bnt-choice-video:first').click();
+                }
+            });
+        });
+        $('.blockanswer-video').css('display','none');
+        $('.bnt-choice-video').on('click',function(e){
+            e.preventDefault();
+            var type = $(this).data('value');
+            $('.bnt-choice-video').removeClass('active');
+            $(this).addClass('active');
+            $(".panel-hide").removeClass('active');
+            $('#blockanswer-video-'+type).addClass('active');
+            $(".panel-hide").not(".active").stop().fadeOut('normal',function(){
+                $('#blockanswer-video-'+type).stop().fadeIn('fast');
+                if(type=="webcam"){
+                    $('#blockanswer-video-upload').stop().fadeIn('fast');
+                }
+                $('#validFormVideo').stop().fadeIn('fast');
+                
+            });
+        });
+        $('.link-history-more').on('click',function(e) {
+            e.preventDefault();
+            $('.history-hidden').fadeIn();
+            $(this).fadeOut();
+        });
+
+        document.getElementsByName("contact_talent[message]")[0].addEventListener('change', verifySubmitButton);
+        $('#contact_talent_status').on('change',verifySubmitButton);
+
+        var form = [];
+        form['contact_talent_message'] = 0;
+        form['contact_talent_video'] = 0;
+        form['contact_talent_status_video'] = 0;
+        form['contact_talent_status'] = 0;
+        function verifySubmitButton(){
+            if(this.value && this.value != 0){
+                form[this.id] = 1;
+            } else {
+                form[this.id] = 0;
+            }
+            if(form['contact_talent_message'] + form['contact_talent_status'] >= 2){
+                $('.blockanswer-message .btn').removeClass('disabled');
+            } else {
+                $('.blockanswer-message .btn').addClass('disabled');
+            }
+        }
+
+        $('#contact_talent_status_video').on('change',verifyVideoSubmitButton);
+        function verifyVideoSubmitButton(){
+            if(this.value && this.value != 0){
+                form[this.id] = 1;
+            } else {
+                form[this.id] = 0;
+            }
+            if(form['contact_talent_video'] + form['contact_talent_status_video'] >= 2){
+                $('#validFormVideo .btn').removeClass('disabled');
+            } else {
+                $('#validFormVideo .btn').addClass('disabled');
+            }
+        }
+
+        $('.message-answer').readmore({
+            speed: 75,
+            lessLink: '<a href="#" class="link-message-more">Fermer</a>',
+            moreLink: '<a href="#" class="link-message-more">{% trans %}label.link.readmore{% endtrans %}</a>',
+            blockProcessed: function(element,collapsable){
+                console.log(element);
+                console.log(collapsable);
+                if(collapsable == false){
+                    $('.message-answer').readmore('destroy');
+                }
+            }
+        });
+    </script>
+{% endblock %}
@@ -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 %}
@@ -90,18 +90,20 @@
                                <p class="chip">{{ tag }}</p>
                            {% endfor %}
                        </div>
-                        <div class="col s12 m-t-20 ">
-                            {% if not is_granted('ROLE_COMPANY') %}
-                                <p class="item-detail-reply center-align">
-                                    <a href="{{ path('talent_spontaneous_application_create',{'id': company.id}) }}"
-                                       class="btn btn-default">
-                                        Candidature spontanée
-                                    </a>
-                                </p>
-                            {% endif %}
+                    </div>
+                    {% if not is_granted('ROLE_COMPANY') %}
+                    <div class="row bg-bordered row-promoted">
+                        <div class="col s12 center-align">
+                            <h3>Vous souhaitez rejoindre <span class="color-blue1">{{ company.brandname }}</span> ?</h3>
+                            <a href="{{ path('talent_spontaneous_application_create',{'id': company.getId()}) }}"
+                            class="btn btn-default">
+                                Candidature spontanée
+                            </a>
                        </div>
                    </div>
+                    {% endif %}
                </div>
+                
                <div id="offers" class="row">
                    <div class="col s12">
                        <h1>Les offres d’emploi pour {{ company.brandname }}</h1>
@@ -128,20 +130,18 @@
                    <div class="row">
                        <div class="col s12">
                            <div class="col-content p-30">
-                                {% if popup_answer_already_send is not empty and popup_answer_already_send[0] == true %}
-                                    <h3 class="color-blue1 center-align">Votre candidature a bien été envoyée à {{ company.brandname }} !</h3>
-                                    <div class="col offset-s2 s8 center-align">
-                                        <div class="embed-responsive embed-responsive-16by9">
-                                            <div class="col s12">
-                                                <iframe src="https://player.vimeo.com/video/249822507"
-                                                        width="100%" height="640" frameborder="0"></iframe>
-                                            </div>
+                                <h3 class="color-blue1 center-align">Votre candidature a bien été envoyée à {{ company.brandname }} !</h3>
+                                <div class="col offset-s2 s8 center-align">
+                                    <div class="embed-responsive embed-responsive-16by9">
+                                        <div class="col s12">
+                                            <iframe src="https://player.vimeo.com/video/249822507"
+                                                    width="100%" height="640" frameborder="0"></iframe>
                                        </div>
-                                        <a href="{{ path('talent_dashboard') }}" class="btn btn-default m-t-20">Accéder à mon profil</a>
-                                        <br /><br />
-                                        <a class="text modal-action modal-close">Fermer</a>
                                    </div>
-                                {% endif %}
+                                    <a href="{{ path('talent_dashboard') }}" class="btn btn-default m-t-20">Accéder à mon profil</a>
+                                    <br /><br />
+                                    <a class="text modal-action modal-close">Fermer</a>
+                                </div>
                            </div>
                        </div>
                    </div>
@@ -106,11 +106,11 @@
                $('.fa-refresh').show();
                var month1 = obj.date1.getMonth();
                var day1 = obj.date1.getDate();
-                var year1 = obj.date1.getUTCFullYear();
+                var year1 = obj.date1.getFullYear();
                var month2 = obj.date2.getMonth();
                var day2 = obj.date2.getDate();
-                var year2 = obj.date2.getUTCFullYear();
-                var date1 = (month1 + 1) + "/" + day1 + "/" + year1 +" 00:00:00";
+                var year2 = obj.date2.getFullYear();
+                var date1 = (month1 + 1) + "/" + day1 + "/" + year1 +" 00:00:01";
                var date2 = (month2 + 1) +"/" + day2 + "/" + year2 +" 23:59:59";
                getChartData(date1, date2);
            });
@@ -0,0 +1,20 @@
+<div class="row bg-bordered p-0">
+    <ul class="nav-tabs">
+        <li class="{% if tab == 1 %} active {% endif %} col s3">
+            <a {% if tab == 1 %}class="active"{% endif %} target="_self"
+           href="{{ path('company_ad') }}">
+            {{ 'company.title.ads.label'|trans }}
+            </a>
+        </li>
+        <li class="{% if tab == 2 %} active {% endif %} col s3">
+             <a {% if tab == 2 %}class="active"{% endif %} target="_self" href="{{ path('company_answer_list') }}">
+            {{ 'company.menu.answers.label'|trans }}
+            </a>
+        </li>
+    </ul>
+    <div class="col s4 right m-t-10">
+        <a class="btn-square" target="_self" href="{{ path('company_ad_create') }}">
+            <i class="fa fa-plus"></i> {{ 'ad.company.add.label'|trans }}
+        </a>
+    </div>
+</div>
@@ -1,4 +1,4 @@
-{% for a in ads %}
+{% for a in ads if a.isPrivate != true %}
 <div class="col s12">
    <div class="card z-depth-3">
        <div class="card-image">
@@ -1,4 +1,4 @@
-{% for a in ads %}
+{% for a in ads if a.isPrivate != true %}
    <div id="adRow" class="row item-list-bis z-depth-2 row-noMargin">
        <div class="col s12 m4 col-noPadding ad-picture">
            <a href="{{ path('ad_show',{'alias': a.alias }) }}" title="{{ a.title }}" class="item-list-media">
@@ -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">
@@ -34,6 +34,15 @@
            </div>
            <div class="row m-b-0 p-b-30">
                <div class="col s12 m12">
+                    <div id="header-resultats">
+                        {% if isPromotedAds %}
+                            <div><span class="color-blue2">{{ ads|length }}</span> offres d'emploi pourvues</div>
+                            <div><span><a href="{{ path('ad_search_result') }}">Voir les offres d'emploi en cours</a></span></div>
+                        {% else %}
+                            <div><span class="color-blue2">{{ ads|length }}</span> offres d'emploi en cours</div>
+                            <div><span><a href="{{ path('ad_search_result', {'promoted': true }) }}">Voir les offres d'emploi pourvues</a></span></div>
+                        {% endif %}
+                    </div>
                    <div id="liste-resultats">
                        {% if ads|length > 0 and noResults == false %}
                            {% include 'default/ad_listing.html.twig' with {'ads':ads} %}
@@ -35,6 +35,9 @@
                <div class="col s12 m12 l8 xl9">
                    {% if ad.video and ad.status != "CLOSED" %}
                        <div class="row m-b-0" id="adVideo">
+                            {#{% if ad.id == 38 %}
+                                <img class="responsive-img" src="{{asset('/img/GROUPE-ROCHER-TT.jpg')}}">
+                            {% else %}#}
                            <div class="embed-responsive embed-responsive-16by9">
                                <div class="col s12">
                                    <iframe src="https://player.vimeo.com/video/{{ ad.video.cdnUrl|replace({ "/videos/": ""}) }}"
@@ -42,8 +45,11 @@
                                            allowfullscreen></iframe>
                                </div>
                            </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 %}
@@ -92,16 +98,29 @@
                                        {{ 'ad.talent.isAnswer.label'|trans }}
                                    </div>
                                {% elseif not is_granted('ROLE_COMPANY') %}
-                                    <p class="item-detail-reply">
-                                        <a href="{{ path('talent_answer_create',{'id': ad.getId()}) }}"
-                                        class="btn btn-default">
-                                            Postuler
-                                        </a>
-                                    </p>
+                                    {% if not ad.isPromoted %}
+                                        <p class="item-detail-reply">
+                                            <a  title="postuler-bottom" href="{{ path('talent_answer_create',{'id': ad.getId()}) }}"
+                                            class="btn btn-default">
+                                                Postuler
+                                            </a>
+                                        </p>
+                                    {% endif %}
                                {% endif %}
                            {% endif %}
                        </div>
                    </div>
+                    {% if ad.isPromoted %}
+                    <div class="row bg-bordered row-promoted">
+                        <div class="col s12 center-align">
+                            <h3>Vous souhaitez rejoindre <span class="color-blue1">{{ ad.company.brandname }}</span> ?</h3>
+                            <a href="{{ path('talent_spontaneous_application_create',{'id': ad.company.getId()}) }}"
+                            class="btn btn-default">
+                                Candidature spontanée
+                            </a>
+                        </div>
+                    </div>
+                    {% endif %}
                    <div class="col s12 hide-on-large-only m-b-50">
                    {% include 'default/ad_sidebar.html.twig' with {'ad': ad, 'showBrand': true} %}
                    </div>
@@ -56,12 +56,18 @@
                {{ 'ad.talent.isAnswer.label'|trans }}
            </div>
        {% elseif not is_granted('ROLE_COMPANY') %}
-            <p class="item-detail-reply">
-                <a href="{{ path('talent_answer_create',{'id': ad.getId()}) }}"
-                class="btn btn-default">
-                    Postuler
-                </a>
-            </p>
+            {% if not ad.isPromoted %}
+                <p class="item-detail-reply">
+                    <a title="postuler-side" href="{{ path('talent_answer_create',{'id': ad.getId()}) }}"
+                    class="btn btn-default">
+                        Postuler
+                    </a>
+                </p>
+            {% else %}
+                <div class="item-detail-ispromoted">
+                    Offre pourvue
+                </div>
+            {% endif %}
        {% endif %}
    {% endif %}
 </div>
@@ -1,4 +1,4 @@
-{% for company in companies %}
+{% for company in companies if company.isPrivate != true %}
    <div class="col s12">
        <div class="card z-depth-3 card-company">
            <div class="card-content card-content-company">
@@ -37,80 +37,7 @@
            <div class="row m-b-0 p-b-30">
                <div class="col s12 m12">
                    <div id="liste-resultats">
-                        {% for c in companies %}
-                            {% if (c.presentationVideo is not null or c.getPublishedAds|length > 0 ) %}
-                                <div class="row item-list-bis z-depth-2 row-noMargin">
-
-                                    <div class="col s12 m2 ad-picture col-logo-lg">
-                                        <a href="{{ path('company_show',{'alias': c.alias }) }}"
-                                           title="{{ c.brandname }}">
-                                            {% if c.logo is not null %}
-                                                <img src="{{ c.webPath | imagine_filter('profile_thumb') }}"/>
-                                            {% endif %}
-                                        </a>
-                                    </div>
-                                    <div class="col s12 m6 col-noPadding">
-                                        <div class="row row-infos row-noMargin">
-                                            <div class="col s4 m5 l4 col-noPadding company-infos m-l-30">
-                                                <div class="item-list-website">
-                                                    <h2>
-                                                        <a href="{{ path('company_show',{'alias': c.alias }) }}"
-                                                           class="hover-blue2">
-                                                            <b>{{ c.brandName }}</b>
-                                                        </a>
-                                                    </h2>
-
-                                                    <br/>
-                                                    {{ c.init }}
-                                                    {% if c.city != null %}
-                                                        {{ c.city }}
-                                                    {% endif %}
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="row row-tags row-noMargin">
-                                            <div class="col s11 col-noPadding" style="position:relative;">
-                                                <div class="chip center-align">
-                                                    <a class="td-none color-grey3"
-                                                       href="{{ path('company_show',{'alias': c.alias, '_fragment':'offers' }) }}">
-                                                        {% set nbAds = c.getPublishedAds|length %}
-                                                        {% if nbAds > 1 %}
-                                                            <strong>{{ c.getPublishedAds|length }} offres d'emploi en
-                                                                cours</strong>
-                                                        {% else %}
-                                                            <strong>{{ c.getPublishedAds|length }} offre d'emploi en
-                                                                cours</strong>
-                                                        {% endif %}
-                                                    </a>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="col s12 m4 col-noPadding ad-picture">
-                                        <a href="{{ path('company_show',{'alias': c.alias }) }}"
-                                           title="{{ c.brandname }}"
-                                           class="item-list-media">
-                                            {% if c.presentationVideo %}
-                                                {% if c.presentationVideo.thumbnails.0.sizes is defined %}
-
-                                                    <img class="thumbnail_list"
-                                                         src="{{ c.presentationVideo.thumbnails.0.sizes.4.link }}"
-                                                         alt="{{ c.brandName }}"/>
-
-                                                {% endif %}
-                                                <span class="playerbtn"></span>
-                                            {% else %}
-                                                <img class="thumbnail_list"
-                                                     src="{{ asset('/img/default_picture_company.svg') }}"
-                                                     alt="{{ c.brandName }}"/>
-                                            {% endif %}
-                                        </a>
-                                    </div>
-                                    <div class="borderList"></div>
-                                    <div class="clearfix"></div>
-                                </div>
-                            {% endif %}
-                        {% endfor %}
+                        {% include 'default/company_listing.html.twig' with {'companies':companies} %}
                    </div>
                </div>
            </div>
@@ -0,0 +1,74 @@
+{% for c in companies if c.isPrivate != true %}
+    {% if (c.presentationVideo is not null or c.getPublishedAds|length > 0 ) %}
+        <div class="row item-list-bis z-depth-2 row-noMargin">
+
+            <div class="col s12 m2 ad-picture col-logo-lg">
+                <a href="{{ path('company_show',{'alias': c.alias }) }}"
+                    title="{{ c.brandname }}">
+                    {% if c.logo is not null %}
+                        <img src="{{ c.webPath | imagine_filter('profile_thumb') }}"/>
+                    {% endif %}
+                </a>
+            </div>
+            <div class="col s12 m6 col-noPadding">
+                <div class="row row-infos row-noMargin">
+                    <div class="col s4 m5 l4 col-noPadding company-infos m-l-30">
+                        <div class="item-list-website">
+                            <h2>
+                                <a href="{{ path('company_show',{'alias': c.alias }) }}"
+                                    class="hover-blue2">
+                                    <b>{{ c.brandName }}</b>
+                                </a>
+                            </h2>
+
+                            <br/>
+                            {{ c.init }}
+                            {% if c.city != null %}
+                                {{ c.city }}
+                            {% endif %}
+                        </div>
+                    </div>
+                </div>
+                <div class="row row-tags row-noMargin">
+                    <div class="col s11 col-noPadding" style="position:relative;">
+                        <div class="chip center-align">
+                            <a class="td-none color-grey3"
+                                href="{{ path('company_show',{'alias': c.alias, '_fragment':'offers' }) }}">
+                                {% set nbAds = c.getPublishedAds|length %}
+                                {% if nbAds > 1 %}
+                                    <strong>{{ c.getPublishedAds|length }} offres d'emploi en
+                                        cours</strong>
+                                {% else %}
+                                    <strong>{{ c.getPublishedAds|length }} offre d'emploi en
+                                        cours</strong>
+                                {% endif %}
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="col s12 m4 col-noPadding ad-picture">
+                <a href="{{ path('company_show',{'alias': c.alias }) }}"
+                    title="{{ c.brandname }}"
+                    class="item-list-media">
+                    {% if c.presentationVideo %}
+                        {% if c.presentationVideo.thumbnails.0.sizes is defined %}
+
+                            <img class="thumbnail_list"
+                                    src="{{ c.presentationVideo.thumbnails.0.sizes.4.link }}"
+                                    alt="{{ c.brandName }}"/>
+
+                        {% endif %}
+                        <span class="playerbtn"></span>
+                    {% else %}
+                        <img class="thumbnail_list"
+                                src="{{ asset('/img/default_picture_company.svg') }}"
+                                alt="{{ c.brandName }}"/>
+                    {% endif %}
+                </a>
+            </div>
+            <div class="borderList"></div>
+            <div class="clearfix"></div>
+        </div>
+    {% endif %}
+{% endfor %}
@@ -1,7 +1,7 @@
 <footer class="page-footer">
    <div class="container">
        <div class="row footer-info">
-            <div class="col xl2 l2 m6 s6">
+            <div class="col xl2 l2 m6 s12 col-footer-logo">
                <img src="{{ asset('/img/logo-mini-white.svg') }}" alt="Talents Tube 1er job board 100% vidéo">
            </div>
            <div class="col xl3 l3 m6 s6">
@@ -16,6 +16,9 @@
                    <li>
                        <a class="white-text" href="{{ path('company_list') }}" title="Listes entreprises">Nos entreprises</a>
                    </li>
+                    <li>
+                        <a class="white-text" href="{{ path('territory_list') }}" title="Listes des territoires">Nos territoires</a>
+                    </li>
                    <li>
                        <a class="white-text" href="https://blog.talentstube.com/contact.html" title="Talents Tube ">Contact</a>
                    </li>
@@ -30,6 +33,9 @@
                    <li>
                        <a class="white-text" href="{{ path('service_cgu') }}">Conditions générales d'utilisation</a>
                    </li>
+                    <li>
+                        <a class="white-text" href="{{ path('page_Confidentialite') }}">Politique de confidentialité et protection des données</a>
+                    </li>
                </ul>
            </div>
            <div class="col xl3 l3 m6 s12 left-align">
@@ -50,7 +56,7 @@
                </p>
                <h5 class="white-text">Contactez-nous !</h5>
                <a class="white-text" href="mailto:&#098;&#111;&#110;&#106;&#111;&#117;&#114;&#064;&#116;&#097;&#108;&#101;&#110;&#116;&#115;&#116;&#117;&#098;&#101;&#046;&#099;&#111;&#109;">Par mail</a>
-                <p class="white-text" >02 97 68 14 02</p>
+                <p class="white-text">02 30 05 06 31</p>
                <p class="footer-newsletter">
                    <a class="btn-large btn-round" href="#" title="Newsletter" data-token="ecea5416671e97e3abfa8195848a9140" onclick="mjOpenPopin(event, this)">
                        <i class="fa fa-envelope-open-o left" aria-hidden="true"></i>
@@ -61,7 +67,11 @@
        </div>
        <div class="row footer-more-links">
            <div class="col s12 center-align">
-                <a class="text-center white-text" href="https://www.e-declic.com" target="_blank" title="Agence Web">&copy;&nbsp;2017 Talents Tube</a>
+                <p class="text-center white-text">Entreprise soutenue par</p>
+                <a href="https://www.bretagne.bzh/"><img src="{{ asset('img/RB_monochrome_blanc.svg')}}" alt="Region Bretagne"></a><br>
+            </div>
+            <div class="col s12 center-align m-t-30">
+                <a class="text-center white-text" href="https://www.e-declic.com" target="_blank" title="Agence Web">&copy;&nbsp;2018 Talents Tube</a>
            </div>
        </div>
    </div>
@@ -7,9 +7,10 @@
                    <li><a href="{{ path('page_cvVideo') }}" title="Le Cv vidéo">Le CV vidéo</a></li>
                    <li><a href="{{ path('page_reussirCVvideo') }}" title="Comment faire son CV Vidéo ?">Comment faire son CV Vidéo ?</a></li>
                    <li><a href="{{ path('page_accompagnementTalent') }}" title="Accompagnement talent">Accompagnement</a></li>
+                    <li><a href="{{ path('talent_cv_import') }}" title="Créer mon CV vidéo">Créer mon CV vidéo</a></li>
                </ul>
                <ul id='dropdown_company' class='dropdown-content'>
-                    <li><a href="{{ path('company_list') }}" title="Listes entreprises">Listes entreprises</a></li>
+                    <li><a href="{{ path('company_list') }}" title="Les entreprises qui recrutent">Les entreprises qui recrutent</a></li>
                    <li><a href="{{ path('page_OffreEmploi') }}" title="L'offre d'emploi en vidéo">L'offre d'emploi en vidéo</a></li>
                    <li><a href="{{ path('page_reussirOffrevideo') }}" title="Comment faire une offre en vidéo">Comment faire une offre en vidéo</a></li>
                    <li><a href="{{ path('page_MarqueEmployeur') }}" title="Vidéo Marque Employeur">Vidéo Marque Employeur</a></li>
@@ -9,16 +9,17 @@
                {# VIDEO #}
                <div class="col l12 m12 s12 home-content col-noPadding">
                    <div id="homeTeaser" class="valign-wrapper">
-                        <h1 class="white-text center-align">1er job board <span>100% vidéo</span></h1><br />
+                        <h1 class="white-text center-align">1ère plateforme pour l’emploi
+                            <span>100% vidéo</span></h1><br/>
                        <div class="link-home-head">
                            <a data-target="modal_concept" href="#!" class="btn btn-default btn-round btn-concept modal-trigger">
                                Le concept en vidéo &nbsp;&nbsp;&nbsp;
-                                <img src="{{asset('img/bouton-play.png')}}" />
+                                <img src="{{asset('img/bouton-play.png')}}"/>
                            </a>
                        </div>
                        <div class="header-video-inner">
-                            <video loop="" preload="metadata" autoplay="" id="vid" muted>
-                                <source src="/img/home_video.mp4" type="video/mp4">    
+                            <video loop="" preload="metadata" autoplay="" id="vid" muted="muted">
+                                <source src="/img/home_video.mp4" type="video/mp4">
                            </video>
                        </div>

@@ -26,28 +27,34 @@
                    {# RECHERCHE #}
                    <div class="fluid-container bg-grey-3 homeSearchWrapper">
                        <div id="homeSearch" class="container">
-                        {% include 'form/search_form.html.twig' with {'searchform': searchform } %}
+                            {% include 'form/search_form.html.twig' with {
+                                'searchform' : searchform
+                            } %}
                        </div>
                    </div>
                    {# BLOC OFFRE EMPLOI CARDS #}
                    <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">
                                    <div class="owl-carousel owl-carousel-home">
-                                        {% if ads|length > 0 %}
-                                            {% include 'default/ad_card.html.twig' with {'ads': ads } %}
+                                        {% if ads | length > 0 %}
+                                            {% include 'default/ad_card.html.twig' with {
+                                                'ads' : ads
+                                            } %}
                                        {% endif %}
                                    </div>
                                </div>
                            </div>
                            <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
+                                    <a href="{{ path('ad_search_result') }}" title="Découvrir toutes les offres d'emploi" class="btn btn-default btn-round btn-all-jobs">Voir les offres
                                    </a>
                                </div>
                            </div>
@@ -60,23 +67,24 @@
                        <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">
                                <div class="col s12 col-noPadding">
                                    <div class="owl-carousel owl-carousel-home home-company-carousel">
-                                        {% if talents|length > 0 %}
-                                            {% include 'default/company_card.html.twig' with {'companies': companies } %}
+                                        {% if companies | length > 0 %}
+                                            {% include 'default/company_card.html.twig' with {
+                                                'companies' : companies
+                                            } %}
                                        {% endif %}
                                    </div>
                                </div>
                            </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>
@@ -84,19 +92,22 @@
                </div>
            </div>
        </div>
-        

        {# TALENTS #}
        <div id="liste-talents" class="bg-dark2 button-plus">
-             <div class="container">
+            <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">
-                        {% if talents|length > 0 %}
-                            {% include 'default/talent_card.html.twig' with {'talents': talents } %}
+                        {% if talents | length > 0 %}
+                            {% include 'default/talent_card.html.twig' with {
+                                'talents' : talents
+                            } %}
                        {% endif %}
                    </div>
                </div>
@@ -107,27 +118,34 @@
            <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 %}
-                                <div class="item">
-                                    <div class="embed-responsive embed-responsive-16by9">
-                                        <div class="col s12">
-                                            <iframe src="https://player.vimeo.com/video/{{ territory.presentationVideo.cdnUrl|replace({ "/videos/": ""}) }}"
-                                                    width="100%" height="640" frameborder="0" webkitallowfullscreen mozallowfullscreen
-                                                    allowfullscreen></iframe>
+                            <div class="owl-carousel owl-carousel-home territory-carousel">
+                                {% for t in territories if t.presentationVideo and t.isPrivate != true %}
+                                    <div class="item">
+                                        {% if t.presentationVideo.thumbnails.0. sizes is defined %}
+                                            <a href="{{ path('territory_show',{'alias': t.alias }) }}" title="{{ t.brandname }}">
+                                                <img src="{{ t.presentationVideo.thumbnails.0.sizes.4.link }}" alt="{{ t.brandName }}" class="overlay-hover"/>
+                                                <span class="playerbtn" style="margin-top: -55px;"></span>
+                                            </a>
+                                        {% endif %}
+                                        {% 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">
+                                            <a href="{{ path('territory_show',{'alias': t.alias }) }}" class="color-white td-none">{{ t.brandName|upper }}</a>
                                        </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>
-                                    </div>
-                                </div>
-                            {% endfor %}
-                        </div>    
-                        {% endif %}           
+                                {% endfor %}
+                            </div>
+                            <div class="m-t-30">
+                                <a title="Voir les territoires" class="btn btn-default" href="{{ path('territory_list') }}">
+                                    <span>
+                                        Voir les territoires</span>
+                                </a>
+                            </div>
+                        {% endif %}
                    </div>
                </div>
            </div>
@@ -137,23 +155,23 @@
            <div class="container">
                <div class="blocs-texte-video">
                    <div class="row center-align">
-                        <div class="col s12"><h2 class="blue-text no-margin-top no-margin-bottom">Les conseils de votre
-                                <span>talentstubeuse</span></h2></div>
+                        <div class="col s12">
+                            <h2 class="blue-text no-margin-top no-margin-bottom">Les conseils de votre
+                                <span>talentstubeuse</span></h2>
+                        </div>
                    </div>
                    <div class="row flexcontainer row-bloc-video-1 row-noMargin">
                        <div class="col l6 m12 s12 col-noPadding">
                            <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 mozallowfullscreen
-                                    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">
                                <h2 class="no-margin-top">CV vidéo
                                </h2>
-                                <p>Devenez acteur de vos talents, montrez qui vous êtes !</p>
+                                <p>Devenez acteur de vos talents, montrez qui vous êtes !</p>
                            </div>
                        </div>
                        <div class="clearfix"></div>
@@ -171,9 +189,7 @@
                            <a href="#!" data-video="#video1" class="img_content embed-responsive embed-responsive-16by9" style="background:url(/img-cnt/offre_emploi.jpg);background-size:cover;">
                                <span class="playerbtn"></span>
                            </a>
-                            <iframe style="display:block;" class="hide" id="video1" src="https://player.vimeo.com/video/215657499?title=0&byline=0&portrait=0" width="100%"
-                                    height="344" frameborder="0" webkitallowfullscreen mozallowfullscreen
-                                    allowfullscreen></iframe>
+                            <iframe style="display:block;" class="hide" id="video1" src="https://player.vimeo.com/video/215657499?title=0&byline=0&portrait=0" width="100%" height="344" frameborder="0" webkitallowfullscreen="webkitallowfullscreen" mozallowfullscreen="mozallowfullscreen" allowfullscreen="allowfullscreen"></iframe>
                        </div>
                        <div class="clearfix"></div>
                    </div>
@@ -182,9 +198,7 @@
                            <a href="#!" data-video="#video3" class="img_content embed-responsive embed-responsive-16by9" style="background:url(https://i.vimeocdn.com/video/653721887_1024x573.jpg);background-size:cover;">
                                <span class="playerbtn"></span>
                            </a>
-                            <iframe style="display:block;" class="hide" id="video3" src="https://player.vimeo.com/video/232618030" width="100%"
-                                    height="344" frameborder="0" webkitallowfullscreen mozallowfullscreen
-                                    allowfullscreen></iframe>
+                            <iframe style="display:block;" class="hide" id="video3" src="https://player.vimeo.com/video/232618030" 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">
@@ -204,8 +218,7 @@
    <div id="modal_concept" class="modal modal-fixed-footer">
        <div class="modal-content">
            <div class="video-container">
-                <iframe id="iframe_concept" src="https://player.vimeo.com/video/215638758?title=0&byline=0&portrait=0" frameborder="0" webkitallowfullscreen mozallowfullscreen
-                        allowfullscreen></iframe>
+                <iframe id="iframe_concept" src="https://player.vimeo.com/video/215638758?title=0&byline=0&portrait=0" frameborder="0" webkitallowfullscreen="webkitallowfullscreen" mozallowfullscreen="mozallowfullscreen" allowfullscreen="allowfullscreen"></iframe>
            </div>
        </div>
        <div class="modal-footer">
@@ -4,14 +4,13 @@
        <div class="item">
            <a href="{{ path('talent_show',{'alias': talent.alias }) }}"
                title="{{ user.firstname }} {{ user.lastname }}">
-                {% if user.socialPicture is not null %}
+                {% if user.socialPicture is not null and user.photo is null %}
                    <img class="circle z-depth-3" src="{{ user.socialPicture }}" alt="{{ user.firstname }} {{ user.lastname }}"/>
                {% elseif user.photo %}
                    <img class="circle z-depth-3" src="{{ user.webPath | imagine_filter('profile_square') }}" alt="{{ user.firstname }} {{ user.lastname }}"/>
                {% else %}
-                    <img class="circle z-depth-3"
-                            src="{{ asset('/img/portrait-carre.png') }}"
-                            alt="{{ user.firstname }} {{ user.lastname }}"/>
+                    <div class="circle-letters font-2">{{ user.firstname|first|upper }}{{ user.lastname|first|upper }}</div>
+                       
                {% endif %}
            </a>
            <p class="item-list-job item-list-name center-align">
@@ -3,8 +3,21 @@
 <head>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    <title></title>
+    <!--[if !mso]><!-->
    <style type="text/css">
-
+        @import url(https://fonts.googleapis.com/css?family=Raleway);
+    </style>
+    <style type="text/css">
+        @media only screen and (max-width:480px) {
+            @-ms-viewport { width:320px; }
+            @viewport { width:320px; }
+        }
+    </style>
+    <link href="https://fonts.googleapis.com/css?family=Raleway" rel="stylesheet" type="text/css">
+    <style type="text/css">
+        *{
+            font-family: 'Raleway';
+        }
        #outlook a { padding: 0; }
        .ReadMsgBody { width: 100%; }
        .ExternalClass { width: 100%; }
@@ -16,25 +29,31 @@
            display: block;
            margin: 13px 0;
        }
+        .btn-default {
+            padding: 12px 30px;
+            border-radius: 30px;
+            height: 48px;
+            line-height: 48px;
+            background: #1689fb;
+            font-size: 16px;
+            color: #FFF;
+            text-decoration: none;
+        }
+        .btn-white {
+            background: #FFF;
+            color: #1689fb;
+            border: 1px solid #1689fb;
+            padding: 10px 29px;
+        }

    </style>
-    <!--[if !mso]><!-->
-    <style type="text/css">
-        @import url(https://fonts.googleapis.com/css?family=Ubuntu:400,500,700,300);
-    </style>
-    <style type="text/css">
-        @media only screen and (max-width:480px) {
-            @-ms-viewport { width:320px; }
-            @viewport { width:320px; }
-        }
-    </style>
-    <link href="https://fonts.googleapis.com/css?family=Ubuntu:400,500,700,300" rel="stylesheet" type="text/css">
+
    <!--<![endif]-->
    <style type="text/css">
        @media only screen and (min-width:480px) {
            .mj-column-per-100, * [aria-labelledby="mj-column-per-100"] { width:100%!important; }
        }</style></head>
-<body id="YIELD_MJML" style="background: #F2F2F2;"><div class="mj-body" style="background-color:#F2F2F2;"><!--[if mso]>
+<body id="YIELD_MJML" style="background: #F2F2F2;font-family:'Raleway';"><div class="mj-body" style="background-color:#F2F2F2;"><!--[if mso]>
    <table border="0" cellpadding="0" cellspacing="0" width="600" align="center" style="width:600px;"><tr><td>
    <![endif]--><div style="margin:0 auto;max-width:600px;background:#F2F2F2;"><table class="" cellpadding="0" cellspacing="0" style="width:100%;font-size:0px;background:#F2F2F2;" align="center"><tbody><tr><td style="text-align:center;vertical-align:top;font-size:0;padding:0px;"><!--[if mso]>
                    <table border="0" cellpadding="0" cellspacing="0"><tr><td style="width:600px;">
@@ -57,7 +76,7 @@
    <table border="0" cellpadding="0" cellspacing="0" width="600" align="center" style="width:600px;"><tr><td>
    <![endif]--><div style="margin:0 auto;max-width:600px;background:#FFFFFF;"><table class="" cellpadding="0" cellspacing="0" style="width:100%;font-size:0px;background:#FFFFFF;" align="center"><tbody><tr><td style="text-align:center;vertical-align:top;font-size:0;padding:0px;"><!--[if mso]>
                    <table border="0" cellpadding="0" cellspacing="0"><tr><td style="width:600px;">
-                    <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:20px 35px 20px 35px;" align="left"><div class="mj-content" style="cursor:auto;color:#534F4F;font-family:Trebuchet,Helvetica,sans-serif;font-size:14px;line-height:22px;">
+                    <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:20px 35px 20px 35px;" align="left"><div class="mj-content" style="cursor:auto;color:#534F4F;font-family:Raleway;font-size:14px;line-height:22px;">
                                        {% block content %}{% endblock %}<!--[if mso]>
                    </td></tr></table>
                    <![endif]--></td></tr></tbody></table></div><!--[if mso]>
@@ -67,7 +86,7 @@
    <table border="0" cellpadding="0" cellspacing="0" width="600" align="center" style="width:600px;"><tr><td>
    <![endif]--><div style="margin:0 auto;max-width:600px;background:#FFFFFF;"><table class="" cellpadding="0" cellspacing="0" style="width:100%;font-size:0px;background:#FFFFFF;" align="center"><tbody><tr><td style="text-align:center;vertical-align:top;font-size:0;padding:0px;"><!--[if mso]>
                    <table border="0" cellpadding="0" cellspacing="0"><tr><td style="width:600px;">
-                    <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:0px 35px 0px 35px;" align="center"><div class="mj-content" style="cursor:auto;color:#534F4F;font-family:Trebuchet,Helvetica,sans-serif;font-size:14px;line-height:22px;"><p>Suivez-nous&nbsp;!</p>
+                    <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:0px 35px 0px 35px;" align="center"><div class="mj-content" style="cursor:auto;color:#534F4F;font-family:Raleway;font-size:14px;line-height:22px;"><p>Suivez-nous&nbsp;!</p>
                                        <p>
                                            <a style="margin:10px 20px 22px 20px;" href="https://www.facebook.com/TalentsTuber/"><img src="{{ absolute_url(asset('img/mail/facebook.png')) }}" alt="Facebook"></a>
                                            <a style="margin:10px 20px 22px 20px;" href="https://twitter.com/TalentsTuber"><img src="{{ absolute_url(asset('img/mail/twitter.png')) }}" alt="Twitter"></a>
@@ -81,7 +100,7 @@
    <table border="0" cellpadding="0" cellspacing="0" width="600" align="center" style="width:600px;"><tr><td>
    <![endif]--><div style="margin:0 auto;max-width:600px;background:#F2F2F2;"><table class="" cellpadding="0" cellspacing="0" style="width:100%;font-size:0px;background:#F2F2F2;" align="center"><tbody><tr><td style="text-align:center;vertical-align:top;font-size:0;padding:0px;"><!--[if mso]>
                    <table border="0" cellpadding="0" cellspacing="0"><tr><td style="width:600px;">
-                    <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:20px 35px 20px 35px;" align="center"><div class="mj-content" style="cursor:auto;color:#7E7878;font-family:Trebuchet,Helvetica,sans-serif;font-size:14px;line-height:22px;"><p style="font-weight:bold;">Talents Tube</p>
+                    <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:20px 35px 20px 35px;" align="center"><div class="mj-content" style="cursor:auto;color:#7E7878;font-family:Raleway;font-size:14px;line-height:22px;"><p style="font-weight:bold;">Talents Tube</p>
                                        <p>Place Albert Einstein 6 Le Prisme CP60 PIBS 6 CS 72001 - 56038 VANNES</p>
                                        <p><a style="text-decoration:none;color:#7E7878;font-weight:bold;" href="mailto:contact@talentstube.com">contact@talentstube.com</a></p></div></td></tr></tbody></table></div><!--[if mso]>
                    </td></tr></table>
@@ -2,17 +2,47 @@

 {% block content %}
    {% if type == 'html' %}
-        <p>{{ user.getCivility()|trans }} {{ user.lastname }} {{ user.firstname }}</p>
-        <p>{{ message|nl2br}}</p>
-        <br><br>
-        <p>Informations : La personne qui vous à contacté ne connaîtra pas votre email tant que vous ne lui aurez pas
-            répondu</p>
-
-        <p>Pensez également à bien vérifier l'identité de votre correspondant pour éviter toute tentative de phishing</p>
-
+        {% if video is not null %}
+        <div style="margin-left: -35px; margin-right: -35px;margin-top: -20px;">
+        {% if video.thumbnails.0.sizes is defined %}
+            <img width="100%" src="{{ video.thumbnails.0.sizes.4.link }}"
+                alt="réponse vidéo"/>
+        {% endif %}
+        </div>
+        <br />
+        Bonjour {{ user.firstname }} {{ user.lastname }},<br /><br />
+        <strong>Vous avez reçu une réponse vidéo de l’entreprise {{ message.sender.company.brandname }}.</strong><br />
+        Découvez la réponse vidéo en cliquant sur le bouton ci-dessous.
+        <br/>
+        <br/>
+        <div style="text-align:center;">
+            <a class="btn btn-default" href="{{ path('talent_ad_detail',{'alias': answer.ad.alias,'id': answer.id }) }}">Visionner la réponse vidéo</a>
+        </div>
+        {% else %}
+        <br />
+        Bonjour {{ user.firstname }} {{ user.lastname }},<br /><br />
+        <strong>Vous avez reçu une réponse de l’entreprise {{ message.sender.company.brandname }}.</strong><br />
+        Découvez la réponse en cliquant sur le bouton ci-dessous.
+        <br/>
+        <br/>
+        <div style="text-align:center;">
+            <a class="btn btn-default" href="{{ path('talent_ad_detail',{'alias': answer.ad.alias,'id': answer.id }) }}">Consulter la réponse</a>
+        </div>
+        {% endif %}
+        <br>
+        <strong>Vous souhaitez contacter l’entreprise ?</strong><br /><br />
+        Cliquez sur le bouton ci-dessous pour envoyer un email à la personne en charge du recrutement.
+        <br/>
+        <br/>
+        <div style="text-align:center;">
+            <a class="btn-default btn-white" href="mailto:{{ message.sender.email }}">Répondre à {{ message.sender.firstname }}  {{ message.sender.lastname }}</a>
+        </div>
+        <br />
+        <br />
+        L’équipe Talents Tube
    {% elseif type == 'plain' %}
        {{ user.getCivility()|trans }} {{ user.lastname }} {{ user.firstname }}
-        {{ message}}
+        {{ messageText}}
    {% endif %}

 {% endblock %}
@@ -6,8 +6,10 @@
                <div id="template" class="file-row">
                    <div class="dz-preview">
                        <div id="preview_video">
-                        {% if video %}
-                            <iframe src="https://player.vimeo.com{{ video.getCdnUrl()|replace({ "videos": "video"}) }}" width="100%" height="300px" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+                        {% if video is defined %}
+                            {% if video is not null %}
+                                <iframe src="https://player.vimeo.com{{ video.getCdnUrl()|replace({ "videos": "video"}) }}" width="100%" height="300px" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+                            {% endif %}
                        {% endif %}
                        </div>
                        <div class="progress">
@@ -0,0 +1,59 @@
+{% extends 'base.html.twig' %}
+{% block content %}
+    <div class="fluid-container bg-grey-3">
+        <div class="container contentWrapper contentPage" id="answerPage">
+            <div class="row">
+                <div class="col s12">
+                    <div class="center-align bg-grey-3 m-t-20">
+                        <h3 class="color-blue1 m-t-10">Importer</h3>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col s12">
+                    <div class="col-content bg-arrow z-depth-2 p-20">
+                        <div class="row">
+                            <div class="col s12">
+                                <h4 class="color-blue1 p-0">
+                                    <span class="title-bubble">1</span>
+                                    Importez votre CV Vidéo</h4>
+                            </div>
+                            <div class="col s10 offset-s1 answer-dropzone">
+                                {% include 'media/dropzone.html.twig' with {
+                                    'deleting' : true
+                                } %}
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-t-40">
+                        <div id="form_media" class="col s10 offset-s1 center-align">
+                            <button id="submit" class=" btn btn-large btn-default disabled" type="submit">
+                                Envoyer mon CV
+                            </button><br/><br/>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
+{% block javascripts %}
+    {{ parent() }}
+    <script type="text/javascript">
+        var urlDropzone = '{{ path("upload_media_default", {"id": app.user.getId()}) }}';
+        var urlDelete = 'null'
+        var idObject = '{{ app.user.getId() }}';
+        var typeObject = "user";
+        var videoExist = false;
+    </script>
+    <script src="{{ asset('/js/dropzone.js') }}"></script>
+    <script src="{{ asset('/js/answer.js') }}"></script>
+    <script type="text/javascript">
+        {% if mustLogin == true %}
+            $('#submit').on('click', function (event) {
+                event.preventDefault();
+                $('#modal_login').modal('open');
+            });
+        {% endif %}
+    </script>
+{% endblock %}
@@ -0,0 +1,39 @@
+{% extends 'base.html.twig' %}
+{% block content %}
+
+    {% set title = 'Importer son CV Vidéo' %}
+    {% set route = "media_import_cv" %}
+
+    <div class="fluid-container bg-grey-3">
+        <div class="container contentWrapper contentPage">
+            <div class="row">
+                <div class="col s12">
+                    <div class="col-content center-align m-t-20">
+                        <h3 class="color-blue1 m-0 m-t-10">{{ title }}</h3>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col s12 m6 ">
+                    <div class="col-content p-15 bg-blue-1 center-align whiteColor z-depth-2 choice-answer-item">
+                        <img src="{{ asset('img/img_popupcv/webcam_cv_video.svg')}}">
+                        <h3>J'enregistre mon CV vidéo !</h3>
+                        <p>Suivez nos conseils puis enregistrez votre CV vidéo directement depuis votre webcam.</p>
+                        <a href="{{ path(route,{'type': 'webcam' }) }}" class="btn btn-default white">Enregistrer mon CV vidéo</a>
+                    </div>
+                </div>
+                <div class="col s12 m6">
+                    <div class="col-content p-15 center-align z-depth-2 choice-answer-item bg-white">
+                        <img src="{{ asset('img/img_popupcv/videotheque_cv_video.svg')}}">
+                        <h3>Je possède un CV vidéo !</h3>
+                        <p>Importez une vidéo</p>
+                        <a href="{{ path(route,{'type': 'import'}) }}" class="btn btn btn-default">Importer mon CV vidéo</a><br/><br/>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
+{% block javascripts %}
+    {{ parent() }}
+{% endblock %}
@@ -0,0 +1,105 @@
+{% extends 'base.html.twig' %}
+{% block content %}
+    <div class="fluid-container bg-grey-3">
+        <div class="container contentWrapper contentPage" id="answerPage">
+            <div class="row">
+                <div class="col s12">
+                    <div class="center-align bg-grey-3 m-t-20">
+                        <h3 class="color-blue1 m-t-10">J'enregistre mon CV vidéo</h3>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col s12">
+                    <div class="col-content bg-arrow z-depth-2 p-20">
+                        <div class="row">
+                            <div class="col s12">
+                                <h4 class="color-blue1 p-0">
+                                    <span class="title-bubble">1</span>
+                                    Enregistrez votre cv vidéo</h4>
+                            </div>
+                            <div class="col m4 offset-m1 s12">
+                                <video id="myCvVideo" class="video-js vjs-default-skin"></video>
+                                <div class="video-informations-card center-align">
+                                    <p>Merci de cliquer sur l'icône
+                                        <span class="vjs-icon-device-perm"></span>
+                                        afin d'activer votre webcam.</p>
+                                    <p>Votre webcam activée, lancez l'enregistrement en cliquant sur le bouton rond en bas à gauche du lecteur.</p>
+                                    <p>Si vous n'êtes pas satisfait(e) de votre CV vidéo après un enregistrement, vous pouvez à tout moment recommencer l'enregistrement.</p>
+                                    <p>
+                                        <a class="view-tuto">Revoir le tutoriel</a>
+                                    </p>
+                                </div>
+                            </div>
+                            <div class="col m2 hide-on-small-only">
+                                <div class="valign-wrapper" style="align-items:center;justify-content: center;height: 300px;width:100%;">
+                                    <div style="font-size:40px;">
+                                        <i class="fa fa-arrow-right center-align" aria-hidden="true"></i>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col m4 s12">
+                                <video id="preview" controls="true">
+                                    <span class="vjs-control-text">Play Video</span>
+                                </video>
+                                <div class="btnContainer center-align" style="display:none;">
+                                    <a id="saveRecord" href="#!" class="saveVideo btn btn-default">
+                                        <i class="fa fa-floppy-o" aria-hidden="true"></i>&nbsp; Télécharger mon CV Vidéo
+                                    </a>
+                                    <div class="video-informations-card">
+                                        <p>Une fois téléchargé vous pouvez glisser-déposer votre CV vidéo dans la zone prévue pour lancer le téléchargement.</p>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-content bg-arrow z-depth-2 p-20">
+                        <div class="row">
+                            <div class="col s12">
+                                <h4 class="color-blue1 p-0">
+                                    <span class="title-bubble">2</span>
+                                    Importez votre CV Vidéo</h4>
+                            </div>
+                            <div class="col s10 offset-s1 answer-dropzone">
+                                {% include 'media/dropzone.html.twig' with {
+                                    'deleting' : true
+                                } %}
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row m-t-40">
+                        <div id="form_media" class="col s10 offset-s1 center-align">
+                            <button id="submit" class=" btn btn-large btn-default disabled" type="submit">
+                                Envoyer mon CV vidéo
+                            </button><br/><br/>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
+{% block javascripts %}
+    {{ parent() }}
+    <script type="text/javascript">
+        var urlDropzone = '{{ path("upload_media_default", {"id": app.user.getId()}) }}';
+        var urlDelete = 'null';
+        var idObject = '{{ app.user.getId() }}';
+        var typeObject = "user";
+        var videoExist = false;
+    </script>
+    <script src="{{ asset('/js/dropzone.js') }}"></script>
+    <script src="{{ asset('/js/vendors/video.min.js') }}"></script>
+    <script src="{{ asset('/js/vendors/RecordRTC.js') }}"></script>
+    <script src="{{ asset('/js/vendors/videojs.record.js') }}"></script>
+    <script src="{{ asset('/js/vendors/jquery.browser.min.js') }}"></script>
+    <script src="{{ asset('/js/answer.js') }}"></script>
+    <script type="text/javascript">
+        {% if mustLogin == true %}
+            $('#submit').on('click', function (event) {
+                event.preventDefault();
+                $('#modal_login').modal('open');
+            });
+        {% endif %}
+    </script>
+{% endblock %}
@@ -0,0 +1,10 @@
+{% block content %}
+<div class="row">
+    <div class="col s12">
+        <h4>{% trans %}label.webcam.answer.step2{% endtrans %}</h4>
+    </div>
+    <div class="col s10 offset-s1 answer-dropzone">
+    {% include 'media/dropzone.html.twig' with {'deleting': true }  %}
+    </div>
+</div>
+{% endblock %}
@@ -0,0 +1,28 @@
+
+{% block content %}
+<div class="row">
+    <div class="col s12">
+        <h4>{% trans %}label.webcam.answer.videotheque{% endtrans %}</h4>
+    </div>
+    {% for vid in videos %}
+        {% set img = "" %}
+        {% if vid.thumbnails.0 is defined %}
+            {% set img = vid.thumbnails.0.sizes.4.link %}
+        {% endif %}
+        <div class="col s4">
+            <div class="card">
+                <div class="card-image">
+                    <div class="embed-responsive embed-responsive-16by9">
+                        <iframe src="https://player.vimeo.com{{ vid.getCdnUrl()|replace({ "videos": "video"}) }}" width="100%" height="auto" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+                    </div>
+                </div>
+                <div style="cursor:pointer;" class="card-action" data-url="https://player.vimeo.com{{ vid.getCdnUrl()|replace({ "videos": "video"}) }}" data-img="{{ img }}" data-position="top" data-tooltip="Choisir cette vidéo" href="#"  data-title="{{ vid.getTitle() }}" data-id="{{ vid.getId() }}">
+                    <a class="addExistingVideo" >
+                    <span>{{ vid.getTitle() }}</span>
+                    </a>
+                </div>
+            </div>
+        </div>
+    {% endfor %}
+</div>
+{% endblock %}
@@ -0,0 +1,35 @@
+{% block content %}
+    <div class="row">
+        <div class="col s12">
+            <h4>{% trans %}label.webcam.answer.step1{% endtrans %}</h4>
+        </div>
+        <div class="col s5">
+            <video id="myCvVideo" class="video-js vjs-default-skin"></video>
+            <div class="video-informations-card center-align">
+                <p>Merci de cliquer sur l'icône <span class="vjs-icon-device-perm"></span> afin d'activer votre webcam.</p>
+                <p>Votre webcam activée, lancez l'enregistrement en cliquant sur le bouton rond en bas à gauche du lecteur.</p>
+                <p>Si vous n'êtes pas satisfait(e) de votre vidéo après un enregistrement, vous pouvez à tout moment recommencer l'enregistrement.</p>
+            </div>
+        </div>
+        <div class="col s2 hide-on-small-only">
+            <div class="valign-wrapper" style="align-items:center;justify-content: center;height: 300px;width:100%;">
+                <div style="font-size:40px;">
+                    <i class="fa fa-arrow-right center-align" aria-hidden="true"></i>
+                </div>
+            </div>
+        </div>
+        <div class="col s5">
+            <video id="preview" controls="true">
+                <span class="vjs-control-text">Play Video</span>
+            </video>
+            <div class="btnContainer center-align" style="display:none;">
+                <a id="saveRecord" href="#!" class="saveVideo btn btn-default">
+                    <i class="fa fa-floppy-o" aria-hidden="true"></i>&nbsp; Télécharger ma vidéo
+                </a>
+                <div class="video-informations-card">
+                    <p>Une fois téléchargé vous pouvez glisser-déposer votre vidéo dans la zone prévue pour lancer le téléchargement.</p>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
@@ -0,0 +1,113 @@
+{% extends 'base.html.twig' %}
+{% block content %}
+{% set subtitle = 'Déposer une recommandation pour :' %}
+{% set title = userTalent.firstname ~" "~ userTalent.lastname %}
+<div class="fluid-container bg-grey-3">
+    <div class="container contentWrapper contentPage" id="answerPage">
+        <div class="row">
+            <div class="col s12">
+                <div class="center-align bg-grey-3 m-t-20">
+                    <strong>{{ subtitle }}</strong>
+                    <h3 class="color-blue1 m-t-10">{{ title }}</h3>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col s12">
+                <div class="col-content bg-arrow z-depth-2 p-20">
+                    <div class="row">
+                        <div class="col s12">
+                            <h4 class="color-blue1 p-0"><span class="title-bubble">1</span> Enregistrez votre vidéo de recommandation</h4>
+                        </div>
+                        <div class="col m4 offset-m1 s12">
+                            <video id="myCvVideo" class="video-js vjs-default-skin"></video>
+                            <div class="video-informations-card center-align">
+                                <p>Merci de cliquer sur l'icône <span class="vjs-icon-device-perm"></span> afin d'activer votre webcam.</p>
+                                <p>Votre webcam activée, lancez l'enregistrement en cliquant sur le bouton rond en bas à gauche du lecteur.</p>
+                                <p>Si vous n'êtes pas satisfait(e) de votre vidéo après un enregistrement, vous pouvez à tout moment recommencer l'enregistrement.</p>
+                               
+                            </div>
+                        </div>
+                        <div class="col m2 hide-on-small-only">
+                            <div class="valign-wrapper" style="align-items:center;justify-content: center;height: 300px;width:100%;">
+                                <div style="font-size:40px;">
+                                    <i class="fa fa-arrow-right center-align" aria-hidden="true"></i>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col m4 s12">
+                            <video id="preview" controls="true">
+                                <span class="vjs-control-text">Play Video</span>
+                            </video>
+                            <div class="btnContainer center-align" style="display:none;">
+                                <a id="saveRecord" href="#!" class="saveVideo btn btn-default">
+                                    <i class="fa fa-floppy-o" aria-hidden="true"></i>&nbsp; Télécharger ma Vidéo de recommandation
+                                </a>
+                                <div class="video-informations-card">
+                                    <p>Une fois téléchargé vous pouvez glisser-déposer votre vidéo dans la zone prévue pour lancer le téléchargement.</p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-content bg-arrow z-depth-2 p-20">
+                    <div class="row">
+                        <div class="col s12">
+                            <h4 class="color-blue1 p-0"><span class="title-bubble">2</span>  Importez votre Vidéo de recommandation</h4>
+                        </div>
+                        <div class="col s10 offset-s1 answer-dropzone">
+                        {% include 'media/dropzone.html.twig' with {'deleting': true }  %}
+                        </div>
+                    </div>
+                </div>
+                {{ form_start(form, {'attr': { 'id': 'form_media' } }) }}
+                <div class="col-content z-depth-2 p-20">
+                    <div class="row">
+                        <div class="col s12">
+                            <h4 class="color-blue1 p-0"><span class="title-bubble">3</span>  Choix de relation</h4>
+                        </div>
+                        <div class="col s10 offset-s1 answer-dropzone">
+                        {{ form_row(form.relationType) }}
+                        </div>
+                    </div>
+                </div>
+                <div class="row m-t-40">
+                    <div class="col s10 offset-s1 center-align">
+                        <button id="submit" class=" btn btn-large btn-default disabled"  type="submit">
+                        Envoyer ma recommandation
+                        </button><br /><br />
+                        <a class="color-grey5" href="{{ routeReturn }}">Annuler</a>
+                    </div>
+                </div>
+                {{ form_end(form) }}
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}
+{% block javascripts %}
+    {{ parent() }}
+    <script type="text/javascript">
+        var urlDropzone = '{{ path("upload_media_recommendation", {"id": recommendation.getId()}) }}';
+        var urlDelete = '{{ path("delete_media_recommendation", {"id": recommendation.getId() }) }}'
+        var idObject = '{{ recommendation.getId() }}';
+        var typeObject = "recommendation";
+        {% if video %}
+            if($("#form_media").length){
+                $("#submit").removeClass('disabled');
+                $("#submit").addClass('pulse');
+            }
+            var videoExist =  true;
+            var videoOriginal = "{{video.getOriginalUrl()}}";
+            var mockFile = { name: '{{video.getTitle()}}', size: '181818181', type: 'mp4', serverID: 0, accepted: true };
+        {% else %}
+            var videoExist =  false;
+        {% endif %}
+    </script>
+    <script src="{{ asset('/js/dropzone.js') }}"></script>
+    <script src="{{ asset('/js/vendors/video.min.js') }}"></script>
+    <script src="{{ asset('/js/vendors/RecordRTC.js') }}"></script>
+    <script src="{{ asset('/js/vendors/videojs.record.js') }}"></script>
+    <script src="{{ asset('/js/vendors/jquery.browser.min.js') }}"></script>
+    <script src="{{ asset('/js/answer.js') }}"></script>
+{% endblock %}
@@ -0,0 +1,13 @@
+<div class="col s12" id="breadcrumb">
+    <a href="{{ path('talent_ad_space')}}">
+        <span {% if step == 1 %}class="active"{% endif %}>{% trans %}talent.menu.answers.label{% endtrans %}</span>
+    </a>
+    {% if step >= 2 %}
+    <span class="sepa-breadcrumb">></span>
+    <span {% if step == 2 %}class="active"{% endif %}>{{ title }}</span>
+    {% endif %}
+    <div class="border-breadcrumb"></div>
+</div>
+
+
+
@@ -0,0 +1,97 @@
+{% extends 'talent/base_dashboard_talent.html.twig' %}
+
+{% block dashContent %}
+    {% include 'talent/job_submenu.html.twig' with {
+        'tab' : 1
+    } %}
+    
+    <div class="row bg-bordered p-20">
+        {% if answer.ad is not null %}
+            {% set titleAnswer = answer.ad.title %}
+        {% else %}
+            {% set titleAnswer = answer.company.brandname %}
+        {% endif %}
+        {% include 'talent/ad_breadcrumb.html.twig' with {'step': 2,'title': titleAnswer,'firstname':answer.user.firstname ,'lastname':answer.user.lastname} %}
+        <div class="col s12 m6">
+            <div id="mini-profil-block">
+                {% include 'talent/talent_picture.html.twig' with {
+                    'user' : answer.user
+                } %}
+                <div>
+                    <div class="mini-profil-picture-name">{{ answer.user.firstname }} {{ answer.user.lastname }}</div>
+                    <div>Envoyé le {{ answer.sendTime|date('d/m/Y') }}</div>
+                </div>
+            </div>
+            {% if answer.video is not null %}
+            <div class="embed-responsive embed-responsive-16by9">
+                <iframe src="https://player.vimeo.com/video/{{ answer.video.cdnUrl|replace({ "/videos/": ""}) }}"
+                width="100%" height="auto" frameborder="0" webkitallowfullscreen mozallowfullscreen
+                allowfullscreen></iframe>
+            </div>
+            {% endif %}
+        </div>
+        <div class="col s12 m6">
+            {% if answer.comment %}
+            <strong>{% trans %}label.message{% endtrans %}</strong>
+            <p class="message-answer">{{ answer.comment }}</p>
+            <a href="#" class="link-message-more">{% trans %}label.link.readmore{% endtrans %}</a>
+            {% else %}
+                {% trans %}label.noMessage{% endtrans %}
+            {% endif %}
+        </div>
+        <div class="col s12">
+            <h4 class="no-margin-top bordered">HISTORIQUE DES MESSAGES RECUS</h4>
+        </div>
+        <div class="col s12">            
+            {% if answer.messages %}
+                {% set nbMessage = 0 %}
+                {% for message in answer.messages if message.status != "DRAFT" %}
+                {% set class = '' %}
+                {% if loop.index > 1 %}
+                    {% set class = 'history-hidden' %}
+                {% endif %}
+                <div class="blockanswer-answer {{class}}">
+                    <div class="title-answer">
+                        {{ message.sender.lastname }} {{ message.sender.firstname }} 
+                        <span class="date-answer">{% trans %}label.received{% endtrans %}{{ message.uTime|date('d-m-Y') }}</span>
+                    </div>
+                    <div class="description-answer">
+                        {% if message.video %}
+                        <div class="embed-responsive embed-responsive-16by9">
+                            <iframe src="https://player.vimeo.com/video/{{ message.video.cdnUrl|replace({ "/videos/": ""}) }}"
+                            width="100%" height="300" frameborder="0" webkitallowfullscreen mozallowfullscreen
+                            allowfullscreen></iframe>
+                        </div>
+                        {% endif %}
+                        {{ message.content|nl2br }}
+                    </div>
+                </div>
+                {% set nbMessage = nbMessage + 1 %}
+                {% endfor %}
+            {% endif %}
+        </div>
+        {% if nbMessage > 1 %}
+        <div class="col s12 center-align m-t-30">
+            <a class="bnt btn-round btn-grey-2 link-history-more" href="#" title="{% trans %}label.history.talent.link{% endtrans %}">{% trans %}label.history.talent.link{% endtrans %}</a>
+        </div>
+        {% endif %}
+    </div>
+{% endblock %}
+
+{% block javascripts %}
+    {{ parent() }}
+   
+    <script type="text/javascript">
+        $('.link-message-more').on('click',function(e) {
+            e.preventDefault();
+            $('.message-answer').animate({
+                'height': '100%'
+            })
+        });
+        $('.link-history-more').on('click',function(e) {
+            e.preventDefault();
+            $('.history-hidden').fadeIn();
+            $(this).fadeOut();
+        });
+    </script>
+{% endblock %}
@@ -1,49 +1,50 @@
 {% extends 'talent/base_dashboard_talent.html.twig' %}

-
 {% block dashContent %}
-    {#<h1 class="alttitle">Espace offres d'emploi</h1>#}
+    {% include 'talent/job_submenu.html.twig' with {
+        'tab' : 1
+    } %}
    <div class=" row bg-bordered p-20">
-    <ul class="tabs">
-        <li class="tab col s4"><a class="active" href="#reponses">Mes candidatures</a></li>
-    </ul>
-    <div id="reponses" class="col s12">
-        <table class="bordered highlight responsive-table">
-            <thead>
-            <tr>
-                <th>Intitulé de l'annonce</th>
-                <th>Date de réponse</th>
-                <th>Réponses</th>
-                <th>État</th>
-            </tr>
-            </thead>
-            <tbody>
-            {% for a in answers %}
-                <tr>
-                    <td>
-                        {% if a.ad != null %}{{ a.ad.title }}{% else %}{{ a.company.brandname }}{% endif %}<br />
-                        {% if a.video  is not null %}
-                        <a class="waves-effect waves-light btn btn-default modalBtn" href="#" data-url="{{ a.video.cdnUrl }}">Voir la vidéo</a>
-                        {% endif %}
-                    </td>
-                    <td>{{ a.uTime|date('d/m/Y') }}</td>
-                    <td>
-                        {% if a.ad != null %} {{ a.ad.countAnswers }}{% endif %}
-
-                    </td>
-                    <td>
-                        {% if a.status == "DRAFT" and a.ad != null %}
-                        <a href="{{ path('talent_answer_create',{id:a.ad.id}) }}">
-                            <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
-                        </a>
-                        {% endif %}
-                        {{ a.status|trans }}
-                    </td>
-                </tr>
-            {% endfor %}
-            </tbody>
-        </table>
-        <p class="center-align"></p>
+        {% include 'talent/ad_breadcrumb.html.twig' with {'step': 1} %}
+        <div id="reponses" class="col s12">
+            <table id="table-answers" class="bordered highlight responsive-table">
+                <thead>
+                    <tr>
+                        <th>Intitulé de l'annonce</th>
+                        <th>Date de réponse</th>
+                        <th>Nombre de candidats</th>
+                        <th>Message recus</th>
+                        <th>État</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for a in answers %}
+                        <tr>
+                            <td>
+                                {% if a.ad != null %}
+                                    <a href="{{ path('talent_ad_detail',{alias: a.ad.alias, id: a.id })}}">
+                                    {{ a.ad.title }}
+                                {% else %}
+                                    <a href="{{ path('talent_ad_detail',{alias: a.company.alias, id: a.id })}}">
+                                    {{ a.company.brandname }} - {{ 'company.menu.spontaneous.label'|trans }}
+                                {% endif %}
+                                </a>
+                            </td>
+                            <td>{{ a.sendTime|date('d/m/Y') }}</td>
+                            <td> {% if a.ad != null %}{{ a.ad.countAnswers }}{% else %} - {% endif %}</td>
+                            <td>{{ a.mineMessages|length }}</td>
+                            <td style="min-width: 100px;">
+                                {% if a.status == "DRAFT" and a.ad != null %}
+                                    <a href="{{ path('talent_answer_create',{id:a.ad.id}) }}">
+                                        <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
+                                    </a>
+                                {% endif %}{{ a.status|trans }}
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+            <p class="center-align"></p>
        </div>
        <div id="modal_video" class="modal">
            <div class="modal-content">
@@ -51,24 +52,23 @@
                <div class="videoContainer" style="text-align:center;">Loading...</div>
            </div>
            <div class="modal-footer">
-                 <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Fermer</a>
+                <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Fermer</a>
            </div>
        </div>
    </div>

-
 {% endblock %}

 {% block javascripts %}
    {{ parent() }}
    <script src="https://player.vimeo.com/api/player.js"></script>
    <script type="text/javascript">
-        $('.modalBtn').click(function(){
+        $('.modalBtn').click(function () {
            $('.videoContainer').html('');
            $('#modal_video').modal('open');
            var urlVideo = $(this).data("url");
            urlVideo = urlVideo.replace('videos', 'video');
-            var player = '<div data-vimeo-url="https://vimeo.com'+urlVideo+'" id="player_vimeo"></div>';
+            var player = '<div data-vimeo-url="https://vimeo.com' + urlVideo + '" id="player_vimeo"></div>';
            $('.videoContainer').html(player);
            var player_vimeo = new Vimeo.Player('player_vimeo');
        });
@@ -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 %}
@@ -0,0 +1,10 @@
+<div class="row bg-bordered p-0">
+    <ul class="nav-tabs">
+        <li class="{% if tab == 1 %} active {% endif %} col s3">
+            <a {% if tab == 1 %}class="active"{% endif %} href="{{ path('talent_ad_space') }}">{{'talent.menu.answers.label'|trans}}</a>
+        </li>
+        <li class="{% if tab == 2 %} active {% endif %} col s3">
+            <a {% if tab == 2 %}class="active"{% endif %} href="{{path('recommandation_list')}}">{{'talent.menu.recommandations.label'|trans}}</a>
+        </li>
+    </ul>
+</div>
--- a/Show More
+++ b/Show More