Makefile CLIENT name

don't know if delete would be good

.gitignore

@@ -10,3 +10,5 @@
 volume/www/website/.idea
 /volume/www/website/store/themes/talentstube-20170413/cache/*
 /volume/www/website/store/img/tmp/*
+volume/www/website/www/app/Resources/views/default/index.html.twig
+TODO

Makefile

@@ -2,7 +2,7 @@
 CLIENT=tt-website
 
 DOCKERCOMPOSE := $(shell command -v docker-compose 2> /dev/null)
-USAGE := Usage: make ENV={prod|preprod|dev} {docker-build|docker-start|docker-stop|docker-restart}
+USAGE := Usage: make ENV={prod|preprod|dev} {SYS=windows|linux}  {docker-build|docker-start|docker-stop|docker-restart}
 
 ifndef DOCKERCOMPOSE
 $(error docker-compose is not available)
@@ -14,16 +14,23 @@ $(info $(USAGE))
 $(error Exiting)
 endif
 
+SYS=linux
+
 DC_OVERRIDE := $(shell test -e conf/docker-compose.override.yml && echo "--file conf/docker-compose.override.yml")
 DC_OVERRIDE_ENV := $(shell test -e conf/docker-compose.$(ENV).yml && echo "--file conf/docker-compose.$(ENV).yml")
 
-DC=ENV=$(ENV) CLIENT=$(CLIENT) $(DOCKERCOMPOSE) --project-name "$(CLIENT)_$(ENV)" --file conf/docker-compose.yml $(DC_OVERRIDE) $(DC_OVERRIDE_ENV)
+ifeq ($(SYS),linux)
+DC=ENV=$(ENV) CLIENT=$(CLIENT) "$(DOCKERCOMPOSE)" --project-name "$(CLIENT)_$(ENV)" --file conf/docker-compose.yml $(DC_OVERRIDE) $(DC_OVERRIDE_ENV)
+else
+DC=ENV=$(ENV) CLIENT=$(CLIENT) "$(DOCKERCOMPOSE)" --project-name "$(CLIENT)_$(ENV)" --file conf/docker-compose.win.yml $(DC_OVERRIDE) $(DC_OVERRIDE_ENV)
+endif
 
 default:
 	$(info $(USAGE))
 	$(error Exiting)
 
 docker-build:
+	$(DC) pull
 	$(DC) build
 	$(DC) up -d
 
@@ -57,8 +64,8 @@ config:
 
 	@echo "  --> Generating mysql auth file"
 	@cat conf/env/store-mysql.env \
-		| python -c "import sys; import string; v=sys.stdin.readline().split('MYSQL_ROOT_PASSWORD=')[1]; print(string.Template(open('conf/build/mysql/my.cnf').read()).substitute({'PASSWORD':v}))" \
-		| docker exec -i $(CLIENT).store-mysql.$(ENV) sh -c 'cat > /root/.my.cnf'
+			| python -c "import sys; import string; v=sys.stdin.readline().split('MYSQL_ROOT_PASSWORD=')[1]; print(string.Template(open('conf/build/mysql/my.cnf').read()).substitute({'PASSWORD':v}))" \
+			| docker exec -i $(CLIENT).store-mysql.$(ENV) sh -c 'cat > /root/.my.cnf'
 
 db-backup-all: db-backup-website db-backup-store
 
@@ -76,9 +83,14 @@ db-backup-store:
 
 db-restore-all: db-restore-website db-restore-store
 
+db-backup-script:
+	@mkdir -p backup/
+	@docker exec $(CLIENT).postgres.$(ENV) pg_dumpall --database database -c -U postgres > backup/postgres_$(ENV)_`date +%d-%m-%Y"_"%H_%M_%S`.sql
+	@docker exec $(CLIENT).store-mysql.$(ENV) mysqldump -uroot database > backup/store-mysql_$(ENV)_`date +%d-%m-%Y"_"%H_%M_%S`.sql
+
 db-restore-website:
-	@echo "Restoring file to database (backup/store-mysql.sql)"
-	@cat backup/postgres.sql | docker exec -i $(CLIENT).postgres.$(ENV) psql --dbname database -U postgres
+	@echo "Restoring file to database (backup/postgres.sql)"
+	@cat backup/postgres.sql | docker exec -i $(CLIENT).postgres.$(ENV) psql --dbname database -U user
 	@docker cp backup/mongo $(CLIENT).mongo.$(ENV):/
 	@docker exec -t $(CLIENT).mongo.$(ENV) mongorestore --drop --gzip --db=tt_history /mongo/tt_history
 
@@ -95,7 +107,7 @@ entities:
 	@docker exec -i $(CLIENT).php.$(ENV) su www-data --shell=/bin/bash -c "/home/www/website/www/bin/console doctrine:generate:entities AppBundle"
 
 db-diff:
-	@docker exec -i $(CLIENT).php.$(ENV) su www-data --shell=/bin/bash -c "/home/www/website/www/bin/console doctrine:migrations:diff"
+	@docker exec -i $(CLIENT).php.$(ENV) su www-data -c "/home/www/website/www/bin/console doctrine:migrations:diff"
 
 db-migrate:
 	@docker exec -i $(CLIENT).php.$(ENV) su www-data --shell=/bin/bash -c "/home/www/website/www/bin/console doctrine:migrations:migrate"
@@ -104,3 +116,7 @@ db-deploy: db-diff db-migrate
 
 es-populate:
 	@docker exec -i $(CLIENT).php.$(ENV) su www-data --shell=/bin/bash -c "/home/www/website/www/bin/console fos:elastica:populate"
+
+sys:
+	@echo $(SYS)
+	@echo $(DC)

TODO

@@ -0,0 +1,3 @@
+
+Todo:
+  ☐ Item

conf/build/php/Dockerfile

@@ -1,47 +1,54 @@
-FROM php:7.1-fpm
+FROM php:7.1-fpm-buster
 
 ENV TERM=xterm
 
-RUN echo 'deb http://ftp.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/debian-backports.list
+#RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main\ndeb http://archive.debian.org/debian/ jessie-backports main" > /etc/apt/sources.list.d/debian-backports.list
 
 RUN apt-get clean \
-	&& apt-get update \
-	&& apt-get install -y lsof nano less git locales
+        && apt-get update \
+        && apt-get install -y lsof nano less git locales
 
 RUN echo 'fr_FR.UTF-8 UTF-8' > /etc/locale.gen \
-	&& /usr/sbin/locale-gen
+        && /usr/sbin/locale-gen
 
 RUN apt-get update \
-	&& apt-get install -y ffmpeg exiftool graphviz libfreetype6-dev libjpeg62-turbo-dev libpng12-dev libmcrypt-dev libxslt-dev libicu-dev libxml2-dev libpq-dev libgeoip-dev libedit-dev mysql-client nodejs npm \
-	&& apt-get install -y --no-install-recommends libmagickwand-dev \
-	&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
-	&& docker-php-ext-install -j4 gd mcrypt xsl zip intl gettext soap pdo_pgsql pdo_mysql mysqli pgsql json readline opcache \
-	&& pecl install geoip-1.1.1 redis imagick mongodb \
-	&& docker-php-ext-enable geoip redis imagick mongodb
+    && apt-get -y install libgmp-dev \
+        && ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/local/include/gmp.h \
+        && docker-php-ext-install gmp \
+        && docker-php-ext-configure gmp
+
+
+RUN apt-get update \
+        && apt-get install -y ffmpeg exiftool graphviz libfreetype6-dev libjpeg62-turbo-dev libpng-dev libmcrypt-dev libxslt-dev libicu-dev libxml2-dev libpq-dev libgeoip-dev libedit-dev mariadb-client nodejs npm \
+        && apt-get install -y --no-install-recommends libmagickwand-dev \
+        && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+        && docker-php-ext-install -j4 gd mcrypt xsl zip intl gettext soap pdo_pgsql pdo_mysql mysqli pgsql json readline opcache \
+        && pecl install geoip-1.1.1 redis imagick mongodb \
+        && docker-php-ext-enable geoip redis imagick mongodb
 
 RUN { \
-	echo 'opcache.memory_consumption=128'; \
-	echo 'opcache.interned_strings_buffer=8'; \
-	echo 'opcache.max_accelerated_files=4000'; \
-	echo 'opcache.revalidate_freq=60'; \
-	echo 'opcache.fast_shutdown=1'; \
-	echo 'opcache.enable_cli=1'; \
-	} >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
+        echo 'opcache.memory_consumption=128'; \
+        echo 'opcache.interned_strings_buffer=8'; \
+        echo 'opcache.max_accelerated_files=4000'; \
+        echo 'opcache.revalidate_freq=60'; \
+        echo 'opcache.fast_shutdown=1'; \
+        echo 'opcache.enable_cli=1'; \
+        } >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
 
 COPY zz-logformat.conf /usr/local/etc/php-fpm.d/
 COPY php.ini /usr/local/etc/php/conf.d/
 
 RUN (curl --silent --show-error https://getcomposer.org/installer | php) \
-	&& mv composer.phar /usr/local/bin/composer
+        && mv composer.phar /usr/local/bin/composer
 
 RUN curl --location --silent --show-error https://symfony.com/installer -o /usr/local/bin/symfony \
-	&& chmod a+x /usr/local/bin/symfony
+        && chmod a+x /usr/local/bin/symfony
 
 RUN curl --location --silent --show-error https://s3.amazonaws.com/files.drush.org/drush.phar -o /usr/local/bin/drush \
-	&& chmod a+x /usr/local/bin/drush
+        && chmod a+x /usr/local/bin/drush
 
-RUN (npm install -g uglify-js) \
-	&& ln -s /usr/bin/nodejs /usr/local/bin/node
+RUN (npm install -g uglify-es) \
+        && ln -s /usr/bin/nodejs /usr/local/bin/node
 
 RUN apt-get clean \
-	&& rm -rf /var/lib/apt/lists/
+        && rm -rf /var/lib/apt/lists/

conf/build/php_light/Dockerfile

@@ -10,7 +10,7 @@ RUN echo 'fr_FR.UTF-8 UTF-8' > /etc/locale.gen \
 	&& /usr/sbin/locale-gen
 
 RUN apt-get update \
-	&& apt-get install -y libfreetype6-dev libjpeg62-turbo-dev libpng12-dev libmcrypt-dev libxslt-dev libicu-dev libxml2-dev libpq-dev libgeoip-dev libedit-dev mysql-client \
+	&& apt-get install -y libfreetype6-dev libjpeg62-turbo-dev libpng-dev libmcrypt-dev libxslt-dev libicu-dev libxml2-dev libpq-dev libgeoip-dev libedit-dev mysql-client \
 	&& apt-get install -y --no-install-recommends libmagickwand-dev \
 	&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
 	&& docker-php-ext-install -j4 gd mcrypt xsl zip intl gettext soap pdo_pgsql pdo_mysql mysqli pgsql json readline opcache \
@@ -33,4 +33,4 @@ RUN (curl --silent --show-error https://getcomposer.org/installer | php) \
 	&& mv composer.phar /usr/local/bin/composer
 
 RUN apt-get clean \
-	&& rm -rf /var/lib/apt/lists/
+	&& rm -rf /var/lib/apt/lists/

conf/build/php_light_win/Dockerfile

@@ -0,0 +1,35 @@
+FROM php:7.1-fpm
+
+ENV TERM=xterm
+
+RUN apt-get clean \
+	&& apt-get update \
+	&& apt-get install -y lsof nano less git locales
+
+RUN echo 'fr_FR.UTF-8 UTF-8' > /etc/locale.gen \
+	&& /usr/sbin/locale-gen
+RUN apt-get update \
+	&& apt-get install -y libfreetype6-dev libjpeg62-turbo-dev libpng-dev libmcrypt-dev libxslt-dev libicu-dev libxml2-dev libpq-dev libgeoip-dev libedit-dev mysql-client \
+	&& apt-get install -y --no-install-recommends libmagickwand-dev \
+	&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+	&& docker-php-ext-install -j4 gd mcrypt xsl zip intl gettext soap pdo_pgsql pdo_mysql mysqli pgsql json readline opcache \
+	&& pecl install geoip-1.1.1 redis imagick \
+	&& docker-php-ext-enable geoip redis imagick
+
+RUN { \
+	echo 'opcache.memory_consumption=128'; \
+	echo 'opcache.interned_strings_buffer=8'; \
+	echo 'opcache.max_accelerated_files=4000'; \
+	echo 'opcache.revalidate_freq=60'; \
+	echo 'opcache.fast_shutdown=1'; \
+	echo 'opcache.enable_cli=1'; \
+	} >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
+
+COPY zz-logformat.conf /usr/local/etc/php-fpm.d/
+COPY php.ini /usr/local/etc/php/conf.d/
+
+RUN (curl --silent --show-error https://getcomposer.org/installer | php) \
+	&& mv composer.phar /usr/local/bin/composer
+
+RUN apt-get clean \
+	&& rm -rf /var/lib/apt/lists/

conf/build/php_light_win/php.ini

@@ -0,0 +1,7 @@
+date.timezone = Europe/Paris
+display_errors = Off
+memory_limit = 256M
+log_errors = On
+error_reporting  =  E_ALL
+error_log = /dev/stdout
+report_memleaks = On

conf/build/php_light_win/zz-logformat.conf

@@ -0,0 +1,2 @@
+[www]
+access.format = "%R [%t] \"%m %r%Q%q\" %s %f %{mili}dms %{kilo}MKb %C%%"

conf/build/php_win/Dockerfile

@@ -0,0 +1,55 @@
+FROM php:7.1-fpm
+
+ENV TERM=xterm
+
+#RUN echo 'deb http://ftp.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/debian-backports.list
+
+RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list.d/debian-backports.list
+
+RUN apt-get clean \
+	&& apt-get update \
+	&& apt-get install -y lsof nano less git locales
+
+RUN echo 'fr_FR.UTF-8 UTF-8' > /etc/locale.gen \
+	&& /usr/sbin/locale-gen
+
+RUN apt-get update && apt-get install -my wget gnupg
+
+RUN curl -sL https://deb.nodesource.com/setup_9.x | bash - \
+    && apt-get install -y nodejs
+
+RUN apt-get update \
+	&& apt-get install -y ffmpeg exiftool graphviz libfreetype6-dev libjpeg62-turbo-dev libpng-dev libmcrypt-dev libxslt-dev libicu-dev libxml2-dev libpq-dev libgeoip-dev libedit-dev mysql-client libgmp-dev nodejs \
+	&& apt-get install -y --no-install-recommends libmagickwand-dev \
+	&& docker-php-ext-configure gd  --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+	&& docker-php-ext-install -j4 gd mcrypt xsl zip intl gettext soap pdo_pgsql pdo_mysql mysqli pgsql json readline opcache gmp \
+	&& docker-php-ext-configure gmp \
+	&& pecl install geoip-1.1.1 redis imagick mongodb \
+	&& docker-php-ext-enable geoip redis imagick mongodb
+
+RUN { \
+	echo 'opcache.memory_consumption=128'; \
+	echo 'opcache.interned_strings_buffer=8'; \
+	echo 'opcache.max_accelerated_files=4000'; \
+	echo 'opcache.revalidate_freq=60'; \
+	echo 'opcache.fast_shutdown=1'; \
+	echo 'opcache.enable_cli=1'; \
+	} >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
+
+COPY zz-logformat.conf /usr/local/etc/php-fpm.d/
+COPY php.ini /usr/local/etc/php/conf.d/
+
+RUN (curl --silent --show-error https://getcomposer.org/installer | php) \
+	&& mv composer.phar /usr/local/bin/composer
+
+RUN curl --location --silent --show-error https://symfony.com/installer -o /usr/local/bin/symfony \
+	&& chmod a+x /usr/local/bin/symfony
+
+RUN curl --location --silent --show-error https://s3.amazonaws.com/files.drush.org/drush.phar -o /usr/local/bin/drush \
+	&& chmod a+x /usr/local/bin/drush
+
+RUN (npm install -g uglify-es) \
+	&& ln -s /usr/bin/nodejs /usr/local/bin/node
+
+RUN apt-get clean \
+	&& rm -rf /var/lib/apt/lists/

conf/build/php_win/php.ini

@@ -0,0 +1,9 @@
+date.timezone = Europe/Paris
+display_errors = Off
+memory_limit = 768M
+log_errors = On
+error_reporting  =  E_ALL
+error_log = /dev/stdout
+report_memleaks = On
+upload_max_filesize = 512M
+post_max_size = 512M

conf/build/php_win/zz-logformat.conf

@@ -0,0 +1,2 @@
+[www]
+access.format = "%R [%t] \"%m %r%Q%q\" %s %f %{mili}dms %{kilo}MKb %C%%"

conf/docker-compose.preprod.yml

@@ -0,0 +1,13 @@
+version: '3'
+
+services:
+  nginx:
+    networks:
+      - default
+      - frontnginx_front
+
+networks:
+  default:
+    driver: bridge
+  frontnginx_front:
+    external: true

conf/docker-compose.win.yml

@@ -0,0 +1,75 @@
+version: "3"
+
+services:
+  ##
+  ## WEBSITE RESSOURCES
+  ##
+  nginx:
+    build: build/nginx
+    container_name: ${CLIENT}.nginx.${ENV}
+    hostname: nginx
+    volumes:
+      - ../volume/nginx/etc.nginx.sites-enabled:/etc/nginx/sites-enabled
+      - ../volume/www:/home/www
+    restart: always
+
+  php:
+    build: build/php_win
+    container_name: ${CLIENT}.php.${ENV}
+    hostname: php
+    volumes:
+      - ../volume/www:/home/www
+    restart: always
+
+  postgres:
+    image: postgres:9.6
+    container_name: ${CLIENT}.postgres.${ENV}
+    hostname: postgres
+    env_file: env/postgres.env
+    volumes:
+      - tt-postgres:/var/lib/postgresql/data
+    restart: always
+
+  mongo:
+    image: mongo:3.4
+    container_name: ${CLIENT}.mongo.${ENV}
+    hostname: mongo
+    volumes:
+      - tt-mongo:/data/db
+    restart: always
+
+  elasticsearch:
+    build: build/elasticsearch
+    container_name: ${CLIENT}.elasticsearch.${ENV}
+    hostname: elasticsearch
+    volumes:
+      - search_db_data:/usr/share/elasticsearch/data
+    restart: always
+
+  ##
+  ## STORE RESSOURCES
+  ##
+  store-php:
+    build: build/php_light_win
+    container_name: ${CLIENT}.store-php.${ENV}
+    hostname: store-php
+    volumes:
+      - ../volume/www:/home/www
+    restart: always
+
+  store-mysql:
+    build: build/mysql
+    container_name: ${CLIENT}.store-mysql.${ENV}
+    hostname: store-mysql
+    env_file: env/store-mysql.env
+    volumes:
+      - ../volume/store-mysql/var.lib.mysql:/var/lib/mysql
+    restart: always
+
+# Elastic does not play well with physical volume (folder rights trouble)
+volumes:
+  ? search_db_data
+  tt-postgres:
+    external: true
+  tt-mongo:
+    external: true

conf/env/sample/mysql.env

@@ -1,4 +0,0 @@
-MYSQL_ROOT_PASSWORD=
-MYSQL_DATABASE=database
-MYSQL_USER=user
-MYSQL_PASSWORD=

conf/env/sample/postgres.env

@@ -1,3 +0,0 @@
-POSTGRES_USER=
-POSTGRES_PASSWORD=
-POSTGRES_DB=

volume/www/website/.gitignore

@@ -1 +1,2 @@
 conf/nginx.conf
+/vendor/

volume/www/website/conf/nginx-preprod.conf

@@ -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;
 }

volume/www/website/conf/redirect.conf

@@ -11,4 +11,5 @@ rewrite  ^/page/presentation-talent$  https://www.talentstube.com/cv-video perma
 rewrite  ^/page/la-plateforme$  https://www.talentstube.com/ permanent;
 rewrite ^/tarifs$ https://www.talentstube.com/accompagnement-entreprise permanent;
 rewrite ^/annonce/38-charge-de-projets-developpement-h-f$  https://www.talentstube.com/annonce/38-charge-de-projets-developpement-cosmetique-h-f permanent;
-rewrite  ^/annonce/recherche/$  https://www.talentstube.com/annonce/recherche permanent;
+rewrite  ^/annonce/recherche/$  https://www.talentstube.com/annonce/recherche permanent;
+rewrite  ^/territoire/1573-communaute-d-agglomeration-castres-mazamet/$  https://www.talentstube.com/territoire/1573-castres-mazamet/ permanent;

volume/www/website/www/README.md

@@ -2,3 +2,46 @@ tt
 ==
 
 A Symfony project created on February 23, 2017, 1:42 pm.
+
+##  To have a representation of entity's mappings
+In php container, do php bin/console yuml:mappings
+To personnalize, see https://github.com/Nono1971/doctrine-yuml-bundle
+
+## If memory issues when installing bundle
+Copy this before composer require : COMPOSER_MEMORY_LIMIT=-1
+
+## To update database schema
+In php container, root@php:/home/www/website/www# php bin/console doctrine:schema:update --force
+It'll update database based on entities
+
+## To push notifications
+- Create new .json file in web/push folder.
+
+- This file is composed of two arrays : parameters, where you select specific subscribers to receive notifications, 
+and notification, where you write the content. 
+
+- Values for parameters : 
+    * "pushType" : define the rule to find subscribers, only one value which fits with next ones. Values : "general", "profil", "users", "tags".
+    * "profilCompletenessPercentage" : define the % of profil completeness. Works with "profil" value of pushType.
+    * "users" : enters subscriber's mail. Works with "users" value of pushType.
+    * "keywords" : enters tags to identify subscribers. Works with "tags" value of pushType.
+
+- Values for notification :
+    * "title" : the title!
+    * "body" : the content.
+    * "icon" : the website icon.
+    * "image" : to add an image.
+    * "tag" : Used to regroup notifications.
+    * "data" : array where you can add "link" property. Link will redirect to the given URL.
+    * "actions" : array where you can add specific action with "action", "title".
+    * "badge" : to add an image for small device.
+
+- Open SendPushCommand.php, go to configure(), and change the last line of addOption() for files with your filename.
+
+## Stacktrace exception API
+All exceptions catched are written in the dev.log file (for ENV=dev I guess) in the AppBundle/var/logs folder. 
+To have an exception that can be written in this file, create or use an already existing Exception (in AppBundle/Exception) in your Controller.
+
+## Question to ask to Corentin
+* Is there a validation from Talents Tube operator to set the answer status to published?
+* Is there a comment to be written when post an answer ? (not here in mock-up)

volume/www/website/www/app/AppKernel.php

@@ -49,8 +49,20 @@ class AppKernel extends Kernel
             new Http\HttplugBundle\HttplugBundle(),
             new HWI\Bundle\OAuthBundle\HWIOAuthBundle(),
 
+            //bentools push
+            new BenTools\WebPushBundle\WebPushBundle(),
             //CookieBar
             new Fairlane\CookieConsentBundle\FairlaneCookieConsentBundle(),
+
+            //Api
+            new JMS\SerializerBundle\JMSSerializerBundle(),
+            new FOS\RestBundle\FOSRestBundle(),
+            new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
+            new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(),
+            new Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle(),
+
+            //CORS
+            new Nelmio\CorsBundle\NelmioCorsBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
@@ -59,6 +71,7 @@ class AppKernel extends Kernel
             $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
             $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
             $bundles[] = new Alex\DoctrineExtraBundle\AlexDoctrineExtraBundle();
+            $bundles[] = new Onurb\Bundle\YumlBundle\OnurbYumlBundle();
         }
 
         return $bundles;

volume/www/website/www/app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig

@@ -15,7 +15,7 @@
                     </p>
                 {% endif %}
                 <br/><br/>
-                {% if app.request.cookies.get('redirect_register')is defined %}
+                {% if app.request.cookies.get('redirect_register') is defined and app.request.cookies.get('redirect_register') is not null %}
                     <div class="center">
                         <a href="{{ app.request.cookies.get('redirect_register') }}" class="btn btn-default">Poursuivre votre candidature</a>
                     </div>

volume/www/website/www/app/Resources/FairlaneCookieConsentBundle/views/cookie-info.html.twig

@@ -9,13 +9,20 @@
         {% set text_accept_button = fairlane_cookie_consent.twig.text_accept_button %}
     {% endif %}
     <div id="fairlane-cookie-consent" {% if fairlane_cookie_consent.useBootstrap == true %}class="navbar navbar-fixed-top"{% endif %}>
-        <p>
-            {{ text_info }}
-            {% if fairlane_cookie_consent.twig.url_additional_info| length > 1 and text_additional_info_link | length > 1 %}
-                <a href="{{ fairlane_cookie_consent.twig.url_additional_info }}" target="_blank">{{ text_additional_info_link }}</a>
-            {% endif %}
-        </p>
-        <button class="btn btn-default">{{ text_accept_button }}</button>
+        <div class="container">
+            <div class="row">
+                <div class="col s8">
+                    <p>{{ text_info }}
+                    {% if fairlane_cookie_consent.twig.url_additional_info| length > 1 and text_additional_info_link | length > 1 %}
+                        <a href="{{ fairlane_cookie_consent.twig.url_additional_info }}" target="_blank">{{ text_additional_info_link }}</a>
+                    {% endif %}
+                    </p>
+                </div>
+                <div class="col s4">
+                    <button class="btn btn-default">{{ text_accept_button }}</button>
+                </div>
+            </div>
+        </div>
     </div>
     {% if fairlane_cookie_consent.useJquery %}
         <script type="text/javascript">

volume/www/website/www/app/Resources/translations/messages.fr.xlf

@@ -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>
@@ -130,9 +166,17 @@
                 <source>company.account.password.modify.label</source>
                 <target>Modifier le mot de passe</target>
             </trans-unit>
+            <trans-unit id="company.account.notifications.title">
+                <source>company.account.notifications.title</source>
+                <target>Notifications</target>
+            </trans-unit>
             <trans-unit id="profile.edit.submit">
                 <source>profile.edit.submit</source>
                 <target>Sauvegarder mon profil</target>
+            </trans-unit>
+             <trans-unit id="profile.edit.save">
+                <source>profile.edit.save</source>
+                <target>Enregistrer</target>
             </trans-unit>
             <trans-unit id="profile.company.title">
                 <source>profile.company.title</source>
@@ -190,10 +234,34 @@
                 <source>profile.company.logo</source>
                 <target>Logo de l'entreprise</target>
             </trans-unit>
+            <trans-unit id="talent.profile.title.label">
+                <source>talent.profile.title.label</source>
+                <target>Titre de votre profil</target>
+            </trans-unit>
+            <trans-unit id="talent.profile.situation.label">
+                <source>talent.profile.situation.label</source>
+                <target>Votre situation</target>
+            </trans-unit>
+            <trans-unit id="talent.profile.description.label">
+                <source>talent.profile.description.label</source>
+                <target>Quelques mots sur vous</target>
+            </trans-unit>
+            <trans-unit id="profile.talent.tags">
+                <source>profile.talent.tags</source>
+                <target>Vos compétences.</target>
+            </trans-unit>
+            <trans-unit id="profile.talent.under.tags">
+                <source>profile.talent.under.tags</source>
+                <target>Définissez vos clés dans l’ordre d’importance. Vous pouvez indiquer jusqu’à 50 compétences.</target>
+            </trans-unit>
+            <trans-unit id="talent.menu.dashboard.label">
+                <source>talent.menu.dashboard.label</source>
+                <target>Mon profil</target>
+            </trans-unit>
             <!-- 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 +301,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 +328,90 @@
             <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>
+            <trans-unit id="talent.profile.career.company.label">
+                <source>talent.profile.career.company.label</source>
+                <target>Entreprise</target>
+            </trans-unit>
+            <trans-unit id="talent.profile.career.job.label">
+                <source>talent.profile.career.job.label</source>
+                <target>Intitulé du poste</target>
+            </trans-unit>
+            <trans-unit id="talent.profile.career.begin.label">
+                <source>talent.profile.career.begin.label</source>
+                <target>Début</target>
+            </trans-unit>
+            <trans-unit id="talent.profile.career.end.label">
+                <source>talent.profile.career.end.label</source>
+                <target>Fin</target>
+            </trans-unit>
+            <trans-unit id="talent.profile.career.skills.label">
+                <source>talent.profile.career.skills.label</source>
+                <target>Vos compétences</target>
+            </trans-unit>
+            <trans-unit id="talent.profile.career.actualJob.label">
+                <source>talent.profile.career.actualJob.label</source>
+                <target>Toujours en poste</target>
+            </trans-unit>
+            <trans-unit id="talent.profile.career.place.label">
+                <source>talent.profile.career.place.label</source>
+                <target>Lieux</target>
+            </trans-unit>
+            <trans-unit id="talent.profile.formation.name.label">
+                <source>talent.profile.formation.name.label</source>
+                <target>Diplome</target>
+            </trans-unit>
+            <trans-unit id="talent.profile.formation.school.label">
+                <source>talent.profile.formation.school.label</source>
+                <target>Ecole</target>
+            </trans-unit>
+            <trans-unit id="talent.profile.formation.actual.label">
+                <source>talent.profile.formation.actual.label</source>
+                <target>Toujours en cours</target>
+            </trans-unit>
+            <trans-unit id="talent.profile.formation.obtention.label">
+                <source>talent.profile.formation.obtention.label</source>
+                <target>Année d'obtention</target>
+            </trans-unit>
+            <trans-unit id="talent.profile.language.skill.1.label">
+                <source>talent.profile.language.skill.1.label</source>
+                <target>Notions</target>
+            </trans-unit>
+            <trans-unit id="talent.profile.language.skill.2.label">
+                <source>talent.profile.language.skill.2.label</source>
+                <target>Compétence professionnelle limitée</target>
+            </trans-unit>
+            <trans-unit id="talent.profile.language.skill.3.label">
+                <source>talent.profile.language.skill.3.label</source>
+                <target>Compétence professionnelle complète</target>
+            </trans-unit>
+            <trans-unit id="talent.profile.language.skill.4.label">
+                <source>talent.profile.language.skill.4.label</source>
+                <target>Bilingue ou natif</target>
+            </trans-unit>
+            <trans-unit id="talent.profile.language.name.label">
+                <source>talent.profile.language.name.label</source>
+                <target>Langue</target>
+            </trans-unit>
+            <trans-unit id="talent.profile.situation.1.label">
+                <source>talent.profile.situation.1.label</source>
+                <target>En recherche d’emploi</target>
+            </trans-unit>
+             <trans-unit id="talent.profile.situation.2.label">
+                <source>talent.profile.situation.2.label</source>
+                <target>À l’écoute d’opportunités</target>
+            </trans-unit>
+             <trans-unit id="talent.profile.situation.3.label">
+                <source>talent.profile.situation.3.label</source>
+                <target>En poste</target>
             </trans-unit>
             <!-- TALENT -->
             <trans-unit id="ad.talent.answer.label">
@@ -394,7 +546,134 @@
                         
                         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>
+
+            <!-- Territoires -->
+            <trans-unit id="message.territory.list.ads">
+                <source>message.territory.list.ads</source>
+                <target>offres d'emploi en cours sur ce territoire</target>
+            </trans-unit>
+             <trans-unit id="message.territory.list.ad">
+                <source>message.territory.list.ad</source>
+                <target>offre d'emploi en cours sur ce territoire</target>
+            </trans-unit>
+            <trans-unit id="message.territory.list.noads">
+                <source>message.territory.list.noads</source>
+                <target>Découvrez les entreprises qui recrutent sur ce territoire</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

volume/www/website/www/app/Resources/views/admin/answer_list_moderation.html.twig

@@ -0,0 +1,134 @@
+{% extends 'admin/base_admin.html.twig' %}
+
+
+{% block contentHeader %}
+    <h1>
+        Liste des Candidatures
+    </h1>
+    <ol class="breadcrumb">
+        <li><a href="{{ path('admin_dashboard') }}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+        <li class="active">Annonces</li>
+    </ol>
+{% endblock %}
+
+{% block content %}
+
+        <div class="box box-primary">
+            <div class="box-body">
+                <table id="answer_list_table" class="table table-hover table-bordered">
+                    <thead>
+                    <tr>
+                        <th class="col-xs-2">Date d'envoi</th>
+                        <th>Utilisateur</th>
+                        <th>Annonce / Entreprise</th>
+                        <th>video</th>
+                        <th>Status</th>
+                        <th>action</th>
+                    </tr>
+                    </thead>
+
+                    <tbody>
+                    {% for answer in answers if answer.status != "DRAFT" %}
+                        <tr>
+                            <td data-order="{{ answer.sendTime|date('U') }}">{{ answer.sendTime|date('d/m/Y') }}</td>
+                            <td>{{ answer.user.firstname }} {{ answer.user.lastname }}</td>
+                            {% if  answer.ad %}
+                                <td>{{ answer.ad.company.brandname }} - {{ answer.ad.title }}</td>
+                            {% else %}
+                                <td>{{ answer.company.brandname }}</td>
+                            {% endif %}
+                            <td>
+                               
+                                ID Candidature : {{ answer.id }}<br />
+                                {% if  answer.video.cdnUrl is defined %}
+                                    <iframe src="https://player.vimeo.com/video/{{ answer.video.cdnUrl|replace({ "/videos/": ""}) }}"
+                                    width="auto" height="auto" frameborder="0" webkitallowfullscreen mozallowfullscreen
+                                    allowfullscreen></iframe>
+                                {% endif %}
+                            </td>
+                            <td class="status">{{ answer.status }}</td>
+                            <td>
+                               Actions :
+                               <select class="changeStatus" name="changeStatus" data-id="{{ answer.id }}">
+                                <option value="null">choisir</option>
+                                <option value="SENDED">Envoyé</option>
+                                <option value="DRAFT">Brouillon</option>
+                                <option value="REFUSED">Refuser</option>
+                               </select>
+                               <br />
+                               <a class="delete-answer" href='{{ path("admin_answer_delete",{'id':answer.id }) }}' data-toggle="tooltip" title="Supprimer">
+                                    Supprimer <i class="fa fa-trash"></i>
+                                </a>
+                            </td>
+                        </tr>
+                    {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+        </div>
+
+{% endblock %}
+
+{% block javascripts %}
+    <script>
+        $(function () {
+            $('.changeStatus').change(function(e){
+                e.preventDefault();
+                var idAnswer = $(this).data('id');
+                var value = $(this).val();
+                var route = '/app_dev.php/admin/config/answer/' + idAnswer + '/status/' + value;
+                var select = $(this); 
+                $.ajax({
+                    type: "POST",
+                    url: route,
+                    dataType: "json",
+                    success: function (msg) {
+                        console.log("ok");
+                        select.parent().prev('.status').html(value);
+                    }
+                });
+                
+            });
+            
+            $('#answer_list_table').DataTable({
+                "paging": true,
+                "lengthChange": true,
+                "searching": true,
+                "ordering": true,
+                "info": true,
+                "autoWidth": false,
+                "language": {
+                    "url": "http://cdn.datatables.net/plug-ins/1.10.11/i18n/French.json"
+                },
+                "columnDefs": [
+                    {"targets": 1, "searchable": true, "orderable": true},
+                    {"targets": 2, "searchable": true, "orderable": true},
+                    {"targets": 4, "searchable": true, "orderable": true, "className": "text-center"},
+                ],
+                "order": [[ 0, "desc" ]]
+            });
+
+            $(".delete-answer").confirm({
+                title: "Êtes vous sûr de supprimer cette candidature ?",
+                content: "Supprimer cette candidature supprimera le  média associé",
+                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 %}

volume/www/website/www/app/Resources/views/admin/base_admin.html.twig

@@ -16,6 +16,7 @@
     <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 %}
 
@@ -71,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 %}

volume/www/website/www/app/Resources/views/admin/recommendation_list.html.twig

@@ -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 %}

volume/www/website/www/app/Resources/views/admin/sidebar_menu.html.twig

@@ -28,6 +28,11 @@
                     <i class="fa fa-file-video-o" aria-hidden="true"></i> <span>Vidéos Talent</span>
                 </a>
             </li>
+            <li>
+                <a href="{{ path('admin_anwser_moderation_list') }}">
+                    <i class="fa fa-file-video-o" aria-hidden="true"></i> <span>Candidatures</span>
+                </a>
+            </li>
         </ul>
         <ul class="sidebar-menu">
             <li class="header">ENTITEES</li>
@@ -53,9 +58,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>

volume/www/website/www/app/Resources/views/admin/talent_edit.html.twig

@@ -28,6 +28,7 @@
                                         <i class="fa fa-star color-gold" aria-hidden="true"></i>
                                     </span>
                         {% endif %}
+                        <br/><i class="fa fa-link"></i>Url :<br /> https://www.talentstube.com{{ path("talent_show",{'alias':user.company.alias})}}<br />
                     </h3>
                     <br>
                     <span><a href="mailto:{{ user.email }}">{{ user.email }}</a></span>

volume/www/website/www/app/Resources/views/admin/territory_edit.html.twig

@@ -30,6 +30,7 @@
                     {{ 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) }}

volume/www/website/www/app/Resources/views/answer/answer_tuto.twig

@@ -1,13 +1,13 @@
-<div id="modal-tuto" class="modal">
+<div id="modal-tuto" class="modal modal-fixed-footer">
     <div class="modal-content">
         <div class="row">
             <div class="col s12">
+                <h3 class="color-blue1 center-align title-tuto">Les conseils de Talents Tube</h3>
                 <div class="col-content">
-                    <h3 class="color-blue1 center-align">Les conseils de Talents Tube</h3>
                     <div class="owl-carousel tuto-carousel">
                         <div class="item-tuto-webcam carousel-item">
                             <div class="row">
-                                <div class="col s4 offset-s1 hide-on-med-and-down">
+                                <div class="col s3 offset-s1 hide-on-med-and-down">
                                     <img class="responsive-img" src="{{ asset('img/img_popupcv/cv_video_step_1.svg')}}" alt="">
                                 </div>
                                 <div class="col s11 m11 l6 offset-s1 left-align">
@@ -31,7 +31,7 @@
                         </div>
                         <div class="item-tuto-webcam carousel-item">
                             <div class="row">
-                                <div class="col s4 offset-s1 hide-on-med-and-down">
+                                <div class="col s3 offset-s1 hide-on-med-and-down">
                                     <img class="responsive-img" src="{{ asset('img/img_popupcv/cv_video_step_2.svg')}}" alt="">
                                 </div>
                                 <div class="col s11 m11 l6 offset-s1 left-align">
@@ -51,7 +51,7 @@
                         </div>
                         <div class="item-tuto-webcam carousel-item">
                             <div class="row">
-                                <div class="col s4 offset-s1 hide-on-med-and-down">
+                                <div class="col s3 offset-s1 hide-on-med-and-down">
                                     <img class="responsive-img" src="{{ asset('img/img_popupcv/cv_video_step_3.svg')}}" alt="">
                                 </div>
                                 <div class="col s11 m11 l6 offset-s1 left-align">
@@ -73,12 +73,15 @@
                             </div>
                         </div>
                     </div>
-                    <div class="carousel-fixed-item right">
-                        <a class="text close-tuto">Passer l'intro</a>
-                        <a class="btn btn-default next-slide">suivant</a>
-                    </div>
                 </div>
             </div>
         </div>
     </div>
+    <div class="modal-footer">
+        <div id="customDots" class="owl-dots"></div>
+        <div class="carousel-fixed-item right">
+            <a class="text close-tuto">Passer l'intro</a>
+            <a class="btn btn-default next-slide">suivant</a>
+        </div>
+    </div>
 </div>

volume/www/website/www/app/Resources/views/base.html.twig

@@ -15,7 +15,7 @@
             j.src =
                     'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
             f.parentNode.insertBefore(j, f);
-        })(window, document, 'script', 'dataLayer', 'GTM-P4G65WJ');
+        })(window, document, 'script', 'dataLayer', 'UA-98246968-1');
     </script>
     <!-- End Google Tag Manager -->
     <script type="text/javascript" defer="defer" src="https://extend.vimeocdn.com/ga/64189815.js"></script>
@@ -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 %}
@@ -72,6 +70,7 @@
 {#{% include 'default/alert.html.twig' %}#}
 {% include 'default/user_switch.html.twig' %}
 {% include 'default/header.html.twig' %}
+{% include 'default/props_settings.html.twig' %}
 {% block content %}
 {% endblock %}
 {% include 'default/footer.html.twig' %}
@@ -81,6 +80,7 @@
     '@global'
     output='assetic/main.js' filter='?uglifyjs2' %}
     <script src="{{ asset_url }}"></script>
+    
     {% endjavascripts %}
 {% endblock %}
 {{ include('FairlaneCookieConsentBundle::cookie-info.html.twig') }}

volume/www/website/www/app/Resources/views/base_dashboard.html.twig

@@ -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 %}

volume/www/website/www/app/Resources/views/company/ad_answer_list.html.twig

@@ -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 %}

volume/www/website/www/app/Resources/views/company/ad_breadcrumb.html.twig

@@ -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>
+
+
+

volume/www/website/www/app/Resources/views/company/ad_list.html.twig

@@ -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 %}

volume/www/website/www/app/Resources/views/company/ad_table_listing.html.twig

@@ -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>

volume/www/website/www/app/Resources/views/company/answer_list.html.twig

@@ -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 %}

volume/www/website/www/app/Resources/views/company/answer_show.html.twig

@@ -2,95 +2,252 @@
 
 
 {% 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">
+                <a target="_blank" href="{{ path('talent_show',{'alias':answer.user.company.alias} ) }}">
+                {% include 'talent/talent_picture.html.twig' with {
+                    'user' : answer.user
+                } %}
+                </a>
                 <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">
+                        <a target="_blank" href="{{ path('talent_show',{'alias':answer.user.company.alias} ) }}">
+                        {{ answer.user.firstname }} {{ answer.user.lastname }}
+                        &nbsp;<i class="fa fa-user-circle"></i>
+                        </a>
+                    </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">
-                        {% if answer.user.getWebPath() %}
-                        <img src="{{ answer.user.getWebPath() | imagine_filter('profile_square') }}"
-                             alt="{{ answer.user.firstname }} {{ answer.user.lastname }}"
-                             class="circle responsive-img"/>
-                        {% endif %}
-                    </p>
-                    <i class="fa fa-user-circle"
-                       aria-hidden="true"></i> {{ answer.user.firstname }} {{ answer.user.lastname }}
-                    {% 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 %}

volume/www/website/www/app/Resources/views/company/base_dashboard_company.html.twig

@@ -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 %}

volume/www/website/www/app/Resources/views/company/company_show.html.twig

@@ -68,11 +68,11 @@
                                 - {{ company.addresses.billing.country|country }}</p>
                         {% endif %}
                     </div>
-                    <div class="col s12 profil-links">
+                    <div class="col s12 profil-links center-align">
                         {% if company.website %}
                             <a target="_blank" href="{{ company.website }}" class="td-none">
                                     <span class="fa-stack fa-lg">
-                                        <i class="fa fa-circle fa-stack-2x z-depth-2"></i>
+                                        <i class="fa fa-circle fa-stack-2x"></i>
                                         <i class="fa fa-link fa-stack-1x fa-inverse"></i>
                                     </span>
                             </a>
@@ -130,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>

volume/www/website/www/app/Resources/views/company/job_submenu.html.twig

@@ -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>

volume/www/website/www/app/Resources/views/default/ad_card.html.twig

@@ -46,9 +46,9 @@
                 <span class="clearfix"></span>
                 <div class="keywords">
                     {% if a.publicTag %}
-                        {% for keyword in a.publicTag %}
+                        {% for tag in a.publicTag %}
                         <div class="chip">
-                            {{ keyword }}
+                            <a href="{{ path('ad_search_result',{'tag':tag }) }}">{{ tag }}</a>
                         </div>
                         {% endfor %}
                     {% endif %}

volume/www/website/www/app/Resources/views/default/ad_listing.html.twig

@@ -52,7 +52,9 @@
                 <div class="col s11 col-noPadding" style="position:relative;">
                     <div class="frame" id="basic">
                         <ul class="slidee">{% for tag in a.publicTag %}
-                                <li class="chip">{{ tag }}</li>{% endfor %}</ul>
+                                <li class="chip">
+                                    <a href="{{ path('ad_search_result',{'tag':tag }) }}" class="hover-blue2">{{ tag }}</a>
+                                </li>{% endfor %}</ul>
                     </div>
                     <div class="controls center">
                         <a class="prev"><i class="fa fa-arrow-circle-left" aria-hidden="true"></i></a>

volume/www/website/www/app/Resources/views/default/ad_show.html.twig

@@ -40,7 +40,7 @@
                             {% else %}#}
                             <div class="embed-responsive embed-responsive-16by9">
                                 <div class="col s12">
-                                    <iframe src="https://player.vimeo.com/video/{{ ad.video.cdnUrl|replace({ "/videos/": ""}) }}"
+                                    <iframe src="https://player.vimeo.com/video/{{ ad.video.cdnUrl|replace({ "/videos/": ""}) }}?texttrack=fr"
                                             width="100%" height="640" frameborder="0" webkitallowfullscreen mozallowfullscreen
                                             allowfullscreen></iframe>
                                 </div>
@@ -51,6 +51,11 @@
                                     OFFRE POURVUE
                                 </div>
                             {% endif %}
+                            {% if ad.id == 53 %}
+                            <div class="isPromoted">
+                            Traitement des candidatures vidéos 
+                            </div>
+                            {% endif %}
                         </div>
                     {% endif %}
                     
@@ -76,9 +81,8 @@
                         </div>
                         <div class="col s12">
                             {% for tag in ad.publicTag %}
-                                <p class="chip">{{ tag }}</p>
+                                <p class="chip"><a href="{{ path('ad_search_result',{'tag':tag }) }}" class="hover-blue2">{{ tag }}</a></p>
                             {% endfor %}
-
                             <div class="item-detail-description">
                                 <h3 class="blue-text">Détails de l'offre d'emploi</h3>
                                 <p>{{ ad.description|nl2br }}</p>
@@ -99,12 +103,14 @@
                                     </div>
                                 {% elseif not is_granted('ROLE_COMPANY') %}
                                     {% if not ad.isPromoted %}
+                                        {% if ad.id != 53 %}
                                         <p class="item-detail-reply">
-                                            <a href="{{ path('talent_answer_create',{'id': ad.getId()}) }}"
+                                            <a  title="postuler-bottom" href="{{ path('talent_answer_create',{'id': ad.getId()}) }}"
                                             class="btn btn-default">
                                                 Postuler
                                             </a>
                                         </p>
+                                        {% endif %}
                                     {% endif %}
                                 {% endif %}
                             {% endif %}
@@ -188,6 +194,10 @@
     <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDYV8IJGtIoWLfXJQQvIuDQ88n2aEuRgpg&libraries=places"></script>
     <script type="text/javascript">
         $(document).ready(function(){
+            //asking for push
+            EdeclicLib = window.EdeclicLib || {};
+            EdeclicLib.delayedAsk();
+            //
             $('.tooltipped').tooltip();
             $.get( "{{ path('ad_ajaxRecStat',{'id': ad.id }) }}", function( data ) {});
             if ($('#modal-answer').length > 0) { 

volume/www/website/www/app/Resources/views/default/ad_sidebar.html.twig

@@ -57,12 +57,14 @@
             </div>
         {% elseif not is_granted('ROLE_COMPANY') %}
             {% if not ad.isPromoted %}
+                {% if ad.id != 53 %}
                 <p class="item-detail-reply">
-                    <a href="{{ path('talent_answer_create',{'id': ad.getId()}) }}"
+                    <a title="postuler-side" href="{{ path('talent_answer_create',{'id': ad.getId()}) }}"
                     class="btn btn-default">
                         Postuler
                     </a>
                 </p>
+                {% endif %}
             {% else %}
                 <div class="item-detail-ispromoted">
                     Offre pourvue

volume/www/website/www/app/Resources/views/default/button_login.html.twig

@@ -13,15 +13,17 @@
 {% else %}
     <div class="header-link header-link-signin right-align">
         {% if is_granted('ROLE_TALENT') %}
-            {% set path = path('talent_dashboard') %}
+            {% set pathDash = path('talent_dashboard') %}
         {% elseif is_granted('ROLE_COMPANY') %}
-            {% set path = path('company_dashboard') %}
+            {% set pathDash = path('company_dashboard') %}
         {% elseif is_granted('ROLE_TERRITORY') %}
-            {% set path = path('territory_dashboard') %}
+            {% set pathDash = path('territory_dashboard') %}
         {% elseif is_granted('ROLE_ADMIN') %}
-            {% set path = path('admin_dashboard') %}
+            {% set pathDash = path('admin_dashboard') %}
+        {% else %}
+            {% set pathDash = path('talent_dashboard') %}
         {% endif %}
-        <a class="btn button-round-small" href="{{ path }}">
+        <a class="btn button-round-small" href="{{ pathDash }}">
             <i class="material-icons">perm_identity</i>
             <span>Mon compte</span>
         </a>

volume/www/website/www/app/Resources/views/default/company_listing.html.twig

@@ -32,15 +32,22 @@
                 <div class="row row-tags row-noMargin">
                     <div class="col s11 col-noPadding" style="position:relative;">
                         <div class="chip center-align">
+                            {% set nbAds = c.getPublishedAds|length %}
+                            {% set fragment = "" %}
+                            {% if nbAds > 0 %}
+                            {% set fragment = "offers" %}
+                            {% endif %}
                             <a class="td-none color-grey3"
-                                href="{{ path('company_show',{'alias': c.alias, '_fragment':'offers' }) }}">
+                                href="{{ path('company_show',{'alias': c.alias, '_fragment': fragment }) }}">
                                 {% set nbAds = c.getPublishedAds|length %}
                                 {% if nbAds > 1 %}
                                     <strong>{{ c.getPublishedAds|length }} offres d'emploi en
                                         cours</strong>
-                                {% else %}
+                                {% elseif nbAds == 1 %}
                                     <strong>{{ c.getPublishedAds|length }} offre d'emploi en
                                         cours</strong>
+                                {% else %}
+                                    <strong>candidature spontanée</strong>
                                 {% endif %}
                             </a>
                         </div>

volume/www/website/www/app/Resources/views/default/facebook.html.twig

@@ -4,7 +4,7 @@
         {% set destination = path('redirect_dashboard') %}
     {% endif %}
     <a class="btn btn-default btn-facebook z-depth-2" href="{{ url("hwi_oauth_service_redirect", {service: "facebook"}) }}?_destination={{ destination }}">Connexion avec Facebook</a>
-    <a class="btn btn-default btn-linkedin z-depth-2" href="{{ url("hwi_oauth_service_redirect", {service: "linkedin"}) }}?_destination={{ destination }}">Connexion avec Linkedin</a>
+    {# <a class="btn btn-default btn-linkedin z-depth-2" href="{{ url("hwi_oauth_service_redirect", {service: "linkedin"}) }}?_destination={{ destination }}">Connexion avec Linkedin</a> #}
     <div class="row">
         <div class="col s12">
             <div class="separator-with-label">

volume/www/website/www/app/Resources/views/default/header.html.twig

@@ -3,22 +3,49 @@
         <div class="row">
             <div class="col s12 m12 l10">
                 <ul id='dropdown_talents' class='dropdown-content'>
-                    <li><a href="{{ path('ad_search_result') }}" title="Offres d'emploi vidéos">Offres d'emploi</a></li>
-                    <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('ad_search_result') }}" title="Offres d'emploi vidéos">Offres d'emploi</a>
+                    </li>
+                    <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="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>
-                    <li><a href="{{ path('page_accompagnementEntreprise') }}" title="Conseils & accompagnement">Conseils & accompagnement</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>
+                    <li>
+                        <a href="{{ path('page_accompagnementEntreprise') }}" title="Conseils & accompagnement">Conseils & accompagnement</a>
+                    </li>
                 </ul>
                 <ul id='dropdown_territoire' class='dropdown-content'>
-                    <li><a href="{{ path('territory_list') }}">Liste des territoires</a></li>
-                    <li><a href="{{ path('page_VideoTerritory') }}">La vidéo territoire</a></li>
-                    <li><a href="{{ path('page_AccompagnementTerritory') }}">Conseils et accompagnement</a></li>
+                    <li>
+                        <a href="{{ path('territory_list') }}">Liste des territoires</a>
+                    </li>
+                    <li>
+                        <a href="{{ path('page_VideoTerritory') }}">La vidéo territoire</a>
+                    </li>
+                    <li>
+                        <a href="{{ path('page_AccompagnementTerritory') }}">Conseils et accompagnement</a>
+                    </li>
                 </ul>
                 <nav>
                     <div class="nav-wrapper">
@@ -27,16 +54,25 @@
                                 <img src="{{ asset('img/Logo-header.png') }}" alt="Talents Tube"/>
                             </a>
                         </div>
-                        <a href="#" data-activates="mobile-demo" class="button-collapse"><i class="material-icons">menu</i></a>
+                        <a href="#" data-activates="mobile-demo" class="button-collapse">
+                            <i class="material-icons">menu</i>
+                        </a>
                         <ul class="right hide-on-med-and-down">
-                            <li><a class="dropdown-button" data-activates="dropdown_talents" href="{{ path('page_cvVideo') }}"
-                                    title="Talents">Talents</a></li>
-                            <li><a href="{{ path('ad_search_result') }}" title="Offres d'emploi vidéos">Offres d'emploi</a></li>
-                            <li><a class="dropdown-button" data-activates="dropdown_company" href="{{ path('company_list') }}"
-                                    title="Les entreprises de talents">Entreprises</a></li>
-                            <li><a class="dropdown-button" data-activates="dropdown_territoire" href="{{ path('territory_list') }}"
-                                    title="Les territoires">Territoires</a></li>
-                            <li><a href="https://blog.talentstube.com" title="Blog Talents Tube">Blog</a></li>
+                            <li>
+                                <a class="dropdown-button" data-activates="dropdown_talents" href="{{ path('page_cvVideo') }}" title="Talents">Talents</a>
+                            </li>
+                            <li>
+                                <a href="{{ path('ad_search_result') }}" title="Offres d'emploi vidéos">Offres d'emploi</a>
+                            </li>
+                            <li>
+                                <a class="dropdown-button" data-activates="dropdown_company" href="{{ path('company_list') }}" title="Les entreprises de talents">Entreprises</a>
+                            </li>
+                            <li>
+                                <a class="dropdown-button" data-activates="dropdown_territoire" href="{{ path('territory_list') }}" title="Les territoires">Territoires</a>
+                            </li>
+                            <li>
+                                <a href="https://blog.talentstube.com" title="Blog Talents Tube">Blog</a>
+                            </li>
                         </ul>
 
                     </div>
@@ -47,6 +83,13 @@
             </div>
         </div>
     </div>
+    {#<div id="newApp" class="container-fluid">
+        <div class="row">
+            <div class="col s12 m12">
+                <p>"Nouveau ! Trouvez un job plus facilement avec notre <a href="http://pp.app.talentstube.com">web application</a>.📲"</p>
+            </div>
+        </div>
+    </div>#}
 </div>
 <div class="nav-wrapper">
     <ul class="side-nav collapsible" data-collapsible="accordion" id="mobile-demo">
@@ -57,10 +100,10 @@
             <a class="collapsible-header" title="Talents">Talents</a>
             <div class="collapsible-body">
                 <ul>
-                    <li><a href="{{ path('ad_search_result') }}" title="Offres d'emploi vidéos">Offres d'emploi</a></li>
-                    <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><ahref="{{ path('ad_search_result') }}" title="Offres d'emploi vidéos">Offres d'emploi</a></li>
+                    <li><ahref="{{ path('page_cvVideo') }}" title="Le Cv vidéo">Le CV vidéo</a></li>
+                    <li><ahref="{{ path('page_reussirCVvideo') }}" title="Comment faire son CV Vidéo ?">Comment faire son CV Vidéo ?</a></li>
+                    <li><ahref="{{ path('page_accompagnementTalent') }}" title="Accompagnement talent">Accompagnement</a></li>
                 </ul>
             </div>
         </li>
@@ -71,11 +114,11 @@
             <a class="collapsible-header" title="Les entreprises de talents">Entreprises</a>
             <div class="collapsible-body">
                 <ul>
-                    <li><a href="{{ path('company_list') }}" title="Listes entreprises">Listes entreprises</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>
-                    <li><a href="{{ path('page_accompagnementEntreprise') }}" title="Conseils & accompagnement">Conseils & accompagnement</a></li>
+                    <li><ahref="{{ path('company_list') }}" title="Listes entreprises">Listes entreprises</a></li>
+                    <li><ahref="{{ path('page_OffreEmploi') }}" title="L'offre d'emploi en vidéo">L'offre d'emploi en vidéo</a></li>
+                    <li><ahref="{{ path('page_reussirOffrevideo') }}" title="Comment faire une offre en vidéo">Comment faire une offre en vidéo</a></li>
+                    <li><ahref="{{ path('page_MarqueEmployeur') }}" title="Vidéo Marque Employeur">Vidéo Marque Employeur</a></li>
+                    <li><ahref="{{ path('page_accompagnementEntreprise') }}" title="Conseils & accompagnement">Conseils & accompagnement</a></li>
                 </ul>
             </div>
         </li>
@@ -83,9 +126,9 @@
             <a class="collapsible-header" title="Les territoires">Territoires</a>
             <div class="collapsible-body">
                 <ul>
-                    <li><a href="{{ path('territory_list') }}">Liste des territoires</a></li>
-                    <li><a href="{{ path('page_VideoTerritory') }}">La vidéo territoire</a></li>
-                    <li><a href="{{ path('page_AccompagnementTerritory') }}">Conseils et accompagnement</a></li>
+                    <li><ahref="{{ path('territory_list') }}">Liste des territoires</a></li>
+                    <li><ahref="{{ path('page_VideoTerritory') }}">La vidéo territoire</a></li>
+                    <li><ahref="{{ path('page_AccompagnementTerritory') }}">Conseils et accompagnement</a></li>
                 </ul>
             </div>
         </li>
@@ -93,4 +136,4 @@
             <a class="collapsible-header" href="https://blog.talentstube.com" title="Blog Talents Tube">Blog</a>
         </li>
     </ul>
-</div>
+</div>

volume/www/website/www/app/Resources/views/default/index.html.twig

@@ -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">1ère plateforme pour l’emploi <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,7 +27,9 @@
                     {# 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 #}
@@ -41,16 +44,17 @@
                             <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">Voir les offres
+                                    <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>
@@ -70,8 +74,10 @@
                             <div class="row">
                                 <div class="col s12 col-noPadding">
                                     <div class="owl-carousel owl-carousel-home home-company-carousel">
-                                        {% if companies|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>
@@ -86,22 +92,31 @@
                 </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 talents</h2></div>
-                    <h3 class="subtitles-homepage">Découvrez leurs CV vidéo et vidéo de motivation.</h3>
+                    <div class="col s12">
+                        <h2 class="blue-text no-margin-top">Les talents à la une</h2>
+                    </div>
+                    <h3 class="subtitles-homepage">Découvrez leur 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>
+                <div class="row center-align">
+                    <h2>Rejoignez une communauté de plus de <strong>1000</strong> candidats</h2>
+                    <div class="col s12 m-t-50">
+                        <a href="#!" title="Créer Mon profil" class="btn btn-default btn-round btn-create-account">Créer mon profil</a>
+                    </div>
+                </div>
             </div>
         </div>
         {# TERRITOIRE #}
@@ -112,25 +127,31 @@
                         <h2 class="blue-text no-margin-top">Les territoires</h2>
                         <h3 class="subtitles-homepage">Venez vivre et travailler chez nous.</h3>
                         {% if territories %}
-                        <div class="owl-carousel owl-carousel-home territory-carousel">
-                            {% for territory in territories if territory.presentationVideo and territory.isPrivate != true %}
-                                <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 hover-none">
+                                            <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="Voir les territoires" class="btn btn-default" href="{{ path('territory_list') }}">
-                                            Voir les territoires</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>
@@ -140,23 +161,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>
@@ -174,9 +195,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>
@@ -185,9 +204,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">
@@ -207,8 +224,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">