From 548e8ce079aac83c9d9067fe95b11ff1b9e0c5e5 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 12:18:54 +0200
Subject: [PATCH 01/72] [Fix #68] Remove reference to application_split2.scss

It has been removed in 6a261d1
---
 config/application.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/application.rb b/config/application.rb
index 8edea6693..b3c5dc10c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -23,7 +23,6 @@ module TPS
 
     config.autoload_paths += %W(#{config.root}/lib #{config.root}/app/validators #{config.root}/app/facades)
     config.assets.paths << Rails.root.join('app', 'assets', 'javascript')
-    config.assets.precompile += %w( application_split2.css )
 
     if Rails.env.production?
       URL = "https://tps.apientreprise.fr/"

From a93aba5967c14cb965390938d871eb83f556929e Mon Sep 17 00:00:00 2001
From: Mathieu Magnin <mathieu.magnin@gmail.com>
Date: Thu, 6 Apr 2017 16:15:45 +0200
Subject: [PATCH 02/72] Update poltergeist

---
 Gemfile.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 40665e46f..c627a8b96 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -69,7 +69,7 @@ GEM
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     apipie-rails (0.3.7)
       json
@@ -97,7 +97,7 @@ GEM
     browser (2.3.0)
     builder (3.2.3)
     byebug (9.0.6)
-    capybara (2.11.0)
+    capybara (2.13.0)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -413,7 +413,7 @@ GEM
       json
     orm_adapter (0.5.0)
     pg (0.19.0)
-    poltergeist (1.12.0)
+    poltergeist (1.14.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
@@ -424,7 +424,7 @@ GEM
     pry-byebug (3.4.2)
       byebug (~> 9.0)
       pry (~> 0.10)
-    public_suffix (2.0.4)
+    public_suffix (2.0.5)
     rack (2.0.1)
     rack-handlers (0.7.3)
       rack
@@ -626,7 +626,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    websocket-driver (0.6.4)
+    websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     will_paginate (3.1.5)

From 86ab596a87ac77ddb550a414f5ac620f2ab4073c Mon Sep 17 00:00:00 2001
From: Mathieu Magnin <mathieu.magnin@gmail.com>
Date: Thu, 6 Apr 2017 16:58:00 +0200
Subject: [PATCH 03/72] Change test structure

---
 .../drawing_a_zone_with_freedraw_spec.rb      | 23 ++++++++++++++-----
 spec/features/users/list_dossiers_spec.rb     |  1 -
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/spec/features/users/drawing_a_zone_with_freedraw_spec.rb b/spec/features/users/drawing_a_zone_with_freedraw_spec.rb
index b7a4f8495..3cbd1c26e 100644
--- a/spec/features/users/drawing_a_zone_with_freedraw_spec.rb
+++ b/spec/features/users/drawing_a_zone_with_freedraw_spec.rb
@@ -15,13 +15,24 @@ feature 'drawing a zone with freedraw' do
       expect(page).to have_css('#login_user')
     end
 
-    context 'when he enter login information' do
+    scenario 'he logs in and he is redirected to carte page', vcr: { cassette_name: 'drawing_a_zone_with_freedraw_redirected_to_carte_page' } do
+      within('#new_user') do
+        page.find_by_id('user_email').set user.email
+        page.find_by_id('user_password').set user.password
+        page.click_on 'Se connecter'
+      end
+      expect(page).to have_css('.content #map')
+    end
+  end
+
+  context 'when user is logged in' do
+    before do
+      login_as user, scope: :user
+    end
+
+    context 'when he is visiting the map page' do
       before do
-        within('#new_user') do
-          page.find_by_id('user_email').set user.email
-          page.find_by_id('user_password').set user.password
-          page.click_on 'Se connecter'
-        end
+        visit users_dossier_carte_path dossier_id: dossier.id
       end
 
       context 'when procedure have api carto activated' do
diff --git a/spec/features/users/list_dossiers_spec.rb b/spec/features/users/list_dossiers_spec.rb
index d970de7b4..1ae783994 100644
--- a/spec/features/users/list_dossiers_spec.rb
+++ b/spec/features/users/list_dossiers_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 feature 'user access to the list of his dossier' do
-
   let(:user) { create(:user) }
   let!(:last_updated_dossier) { create(:dossier, :with_entreprise, user: user, state: 'replied')}
   let!(:dossier1) { create(:dossier, :with_entreprise, user: user, state: 'replied') }

From e6269335696ef750d39a537b50d2cbe24d724b0e Mon Sep 17 00:00:00 2001
From: Mathieu Magnin <mathieu.magnin@gmail.com>
Date: Mon, 10 Apr 2017 16:05:18 +0200
Subject: [PATCH 04/72] Remove annoying test with external dependency

---
 .../drawing_a_zone_with_freedraw_spec.rb      |  27 ----
 ..._with_freedraw_when_draw_a_zone_on_map.yml | 143 ------------------
 2 files changed, 170 deletions(-)
 delete mode 100644 spec/fixtures/cassettes/drawing_a_zone_with_freedraw_when_draw_a_zone_on_map.yml

diff --git a/spec/features/users/drawing_a_zone_with_freedraw_spec.rb b/spec/features/users/drawing_a_zone_with_freedraw_spec.rb
index 3cbd1c26e..57633a08b 100644
--- a/spec/features/users/drawing_a_zone_with_freedraw_spec.rb
+++ b/spec/features/users/drawing_a_zone_with_freedraw_spec.rb
@@ -52,33 +52,6 @@ feature 'drawing a zone with freedraw' do
           expect(page).to have_content('Le status de votre dossier n\'autorise pas cette URL')
         end
       end
-
-      context 'when draw a zone on #map', js: true, vcr: { cassette_name: 'drawing_a_zone_with_freedraw_when_draw_a_zone_on_map' } do
-        context 'when module quartiers prioritaires is activated' do
-          let(:module_api_carto) { create(:module_api_carto, :with_quartiers_prioritaires) }
-
-          before do
-            allow(ModuleApiCartoService).
-                to receive(:generate_qp).
-                       and_return({"QPCODE1234" => {:code => "QPCODE1234", :nom => "Quartier de test", :commune => "Paris", :geometry => {:type => "MultiPolygon", :coordinates => [[[[2.38715792094576, 48.8723062632126], [2.38724851642619, 48.8721392348061]]]]}}})
-
-            page.execute_script('freeDraw.fire("markers", {latLngs: []});')
-            wait_for_ajax
-          end
-
-          scenario 'div #map .qp is present' do
-            expect(page).to have_css('.content #map.qp')
-          end
-
-          scenario 'QP name is present on page' do
-            expect(page).to have_content('Quartier de test')
-          end
-
-          scenario 'Commune is present on page' do
-            expect(page).to have_content('Paris')
-          end
-        end
-      end
     end
   end
 end
diff --git a/spec/fixtures/cassettes/drawing_a_zone_with_freedraw_when_draw_a_zone_on_map.yml b/spec/fixtures/cassettes/drawing_a_zone_with_freedraw_when_draw_a_zone_on_map.yml
deleted file mode 100644
index 290ed6d79..000000000
--- a/spec/fixtures/cassettes/drawing_a_zone_with_freedraw_when_draw_a_zone_on_map.yml
+++ /dev/null
@@ -1,143 +0,0 @@
----
-http_interactions:
-- request:
-    method: post
-    uri: https://auth.cloud.ovh.net/v2.0/tokens
-    body:
-      encoding: UTF-8
-      string: '{"auth":{"passwordCredentials":{"username":"ovh_fake_username","password":"ovh_fake_password"},"tenantName":"ovh_fake_tenant_name"}}'
-    headers:
-      User-Agent:
-      - fog/1.38.0 fog-core/1.38.0
-      Content-Type:
-      - application/json
-  response:
-    status:
-      code: 200
-      message: ''
-    headers:
-      Vary:
-      - X-Auth-Token
-      Content-Type:
-      - application/json
-      Content-Length:
-      - '7079'
-      Date:
-      - Thu, 12 May 2016 14:05:17 GMT
-      Connection:
-      - close
-    body:
-      encoding: UTF-8
-      string: '{"access": {"token": {"issued_at": "2016-05-12T14:05:17.214079", "expires":
-        "2016-05-13T14:05:17Z", "id": "ff665d4700654b6d9c94964dfc1a262f", "tenant":
-        {"id": "a24c37ed11a84896914514384898c34b", "enabled": true, "name": "2627898119540674",
-        "description": "apientreprise"}, "audit_ids": ["Y2ixVCRJQe-D6IN-cPQQsw"]},
-        "serviceCatalog": [{"endpoints": [{"adminURL": "https://compute.gra1.cloud.ovh.net/v2/a24c37ed11a84896914514384898c34b",
-        "region": "GRA1", "internalURL": "https://compute.gra1.cloud.ovh.net/v2/a24c37ed11a84896914514384898c34b",
-        "id": "17f6ef1cc63e492ab8d3f2bda8428cb0", "publicURL": "https://compute.gra1.cloud.ovh.net/v2/a24c37ed11a84896914514384898c34b"},
-        {"adminURL": "https://compute.bhs1.cloud.ovh.net/v2/a24c37ed11a84896914514384898c34b",
-        "region": "BHS1", "internalURL": "https://compute.bhs1.cloud.ovh.net/v2/a24c37ed11a84896914514384898c34b",
-        "id": "21fdd202afd04470bbaf84f9396d0dcc", "publicURL": "https://compute.bhs1.cloud.ovh.net/v2/a24c37ed11a84896914514384898c34b"},
-        {"adminURL": "https://compute.sbg1.cloud.ovh.net/v2/a24c37ed11a84896914514384898c34b",
-        "region": "SBG1", "internalURL": "https://compute.sbg1.cloud.ovh.net/v2/a24c37ed11a84896914514384898c34b",
-        "id": "a707bffedf1c4b80a124c585c67c1639", "publicURL": "https://compute.sbg1.cloud.ovh.net/v2/a24c37ed11a84896914514384898c34b"}],
-        "endpoints_links": [], "type": "compute", "name": "nova"}, {"endpoints": [{"adminURL":
-        "https://network.compute.gra1.cloud.ovh.net/", "region": "GRA1", "internalURL":
-        "https://network.compute.gra1.cloud.ovh.net/", "id": "26a339a8c7d5463f89ca937068ebbcd4",
-        "publicURL": "https://network.compute.gra1.cloud.ovh.net/"}, {"adminURL":
-        "https://network.compute.bhs1.cloud.ovh.net/", "region": "BHS1", "internalURL":
-        "https://network.compute.bhs1.cloud.ovh.net/", "id": "3fe2326789ec4e37af2e6b2c80a90876",
-        "publicURL": "https://network.compute.bhs1.cloud.ovh.net/"}, {"adminURL":
-        "https://network.compute.sbg1.cloud.ovh.net/", "region": "SBG1", "internalURL":
-        "https://network.compute.sbg1.cloud.ovh.net/", "id": "075839111e7a41f1bb458926e5f04cec",
-        "publicURL": "https://network.compute.sbg1.cloud.ovh.net/"}], "endpoints_links":
-        [], "type": "network", "name": "neutron"}, {"endpoints": [{"adminURL": "https://volume.compute.gra1.cloud.ovh.net/v2/a24c37ed11a84896914514384898c34b",
-        "region": "GRA1", "internalURL": "https://volume.compute.gra1.cloud.ovh.net/v2/a24c37ed11a84896914514384898c34b",
-        "id": "7231957fdf0346e5adebe860ac5e5e57", "publicURL": "https://volume.compute.gra1.cloud.ovh.net/v2/a24c37ed11a84896914514384898c34b"},
-        {"adminURL": "https://volume.compute.bhs1.cloud.ovh.net/v2/a24c37ed11a84896914514384898c34b",
-        "region": "BHS1", "internalURL": "https://volume.compute.bhs1.cloud.ovh.net/v2/a24c37ed11a84896914514384898c34b",
-        "id": "2f5b68f95d7b4b1fad1a683dac8e8ca3", "publicURL": "https://volume.compute.bhs1.cloud.ovh.net/v2/a24c37ed11a84896914514384898c34b"},
-        {"adminURL": "https://volume.compute.sbg1.cloud.ovh.net/v2/a24c37ed11a84896914514384898c34b",
-        "region": "SBG1", "internalURL": "https://volume.compute.sbg1.cloud.ovh.net/v2/a24c37ed11a84896914514384898c34b",
-        "id": "021b61bd7313479e8f8d77d21c7b434a", "publicURL": "https://volume.compute.sbg1.cloud.ovh.net/v2/a24c37ed11a84896914514384898c34b"}],
-        "endpoints_links": [], "type": "volumev2", "name": "cinderv2"}, {"endpoints":
-        [{"adminURL": "https://image.compute.gra1.cloud.ovh.net/", "region": "GRA1",
-        "internalURL": "https://image.compute.gra1.cloud.ovh.net/", "id": "56795c82f1744e47b7782f1fc2407212",
-        "publicURL": "https://image.compute.gra1.cloud.ovh.net/"}, {"adminURL": "https://image.compute.bhs1.cloud.ovh.net/",
-        "region": "BHS1", "internalURL": "https://image.compute.bhs1.cloud.ovh.net/",
-        "id": "5eaa4cbe80354ea482f2b0477c9c16f0", "publicURL": "https://image.compute.bhs1.cloud.ovh.net/"},
-        {"adminURL": "https://image.compute.sbg1.cloud.ovh.net/", "region": "SBG1",
-        "internalURL": "https://image.compute.sbg1.cloud.ovh.net/", "id": "15758b246d1340e887a2170bd3399071",
-        "publicURL": "https://image.compute.sbg1.cloud.ovh.net/"}], "endpoints_links":
-        [], "type": "image", "name": "glance"}, {"endpoints": [{"adminURL": "https://volume.compute.gra1.cloud.ovh.net/v1/a24c37ed11a84896914514384898c34b",
-        "region": "GRA1", "internalURL": "https://volume.compute.gra1.cloud.ovh.net/v1/a24c37ed11a84896914514384898c34b",
-        "id": "a6936c8876c1490cbf91d0707e78d350", "publicURL": "https://volume.compute.gra1.cloud.ovh.net/v1/a24c37ed11a84896914514384898c34b"},
-        {"adminURL": "https://volume.compute.bhs1.cloud.ovh.net/v1/a24c37ed11a84896914514384898c34b",
-        "region": "BHS1", "internalURL": "https://volume.compute.bhs1.cloud.ovh.net/v1/a24c37ed11a84896914514384898c34b",
-        "id": "43bc107cf78448faa9e5a6b3a5ca48dd", "publicURL": "https://volume.compute.bhs1.cloud.ovh.net/v1/a24c37ed11a84896914514384898c34b"},
-        {"adminURL": "https://volume.compute.sbg1.cloud.ovh.net/v1/a24c37ed11a84896914514384898c34b",
-        "region": "SBG1", "internalURL": "https://volume.compute.sbg1.cloud.ovh.net/v1/a24c37ed11a84896914514384898c34b",
-        "id": "2be04ee1ddb148c19e91d3da5934fa55", "publicURL": "https://volume.compute.sbg1.cloud.ovh.net/v1/a24c37ed11a84896914514384898c34b"}],
-        "endpoints_links": [], "type": "volume", "name": "cinder"}, {"endpoints":
-        [{"adminURL": "https://storage.gra1.cloud.ovh.net", "region": "GRA1", "internalURL":
-        "http://127.0.0.1:8888/v1/AUTH_a24c37ed11a84896914514384898c34b", "id": "c96f61d071a74e36bd3c07e53d241ce3",
-        "publicURL": "https://storage.gra1.cloud.ovh.net/v1/AUTH_a24c37ed11a84896914514384898c34b"},
-        {"adminURL": "https://storage.bhs1.cloud.ovh.net:8888/", "region": "BHS1",
-        "internalURL": "http://127.0.0.1:8888/v1/AUTH_a24c37ed11a84896914514384898c34b",
-        "id": "3327534a1a824389aae5d663b9821d67", "publicURL": "https://storage.bhs1.cloud.ovh.net/v1/AUTH_a24c37ed11a84896914514384898c34b"},
-        {"adminURL": "https://storage.sbg1.cloud.ovh.net", "region": "SBG1", "internalURL":
-        "http://127.0.0.1:8888/v1/AUTH_a24c37ed11a84896914514384898c34b", "id": "2af96b87ad484cb7879a9ea554d5418c",
-        "publicURL": "https://storage.sbg1.cloud.ovh.net/v1/AUTH_a24c37ed11a84896914514384898c34b"}],
-        "endpoints_links": [], "type": "object-store", "name": "swift"}, {"endpoints":
-        [{"adminURL": "https://auth.cloud.ovh.net:35357/v2.0", "region": "GRA1", "internalURL":
-        "http://127.0.0.1:5000/v2.0", "id": "62101e498fc3404dbc18ec80888992cb", "publicURL":
-        "https://auth.cloud.ovh.net/v2.0"}, {"adminURL": "https://auth.cloud.ovh.net:35357/v2.0",
-        "region": "BHS1", "internalURL": "http://127.0.0.1:5000/v2.0", "id": "00e403276b3246c4a5c54dc7133f9f0a",
-        "publicURL": "https://auth.cloud.ovh.net/v2.0"}, {"adminURL": "https://auth.cloud.ovh.net:35357/v2.0",
-        "region": "SBG1", "internalURL": "http://127.0.0.1:5000/v2.0", "id": "6094ef2ed9f240ed9b648dfcc0d9f923",
-        "publicURL": "https://auth.cloud.ovh.net/v2.0"}], "endpoints_links": [], "type":
-        "identity", "name": "keystone"}], "user": {"username": "MhsuDbK4DsPr", "roles_links":
-        [], "id": "43914cf4645747ba90d075c62ebb5018", "roles": [{"name": "_member_"}],
-        "name": "MhsuDbK4DsPr"}, "metadata": {"is_admin": 0, "roles": ["9fe2ff9ee4384b1894a90878d3e92bab"]}}}'
-    http_version:
-  recorded_at: Thu, 12 May 2016 14:05:17 GMT
-- request:
-    method: get
-    uri: http://api-adresse.data.gouv.fr/search?limit=1&q=6%20RUE%20RAOUL%20NORDLING%20IMMEUBLE%20BORA%2092270%20BOIS%20COLOMBES
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - "*/*; q=0.5, application/xml"
-      Accept-Encoding:
-      - gzip, deflate
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - nginx/1.6.2
-      Date:
-      - Thu, 12 May 2016 14:13:15 GMT
-      Content-Type:
-      - application/json; charset=utf-8
-      Content-Length:
-      - '189'
-      Connection:
-      - keep-alive
-      Access-Control-Allow-Origin:
-      - "*"
-      Access-Control-Allow-Headers:
-      - X-Requested-With
-    body:
-      encoding: UTF-8
-      string: '{"limit": 1, "attribution": "BAN", "version": "draft", "licence": "ODbL
-        1.0", "query": "6 RUE RAOUL NORDLING IMMEUBLE BORA 92270 BOIS COLOMBES", "type":
-        "FeatureCollection", "features": []}'
-    http_version:
-  recorded_at: Thu, 12 May 2016 14:13:16 GMT
-recorded_with: VCR 3.0.1

From 074c6fe72bf6c12db4ccbd2b478b1bcec46b63c7 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Tue, 4 Apr 2017 11:42:00 +0200
Subject: [PATCH 05/72] Use scenic in all environments

---
 Gemfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index e6d77a9ab..60952ee60 100644
--- a/Gemfile
+++ b/Gemfile
@@ -93,6 +93,8 @@ gem 'simple_form'
 
 gem 'newrelic_rpm'
 
+gem 'scenic'
+
 # Sidekiq
 gem 'sidekiq'
 gem 'sidekiq-cron', '~> 0.4.4'
@@ -145,6 +147,3 @@ group :production, :staging do
   gem 'sentry-raven'
 end
 
-group :production, :staging, :development do
-  gem 'scenic'
-end

From 3ca914aba80741c7d4418da7529f352bb74c7a61 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Tue, 4 Apr 2017 11:42:42 +0200
Subject: [PATCH 06/72] Delete some environment-based conditions

We should always try to be the closest to the
production environment
---
 app/models/notification.rb                                  | 1 -
 ...0160127170437_change_date_creation_type_to_entreprise.rb | 6 +-----
 db/migrate/20161025150900_create_searches.rb                | 4 ++--
 db/migrate/20161102154835_update_searches_to_version_2.rb   | 4 ++--
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index e538f0a25..4ff810f37 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -1,6 +1,5 @@
 class Notification < ActiveRecord::Base
   belongs_to :dossier
-  serialize :liste if Rails.env.test?
 
   # after_save :broadcast_notification
 
diff --git a/db/migrate/20160127170437_change_date_creation_type_to_entreprise.rb b/db/migrate/20160127170437_change_date_creation_type_to_entreprise.rb
index 5168938c7..6451dc0d1 100644
--- a/db/migrate/20160127170437_change_date_creation_type_to_entreprise.rb
+++ b/db/migrate/20160127170437_change_date_creation_type_to_entreprise.rb
@@ -1,10 +1,6 @@
 class ChangeDateCreationTypeToEntreprise < ActiveRecord::Migration
   def up
-    if Rails.env.test?
-      change_column :entreprises, :date_creation, "timestamp"
-    else
-      change_column :entreprises, :date_creation, "timestamp USING to_timestamp(date_creation) at time zone 'UTC-2'"
-    end
+    change_column :entreprises, :date_creation, "timestamp USING to_timestamp(date_creation) at time zone 'UTC-2'"
   end
 
   def down
diff --git a/db/migrate/20161025150900_create_searches.rb b/db/migrate/20161025150900_create_searches.rb
index 5252c6006..3b2ee975f 100644
--- a/db/migrate/20161025150900_create_searches.rb
+++ b/db/migrate/20161025150900_create_searches.rb
@@ -9,7 +9,7 @@ class CreateSearches < ActiveRecord::Migration
     add_index :individuals, :dossier_id
     add_index :pieces_justificatives, :dossier_id
     add_index :rna_informations, :entreprise_id
-    create_view :searches unless Rails.env.test? #, materialized: true
+    create_view :searches
   end
 
   def down
@@ -22,6 +22,6 @@ class CreateSearches < ActiveRecord::Migration
     remove_index :individuals, :dossier_id
     remove_index :pieces_justificatives, :dossier_id
     remove_index :rna_informations, :entreprise_id
-    drop_view :searches unless Rails.env.test? #, materialized: true
+    drop_view :searches
   end
 end
diff --git a/db/migrate/20161102154835_update_searches_to_version_2.rb b/db/migrate/20161102154835_update_searches_to_version_2.rb
index b749a08ea..55223b4cf 100644
--- a/db/migrate/20161102154835_update_searches_to_version_2.rb
+++ b/db/migrate/20161102154835_update_searches_to_version_2.rb
@@ -1,9 +1,9 @@
 class UpdateSearchesToVersion2 < ActiveRecord::Migration
   def up
-    replace_view :searches, version: 2 unless Rails.env.test?
+    replace_view :searches, version: 2
   end
 
   def down
-    replace_view :searches, version: 1 unless Rails.env.test?
+    replace_view :searches, version: 1
   end
 end

From aef804a988ee892c89498b2a776bf0a34c6ffa6d Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Tue, 4 Apr 2017 11:43:07 +0200
Subject: [PATCH 07/72] Use a postgresql database for tests

Try to be the closest to the production
environment
---
 README.md           | 1 +
 config/database.yml | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 5c17747dc..e33184bf1 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@ Les informations nécessaire à l'initialisation de la base doivent être pré-c
     su - postgres
     psql
     > create user tps with password 'lol' superuser;
+    > create user tps_test with password 'tps_test' superuser;
     > \q
 
 
diff --git a/config/database.yml b/config/database.yml
index 76a34a338..9f8cb0b14 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -9,7 +9,10 @@ development:
 
 
 test:
-  adapter: sqlite3
+  adapter: postgresql
+  encoding: unicode
+  database: tps_test
+  host: localhost
   pool: 5
-  timeout: 5000
-  database: db/test.sqlite3
+  username: tps_test
+  password: tps_test

From 30d1d872776e496c507b122e1d5e2fe190fd2c16 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Tue, 4 Apr 2017 12:09:25 +0200
Subject: [PATCH 08/72] Fix a test due to the move to Postgresql
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

double precision’s length is 15 digits
---
 spec/controllers/users/carte_controller_shared_example.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/users/carte_controller_shared_example.rb b/spec/controllers/users/carte_controller_shared_example.rb
index 6e5fe11a1..55d63d266 100644
--- a/spec/controllers/users/carte_controller_shared_example.rb
+++ b/spec/controllers/users/carte_controller_shared_example.rb
@@ -164,7 +164,7 @@ shared_examples 'carte_controller_spec' do
           subject { Cadastre.last }
 
           it { expect(subject.surface_intersection).to eq('0.0006') }
-          it { expect(subject.surface_parcelle).to eq(11252.692583090324) }
+          it { expect(subject.surface_parcelle).to eq(11252.6925830903) }
           it { expect(subject.numero).to eq('0013') }
           it { expect(subject.feuille).to eq(1) }
           it { expect(subject.section).to eq('CD') }

From 0e13e4bdfd817585ada22abaae398bf6346413a8 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Tue, 4 Apr 2017 11:43:49 +0200
Subject: [PATCH 09/72] Use transaction instead of truncation DatabaseCleaner
 strategy

It is the recommended strategy for ActiveRecod
---
 spec/spec_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f3b8d6030..d28fae75d 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -55,7 +55,7 @@ VCR.configure do |c|
   c.configure_rspec_metadata!
 end
 
-DatabaseCleaner.strategy = :truncation
+DatabaseCleaner.strategy = :transaction
 
 SIADETOKEN = :valid_token unless defined? SIADETOKEN
 BROWSER.value = Browser.new('Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Win64; x64; Trident/6.0)')

From fa9bf2d398603b4071dc384e7e0553a17491ea1d Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Tue, 4 Apr 2017 12:09:51 +0200
Subject: [PATCH 10/72] Fix a test now that we use transaction instead of
 truncation

---
 spec/models/concern/mail_template_concern_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/models/concern/mail_template_concern_spec.rb b/spec/models/concern/mail_template_concern_spec.rb
index f177a360a..b82d78117 100644
--- a/spec/models/concern/mail_template_concern_spec.rb
+++ b/spec/models/concern/mail_template_concern_spec.rb
@@ -8,8 +8,8 @@ describe MailTemplateConcern do
     it 'works' do
         initiated_mail.object = '[TPS] --numero_dossier-- --libelle_procedure-- --lien_dossier--'
         expected =
-          "[TPS] 1 Demande de subvention " +
-          "<a target=\"_blank\" href=\"http://localhost:3000/users/dossiers/1/recapitulatif\">http://localhost:3000/users/dossiers/1/recapitulatif</a>"
+          "[TPS] #{dossier.id} Demande de subvention " +
+          "<a target=\"_blank\" href=\"http://localhost:3000/users/dossiers/#{dossier.id}/recapitulatif\">http://localhost:3000/users/dossiers/#{dossier.id}/recapitulatif</a>"
 
         expect(initiated_mail.object_for_dossier(dossier)).to eq(expected)
     end

From 8015710db27fda83ff26a90dd309ddedbc019bd2 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Tue, 4 Apr 2017 11:52:52 +0200
Subject: [PATCH 11/72] Add config/database.yml.ci

---
 config/database.yml.ci | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 config/database.yml.ci

diff --git a/config/database.yml.ci b/config/database.yml.ci
new file mode 100644
index 000000000..3d17efadf
--- /dev/null
+++ b/config/database.yml.ci
@@ -0,0 +1,6 @@
+test:
+  adapter: postgresql
+  database: app_test
+  pool: 5
+  username:
+  password:

From 8a424059f9889a1bffbc049f5455c6352329afa2 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Tue, 4 Apr 2017 11:53:16 +0200
Subject: [PATCH 12/72] Update circle.yml so that it works properly with
 postgresql

---
 circle.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index d16255161..8fbdcce89 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,6 +1,7 @@
 database:
   override:
-    - bundle exec rake db:drop db:create db:migrate RAILS_ENV=test
+    - cp config/database.yml.ci config/database.yml
+    - bundle exec rake db:create db:schema:load db:migrate RAILS_ENV=test
 
 deployment:
   staging:

From 82b07be45535329fa36ae88e8ed486aab65bcaa4 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Mon, 10 Apr 2017 17:33:05 +0200
Subject: [PATCH 13/72] Fix a failing test, incompatible with the new
 DatabaseCleaner strategy

---
 spec/features/admin/procedure_creation_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/features/admin/procedure_creation_spec.rb b/spec/features/admin/procedure_creation_spec.rb
index 8081ca485..fbf76005a 100644
--- a/spec/features/admin/procedure_creation_spec.rb
+++ b/spec/features/admin/procedure_creation_spec.rb
@@ -67,7 +67,7 @@ feature 'As an administrateur I wanna create a new procedure', js: true do
 
       page.find_by_id('onglet-preview').trigger('click')
       expect(page).to have_current_path(admin_procedure_previsualisation_path(Procedure.first.id.to_s))
-      expect(page.find_by_id('champs_1')['placeholder']).to eq('libelle de champ')
+      expect(page.find("input[type='text']")['placeholder']).to eq('libelle de champ')
       expect(page.first('.piece-libelle').text).to eq('libelle de piece')
     end
 

From beea66ad301c30c45dcc3e0f2333f53f32e855a3 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Mon, 10 Apr 2017 17:54:29 +0200
Subject: [PATCH 14/72] Remove the sqlite3 gem

We now run tests with PostgreSQL
---
 Gemfile      | 1 -
 Gemfile.lock | 2 --
 2 files changed, 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 60952ee60..aaa5c392f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -116,7 +116,6 @@ group :test do
   gem 'guard-livereload', '~> 2.4', require: false
   gem 'vcr'
   gem 'rails-controller-testing'
-  gem 'sqlite3'
 end
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index c627a8b96..7cd099c9f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -574,7 +574,6 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
     swd (1.0.1)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
@@ -705,7 +704,6 @@ DEPENDENCIES
   spreadsheet_architect
   spring
   spring-commands-rspec
-  sqlite3
   therubyracer
   timecop
   turbolinks (~> 5.0)

From e120e58b07b9e59bfd5770c28a5e15ad8f1336d2 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Tue, 4 Apr 2017 13:33:43 +0200
Subject: [PATCH 15/72] Change the username and password for the development DB

---
 README.md           | 2 +-
 config/database.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index e33184bf1..b4b35074e 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Les informations nécessaire à l'initialisation de la base doivent être pré-c
 
     su - postgres
     psql
-    > create user tps with password 'lol' superuser;
+    > create user tps_development with password 'tps_development' superuser;
     > create user tps_test with password 'tps_test' superuser;
     > \q
 
diff --git a/config/database.yml b/config/database.yml
index 9f8cb0b14..f3163b7a2 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -4,8 +4,8 @@ development:
   database: tps_development
   host: localhost
   pool: 5
-  username: tps
-  password: lol
+  username: tps_development
+  password: tps_development
 
 
 test:

From d5fdd12da826e1c976b234e376ffb46026ed09eb Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Tue, 4 Apr 2017 13:34:01 +0200
Subject: [PATCH 16/72] Clean database.yml

---
 config/database.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/database.yml b/config/database.yml
index f3163b7a2..75dedfa2d 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -7,7 +7,6 @@ development:
   username: tps_development
   password: tps_development
 
-
 test:
   adapter: postgresql
   encoding: unicode

From e7e4e41e12b7b7d9f4938bb78893509448d7fd61 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 11:38:44 +0200
Subject: [PATCH 17/72] Haml Ruby evaluation tags must be followed by a space

---
 app/views/admin/accompagnateurs/show.html.haml   |  2 +-
 .../admin/change_dossier_state/check.html.haml   |  2 +-
 .../admin/gestionnaires/_informations.html.haml  |  2 +-
 app/views/admin/gestionnaires/_list.html.haml    |  2 +-
 app/views/admin/mail_templates/edit.html.haml    |  2 +-
 .../pieces_justificatives/_fields.html.haml      |  6 +++---
 .../admin/procedures/_informations.html.haml     |  8 ++++----
 .../admin/procedures/_modal_publish.html.haml    |  6 +++---
 app/views/admin/procedures/_onglets.html.haml    |  4 ++--
 app/views/admin/procedures/new.html.haml         |  2 +-
 app/views/admin/procedures/show.html.haml        | 10 +++++-----
 app/views/administrateurs/sessions/new.html.haml |  2 +-
 app/views/administrations/index.html.haml        |  4 ++--
 .../backoffice/dossiers/_filter_framed.html.haml |  2 +-
 .../backoffice/dossiers/_followers.html.haml     |  2 +-
 app/views/backoffice/dossiers/_list.html.haml    |  4 ++--
 .../backoffice/dossiers/_pref_list.html.haml     |  4 ++--
 .../dossiers/_state_description.html.haml        | 12 ++++++------
 app/views/backoffice/dossiers/index.html.haml    |  8 ++++----
 app/views/backoffice/dossiers/search.html.haml   |  2 +-
 app/views/dossiers/_infos_dossier.html.haml      | 12 ++++++------
 .../dossiers/_pieces_justificatives.html.haml    |  4 ++--
 app/views/dossiers/etapes/_etape1.html.haml      |  4 ++--
 .../etapes/etape_2/_individual.html.haml         |  2 +-
 app/views/layouts/_ie_lt_10.html.haml            |  4 ++--
 app/views/layouts/_navbar.html.haml              |  4 ++--
 app/views/layouts/application.html.haml          |  4 ++--
 ...admin_procedurescontroller_archived.html.haml |  2 +-
 ...el_admin_procedurescontroller_draft.html.haml |  2 +-
 ...el_admin_procedurescontroller_index.html.haml |  2 +-
 ...l_admin_procedurescontroller_navbar.html.haml |  6 +++---
 ...backoffice_dossierscontroller_index.html.haml |  2 +-
 ...anel_users_dossierscontroller_index.html.haml |  2 +-
 ...ar_admin_procedurescontroller_index.html.haml |  4 ++--
 ..._backoffice_dossierscontroller_show.html.haml |  2 +-
 .../navbars/_navbar_log_options.html.haml        |  8 ++++----
 app/views/root/landing.html.haml                 |  6 +++---
 app/views/users/carte/_init_carto.html.haml      |  2 +-
 app/views/users/carte/show.html.haml             | 12 ++++++------
 app/views/users/description/_champs.html.haml    |  6 +++---
 .../description/_pieces_justificatives.html.haml | 14 +++++++-------
 app/views/users/description/_show.html.haml      | 10 +++++-----
 .../champs/_header_private_section.html.haml     |  2 +-
 .../description/champs/_header_section.html.haml |  2 +-
 .../users/dossiers/_state_description.html.haml  | 16 ++++++++--------
 .../users/sessions/_resume_procedure.html.haml   |  4 ++--
 app/views/users/sessions/new.html.haml           |  2 +-
 47 files changed, 113 insertions(+), 113 deletions(-)

diff --git a/app/views/admin/accompagnateurs/show.html.haml b/app/views/admin/accompagnateurs/show.html.haml
index d62a10c54..eba44b222 100644
--- a/app/views/admin/accompagnateurs/show.html.haml
+++ b/app/views/admin/accompagnateurs/show.html.haml
@@ -13,7 +13,7 @@
             .row
               .col-xs-5
                 = hidden_field_tag :procedure_id, params[:procedure_id]
-                =render partial: 'admin/gestionnaires/informations', locals: {f: f}
+                = render partial: 'admin/gestionnaires/informations', locals: {f: f}
               .col-xs-2
                 %br
                 %br
diff --git a/app/views/admin/change_dossier_state/check.html.haml b/app/views/admin/change_dossier_state/check.html.haml
index 796518ae7..957c4f3c7 100644
--- a/app/views/admin/change_dossier_state/check.html.haml
+++ b/app/views/admin/change_dossier_state/check.html.haml
@@ -13,5 +13,5 @@
     %select{id: :next_state, name: :next_state}
       - Dossier.states.each do |state|
         %option{value: state[0]}
-          =DossierDecorator.case_state_fr state[1]
+          = DossierDecorator.case_state_fr state[1]
     = f.submit 'Valider'
diff --git a/app/views/admin/gestionnaires/_informations.html.haml b/app/views/admin/gestionnaires/_informations.html.haml
index b7c9a268c..f7246847c 100644
--- a/app/views/admin/gestionnaires/_informations.html.haml
+++ b/app/views/admin/gestionnaires/_informations.html.haml
@@ -1,4 +1,4 @@
--{email: 'Email*'}.each do |key, value|
+- {email: 'Email*'}.each do |key, value|
   .form-group
     %h4
       = value
diff --git a/app/views/admin/gestionnaires/_list.html.haml b/app/views/admin/gestionnaires/_list.html.haml
index 48cdd8f68..82f8ff862 100644
--- a/app/views/admin/gestionnaires/_list.html.haml
+++ b/app/views/admin/gestionnaires/_list.html.haml
@@ -11,7 +11,7 @@
           .delete.btn.btn-sm.fa.fa-trash
 
           .confirm
-            =link_to 'Valider', admin_gestionnaire_path(id: gestionnaire.id), {method: :delete, class: 'btn btn-sm btn-success'}
+            = link_to 'Valider', admin_gestionnaire_path(id: gestionnaire.id), {method: :delete, class: 'btn btn-sm btn-success'}
             .cancel.btn.btn-sm.btn-danger.fa.fa-minus{style: 'top: 0'}
 
   = smart_listing.paginate
diff --git a/app/views/admin/mail_templates/edit.html.haml b/app/views/admin/mail_templates/edit.html.haml
index 31ff8fd7f..8d72c9cc6 100644
--- a/app/views/admin/mail_templates/edit.html.haml
+++ b/app/views/admin/mail_templates/edit.html.haml
@@ -27,4 +27,4 @@
             %td.center
               = "--#{balise.first}--"
             %td
-              =balise.second[:description]
+              = balise.second[:description]
diff --git a/app/views/admin/pieces_justificatives/_fields.html.haml b/app/views/admin/pieces_justificatives/_fields.html.haml
index 7c7871a32..7cbdf5a99 100644
--- a/app/views/admin/pieces_justificatives/_fields.html.haml
+++ b/app/views/admin/pieces_justificatives/_fields.html.haml
@@ -2,16 +2,16 @@
   .form-inline
     .form-group
       %h4 Libellé
-      =ff.text_field :libelle, class: 'form-control libelle', placeholder: 'Libellé'
+      = ff.text_field :libelle, class: 'form-control libelle', placeholder: 'Libellé'
     .form-group
       %h4 Description
-      =ff.text_area :description, class: 'form-control description', placeholder: 'Description'
+      = ff.text_area :description, class: 'form-control description', placeholder: 'Description'
     .form-group
       %h4
         Lien du formulaire vierge
         %small
           (optionel)
-      =ff.url_field :lien_demarche, class: 'form-control', placeholder: 'Lien du document vierge'
+      = ff.url_field :lien_demarche, class: 'form-control', placeholder: 'Lien du document vierge'
 
     .form-group
       = ff.hidden_field :order_place, value: ff.index
diff --git a/app/views/admin/procedures/_informations.html.haml b/app/views/admin/procedures/_informations.html.haml
index b1aef83f2..5b62353d9 100644
--- a/app/views/admin/procedures/_informations.html.haml
+++ b/app/views/admin/procedures/_informations.html.haml
@@ -2,7 +2,7 @@
   .alert.alert-info
     Cette procédure est publiée, certains éléments de la description ne sont plus modifiables
 
--{libelle: 'Libellé*', description: 'Description*', organisation: 'Organisation', direction: 'Direction', lien_site_web: 'Lien site internet', lien_notice: 'Lien notice'}.each do |key, value|
+- {libelle: 'Libellé*', description: 'Description*', organisation: 'Organisation', direction: 'Direction', lien_site_web: 'Lien site internet', lien_notice: 'Lien notice'}.each do |key, value|
   .form-group
     %h4
       = value
@@ -26,7 +26,7 @@
     %h4 Drapeau européen
     .checkbox
       %label
-        =f.check_box :euro_flag
+        = f.check_box :euro_flag
         Afficher le drapeau européen
 
 - unless @procedure.locked?
@@ -37,7 +37,7 @@
       = f.fields_for :module_api_carto, @procedure.module_api_carto do |ff|
         .checkbox
           %label
-            =ff.check_box :use_api_carto, id: :procedure_module_api_carto_use_api_carto
+            = ff.check_box :use_api_carto, id: :procedure_module_api_carto_use_api_carto
             Utilisation de la cartographie
 
         %ul#modules_api_carto
@@ -67,7 +67,7 @@
       %h4 Particuliers
       .checkbox
         %label
-          =f.check_box :for_individual
+          = f.check_box :for_individual
           Cette procédure s'adresse à un public qui
           %b
             ne possède pas (ou pas encore) de numéro SIRET,
diff --git a/app/views/admin/procedures/_modal_publish.html.haml b/app/views/admin/procedures/_modal_publish.html.haml
index a241ae444..1749f2e77 100644
--- a/app/views/admin/procedures/_modal_publish.html.haml
+++ b/app/views/admin/procedures/_modal_publish.html.haml
@@ -6,12 +6,12 @@
           %button.close{"aria-label" => "Close", "data-dismiss" => "modal", :type => "button"}
             %span{"aria-hidden" => "true"} ×
           %h4#myModalLabel.modal-title
-            =@procedure.archived?? 'Réactiver' : 'Publier'
+            = @procedure.archived?? 'Réactiver' : 'Publier'
             la procédure
             %span#publishModal_title
         .modal-body
           Vous vous apprêtez à
-          =@procedure.archived?? 'republier' : 'publier'
+          = @procedure.archived?? 'republier' : 'publier'
           votre procédure au public.
           - unless @procedure.archived?
             %b
@@ -23,7 +23,7 @@
             %br
             %h4 Lien de la procédure
             %p.center
-              ="#{root_url}commencer/"
+              = "#{root_url}commencer/"
               = text_field_tag('procedure_path', @procedure.default_path,
                                 id: 'procedure_path',
                                 placeholder: 'Chemin vers la procédure',
diff --git a/app/views/admin/procedures/_onglets.html.haml b/app/views/admin/procedures/_onglets.html.haml
index ca258a54d..2caac8f1c 100644
--- a/app/views/admin/procedures/_onglets.html.haml
+++ b/app/views/admin/procedures/_onglets.html.haml
@@ -3,7 +3,7 @@
     %li{class: @draft_class}
       %a{:href => "#{url_for :admin_procedures_draft}"}
         %h5.text-primary
-          ="Brouillons"
+          = "Brouillons"
 
     %li{class: @active_class}
       %a{:href => "#{url_for :admin_procedures}"}
@@ -13,5 +13,5 @@
     %li{class: @archived_class}
       %a{:href => "#{url_for :admin_procedures_archived}"}
         %h5{style: 'color: black'}
-          ="Archivées"
+          = "Archivées"
 %br
diff --git a/app/views/admin/procedures/new.html.haml b/app/views/admin/procedures/new.html.haml
index b6c555d99..703f98e12 100644
--- a/app/views/admin/procedures/new.html.haml
+++ b/app/views/admin/procedures/new.html.haml
@@ -1,6 +1,6 @@
 .row.white-back
   %h2
-    =t('dynamics.admin.dossiers.tableau_de_bord.nouvelle_procedure')
+    = t('dynamics.admin.dossiers.tableau_de_bord.nouvelle_procedure')
 
   #procedure_new.section.section-label
     = form_for @procedure, url: {controller: 'admin/procedures', action: :create}, multipart: true do |f|
diff --git a/app/views/admin/procedures/show.html.haml b/app/views/admin/procedures/show.html.haml
index 7249a0ed6..e08f0a40e 100644
--- a/app/views/admin/procedures/show.html.haml
+++ b/app/views/admin/procedures/show.html.haml
@@ -1,6 +1,6 @@
 .row.white-back
   #procedure_show
-    -unless @facade.procedure.published?
+    - unless @facade.procedure.published?
       - if @facade.procedure.gestionnaires.size == 0
         %a.action_button.btn.btn-success{style:'float: right; margin-top: 10px', disabled: 'disabled', 'data-toggle' => :tooltip, title: 'Vous ne pouvez pas publier une procédure sans qu\'aucun accompagnateur ne soit affecté à celle-ci.', id: 'publish-procedure'}
           %i.fa.fa-eraser
@@ -10,13 +10,13 @@
           %i.fa.fa-eraser
           Publier
 
-      =render partial: '/admin/procedures/modal_publish'
+      = render partial: '/admin/procedures/modal_publish'
 
     %a#transfer.btn.btn-small.btn-default{"data-target" => "#transferModal", "data-toggle" => "modal", :type => "button", style:'float: right; margin-top: 10px; margin-right: 10px'}
       %i.fa.fa-exchange
       Transférer
 
-    =render partial: '/admin/procedures/modal_transfer'
+    = render partial: '/admin/procedures/modal_transfer'
 
     - if @facade.procedure.archived?
       %a#reenable.btn.btn-small.btn-default.text-info{"data-target" => "#publishModal", "data-toggle" => "modal", :type => "button", style:'float: right; margin-top: 10px'}
@@ -90,7 +90,7 @@
           %br
     %br
     %h3
-      =t('dynamics.admin.procedure.stats.title')
+      = t('dynamics.admin.procedure.stats.title')
 
     .row
       .col-xs-6{style:'margin-left:3%'}
@@ -129,4 +129,4 @@
         - if @facade.dossiers_for_pie_highchart.blank?
           Aucune statistique pour le moment
         - else
-          =pie_chart @facade.dossiers_for_pie_highchart
+          = pie_chart @facade.dossiers_for_pie_highchart
diff --git a/app/views/administrateurs/sessions/new.html.haml b/app/views/administrateurs/sessions/new.html.haml
index a2b8d0435..1d2a616cb 100644
--- a/app/views/administrateurs/sessions/new.html.haml
+++ b/app/views/administrateurs/sessions/new.html.haml
@@ -3,7 +3,7 @@
   = image_tag(image_url(LOGO_NAME))
   %br
   %h2#login_admin
-    =t('dynamics.admin.connexion_title')
+    = t('dynamics.admin.connexion_title')
 
   %br
   %br
diff --git a/app/views/administrations/index.html.haml b/app/views/administrations/index.html.haml
index 4e83c9cfc..0262424be 100644
--- a/app/views/administrations/index.html.haml
+++ b/app/views/administrations/index.html.haml
@@ -8,7 +8,7 @@
         = f.submit 'Créer un administrateur', class: 'btn btn-success', id: 'submit_new_administrateur'
 
     .text-center
-      =link_to 'Stats', administrations_stats_path, style: 'margin-bottom: 50px; display: block', 'data-no-turbolink': true
+      = link_to 'Stats', administrations_stats_path, style: 'margin-bottom: 50px; display: block', 'data-no-turbolink': true
 
     = smart_listing_render :admins
 
@@ -16,4 +16,4 @@
     %br
 
     .text-center
-      =link_to 'Deconnexion', '/administrations/sign_out', method: :delete
+      = link_to 'Deconnexion', '/administrations/sign_out', method: :delete
diff --git a/app/views/backoffice/dossiers/_filter_framed.html.haml b/app/views/backoffice/dossiers/_filter_framed.html.haml
index 5e8337870..393edbdeb 100644
--- a/app/views/backoffice/dossiers/_filter_framed.html.haml
+++ b/app/views/backoffice/dossiers/_filter_framed.html.haml
@@ -2,7 +2,7 @@
   .panel-heading
     = preference.libelle
 
-  =form_tag @facade_data_view.filter_url, {class: 'panel-body form-inline', method: :post} do
+  = form_tag @facade_data_view.filter_url, {class: 'panel-body form-inline', method: :post} do
     %input.form-control.filter_input{name: "filter_input[#{preference.table_attr}]", style:'width: 69%', value: "#{preference.filter}"}
     %button.btn.btn-sm.btn-success
       %i.fa.fa-check
diff --git a/app/views/backoffice/dossiers/_followers.html.haml b/app/views/backoffice/dossiers/_followers.html.haml
index c9cd2b528..633e2dcc1 100644
--- a/app/views/backoffice/dossiers/_followers.html.haml
+++ b/app/views/backoffice/dossiers/_followers.html.haml
@@ -1,5 +1,5 @@
 %h3
-  =t('dynamics.dossiers.followers.title')
+  = t('dynamics.dossiers.followers.title')
 
 %br
 .row
diff --git a/app/views/backoffice/dossiers/_list.html.haml b/app/views/backoffice/dossiers/_list.html.haml
index bf18a4ad2..c4c7a796d 100644
--- a/app/views/backoffice/dossiers/_list.html.haml
+++ b/app/views/backoffice/dossiers/_list.html.haml
@@ -11,7 +11,7 @@
         %th{class: "col-md-#{preference.bootstrap_lg} col-lg-#{preference.bootstrap_lg}"}
           - if preference.table.to_s.include? 'champs'
             = preference.libelle
-          -else
+          - else
             = smart_listing.sortable preference.libelle, preference.table_attr
           - if @facade_data_view.active_filter? preference
             %i.filter.fa.fa-filter{style: "color:#{(preference.filter.blank? ? 'grey' : 'orange')}", id: "filter_#{smart_listing.name.to_s}_#{preference.table_attr.sub('.', '_')}"}
@@ -54,7 +54,7 @@
         %td.center
           - if current_gestionnaire.follow?(dossier.id)
             = link_to('Quitter'.html_safe, backoffice_dossier_follow_path(dossier_id: dossier.id), 'data-method' => :put, class: 'btn-sm btn-danger', id: "suivre_dossier_#{dossier.id}")
-          -else
+          - else
             = link_to('Suivre', backoffice_dossier_follow_path(dossier_id: dossier.id), 'data-method' => :put, class: 'btn-sm btn-primary', id: "suivre_dossier_#{dossier.id}")
         %td.center{style:"color: #{dossier.total_follow == 0 ? 'red' : ''}"}
           = dossier.total_follow
diff --git a/app/views/backoffice/dossiers/_pref_list.html.haml b/app/views/backoffice/dossiers/_pref_list.html.haml
index 00fe0f247..1e171f124 100644
--- a/app/views/backoffice/dossiers/_pref_list.html.haml
+++ b/app/views/backoffice/dossiers/_pref_list.html.haml
@@ -1,10 +1,10 @@
 %button#pref_list_dossier_close_action.btn.btn-danger.btn-xs.fixed-right
   %i.fa.fa-close
 %h3
-  =t('dynamics.backoffice.pref_list.title')
+  = t('dynamics.backoffice.pref_list.title')
 
 %p{style:'margin-top: 15px; margin-bottom: 20px'}
-  =t('dynamics.backoffice.pref_list.description')
+  = t('dynamics.backoffice.pref_list.description')
 
 %h4.text-primary
   Actuelles
diff --git a/app/views/backoffice/dossiers/_state_description.html.haml b/app/views/backoffice/dossiers/_state_description.html.haml
index 60ac57068..1b726ba0d 100644
--- a/app/views/backoffice/dossiers/_state_description.html.haml
+++ b/app/views/backoffice/dossiers/_state_description.html.haml
@@ -5,17 +5,17 @@
         .col-md-1.col-lg-1.col-sm-1.col-xs-1.col-sm-1.col-xs-1
           .fa.fa-info-circle.text-info{style:'font-size: 2em; margin-top: 20%'}
         .col-xs-11
-          -if dossiers_list_facade.liste == 'nouveaux'
+          - if dossiers_list_facade.liste == 'nouveaux'
             Tous les dossiers présents dans cette liste sont ceux qui
             %b
               n'ont jamais été ouvert par votre service.
             Il attende une première lecture et intervention de votre part.
-          -elsif dossiers_list_facade.liste == 'a_traiter'
+          - elsif dossiers_list_facade.liste == 'a_traiter'
             Tous les dossiers présents dans cette liste sont ceux qui sont
             %b
               en cours de construction avec l'usager.
             Ils ne sont pas figés et ne sont donc pas complets.
-          -elsif dossiers_list_facade.liste == 'fige'
+          - elsif dossiers_list_facade.liste == 'fige'
             Tous les dossiers présents dans cette liste ont été déclarés
             %b
               complets
@@ -23,14 +23,14 @@
             %b
               plus modifiables par l'usager.
             Ils attendent donc leurs dépots officiels qui doit être effectué par l'usager.
-          -elsif dossiers_list_facade.liste == 'deposes'
+          - elsif dossiers_list_facade.liste == 'deposes'
             Tous les dossiers présents dans cette liste ont été
             %b
               officiellement déposé par l'usager pour examen.
             Il faut donc que vous confirmiez par "accusé de réception" la bonne réception de toutes les informations et documents demandés avant examen final.
-          -elsif dossiers_list_facade.liste == 'a_instruire'
+          - elsif dossiers_list_facade.liste == 'a_instruire'
             Tous les dossiers présents dans cette liste sont à instruire. Ceux sont tous les dossiers
             %b
               qui ont reçu bonne réception.
-          -elsif dossiers_list_facade.liste == 'termine'
+          - elsif dossiers_list_facade.liste == 'termine'
             Tous les dossiers présents dans cette liste sont considérés comme cloturé car ils ont tous reçu un verdict final qui peut être "Validé", "Refusé" ou "Sans suite".
diff --git a/app/views/backoffice/dossiers/index.html.haml b/app/views/backoffice/dossiers/index.html.haml
index 561c8df4b..e1ce91192 100644
--- a/app/views/backoffice/dossiers/index.html.haml
+++ b/app/views/backoffice/dossiers/index.html.haml
@@ -16,13 +16,13 @@
 
   .row.center
     .col-xs-3
-      =link_to 'Tous les états', '?liste=all_state', class: 'text-info', style:"text-decoration: #{@facade_data_view.liste == 'all_state'? 'underline' : ''}"
+      = link_to 'Tous les états', '?liste=all_state', class: 'text-info', style:"text-decoration: #{@facade_data_view.liste == 'all_state'? 'underline' : ''}"
     .col-xs-3
-      =link_to 'En construction', '?liste=a_traiter', class: 'text-danger', style:"text-decoration: #{@facade_data_view.liste == 'a_traiter'? 'underline' : ''}"
+      = link_to 'En construction', '?liste=a_traiter', class: 'text-danger', style:"text-decoration: #{@facade_data_view.liste == 'a_traiter'? 'underline' : ''}"
     .col-xs-3
-      =link_to  'En instruction', '?liste=a_instruire', class: 'text-warning', style:"text-decoration: #{@facade_data_view.liste == 'a_instruire'? 'underline' : ''}"
+      = link_to  'En instruction', '?liste=a_instruire', class: 'text-warning', style:"text-decoration: #{@facade_data_view.liste == 'a_instruire'? 'underline' : ''}"
     .col-xs-3
-      =link_to  'Terminés', '?liste=termine', class: 'text-success', style:"text-decoration: #{@facade_data_view.liste == 'termine'? 'underline' : ''}"
+      = link_to  'Terminés', '?liste=termine', class: 'text-success', style:"text-decoration: #{@facade_data_view.liste == 'termine'? 'underline' : ''}"
 
   .default_data_block.default_visible
     .row.show-block#follow_dossiers
diff --git a/app/views/backoffice/dossiers/search.html.haml b/app/views/backoffice/dossiers/search.html.haml
index 8700346d4..32713d212 100644
--- a/app/views/backoffice/dossiers/search.html.haml
+++ b/app/views/backoffice/dossiers/search.html.haml
@@ -10,7 +10,7 @@
           %div.carret-down
           Résultat de la recherche
         %div.col-lg-2.col-md-2.col-sm-2.col-xs-2.count
-          =@dossiers.count
+          = @dossiers.count
           dossiers
       %div.body
         = smart_listing_render :search
diff --git a/app/views/dossiers/_infos_dossier.html.haml b/app/views/dossiers/_infos_dossier.html.haml
index 39772f897..063e4f671 100644
--- a/app/views/dossiers/_infos_dossier.html.haml
+++ b/app/views/dossiers/_infos_dossier.html.haml
@@ -43,10 +43,10 @@
     - if @facade.dossier.mandataire_social && gestionnaire_signed_in?
       .mandataire_social.text-success.center
         %br
-        ="Il est probable que le soumissionnaire du dossier soit un des mandataire social de l'entreprise ("
+        = "Il est probable que le soumissionnaire du dossier soit un des mandataire social de l'entreprise ("
         %b
-          ="#{@facade.dossier.user.given_name} #{@facade.dossier.user.family_name}"
-        =")"
+          = "#{@facade.dossier.user.given_name} #{@facade.dossier.user.family_name}"
+        = ")"
 %div.row
   - if @facade.procedure.cerfa_flag? || @facade.dossier.types_de_piece_justificative.count > 0
     .col-xs-12
@@ -124,7 +124,7 @@
                   %th
                     Lien
                 %thead.tr_content#cerfa
-                  -if @facade.procedure.cerfa_flag?
+                  - if @facade.procedure.cerfa_flag?
                     - if @facade.dossier.cerfa_available?
                       - @facade.cerfas_ordered.each do |cerfa|
                         %tr
@@ -133,7 +133,7 @@
                           %td.col-md-6.col-sm-6.col-xs-6.col-lg-4
                             = cerfa.created_at
                           %td.col-md-6.col-sm-6.col-xs-6.col-lg-4
-                            =link_to 'Récupérer', cerfa.content_url, {target: :blank}
+                            = link_to 'Récupérer', cerfa.content_url, {target: :blank}
                 - @facade.dossier.types_de_piece_justificative.each do |type_de_piece_justificative|
                   %tbody.tr_content{id: "type_de_pj_#{type_de_piece_justificative.id}"}
                     - @facade.dossier.retrieve_all_piece_justificative_by_type(type_de_piece_justificative.id).each do |piece_justificative|
@@ -143,7 +143,7 @@
                         %td.col-md-6.col-sm-6.col-xs-6.col-lg-4
                           = piece_justificative.created_at
                         %td.col-md-6.col-sm-6.col-xs-6.col-lg-4
-                          =link_to 'Récupérer', piece_justificative.content_url, {target: :blank}
+                          = link_to 'Récupérer', piece_justificative.content_url, {target: :blank}
             .modal-footer
 
 #modalCommentairesDossierParChamp.modal.fade{"tabindex" => -1, "role" => "dialog"}
diff --git a/app/views/dossiers/_pieces_justificatives.html.haml b/app/views/dossiers/_pieces_justificatives.html.haml
index 888c65b1a..4cdda96bd 100644
--- a/app/views/dossiers/_pieces_justificatives.html.haml
+++ b/app/views/dossiers/_pieces_justificatives.html.haml
@@ -3,7 +3,7 @@
     - if @facade.procedure.cerfa_flag?
       %tr{id: "piece_justificative_0"}
         %th{class:'col-lg-6'}
-          ='Formulaire'
+          = 'Formulaire'
         %td.col-lg-6.col-md-6.col-sm-6.col-xs-6
           - if @facade.dossier.cerfa_available?
             %a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter
@@ -42,4 +42,4 @@
             = 'Pièce non fournie'
 
   -#- if gestionnaire_signed_in?
-  =render partial: '/dossiers/modal_historique'
+  = render partial: '/dossiers/modal_historique'
diff --git a/app/views/dossiers/etapes/_etape1.html.haml b/app/views/dossiers/etapes/_etape1.html.haml
index 784796e4b..98efbc2ae 100644
--- a/app/views/dossiers/etapes/_etape1.html.haml
+++ b/app/views/dossiers/etapes/_etape1.html.haml
@@ -4,10 +4,10 @@
   #logos.center{class: (@facade.entreprise.nil? ? '' : 'mask')}
     - if @facade.procedure.euro_flag
       #euro_flag.flag
-        =image_tag('drapeau_europe.png')
+        = image_tag('drapeau_europe.png')
 
     #logo_procedure.flag
-      =image_tag( @facade.procedure.decorate.logo_img )
+      = image_tag( @facade.procedure.decorate.logo_img )
 
 .etape.etapes_informations.col-xs-9
   .row
diff --git a/app/views/dossiers/etapes/etape_2/_individual.html.haml b/app/views/dossiers/etapes/etape_2/_individual.html.haml
index 48bc13797..d6b78e478 100644
--- a/app/views/dossiers/etapes/etape_2/_individual.html.haml
+++ b/app/views/dossiers/etapes/etape_2/_individual.html.haml
@@ -38,7 +38,7 @@
             = f.check_box :autorisation_donnees
             = "&nbsp;".html_safe
             Vos informations personnelles ne seront jamais utilisées dans un but lucratif ou commercial. Elles ne pourront être communiquées à de tiers personnes sans votre accord préalable. Elles pourront en revanche être communiquées aux administrations compétentes afin d'instruire votre dossier, conformément à la déclaration CNIL effectué par le service TPS.
-            =link_to 'en savoir plus', cgu_path, target: '_blank'
+            = link_to 'en savoir plus', cgu_path, target: '_blank'
     .row
       .col-xs-5.col-xs-5
       .col-xs-2.col-xs-2
diff --git a/app/views/layouts/_ie_lt_10.html.haml b/app/views/layouts/_ie_lt_10.html.haml
index 1c2ebbad5..81ae102b6 100644
--- a/app/views/layouts/_ie_lt_10.html.haml
+++ b/app/views/layouts/_ie_lt_10.html.haml
@@ -1,8 +1,8 @@
-="<!--[if lt IE 10]>".html_safe
+= "<!--[if lt IE 10]>".html_safe
 
 %div.center{style:'width: 100%; background-color: white; position: fixed; top:0; left:0; z-index: 100000'}
   %h3.text-danger
     %b
       Votre version d'Internet Explorer est trop ancienne pour être utilisée sur le service TPS. Version minimum : Internet Explorer 10
 
-="<![endif]-->".html_safe
+= "<![endif]-->".html_safe
diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml
index e06e7ac45..b4ab94f15 100644
--- a/app/views/layouts/_navbar.html.haml
+++ b/app/views/layouts/_navbar.html.haml
@@ -9,9 +9,9 @@
 .col-xs-10.no-padding
   #navbar-body
     .row
-      -begin
+      - begin
         = render partial: @navbar_url
-      -rescue
+      - rescue
         = render partial: 'layouts/navbars/navbar_default'
 
       = render partial: 'layouts/navbars/navbar_log_options'
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index ab1caee1b..96010a34f 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -3,7 +3,7 @@
     %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
     %meta{ name: "turbolinks-cache-control", content: "no-cache" }
     %title
-      =t('dynamics.page_title')
+      = t('dynamics.page_title')
     %meta{'http-equiv' => "X-UA-Compatible", :content => "IE=edge"}
 
     = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
@@ -44,7 +44,7 @@
         - else
           - main_container_size = 12
 
-        =render partial: 'layouts/main_container', locals: {main_container_size: main_container_size}
+        = render partial: 'layouts/main_container', locals: {main_container_size: main_container_size}
     #mask_search
       %h1
         %i.fa.fa-times{style:'position: fixed; top: 10; right: 30; color: white;'}
diff --git a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_archived.html.haml b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_archived.html.haml
index 36682366a..fb215e59f 100644
--- a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_archived.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_archived.html.haml
@@ -1 +1 @@
-=render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_index'
+= render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_index'
diff --git a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_draft.html.haml b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_draft.html.haml
index 36682366a..fb215e59f 100644
--- a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_draft.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_draft.html.haml
@@ -1 +1 @@
-=render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_index'
+= render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_index'
diff --git a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml
index c246b2d97..be385802c 100644
--- a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml
@@ -23,7 +23,7 @@
 
     %a{:href => "#{url_for :admin_procedures_archived}", id: "archived-procedures"}
       %div.procedure_list_element{class: @archived_class}
-        ="Archivées"
+        = "Archivées"
         .badge.progress-bar-purple
           = current_administrateur.procedures.where(archived: true).count
 
diff --git a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml
index fe18dc18d..f59bb061e 100644
--- a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml
@@ -1,9 +1,9 @@
 %div#first-block
   %div.en-cours
-    -unless @procedure.logo.blank?
+    - unless @procedure.logo.blank?
       = image_tag @procedure.decorate.logo_img, style: 'width: 30px'
     %b
-      =@procedure.libelle
+      = @procedure.libelle
 
 %div#action-block
 
@@ -16,7 +16,7 @@
 
     %a{:href => "#{url_for admin_procedure_accompagnateurs_path(@procedure)}", id: 'onglet-accompagnateurs'}
       %div.procedure_list_element{class: ('active' if active == 'Accompagnateurs')}
-        =t('dynamics.admin.procedure.onglets.accompagnateurs')
+        = t('dynamics.admin.procedure.onglets.accompagnateurs')
 
     %a{:href => "#{url_for edit_admin_procedure_path(@procedure)}", id: 'onglet-description'}
       %div.procedure_list_element{class: ('active' if active == 'Description')}
diff --git a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml
index 6f8b17d10..32f2d44b3 100644
--- a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml
@@ -29,7 +29,7 @@
           - if total_new > 0
             .badge.progress-bar-success{title:'Nouveaux dossiers'}
               = total_new
-          -if procedure[:unread_notifications] > 0
+          - if procedure[:unread_notifications] > 0
             .badge.progress-bar-warning{title: 'Notifications'}
               = procedure[:unread_notifications]
   #notifications_list.hidden
diff --git a/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml
index a6f39fe6d..04a7b90ec 100644
--- a/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml
@@ -25,7 +25,7 @@
 
       %a{:href => "#{url_for users_dossiers_path(liste: 'en_instruction')}", 'data-toggle' => :tooltip, title: 'Les dossiers en cours d\'examen par l\'administration compétante.'}
         %div.procedure_list_element{ class: @dossiers_list_facade.en_instruction_class, id: 'en_instruction' }
-          ="En instruction"
+          = "En instruction"
           .badge.progress-bar-default
             = @dossiers_list_facade.en_instruction_total
 
diff --git a/app/views/layouts/navbars/_navbar_admin_procedurescontroller_index.html.haml b/app/views/layouts/navbars/_navbar_admin_procedurescontroller_index.html.haml
index 13fdaf3c7..becba7d6a 100644
--- a/app/views/layouts/navbars/_navbar_admin_procedurescontroller_index.html.haml
+++ b/app/views/layouts/navbars/_navbar_admin_procedurescontroller_index.html.haml
@@ -13,12 +13,12 @@
           = link_to(admin_procedures_path, id: :menu_item_procedure) do
             %i.fa.fa-list{ style: "background-size: 10px;"}
             &nbsp;
-            =t('dynamics.admin.menu.procedures')
+            = t('dynamics.admin.menu.procedures')
         %li
           = link_to(admin_gestionnaires_path) do
             %i.fa.fa-user
             &nbsp;
-            =t('dynamics.admin.menu.accompagnateurs')
+            = t('dynamics.admin.menu.accompagnateurs')
         %li.divider{ role: :separator}
         %li
           = link_to(admin_profile_path, id: :profile) do
diff --git a/app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml b/app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml
index d6c9f218f..55500a0be 100644
--- a/app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml
+++ b/app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml
@@ -8,7 +8,7 @@
         = link_to backoffice_dossier_follow_path(dossier_id: @facade.dossier.id), "data-method" => :put, class: "button-navbar-action",id: "suivre_dossier_#{@facade.dossier.id}" do
           %i.fa.fa-user-times
           Ne plus suivre
-      -else
+      - else
         = link_to backoffice_dossier_follow_path(dossier_id: @facade.dossier.id), 'data-method' => :put, class: 'button-navbar-action', id: "suivre_dossier_#{@facade.dossier.id}" do
           %i.fa.fa-user-plus
           Suivre le dossier
diff --git a/app/views/layouts/navbars/_navbar_log_options.html.haml b/app/views/layouts/navbars/_navbar_log_options.html.haml
index 56d847d1c..6d04a698a 100644
--- a/app/views/layouts/navbars/_navbar_log_options.html.haml
+++ b/app/views/layouts/navbars/_navbar_log_options.html.haml
@@ -1,15 +1,15 @@
--if user_signed_in?
+- if user_signed_in?
   #sign_out.col-xs-2.no-padding
     = render partial: 'users/login_banner'
     = render partial: 'layouts/credentials'
--elsif gestionnaire_signed_in?
+- elsif gestionnaire_signed_in?
   #sign_out.col-xs-2.no-padding
     = render partial: 'gestionnaires/login_banner'
     = render partial: 'layouts/credentials'
--elsif administrateur_signed_in?
+- elsif administrateur_signed_in?
   #sign_out.col-xs-2.no-padding
     = render partial: 'administrateurs/login_banner'
     = render partial: 'layouts/credentials'
--else
+- else
   #sign_in.col-xs-2
     = link_to "Connexion", new_user_session_path, :class => 'btn btn-lg btn-primary'
diff --git a/app/views/root/landing.html.haml b/app/views/root/landing.html.haml
index 2326d629d..4ca3c7355 100644
--- a/app/views/root/landing.html.haml
+++ b/app/views/root/landing.html.haml
@@ -46,17 +46,17 @@
     .col-md-4.col-lg-4
       %h3.text-primary Acteurs publics
       %h4 Créez des démarches en ligne simplifiées et sécurisées.
-      =link_to 'Démonstration', "#{@demo_environment_host}/administrateurs/sign_in/demo", {class: 'btn btn-lg btn-primary'}
+      = link_to 'Démonstration', "#{@demo_environment_host}/administrateurs/sign_in/demo", {class: 'btn btn-lg btn-primary'}
 
     .col-md-4.col-lg-4
       %h3.text-warning Agents et services
       %h4 Accompagnez et co-traitez les projets avec les usagers.
-      =link_to 'Démonstration', "#{@demo_environment_host}/gestionnaires/sign_in/demo", {class: 'btn btn-lg btn-warning'}
+      = link_to 'Démonstration', "#{@demo_environment_host}/gestionnaires/sign_in/demo", {class: 'btn btn-lg btn-warning'}
 
     .col-md-4.col-lg-4
       %h3.text-success Usagers
       %h4 Profitez de démarches simplifiées et d’échanges continus avec les services traitants.
-      =link_to 'Démonstration', "#{@demo_environment_host}/users/sign_in/demo", {class: 'btn btn-lg btn-success'}
+      = link_to 'Démonstration', "#{@demo_environment_host}/users/sign_in/demo", {class: 'btn btn-lg btn-success'}
 
   .split-hr-left
 
diff --git a/app/views/users/carte/_init_carto.html.haml b/app/views/users/carte/_init_carto.html.haml
index 8516fe270..533f121ec 100644
--- a/app/views/users/carte/_init_carto.html.haml
+++ b/app/views/users/carte/_init_carto.html.haml
@@ -1,3 +1,3 @@
 %script{type: 'text/javascript'}
-  ="var dossier_id =#{dossier.id}"
+  = "var dossier_id =#{dossier.id}"
   $(document).on('turbolinks:load', initCarto);
diff --git a/app/views/users/carte/show.html.haml b/app/views/users/carte/show.html.haml
index ca76d5f34..860a44b03 100644
--- a/app/views/users/carte/show.html.haml
+++ b/app/views/users/carte/show.html.haml
@@ -1,7 +1,7 @@
 .row#carto_page
   .col-lg-12.col-md-12.col-sm-12.col-xs-12
     %h2
-      ='Localisation'
+      = 'Localisation'
     %h4.text-primary
       Positionnez-vous et dessinez sur la carte la zone d'action de votre demande.
     %br
@@ -16,7 +16,7 @@
       %br
       %br
 
-      =render partial: 'users/carte/map', locals: {dossier: @dossier}
+      = render partial: 'users/carte/map', locals: {dossier: @dossier}
 
       = form_tag(url_for({controller: :carte, action: :save, dossier_id: @dossier.id}), class: 'form-inline', method: 'POST') do
         %br
@@ -24,9 +24,9 @@
         %input{id: 'quartier_prioritaires', type:'hidden', value: "#{@dossier.quartier_prioritaires.to_json}"}
         %input{id: 'cadastres', type:'hidden', value: "#{@dossier.cadastres.to_json}"}
 
-        -if @dossier.draft?
-          =render partial: '/layouts/etape_suivante'
-        -else
-          =render partial: '/layouts/modifications_terminees'
+        - if @dossier.draft?
+          = render partial: '/layouts/etape_suivante'
+        - else
+          = render partial: '/layouts/modifications_terminees'
 
     = render partial: 'users/carte/init_carto', locals: {dossier: @dossier}
diff --git a/app/views/users/description/_champs.html.haml b/app/views/users/description/_champs.html.haml
index 7ee565d10..2d7f6faf6 100644
--- a/app/views/users/description/_champs.html.haml
+++ b/app/views/users/description/_champs.html.haml
@@ -4,11 +4,11 @@
 
 - unless @headers.blank?
   - if @champs.first.type_champ != 'header_section'
-    =render partial: render_partial_url, locals: {libelle: 'Dossier', order_place: -1, champs: @champs}
+    = render partial: render_partial_url, locals: {libelle: 'Dossier', order_place: -1, champs: @champs}
   - @headers.each do |header|
     .row
       %div{class: "type_champ-#{header.type_champ}"}
-        =render partial: render_partial_url, locals: {libelle: header.libelle, order_place: header.order_place, champs: @champs}
+        = render partial: render_partial_url, locals: {libelle: header.libelle, order_place: header.order_place, champs: @champs}
 - else
   .row
-    =render partial: render_partial_url, locals: {libelle: 'Dossier', order_place: -1, champs: @champs}
+    = render partial: render_partial_url, locals: {libelle: 'Dossier', order_place: -1, champs: @champs}
diff --git a/app/views/users/description/_pieces_justificatives.html.haml b/app/views/users/description/_pieces_justificatives.html.haml
index c7905af28..4e9877ba3 100644
--- a/app/views/users/description/_pieces_justificatives.html.haml
+++ b/app/views/users/description/_pieces_justificatives.html.haml
@@ -4,18 +4,18 @@
       %th
         Formulaire de demande ou CERFA (complété et numérisé)
       %td
-        -unless dossier.procedure.lien_demarche.blank?
+        - unless dossier.procedure.lien_demarche.blank?
           %em
             Récupérer le formulaire de demande ou CERFA vierge pour mon dossier :
             = link_to "Télécharger", "#{dossier.procedure.lien_demarche}", target: :blank, id: :lien_cerfa
             -# %a{ id: 'lien_cerfa', href: "#{dossier.procedure.lien_demarche}", target: '_blank'} Télécharger
 
       %td
-        -if dossier.cerfa_available?
+        - if dossier.cerfa_available?
           %span.btn.btn-sm.btn-file.btn-success
             Modifier
             %input{type: 'file', name:'cerfa_pdf', id:'cerfa_pdf', accept: PieceJustificative.accept_format, :max_file_size => 6.megabytes }
-        -else
+        - else
           %input{type: 'file', name:'cerfa_pdf', id:'cerfa_pdf', accept:  PieceJustificative.accept_format, :max_file_size => 6.megabytes }
 
   - dossier.types_de_piece_justificative.order('order_place ASC').each do |type_de_piece_justificative|
@@ -30,12 +30,12 @@
             = link_to "Télécharger", type_de_piece_justificative.lien_demarche, target: :blank
 
       %td
-        -if type_de_piece_justificative.api_entreprise
+        - if type_de_piece_justificative.api_entreprise
           %span.text-success{ id: "piece_justificative_#{type_de_piece_justificative.id}" } Nous l'avons récupéré pour vous.
-        -else
-          -if dossier.retrieve_last_piece_justificative_by_type(type_de_piece_justificative.id).nil?
+        - else
+          - if dossier.retrieve_last_piece_justificative_by_type(type_de_piece_justificative.id).nil?
             = file_field_tag "piece_justificative_#{type_de_piece_justificative.id}", accept:  PieceJustificative.accept_format, :max_file_size => 6.megabytes
-          -else
+          - else
             %span.btn.btn-sm.btn-file.btn-success
               Modifier
               = file_field_tag "piece_justificative_#{type_de_piece_justificative.id}", accept:  PieceJustificative.accept_format, :max_file_size => 6.megabytes
diff --git a/app/views/users/description/_show.html.haml b/app/views/users/description/_show.html.haml
index ac21a126e..5a5309090 100644
--- a/app/views/users/description/_show.html.haml
+++ b/app/views/users/description/_show.html.haml
@@ -8,7 +8,7 @@
               .fa.fa-info-circle.text-info{style:'font-size: 2em; margin-top: 20%'}
             .col-xs-10{style:'padding-right: 0px'}
               %b
-                =link_to 'Accéder au guide', @dossier.procedure.lien_notice, {target: '_blank'}
+                = link_to 'Accéder au guide', @dossier.procedure.lien_notice, {target: '_blank'}
               pour remplir pour votre dossier
 
   %h2.text-info
@@ -16,11 +16,11 @@
 
   -#TODO use form_for
   = form_tag(url_for({controller: 'users/description', action: :update, dossier_id: @dossier.id}), class: 'form', method: 'POST', multipart: true) do
-    -unless @champs.nil?
+    - unless @champs.nil?
       #liste_champs
-        =render partial: 'users/description/champs', locals:{private: false}
+        = render partial: 'users/description/champs', locals:{private: false}
 
-    -if !@procedure.lien_demarche.blank? || @procedure.cerfa_flag || @dossier.types_de_piece_justificative.size > 0
+    - if !@procedure.lien_demarche.blank? || @procedure.cerfa_flag || @dossier.types_de_piece_justificative.size > 0
       %br
       %h3 Pièces jointes
 
@@ -30,7 +30,7 @@
       .col-lg-8
         = render partial: 'users/description/pieces_justificatives', locals: { dossier: @dossier }
 
-    -route = Rails.application.routes.recognize_path(request.referrer) # WTF ?
+    - route = Rails.application.routes.recognize_path(request.referrer) # WTF ?
     - unless route[:controller].match('admin')
       %div{style: 'text-align:right'}
         %h6 Tous les champs portant un * sont obligatoires.
diff --git a/app/views/users/description/champs/_header_private_section.html.haml b/app/views/users/description/champs/_header_private_section.html.haml
index f1ec1ce8f..b5be240c6 100644
--- a/app/views/users/description/champs/_header_private_section.html.haml
+++ b/app/views/users/description/champs/_header_private_section.html.haml
@@ -2,5 +2,5 @@
   .col-lg-12.col-md-12.col-sm-12.col-xs-12
     %br
     %h3.text-info
-      =libelle
+      = libelle
     = render partial: 'users/description/champs/render_list_champs', locals: {champs: champs, order_place: order_place}
diff --git a/app/views/users/description/champs/_header_section.html.haml b/app/views/users/description/champs/_header_section.html.haml
index cc2c1099f..8415bfdee 100644
--- a/app/views/users/description/champs/_header_section.html.haml
+++ b/app/views/users/description/champs/_header_section.html.haml
@@ -4,6 +4,6 @@
       .col-xs-12.title
         .carret-right
         .carret-down
-        =libelle
+        = libelle
     .body
       = render partial: 'users/description/champs/render_list_champs', locals: {champs: champs, order_place: order_place}
diff --git a/app/views/users/dossiers/_state_description.html.haml b/app/views/users/dossiers/_state_description.html.haml
index 6d66eb71b..8ef35af08 100644
--- a/app/views/users/dossiers/_state_description.html.haml
+++ b/app/views/users/dossiers/_state_description.html.haml
@@ -5,33 +5,33 @@
         .col-md-1.col-lg-1.col-sm-1.col-xs-1
           .fa.fa-info-circle.text-info{style:'font-size: 2em; margin-top: 20%'}
         .col-xs-11
-          -if dossiers_list_facade.liste == 'brouillon'
+          - if dossiers_list_facade.liste == 'brouillon'
             Les dossiers présents dans cette liste
             %b
               n'ont pas encore été soumis aux services instructeurs.
             Ils ne sont visibles que par vous.
-          -elsif dossiers_list_facade.liste == 'nouveaux'
+          - elsif dossiers_list_facade.liste == 'nouveaux'
             Les dossiers présents dans cette liste
             %b
               n'ont pas encore été ouverts
             par les services instructeurs. Une notification vous sera envoyée quand votre demande aura été étudiée.
-          -elsif dossiers_list_facade.liste == 'a_traiter'
+          - elsif dossiers_list_facade.liste == 'a_traiter'
             Les dossiers présents dans cette liste sont
             %b
               visibles par les services instructeurs.
             %br
             Ces dossiers ne sont pas encore figés et peuvent être modifiés à souhait.
-          -elsif dossiers_list_facade.liste == 'en_attente'
+          - elsif dossiers_list_facade.liste == 'en_attente'
             Les dossiers présents dans cette liste sont
             %b
               en cours de relecture par les services instructeurs.
             Il reviendra vers vous si des informations ou documents sont manquants pour le futur examen de votre dossier.
-          -elsif dossiers_list_facade.liste == 'valides'
+          - elsif dossiers_list_facade.liste == 'valides'
             Les dossiers présents dans cette liste ont été
             %b
               relus et considérés comme complets
             pour examen par les services instructeurs. Ceux-ci ne peuvent maintenant plus être modifiés. Il faut que vous procédiez à leur dépôt afin qu'une décision finale soit rendue.
-          -elsif dossiers_list_facade.liste == 'en_instruction'
+          - elsif dossiers_list_facade.liste == 'en_instruction'
             Les dossiers présents dans cette liste sont
             %b
               en cours de réception
@@ -39,12 +39,12 @@
             %b
               en cours d'examen
             par les services instructeurs. Une notification vous sera envoyée une fois qu'une décision aura été rendue.
-          -elsif dossiers_list_facade.liste == 'termine'
+          - elsif dossiers_list_facade.liste == 'termine'
             Les dossiers présents dans cette liste sont ceux qui ont été instruits et pour lesquels
             %b
               une décision finale a été rendue.
             Ils peuvent posséder trois états différents : Accepté, Refusé ou Sans Suite.
-          -elsif dossiers_list_facade.liste == 'invite'
+          - elsif dossiers_list_facade.liste == 'invite'
             Les dossiers présents dans cette liste sont ceux
             %b
               auxquels vous avez été invités
diff --git a/app/views/users/sessions/_resume_procedure.html.haml b/app/views/users/sessions/_resume_procedure.html.haml
index 590169cad..d05af8c9c 100644
--- a/app/views/users/sessions/_resume_procedure.html.haml
+++ b/app/views/users/sessions/_resume_procedure.html.haml
@@ -5,10 +5,10 @@
 
       - if @dossier.procedure.euro_flag
         #euro_flag.flag
-          =image_tag('drapeau_europe.png')
+          = image_tag('drapeau_europe.png')
 
       #logo_procedure.flag
-        =image_tag( @dossier.procedure.decorate.logo_img )
+        = image_tag( @dossier.procedure.decorate.logo_img )
 
       %h2#titre_procedure.text-info
         = @dossier.procedure.libelle
diff --git a/app/views/users/sessions/new.html.haml b/app/views/users/sessions/new.html.haml
index 30847c93e..fd7e38efb 100644
--- a/app/views/users/sessions/new.html.haml
+++ b/app/views/users/sessions/new.html.haml
@@ -3,7 +3,7 @@
   = render partial: 'users/sessions/resume_procedure'
 
   %h2#login_user
-    =t('dynamics.users.connexion_title')
+    = t('dynamics.users.connexion_title')
 
   %a.btn_fc#btn_fcp{href: '/france_connect/particulier'}
     = image_tag 'franceconnect_logo.png'

From a3d04fe7a90fad73569513bce9ae1642da2441ad Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 11:40:34 +0200
Subject: [PATCH 18/72] Html Ruby evaluation tags must be followed by a single
 space

---
 app/views/dossiers/etapes/_etape2.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/dossiers/etapes/_etape2.html.haml b/app/views/dossiers/etapes/_etape2.html.haml
index fde33f55f..0c18f10e7 100644
--- a/app/views/dossiers/etapes/_etape2.html.haml
+++ b/app/views/dossiers/etapes/_etape2.html.haml
@@ -1,4 +1,4 @@
 - if @facade.procedure.for_individual?
-  =  render partial: 'dossiers/etapes/etape_2/individual'
+  = render partial: 'dossiers/etapes/etape_2/individual'
 - else
   = render partial: 'dossiers/etapes/etape_2/entreprise'

From 7e067c26241bef732f7bcc2ac8376f9df83d34b4 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 11:39:35 +0200
Subject: [PATCH 19/72] Static classes attribute must use the inline tag syntax

---
 app/views/dossiers/_pieces_justificatives.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/dossiers/_pieces_justificatives.html.haml b/app/views/dossiers/_pieces_justificatives.html.haml
index 4cdda96bd..7b703c2b1 100644
--- a/app/views/dossiers/_pieces_justificatives.html.haml
+++ b/app/views/dossiers/_pieces_justificatives.html.haml
@@ -2,7 +2,7 @@
   %table.table
     - if @facade.procedure.cerfa_flag?
       %tr{id: "piece_justificative_0"}
-        %th{class:'col-lg-6'}
+        %th.col-lg-6
           = 'Formulaire'
         %td.col-lg-6.col-md-6.col-sm-6.col-xs-6
           - if @facade.dossier.cerfa_available?

From 2d5df47c4ee82fdb8c3574cf3cec2d309f8ec630 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 15:32:05 +0200
Subject: [PATCH 20/72] Use implicit div tags in HAML files

---
 app/views/admin/procedures/index.html.haml    | 12 ++--
 .../dossiers/_filter_framed.html.haml         |  4 +-
 .../backoffice/dossiers/search.html.haml      | 14 ++---
 app/views/dossiers/_dossier_show.html.haml    | 60 +++++++++----------
 app/views/dossiers/_edit_carto.html.haml      |  2 +-
 .../dossiers/_edit_pieces_jointes.html.haml   |  2 +-
 app/views/dossiers/_infos_dossier.html.haml   | 58 +++++++++---------
 .../dossiers/_infos_entreprise.html.haml      | 54 ++++++++---------
 .../commentaires/_commentaire.html.haml       |  2 +-
 app/views/layouts/_credentials.html.haml      |  4 +-
 app/views/layouts/_ie_lt_10.html.haml         |  2 +-
 app/views/layouts/application.html.haml       |  6 +-
 ...admin_procedurescontroller_index.html.haml | 12 ++--
 ...dmin_procedurescontroller_navbar.html.haml | 22 +++----
 ...koffice_dossierscontroller_index.html.haml | 12 ++--
 .../_left_panel_cgucontroller_index.html.haml | 28 ++++-----
 ...l_users_dossierscontroller_index.html.haml | 16 ++---
 ...ers_recapitulatifcontroller_show.html.haml | 10 ++--
 ...ssiers_procedurecontroller_index.html.haml | 10 ++--
 ...ers_recapitulatifcontroller_show.html.haml |  8 +--
 app/views/users/dossiers/index.html.haml      | 14 ++---
 app/views/users/recapitulatif/show.html.haml  |  2 +-
 22 files changed, 177 insertions(+), 177 deletions(-)

diff --git a/app/views/admin/procedures/index.html.haml b/app/views/admin/procedures/index.html.haml
index 8ebb524ef..cd41c6513 100644
--- a/app/views/admin/procedures/index.html.haml
+++ b/app/views/admin/procedures/index.html.haml
@@ -1,14 +1,14 @@
 #admins_index
   .default_data_block.default_visible
-    %div.row.show-block#new_dossiers
-      %div.header
-        %div.col-lg-10.col-md-10.col-sm-10.col-xs-10.title
-          %div.carret-right
-          %div.carret-down
+    .row.show-block#new_dossiers
+      .header
+        .col-lg-10.col-md-10.col-sm-10.col-xs-10.title
+          .carret-right
+          .carret-down
           Procédures
         %a{href:'/admin/procedures/new'}
           %div#new-procedure.col-lg-2.col-md-2.col-sm-2.col-xs-2.action
             Nouvelle
 
-      %div.body
+      .body
         = smart_listing_render :procedures
diff --git a/app/views/backoffice/dossiers/_filter_framed.html.haml b/app/views/backoffice/dossiers/_filter_framed.html.haml
index 393edbdeb..f8c7b1e55 100644
--- a/app/views/backoffice/dossiers/_filter_framed.html.haml
+++ b/app/views/backoffice/dossiers/_filter_framed.html.haml
@@ -1,4 +1,4 @@
-%div.filter_framed.panel.panel-primary{id: "#{filter_framed_id}", style:'width: 300px; height: 100px; position: absolute; top: 0; left: 0; display: none'}
+.filter_framed.panel.panel-primary{id: "#{filter_framed_id}", style:'width: 300px; height: 100px; position: absolute; top: 0; left: 0; display: none'}
   .panel-heading
     = preference.libelle
 
@@ -6,5 +6,5 @@
     %input.form-control.filter_input{name: "filter_input[#{preference.table_attr}]", style:'width: 69%', value: "#{preference.filter}"}
     %button.btn.btn-sm.btn-success
       %i.fa.fa-check
-    %div.btn.btn-sm.btn-danger.erase-filter
+    .btn.btn-sm.btn-danger.erase-filter
       %i.fa.fa-remove
diff --git a/app/views/backoffice/dossiers/search.html.haml b/app/views/backoffice/dossiers/search.html.haml
index 32713d212..34ffd639d 100644
--- a/app/views/backoffice/dossiers/search.html.haml
+++ b/app/views/backoffice/dossiers/search.html.haml
@@ -3,14 +3,14 @@
     = render partial: 'backoffice/dossiers/pref_list'
 
   .default_data_block.default_visible
-    %div.row.show-block#new_dossiers
-      %div.header
-        %div.col-lg-10.col-md-10.col-sm-10.col-xs-10.title
-          %div.carret-right
-          %div.carret-down
+    .row.show-block#new_dossiers
+      .header
+        .col-lg-10.col-md-10.col-sm-10.col-xs-10.title
+          .carret-right
+          .carret-down
           Résultat de la recherche
-        %div.col-lg-2.col-md-2.col-sm-2.col-xs-2.count
+        .col-lg-2.col-md-2.col-sm-2.col-xs-2.count
           = @dossiers.count
           dossiers
-      %div.body
+      .body
         = smart_listing_render :search
diff --git a/app/views/dossiers/_dossier_show.html.haml b/app/views/dossiers/_dossier_show.html.haml
index 842c9740c..a450fe7d0 100644
--- a/app/views/dossiers/_dossier_show.html.haml
+++ b/app/views/dossiers/_dossier_show.html.haml
@@ -2,48 +2,48 @@
 
 - if @facade.procedure.individual_with_siret
   .default_data_block
-    %div.row.show-block.infos
-      %div.header
-        %div.col-xs-8.title-no-expanse
-          %div.carret-right
+    .row.show-block.infos
+      .header
+        .col-xs-8.title-no-expanse
+          .carret-right
           INFORMATIONS DU DEMANDEUR
         - if !@current_gestionnaire && ["draft", "updated", "replied", "initiated"].include?(@facade.dossier.state)
           %a#add_siret.action{href: users_dossier_add_siret_path(dossier_id: @facade.dossier.id)}
-            %div.col-lg-4.col-md-4.col-sm-4.col-xs-4.action
+            .col-lg-4.col-md-4.col-sm-4.col-xs-4.action
               = "Renseigner un SIRET"
 
 - unless @facade.entreprise.nil?
   .default_data_block
-    %div.row.show-block.infos#infos_entreprise
-      %div.header
-        %div.col-xs-12.title
-          %div.carret-right
-          %div.carret-down
+    .row.show-block.infos#infos_entreprise
+      .header
+        .col-xs-12.title
+          .carret-right
+          .carret-down
           INFORMATIONS DU DEMANDEUR
-      %div.body.display-block-on-print
+      .body.display-block-on-print
         = render partial: '/dossiers/infos_entreprise'
 
 .default_data_block.default_visible
-  %div.row.show-block.infos#infos_dossier
-    %div.header
-      %div.col-xs-10.title
-        %div.carret-right
-        %div.carret-down
+  .row.show-block.infos#infos_dossier
+    .header
+      .col-xs-10.title
+        .carret-right
+        .carret-down
         CONSTRUCTION DU DOSSIER
       = render partial: '/dossiers/edit_dossier'
-    %div.body.display-block-on-print
+    .body.display-block-on-print
       = render partial: '/dossiers/infos_dossier'
 
 - if @facade.dossier.procedure.module_api_carto.use_api_carto
   .default_data_block.default_visible.no-page-break-inside
-    %div.row.show-block#carto
-      %div.header
-        %div.col-xs-10.title
-          %div.carret-right
-          %div.carret-down
+    .row.show-block#carto
+      .header
+        .col-xs-10.title
+          .carret-right
+          .carret-down
           CARTOGRAPHIE
         = render partial: '/dossiers/edit_carto'
-      %div.body.display-block-on-print
+      .body.display-block-on-print
         %input{id: 'json_latlngs',          type: 'hidden', value: "#{@facade.dossier.json_latlngs}", name: 'json_latlngs'}
         %input{id: 'quartier_prioritaires', type: 'hidden', value: "#{@facade.dossier.quartier_prioritaires.to_json}"}
         %input{id: 'cadastres',             type: 'hidden', value: "#{@facade.dossier.cadastres.to_json}"}
@@ -54,14 +54,14 @@
 
 - if @current_gestionnaire && gestionnaire_signed_in? && @champs_private.count > 0
   .default_data_block.default_visible
-    %div.row.show-block#private-fields
-      %div.header
-        %div.col-xs-10.title
-          %div.carret-right
-          %div.carret-down
+    .row.show-block#private-fields
+      .header
+        .col-xs-10.title
+          .carret-right
+          .carret-down
           = "formulaire privé".upcase
-        %div.col-xs-2.count
+        .col-xs-2.count
           - private_fields_count = @champs_private.count
           = (private_fields_count == 1) ? "1 champ" : "#{private_fields_count} champs"
-      %div.body
+      .body
         = render partial: '/dossiers/infos_private_fields'
diff --git a/app/views/dossiers/_edit_carto.html.haml b/app/views/dossiers/_edit_carto.html.haml
index 08380a1a6..fedcf055d 100644
--- a/app/views/dossiers/_edit_carto.html.haml
+++ b/app/views/dossiers/_edit_carto.html.haml
@@ -1,5 +1,5 @@
 - unless @facade.dossier.read_only?
   - if user_signed_in? && (@facade.dossier.owner?(current_user.email) || @facade.dossier.invite_by_user?(current_user.email))
     %a#maj_carte.action{href: "/users/dossiers/#{@facade.dossier.id}/carte"}
-      %div.col-lg-2.col-md-2.col-sm-2.col-xs-2.action
+      .col-lg-2.col-md-2.col-sm-2.col-xs-2.action
         = 'éditer'.upcase
diff --git a/app/views/dossiers/_edit_pieces_jointes.html.haml b/app/views/dossiers/_edit_pieces_jointes.html.haml
index c65d90d10..88f4bff34 100644
--- a/app/views/dossiers/_edit_pieces_jointes.html.haml
+++ b/app/views/dossiers/_edit_pieces_jointes.html.haml
@@ -1,7 +1,7 @@
 - unless @facade.dossier.read_only?
   - if user_signed_in? && (@facade.dossier.owner?(current_user.email) || @facade.dossier.invite_by_user?(current_user.email))
     - if @facade.procedure.cerfa_flag? || @facade.dossier.types_de_piece_justificative.size > 0
-      %div.col-lg-4.col-md-4.col-sm-4.col-xs-4.action
+      .col-lg-4.col-md-4.col-sm-4.col-xs-4.action
         %a#maj_pj.action{"data-target" => "#UploadPJmodal",
                            "data-toggle" => "modal",
                            :type => "button",
diff --git a/app/views/dossiers/_infos_dossier.html.haml b/app/views/dossiers/_infos_dossier.html.haml
index 063e4f671..96524e556 100644
--- a/app/views/dossiers/_infos_dossier.html.haml
+++ b/app/views/dossiers/_infos_dossier.html.haml
@@ -1,26 +1,26 @@
-%div.row
+.row
   .col-xs-12
     - if @facade.procedure.for_individual?
       .row.title-row
-        %div.col-xs-4.split-hr
-        %div.col-xs-4.dossier-title= t('utils.depositaire').upcase
-        %div.col-xs-4.split-hr
+        .col-xs-4.split-hr
+        .col-xs-4.dossier-title= t('utils.depositaire').upcase
+        .col-xs-4.split-hr
       .row
-        %div.col-xs-6.depositaire-label Civilité
-        %div.col-xs-1.comments-off= "-"
-        %div.col-xs-5.depositaire-info= @facade.individual.gender
+        .col-xs-6.depositaire-label Civilité
+        .col-xs-1.comments-off= "-"
+        .col-xs-5.depositaire-info= @facade.individual.gender
       .row
-        %div.col-xs-6.depositaire-label Nom
-        %div.col-xs-1.comments-off= "-"
-        %div.col-xs-5.depositaire-info= @facade.individual.nom
+        .col-xs-6.depositaire-label Nom
+        .col-xs-1.comments-off= "-"
+        .col-xs-5.depositaire-info= @facade.individual.nom
       .row
-        %div.col-xs-6.depositaire-label Prénom
-        %div.col-xs-1.comments-off= "-"
-        %div.col-xs-5.despositaire-info= @facade.individual.prenom
+        .col-xs-6.depositaire-label Prénom
+        .col-xs-1.comments-off= "-"
+        .col-xs-5.despositaire-info= @facade.individual.prenom
       .row
-        %div.col-xs-6.depositaire-label Date de naissance
-        %div.col-xs-1.comments-off= "-"
-        %div.col-xs-5.depositaire-info= @facade.individual.birthdate
+        .col-xs-6.depositaire-label Date de naissance
+        .col-xs-1.comments-off= "-"
+        .col-xs-5.depositaire-info= @facade.individual.birthdate
       .row.margin-top-20
 
     - unless @facade.champs.nil?
@@ -28,15 +28,15 @@
         - next if champ.type_champ == 'explication'
         - if champ.type_champ == 'header_section'
           .row.title-row.margin-top-40
-            %div.col-xs-3.split-hr
-            %div.col-xs-6.dossier-title= champ.libelle.upcase
-            %div.col-xs-3.split-hr
+            .col-xs-3.split-hr
+            .col-xs-6.dossier-title= champ.libelle.upcase
+            .col-xs-3.split-hr
         - else
           .row
-            %div.col-xs-6.depositaire-label= champ.libelle
-            %div.col-md-1.col-lg-1.col-sm-1.col-xs-1.comments-off
+            .col-xs-6.depositaire-label= champ.libelle
+            .col-md-1.col-lg-1.col-sm-1.col-xs-1.comments-off
               = "-"
-            %div.col-xs-5.depositaire-info{ id: "champ-#{champ.id}-value" }
+            .col-xs-5.depositaire-info{ id: "champ-#{champ.id}-value" }
               - unless champ.decorate.value.blank?
                 = champ.decorate.value.html_safe
 
@@ -47,13 +47,13 @@
         %b
           = "#{@facade.dossier.user.given_name} #{@facade.dossier.user.family_name}"
         = ")"
-%div.row
+.row
   - if @facade.procedure.cerfa_flag? || @facade.dossier.types_de_piece_justificative.count > 0
     .col-xs-12
       .row.title-row
-        %div.col-xs-4.split-hr
-        %div.col-xs-4.dossier-title= t('utils.pieces').upcase
-        %div.col-xs-4.split-hr
+        .col-xs-4.split-hr
+        .col-xs-4.dossier-title= t('utils.pieces').upcase
+        .col-xs-4.split-hr
 
   .col-xs-12#pieces_justificatives.margin-bot-40
     .row
@@ -77,9 +77,9 @@
           .row.piece-row
             .col-xs-12{ id: "piece_justificative_#{type_de_piece_justificative.id}" }
               .row
-                %div.col-xs-6.depositaire-label= type_de_piece_justificative.libelle
-                %div.col-xs-1.comments-off= "-"
-                %div.col-xs-5.despositaire-info
+                .col-xs-6.depositaire-label= type_de_piece_justificative.libelle
+                .col-xs-1.comments-off= "-"
+                .col-xs-5.despositaire-info
                   - if type_de_piece_justificative.api_entreprise
                     %span.text-success Nous l'avons récupéré pour vous.
                   - elsif !(@pj = @facade.dossier.retrieve_last_piece_justificative_by_type(type_de_piece_justificative.id)).nil?
diff --git a/app/views/dossiers/_infos_entreprise.html.haml b/app/views/dossiers/_infos_entreprise.html.haml
index 599c9b7bb..661634697 100644
--- a/app/views/dossiers/_infos_entreprise.html.haml
+++ b/app/views/dossiers/_infos_entreprise.html.haml
@@ -2,51 +2,51 @@
   %h4
     = @facade.entreprise.raison_sociale_or_name
   .row.split-row
-    %div.col-xs-12.split-hr
-%div.row
+    .col-xs-12.split-hr
+.row
   .col-xs-12
 
     .row
-      %div.col-xs-4.entreprise-label Siret :
-      %div.col-xs-8.entreprise-info= @facade.etablissement.siret
+      .col-xs-4.entreprise-label Siret :
+      .col-xs-8.entreprise-info= @facade.etablissement.siret
     - if @facade.etablissement.siret != @facade.entreprise.siret_siege_social
       .row
-        %div.col-xs-4.entreprise-label SIRET siège social :
-        %div.col-xs-8.entreprise-info= @facade.entreprise.siret_siege_social
+        .col-xs-4.entreprise-label SIRET siège social :
+        .col-xs-8.entreprise-info= @facade.entreprise.siret_siege_social
     .row
-      %div.col-xs-4.entreprise-label Forme juridique :
-      %div.col-xs-8.entreprise-info= @facade.entreprise.forme_juridique
+      .col-xs-4.entreprise-label Forme juridique :
+      .col-xs-8.entreprise-info= @facade.entreprise.forme_juridique
     .row
-      %div.col-xs-4.entreprise-label Libellé naf :
-      %div.col-xs-8.entreprise-info= @facade.etablissement.libelle_naf
+      .col-xs-4.entreprise-label Libellé naf :
+      .col-xs-8.entreprise-info= @facade.etablissement.libelle_naf
     .row
-      %div.col-xs-4.entreprise-label Code naf :
-      %div.col-xs-8.entreprise-info= @facade.etablissement.naf
+      .col-xs-4.entreprise-label Code naf :
+      .col-xs-8.entreprise-info= @facade.etablissement.naf
     .row
-      %div.col-xs-4.entreprise-label Date de création :
-      %div.col-xs-8.entreprise-info= Time.at(@facade.entreprise.date_creation).strftime "%d-%m-%Y"
+      .col-xs-4.entreprise-label Date de création :
+      .col-xs-8.entreprise-info= Time.at(@facade.entreprise.date_creation).strftime "%d-%m-%Y"
     .row
-      %div.col-xs-4.entreprise-label Effectif organisation :
-      %div.col-xs-8.entreprise-info= @facade.entreprise.effectif
+      .col-xs-4.entreprise-label Effectif organisation :
+      .col-xs-8.entreprise-info= @facade.entreprise.effectif
     .row
-      %div.col-xs-4.entreprise-label Code effectif :
-      %div.col-xs-8.entreprise-info= @facade.entreprise.code_effectif_entreprise
+      .col-xs-4.entreprise-label Code effectif :
+      .col-xs-8.entreprise-info= @facade.entreprise.code_effectif_entreprise
     .row
-      %div.col-xs-4.entreprise-label Numéro TVA intracommunautaire :
-      %div.col-xs-8.entreprise-info= @facade.entreprise.numero_tva_intracommunautaire
+      .col-xs-4.entreprise-label Numéro TVA intracommunautaire :
+      .col-xs-8.entreprise-info= @facade.entreprise.numero_tva_intracommunautaire
 
     .row
-      %div.col-xs-4.entreprise-label Adresse :
-      %div.col-xs-8.entreprise-info
+      .col-xs-4.entreprise-label Adresse :
+      .col-xs-8.entreprise-info
         - @facade.etablissement.adresse.split("\n").each do |line|
           = line
     .row
-      %div.col-xs-4.entreprise-label Capital social :
-      %div.col-xs-8.entreprise-info= @facade.entreprise.pretty_capital_social
+      .col-xs-4.entreprise-label Capital social :
+      .col-xs-8.entreprise-info= @facade.entreprise.pretty_capital_social
 
     .row
-      %div.col-xs-4.entreprise-label Exercices :
-      %div.col-xs-8.entreprise-info
+      .col-xs-4.entreprise-label Exercices :
+      .col-xs-8.entreprise-info
         - @facade.etablissement.exercices.each_with_index do |exercice, index|
           %strong
             = "#{exercice.dateFinExercice.year} : "
@@ -54,6 +54,6 @@
           %br
 
     .row.split-row
-      %div.col-xs-12.split-hr
+      .col-xs-12.split-hr
 - unless @facade.entreprise.rna_information.nil?
   = render partial: '/dossiers/infos_rna'
diff --git a/app/views/dossiers/commentaires/_commentaire.html.haml b/app/views/dossiers/commentaires/_commentaire.html.haml
index 576903f08..b5c928460 100644
--- a/app/views/dossiers/commentaires/_commentaire.html.haml
+++ b/app/views/dossiers/commentaires/_commentaire.html.haml
@@ -1,4 +1,4 @@
-%div.commentaire
+.commentaire
   .comment-header
     = commentaire.header
   .content
diff --git a/app/views/layouts/_credentials.html.haml b/app/views/layouts/_credentials.html.haml
index 0622f4600..0f5457453 100644
--- a/app/views/layouts/_credentials.html.haml
+++ b/app/views/layouts/_credentials.html.haml
@@ -1,4 +1,4 @@
-%div.dropdown-menu#credentials
-  %div.description= t("utils.deconnexion")
+.dropdown-menu#credentials
+  .description= t("utils.deconnexion")
   = @current_gestionnaire.email if @current_gestionnaire
   = @current_user.email if @current_user
diff --git a/app/views/layouts/_ie_lt_10.html.haml b/app/views/layouts/_ie_lt_10.html.haml
index 81ae102b6..d191ed313 100644
--- a/app/views/layouts/_ie_lt_10.html.haml
+++ b/app/views/layouts/_ie_lt_10.html.haml
@@ -1,6 +1,6 @@
 = "<!--[if lt IE 10]>".html_safe
 
-%div.center{style:'width: 100%; background-color: white; position: fixed; top:0; left:0; z-index: 100000'}
+.center{style:'width: 100%; background-color: white; position: fixed; top:0; left:0; z-index: 100000'}
   %h3.text-danger
     %b
       Votre version d'Internet Explorer est trop ancienne pour être utilisée sur le service TPS. Version minimum : Internet Explorer 10
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 96010a34f..4ef794580 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -29,12 +29,12 @@
 
 
     %div#wrap
-      %div.row
+      .row
         %div#header.navbar
           = render partial: "layouts/navbar"
-      %div.row.no-margin
+      .row.no-margin
         - if RenderPartialService.left_panel_exist? @left_pannel_url
-          %div.col-xs-2#left-panel
+          .col-xs-2#left-panel
             - if gestionnaire_signed_in?
               #search-block
                 = render partial: 'layouts/left_panels/search_area'
diff --git a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml
index be385802c..e4ead8b06 100644
--- a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml
@@ -1,5 +1,5 @@
 %div#first-block
-  %div.en-cours
+  .en-cours
     %b
       = dossier_count = current_administrateur.procedures.count
     = ("Procedures".pluralize(dossier_count)).upcase
@@ -7,27 +7,27 @@
 %div#action-block
 
 %div#menu-block
-  %div.split-hr-left
+  .split-hr-left
   #procedure_list
     %a{:href => "#{url_for :admin_procedures_draft}", id: "draft-procedures"}
-      %div.procedure_list_element{class: @draft_class}
+      .procedure_list_element{class: @draft_class}
         = "Brouillons"
         .badge.progress-bar-default
           = current_administrateur.procedures.where(published: false, archived: false).count
 
     %a{:href => "#{url_for :admin_procedures}", id: "active-procedures"}
-      %div.procedure_list_element{class: @active_class}
+      .procedure_list_element{class: @active_class}
         = "Actives"
         .badge.progress-bar-success
           = current_administrateur.procedures.where(published: true, archived: false).count
 
     %a{:href => "#{url_for :admin_procedures_archived}", id: "archived-procedures"}
-      %div.procedure_list_element{class: @archived_class}
+      .procedure_list_element{class: @archived_class}
         = "Archivées"
         .badge.progress-bar-purple
           = current_administrateur.procedures.where(archived: true).count
 
-  %div.split-hr-left
+  .split-hr-left
 
 
 %div#infos-block
diff --git a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml
index f59bb061e..f2a345992 100644
--- a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml
@@ -1,5 +1,5 @@
 %div#first-block
-  %div.en-cours
+  .en-cours
     - unless @procedure.logo.blank?
       = image_tag @procedure.decorate.logo_img, style: 'width: 30px'
     %b
@@ -8,44 +8,44 @@
 %div#action-block
 
 %div#menu-block
-  %div.split-hr-left
+  .split-hr-left
   #procedure_list
     %a{:href => "#{url_for admin_procedure_path(@procedure)}", id: 'onglet-infos'}
-      %div.procedure_list_element{class: ('active' if active == 'Informations')}
+      .procedure_list_element{class: ('active' if active == 'Informations')}
         Informations
 
     %a{:href => "#{url_for admin_procedure_accompagnateurs_path(@procedure)}", id: 'onglet-accompagnateurs'}
-      %div.procedure_list_element{class: ('active' if active == 'Accompagnateurs')}
+      .procedure_list_element{class: ('active' if active == 'Accompagnateurs')}
         = t('dynamics.admin.procedure.onglets.accompagnateurs')
 
     %a{:href => "#{url_for edit_admin_procedure_path(@procedure)}", id: 'onglet-description'}
-      %div.procedure_list_element{class: ('active' if active == 'Description')}
+      .procedure_list_element{class: ('active' if active == 'Description')}
         Description
 
     - unless @procedure.locked?
       %a{:href => "#{url_for admin_procedure_types_de_champ_path(@procedure)}", id: 'onglet-champs'}
-        %div.procedure_list_element{class: ('active' if active == 'Champs')}
+        .procedure_list_element{class: ('active' if active == 'Champs')}
           Champs
 
     - unless @procedure.locked?
       %a{:href => "#{url_for admin_procedure_pieces_justificatives_path(@procedure)}", id: 'onglet-pieces'}
-        %div.procedure_list_element{class: ('active' if active == 'Pieces')}
+        .procedure_list_element{class: ('active' if active == 'Pieces')}
           Pièces jointes
 
     - unless @procedure.locked?
       %a{:href => "#{url_for admin_procedure_types_de_champ_private_path(@procedure)}", id: 'onglet-private-champs'}
-        %div.procedure_list_element{class: ('active' if active == 'Champs privés')}
+        .procedure_list_element{class: ('active' if active == 'Champs privés')}
           Champs privés
 
     %a{:href => "#{url_for admin_procedure_mail_templates_path(@procedure)}", id: 'onglet-inemailsfos'}
-      %div.procedure_list_element{class: ('active' if active == 'E-mails')}
+      .procedure_list_element{class: ('active' if active == 'E-mails')}
         E-mails
 
     %a{:href => "#{url_for admin_procedure_previsualisation_path(@procedure)}", id: 'onglet-preview'}
-      %div.procedure_list_element{class: ('active' if active == 'Prévisualisation')}
+      .procedure_list_element{class: ('active' if active == 'Prévisualisation')}
         Prévisualisation
 
-  %div.split-hr-left
+  .split-hr-left
 
 
 %div#infos-block
diff --git a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml
index 32f2d44b3..655df11e6 100644
--- a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml
@@ -1,29 +1,29 @@
 %div#first-block
-  %div.dossiers-en-cours
+  .dossiers-en-cours
     .count= @facade_data_view.total_dossier_follow
     .text= "SUIVIS"
-  %div.nouveaux-dossiers
+  .nouveaux-dossiers
     .count= @facade_data_view.total_new_dossier
     .text= "NOUVEAUX"
-  %div.nouvelles-notifications
+  .nouvelles-notifications
     .count= @facade_data_view.dossiers_with_unread_notifications.count
     .text= "MODIFIÉS"
 
 %div#action-block
 
 %div#menu-block
-  %div.split-hr-left
+  .split-hr-left
   #switch-buttons
     #switch-procedures.active Procédures
     #switch-notifications Notifications
 
 %div#infos-block
-  %div.split-hr-left
+  .split-hr-left
   #procedure_list
     - @facade_data_view.gestionnaire_procedures_name_and_id_list.each do |procedure|
 
       = link_to backoffice_dossiers_procedure_path(procedure[:id]), {title: procedure[:libelle]} do
-        %div.procedure_list_element{ class: ('active' if procedure[:id] == @facade_data_view.procedure.id rescue '') }
+        .procedure_list_element{ class: ('active' if procedure[:id] == @facade_data_view.procedure.id rescue '') }
           = truncate(procedure[:libelle], length: 50)
           - total_new = @facade_data_view.new_dossier_number procedure[:id]
           - if total_new > 0
diff --git a/app/views/layouts/left_panels/_left_panel_cgucontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_cgucontroller_index.html.haml
index dacf8761d..8668d4115 100644
--- a/app/views/layouts/left_panels/_left_panel_cgucontroller_index.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_cgucontroller_index.html.haml
@@ -1,53 +1,53 @@
 %div#cgu_menu_block
   #procedure_list{style: 'margin-top: 0;'}
     = link_to cgu_path(:anchor => "editeur") do
-      %div.procedure_list_element
+      .procedure_list_element
         Editeur
 
     = link_to cgu_path(:anchor => "ingenieurie_hebergement") do
-      %div.procedure_list_element
+      .procedure_list_element
         Ingénierie et hébergement informatique
 
     = link_to cgu_path(:anchor => "object_website") do
-      %div.procedure_list_element
+      .procedure_list_element
         Object du site internet
 
     = link_to cgu_path(:anchor => "acteurs") do
-      %div.procedure_list_element
+      .procedure_list_element
         Acteurs de TPS
 
     = link_to cgu_path(:anchor => "CNIL") do
-      %div.procedure_list_element
+      .procedure_list_element
         Déclaration CNIL
 
     = link_to cgu_path(:anchor => "data_collects") do
-      %div.procedure_list_element
+      .procedure_list_element
         Données collectées et responsabilité des organismes utilisateurs
 
     = link_to cgu_path(:anchor => "individual_data") do
-      %div.procedure_list_element
+      .procedure_list_element
         Traitement des données à caractère personnel
 
     = link_to cgu_path(:anchor => "entreprise_information") do
-      %div.procedure_list_element
+      .procedure_list_element
         Règles relatives aux informations sur les entreprises mises à disposibition
 
     = link_to cgu_path(:anchor => "reproduction") do
-      %div.procedure_list_element
+      .procedure_list_element
         Droit de reproduction
 
     = link_to cgu_path(:anchor => "propriete_intellectuelle") do
-      %div.procedure_list_element
+      .procedure_list_element
         Propriété intellectuelle
 
     = link_to cgu_path(:anchor => "navigateurs") do
-      %div.procedure_list_element
+      .procedure_list_element
         Logiciels nécessaires à la consultation
 
     = link_to cgu_path(:anchor => "conception") do
-      %div.procedure_list_element
+      .procedure_list_element
         Conception et Réalisation
 
-    %div.procedure_list_element
+    .procedure_list_element
 
-    %div.procedure_list_element
+    .procedure_list_element
diff --git a/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml
index 04a7b90ec..09e5853d5 100644
--- a/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml
@@ -1,5 +1,5 @@
 %div#first-block
-  %div.en-cours
+  .en-cours
     = dossier_count = current_user.dossiers.count
     = ("Dossier".pluralize(dossier_count)).upcase
     %br
@@ -8,39 +8,39 @@
 %div#action-block
 
 %div#menu-block
-  %div.split-hr-left
+  .split-hr-left
   #procedure_list
     - unless current_user.dossiers.count == 0
       %a{:href => "#{url_for users_dossiers_path(liste: 'brouillon')}", 'data-toggle' => :tooltip, title: 'Les dossiers jamais proposés à la relecture.'}
-        %div.procedure_list_element{ class: @dossiers_list_facade.brouillon_class, id: 'brouillon' }
+        .procedure_list_element{ class: @dossiers_list_facade.brouillon_class, id: 'brouillon' }
           = "Brouillons"
           .badge.progress-bar-default
             = @dossiers_list_facade.brouillon_total
 
       %a{:href => "#{url_for users_dossiers_path(liste: 'a_traiter')}", 'data-toggle' => :tooltip, title: 'Les dossiers qui requièrent une action de votre part.'}
-        %div.procedure_list_element{ class: @dossiers_list_facade.en_construction_class, id: 'a_traiter' }
+        .procedure_list_element{ class: @dossiers_list_facade.en_construction_class, id: 'a_traiter' }
           = "En construction"
           .badge.progress-bar-danger
             = @dossiers_list_facade.en_construction_total
 
       %a{:href => "#{url_for users_dossiers_path(liste: 'en_instruction')}", 'data-toggle' => :tooltip, title: 'Les dossiers en cours d\'examen par l\'administration compétante.'}
-        %div.procedure_list_element{ class: @dossiers_list_facade.en_instruction_class, id: 'en_instruction' }
+        .procedure_list_element{ class: @dossiers_list_facade.en_instruction_class, id: 'en_instruction' }
           = "En instruction"
           .badge.progress-bar-default
             = @dossiers_list_facade.en_instruction_total
 
       %a{:href => "#{url_for users_dossiers_path(liste: 'termine')}", 'data-toggle' => :tooltip, title: 'Les dossiers cloturés qui peuvent être "Accepté", "Refusé" ou "Sans suite".'}
-        %div.procedure_list_element{ class:  @dossiers_list_facade.termine_class, id: 'termine' }
+        .procedure_list_element{ class:  @dossiers_list_facade.termine_class, id: 'termine' }
           = "Terminé"
           .badge.progress-bar-success
             = @dossiers_list_facade.termine_total
 
     %a{:href => "#{url_for users_dossiers_path(liste: 'invite')}"}
-      %div.procedure_list_element{ class:  @dossiers_list_facade.invite_class, id: 'invite' }
+      .procedure_list_element{ class:  @dossiers_list_facade.invite_class, id: 'invite' }
         = "Invitation"
         .badge.progress-bar-warning
           = @dossiers_list_facade.invite_total
-  %div.split-hr-left
+  .split-hr-left
 
 
 %div#infos-block
diff --git a/app/views/layouts/left_panels/_left_panel_users_recapitulatifcontroller_show.html.haml b/app/views/layouts/left_panels/_left_panel_users_recapitulatifcontroller_show.html.haml
index ee301158d..6b4a877c2 100644
--- a/app/views/layouts/left_panels/_left_panel_users_recapitulatifcontroller_show.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_users_recapitulatifcontroller_show.html.haml
@@ -1,12 +1,12 @@
 %div#first-block
-  %div.en-cours
+  .en-cours
     %h2 Récapitulatif
-  %div.infos
+  .infos
     %div= t('dynamics.dossiers.numéro') + @facade.dossier.id.to_s
 
 %div#menu-block
 
 %div#infos-block
-  %div.split-hr-left
-  %div.dossier-state= @facade.dossier.display_state
-  %div.split-hr-left
+  .split-hr-left
+  .dossier-state= @facade.dossier.display_state
+  .split-hr-left
diff --git a/app/views/layouts/navbars/_navbar_backoffice_dossiers_procedurecontroller_index.html.haml b/app/views/layouts/navbars/_navbar_backoffice_dossiers_procedurecontroller_index.html.haml
index 79fba1681..b6698512c 100644
--- a/app/views/layouts/navbars/_navbar_backoffice_dossiers_procedurecontroller_index.html.haml
+++ b/app/views/layouts/navbars/_navbar_backoffice_dossiers_procedurecontroller_index.html.haml
@@ -1,12 +1,12 @@
 .col-xs-7.main-info
   = @facade_data_view.procedure_id.nil? ? "Tous les dossiers" :  @facade_data_view.procedure.libelle
-%div.col-lg-3.col-md-3.col-sm-3.col-xs-3.options
-  %div.row
-    %div.col-lg-12.col-md-12.col-sm-12.col-xs-12
+.col-lg-3.col-md-3.col-sm-3.col-xs-3.options
+  .row
+    .col-lg-12.col-md-12.col-sm-12.col-xs-12
       %a.button_navbar#pref_list_dossier_open_action{href: '#', type: :button, 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false }
         %i.fa.fa-pencil
         Modifier le tableau
       %span.caret-right
-  %div.row
-    %div.col-lg-12.col-md-12.col-sm-12.col-xs-12
+  .row
+    .col-lg-12.col-md-12.col-sm-12.col-xs-12
       = render partial: "dossiers/download_dossiers"
diff --git a/app/views/layouts/navbars/_navbar_users_recapitulatifcontroller_show.html.haml b/app/views/layouts/navbars/_navbar_users_recapitulatifcontroller_show.html.haml
index 6be6d4927..54ade1d47 100644
--- a/app/views/layouts/navbars/_navbar_users_recapitulatifcontroller_show.html.haml
+++ b/app/views/layouts/navbars/_navbar_users_recapitulatifcontroller_show.html.haml
@@ -1,15 +1,15 @@
 .col-xs-7.main-info
   %span{ 'data-toggle' => :tooltip, "data-placement" => :bottom, title: @facade.dossier.procedure.libelle }
     = @facade.dossier.procedure.libelle.truncate(60)
-%div.col-lg-3.col-md-3.col-sm-3.col-xs-3.options
-  %div.row.centered-option
-    %div.col-lg-12.col-md-12.col-sm-12.col-xs-12
+.col-lg-3.col-md-3.col-sm-3.col-xs-3.options
+  .row.centered-option
+    .col-lg-12.col-md-12.col-sm-12.col-xs-12
       %div#invitations.dropdown-toggle{ 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false }
         %i.fa.fa-user
         = t('utils.involved')
         .badge.progress-bar-info
           = @facade.dossier.invites.count
-      %div.dropdown-menu.dropdown-menu-right.dropdown-pannel
+      .dropdown-menu.dropdown-menu-right.dropdown-pannel
         %h4= t('dynamics.dossiers.followers.title')
         %ul
           - unless @facade.followers.empty?
diff --git a/app/views/users/dossiers/index.html.haml b/app/views/users/dossiers/index.html.haml
index fce9b71a8..77d25112b 100644
--- a/app/views/users/dossiers/index.html.haml
+++ b/app/views/users/dossiers/index.html.haml
@@ -1,15 +1,15 @@
 #users_index
   .default_data_block.default_visible
-    %div.row.show-block#new_dossiers
-      %div.header
-        %div.col-lg-10.col-md-10.col-sm-10.col-xs-10.title
-          %div.carret-right
-          %div.carret-down
+    .row.show-block#new_dossiers
+      .header
+        .col-lg-10.col-md-10.col-sm-10.col-xs-10.title
+          .carret-right
+          .carret-down
           Dossiers
-        %div.col-lg-2.col-md-2.col-sm-2.col-xs-2.count
+        .col-lg-2.col-md-2.col-sm-2.col-xs-2.count
           -#0
           -#dossiers
-      %div.body
+      .body
         = smart_listing_render :dossiers
 
   = render partial: 'state_description', locals: {dossiers_list_facade: @dossiers_list_facade}
diff --git a/app/views/users/recapitulatif/show.html.haml b/app/views/users/recapitulatif/show.html.haml
index fe7c1ec5d..672ab5867 100644
--- a/app/views/users/recapitulatif/show.html.haml
+++ b/app/views/users/recapitulatif/show.html.haml
@@ -1,2 +1,2 @@
-%div.col-lg-12.col-md-12.col-sm-12.col-xs-12#users_recapitulatif_dossier_show
+.col-lg-12.col-md-12.col-sm-12.col-xs-12#users_recapitulatif_dossier_show
   = render partial: "dossiers/dossier_show"

From 4788e280f5ce2953792b4cb09f302e128d145a10 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 15:34:46 +0200
Subject: [PATCH 21/72] Fix the indentation in the drop down list template

---
 .../description/champs/_drop_down_list.html.haml      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/views/users/description/champs/_drop_down_list.html.haml b/app/views/users/description/champs/_drop_down_list.html.haml
index eebb763f1..9404af5f6 100644
--- a/app/views/users/description/champs/_drop_down_list.html.haml
+++ b/app/views/users/description/champs/_drop_down_list.html.haml
@@ -1,6 +1,7 @@
 - if champ.drop_down_list && champ.drop_down_list.options.any?
-    = select_tag("champs['#{champ.id}']",
-      options_for_select(champ.drop_down_list.options, selected: champ.drop_down_list.selected_options(champ),
-                                                 disabled: champ.drop_down_list.disabled_options),
-                         multiple: champ.drop_down_list.multiple,
-                         class: champ.drop_down_list.multiple ? 'select2' : nil)
+  = select_tag("champs['#{champ.id}']",
+    options_for_select(champ.drop_down_list.options,
+      selected: champ.drop_down_list.selected_options(champ),
+      disabled: champ.drop_down_list.disabled_options),
+      multiple: champ.drop_down_list.multiple,
+      class: champ.drop_down_list.multiple ? 'select2' : nil)

From a8d2a003c10134e42ec34de470bc4dc61fab2792 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 15:35:48 +0200
Subject: [PATCH 22/72] Do not define static class names in the attributes hash

---
 app/views/dossiers/commentaires/_form.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/dossiers/commentaires/_form.html.haml b/app/views/dossiers/commentaires/_form.html.haml
index e245c4964..5296a3f1d 100644
--- a/app/views/dossiers/commentaires/_form.html.haml
+++ b/app/views/dossiers/commentaires/_form.html.haml
@@ -1,6 +1,6 @@
 = form_tag(url_for({ controller: 'commentaires', action: :create, dossier_id: dossier_facade.dossier.id, champ_id: dossier_facade.champ_id }), class: 'form-inline', method: 'POST', multipart: true) do
 
-  %textarea.form-control{id: 'texte_commentaire', class: 'wysihtml5', name: 'texte_commentaire', style: 'width: 100%; margin-bottom:2%', rows: '5', placeholder:"Commentaire"}
+  %textarea.form-control.wysihtml5{id: 'texte_commentaire', name: 'texte_commentaire', style: 'width: 100%; margin-bottom:2%', rows: '5', placeholder:"Commentaire"}
 
   .row
     .col-md-6

From 69ba92009b15d601b6738b509382bd2c37266892 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 15:48:27 +0200
Subject: [PATCH 23/72] Separate HAML comments from the leading # by a space

---
 .../dossiers/_infos_pieces_jointes.html.haml  |  8 ++--
 .../dossiers/_pieces_justificatives.html.haml |  8 ++--
 app/views/dossiers/_show.html.haml            | 10 ++---
 app/views/users/description/_show.html.haml   |  2 +-
 app/views/users/dossiers/index.html.haml      |  4 +-
 app/views/users/passwords/edit.html.haml      | 44 +++++++++----------
 app/views/users/passwords/new.html.haml       | 44 +++++++++----------
 app/views/users/registrations/new.html.haml   | 44 +++++++++----------
 8 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/app/views/dossiers/_infos_pieces_jointes.html.haml b/app/views/dossiers/_infos_pieces_jointes.html.haml
index 5268bdadb..de4b03aa1 100644
--- a/app/views/dossiers/_infos_pieces_jointes.html.haml
+++ b/app/views/dossiers/_infos_pieces_jointes.html.haml
@@ -30,9 +30,9 @@
                 - if type_de_piece_justificative.api_entreprise
                   %span.text-success Nous l'avons récupéré pour vous.
                 - elsif !(@pj = @facade.dossier.retrieve_last_piece_justificative_by_type(type_de_piece_justificative.id)).nil?
-                  -#- if user_signed_in?
-                  -#  = 'Pièce fournie'
-                  -#- elsif gestionnaire_signed_in?
+                  -# - if user_signed_in?
+                  -#   = 'Pièce fournie'
+                  -# - elsif gestionnaire_signed_in?
                   %a{ href: "#{@pj.content_url}", target: '_blank' } Consulter
                   %span{style:'margin-left:12px'}
                     \-
@@ -45,5 +45,5 @@
                 - else
                   = 'Pièce non fournie'
 
-  -#- if gestionnaire_signed_in?
+  -# - if gestionnaire_signed_in?
   = render partial: '/dossiers/modal_historique'
diff --git a/app/views/dossiers/_pieces_justificatives.html.haml b/app/views/dossiers/_pieces_justificatives.html.haml
index 7b703c2b1..a9fff2bc7 100644
--- a/app/views/dossiers/_pieces_justificatives.html.haml
+++ b/app/views/dossiers/_pieces_justificatives.html.haml
@@ -26,9 +26,9 @@
           - if type_de_piece_justificative.api_entreprise
             %span.text-success Nous l'avons récupéré pour vous.
           - elsif !(@pj = @facade.dossier.retrieve_last_piece_justificative_by_type(type_de_piece_justificative.id)).nil?
-            -#- if user_signed_in?
-            -#  = 'Pièce fournie'
-            -#- elsif gestionnaire_signed_in?
+            -# - if user_signed_in?
+            -#   = 'Pièce fournie'
+            -# - elsif gestionnaire_signed_in?
             %a{ href: "#{@pj.content_url}", target: '_blank' } Consulter
             %span{style:'margin-left:12px'}
               \-
@@ -41,5 +41,5 @@
           - else
             = 'Pièce non fournie'
 
-  -#- if gestionnaire_signed_in?
+  -# - if gestionnaire_signed_in?
   = render partial: '/dossiers/modal_historique'
diff --git a/app/views/dossiers/_show.html.haml b/app/views/dossiers/_show.html.haml
index 4874bedb6..61ab17978 100644
--- a/app/views/dossiers/_show.html.haml
+++ b/app/views/dossiers/_show.html.haml
@@ -6,9 +6,9 @@
   .row.etape.etape_2
     = render partial: '/dossiers/etapes/etape2'
 
-  -#- if @facade.procedure.module_api_carto.use_api_carto?
-  -#  .row.etape.etape_3
-  -#    = render partial: '/dossiers/etapes/etape3'
+  -# - if @facade.procedure.module_api_carto.use_api_carto?
+  -#   .row.etape.etape_3
+  -#     = render partial: '/dossiers/etapes/etape3'
   -#
-  -#.row.etape.etape_4
-  -#  = render partial: '/dossiers/etapes/etape4'
+  -# .row.etape.etape_4
+  -#   = render partial: '/dossiers/etapes/etape4'
diff --git a/app/views/users/description/_show.html.haml b/app/views/users/description/_show.html.haml
index 5a5309090..7741315b5 100644
--- a/app/views/users/description/_show.html.haml
+++ b/app/views/users/description/_show.html.haml
@@ -14,7 +14,7 @@
   %h2.text-info
     = @dossier.procedure.libelle
 
-  -#TODO use form_for
+  -# TODO use form_for
   = form_tag(url_for({controller: 'users/description', action: :update, dossier_id: @dossier.id}), class: 'form', method: 'POST', multipart: true) do
     - unless @champs.nil?
       #liste_champs
diff --git a/app/views/users/dossiers/index.html.haml b/app/views/users/dossiers/index.html.haml
index 77d25112b..a3baaba4b 100644
--- a/app/views/users/dossiers/index.html.haml
+++ b/app/views/users/dossiers/index.html.haml
@@ -7,8 +7,8 @@
           .carret-down
           Dossiers
         .col-lg-2.col-md-2.col-sm-2.col-xs-2.count
-          -#0
-          -#dossiers
+          -# 0
+          -# dossiers
       .body
         = smart_listing_render :dossiers
 
diff --git a/app/views/users/passwords/edit.html.haml b/app/views/users/passwords/edit.html.haml
index 204370695..45c85be70 100644
--- a/app/views/users/passwords/edit.html.haml
+++ b/app/views/users/passwords/edit.html.haml
@@ -1,30 +1,30 @@
--#<h2>Sign up</h2>
+-# <h2>Sign up</h2>
 -#
--#<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
--#  <%= devise_error_messages! %>
+-# <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
+-#   <%= devise_error_messages! %>
 -#
--#  <div class="field">
--#    <%= f.label :email %><br />
--#    <%= f.email_field :email, autofocus: true %>
--#  </div>
+-#   <div class="field">
+-#     <%= f.label :email %><br />
+-#     <%= f.email_field :email, autofocus: true %>
+-#   </div>
 -#
--#  <div class="field">
--#    <%= f.label :password %>
--#    <% if @validatable %>
--#    <em>(<%= @minimum_password_length %> characters minimum)</em>
--#    <% end %><br />
--#    <%= f.password_field :password, autocomplete: "off" %>
--#  </div>
+-#   <div class="field">
+-#     <%= f.label :password %>
+-#     <% if @validatable %>
+-#     <em>(<%= @minimum_password_length %> characters minimum)</em>
+-#     <% end %><br />
+-#     <%= f.password_field :password, autocomplete: "off" %>
+-#   </div>
 -#
--#  <div class="field">
--#    <%= f.label :password_confirmation %><br />
--#    <%= f.password_field :password_confirmation, autocomplete: "off" %>
--#  </div>
+-#   <div class="field">
+-#     <%= f.label :password_confirmation %><br />
+-#     <%= f.password_field :password_confirmation, autocomplete: "off" %>
+-#   </div>
 -#
--#  <div class="actions">
--#    <%= f.submit "Sign up" %>
--#  </div>
--#<% end %>
+-#   <div class="actions">
+-#     <%= f.submit "Sign up" %>
+-#   </div>
+-# <% end %>
 
 = devise_error_messages!
 
diff --git a/app/views/users/passwords/new.html.haml b/app/views/users/passwords/new.html.haml
index 79e45d45c..eff778110 100644
--- a/app/views/users/passwords/new.html.haml
+++ b/app/views/users/passwords/new.html.haml
@@ -1,30 +1,30 @@
--#<h2>Sign up</h2>
+-# <h2>Sign up</h2>
 -#
--#<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
--#  <%= devise_error_messages! %>
+-# <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
+-#   <%= devise_error_messages! %>
 -#
--#  <div class="field">
--#    <%= f.label :email %><br />
--#    <%= f.email_field :email, autofocus: true %>
--#  </div>
+-#   <div class="field">
+-#     <%= f.label :email %><br />
+-#     <%= f.email_field :email, autofocus: true %>
+-#   </div>
 -#
--#  <div class="field">
--#    <%= f.label :password %>
--#    <% if @validatable %>
--#    <em>(<%= @minimum_password_length %> characters minimum)</em>
--#    <% end %><br />
--#    <%= f.password_field :password, autocomplete: "off" %>
--#  </div>
+-#   <div class="field">
+-#     <%= f.label :password %>
+-#     <% if @validatable %>
+-#     <em>(<%= @minimum_password_length %> characters minimum)</em>
+-#     <% end %><br />
+-#     <%= f.password_field :password, autocomplete: "off" %>
+-#   </div>
 -#
--#  <div class="field">
--#    <%= f.label :password_confirmation %><br />
--#    <%= f.password_field :password_confirmation, autocomplete: "off" %>
--#  </div>
+-#   <div class="field">
+-#     <%= f.label :password_confirmation %><br />
+-#     <%= f.password_field :password_confirmation, autocomplete: "off" %>
+-#   </div>
 -#
--#  <div class="actions">
--#    <%= f.submit "Sign up" %>
--#  </div>
--#<% end %>
+-#   <div class="actions">
+-#     <%= f.submit "Sign up" %>
+-#   </div>
+-# <% end %>
 
 = devise_error_messages!
 
diff --git a/app/views/users/registrations/new.html.haml b/app/views/users/registrations/new.html.haml
index 9a0fd5934..dc8ba009f 100644
--- a/app/views/users/registrations/new.html.haml
+++ b/app/views/users/registrations/new.html.haml
@@ -1,30 +1,30 @@
--#<h2>Sign up</h2>
+-# <h2>Sign up</h2>
 -#
--#<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
--#  <%= devise_error_messages! %>
+-# <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
+-#   <%= devise_error_messages! %>
 -#
--#  <div class="field">
--#    <%= f.label :email %><br />
--#    <%= f.email_field :email, autofocus: true %>
--#  </div>
+-#   <div class="field">
+-#     <%= f.label :email %><br />
+-#     <%= f.email_field :email, autofocus: true %>
+-#   </div>
 -#
--#  <div class="field">
--#    <%= f.label :password %>
--#    <% if @validatable %>
--#    <em>(<%= @minimum_password_length %> characters minimum)</em>
--#    <% end %><br />
--#    <%= f.password_field :password, autocomplete: "off" %>
--#  </div>
+-#   <div class="field">
+-#     <%= f.label :password %>
+-#     <% if @validatable %>
+-#     <em>(<%= @minimum_password_length %> characters minimum)</em>
+-#     <% end %><br />
+-#     <%= f.password_field :password, autocomplete: "off" %>
+-#   </div>
 -#
--#  <div class="field">
--#    <%= f.label :password_confirmation %><br />
--#    <%= f.password_field :password_confirmation, autocomplete: "off" %>
--#  </div>
+-#   <div class="field">
+-#     <%= f.label :password_confirmation %><br />
+-#     <%= f.password_field :password_confirmation, autocomplete: "off" %>
+-#   </div>
 -#
--#  <div class="actions">
--#    <%= f.submit "Sign up" %>
--#  </div>
--#<% end %>
+-#   <div class="actions">
+-#     <%= f.submit "Sign up" %>
+-#   </div>
+-# <% end %>
 
 = devise_error_messages!
 

From aa255e7e2de0e8d183f35875c66485a2870ad367 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 15:48:37 +0200
Subject: [PATCH 24/72] Use HAML comments in HAML files

---
 app/views/users/description/_show.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/description/_show.html.haml b/app/views/users/description/_show.html.haml
index 7741315b5..e51c33e10 100644
--- a/app/views/users/description/_show.html.haml
+++ b/app/views/users/description/_show.html.haml
@@ -25,7 +25,7 @@
       %h3 Pièces jointes
 
 
-    //TODO a refactorer
+    -# TODO a refactorer
     .row
       .col-lg-8
         = render partial: 'users/description/pieces_justificatives', locals: { dossier: @dossier }

From 7a941d3219987ecebe2c8540759cf8d54f367db4 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 15:59:42 +0200
Subject: [PATCH 25/72] Remove a useless id in _list.html.haml

---
 app/views/admin/procedures/_list.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/procedures/_list.html.haml b/app/views/admin/procedures/_list.html.haml
index ba30f2e6f..365c6cab6 100644
--- a/app/views/admin/procedures/_list.html.haml
+++ b/app/views/admin/procedures/_list.html.haml
@@ -4,9 +4,9 @@
       %th#ID= smart_listing.sortable 'ID', 'id'
       %th#libelle= smart_listing.sortable 'Libellé', 'libelle'
       - if @active_class
-        %th#lien Lien
+        %th Lien
       %th#created_at= smart_listing.sortable 'Date création', 'created_at'
-      %th#lien Actions
+      %th Actions
 
     - @procedures.each do |procedure|
       - procedure = procedure.decorate

From 6cb53b5545fd6a7bbbb7ee314de21e879bc9c12c Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 16:10:46 +0200
Subject: [PATCH 26/72] Move a comment to avoid a haml-lint MultilineScript
 warning

---
 app/views/users/description/_show.html.haml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/users/description/_show.html.haml b/app/views/users/description/_show.html.haml
index e51c33e10..f398ab062 100644
--- a/app/views/users/description/_show.html.haml
+++ b/app/views/users/description/_show.html.haml
@@ -30,7 +30,8 @@
       .col-lg-8
         = render partial: 'users/description/pieces_justificatives', locals: { dossier: @dossier }
 
-    - route = Rails.application.routes.recognize_path(request.referrer) # WTF ?
+    -# WTF ?
+    - route = Rails.application.routes.recognize_path(request.referrer)
     - unless route[:controller].match('admin')
       %div{style: 'text-align:right'}
         %h6 Tous les champs portant un * sont obligatoires.

From 8d9cdf8e33642be1fcd414dc28af33eb1c3b0a6e Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 16:27:23 +0200
Subject: [PATCH 27/72] Remove a useless string in the gestionnaires list

---
 app/views/admin/gestionnaires/_list.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/gestionnaires/_list.html.haml b/app/views/admin/gestionnaires/_list.html.haml
index 82f8ff862..e2b768e52 100644
--- a/app/views/admin/gestionnaires/_list.html.haml
+++ b/app/views/admin/gestionnaires/_list.html.haml
@@ -2,7 +2,7 @@
   %table.table#liste_gestionnaire
     %thead
       %th#libelle= smart_listing.sortable 'Email', 'email'
-      %th= ''
+      %th
 
     - @gestionnaires.each do |gestionnaire|
       %tr

From aaaed328fb8521cb9f3aca8f8dd87fecb897f5f1 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 16:33:53 +0200
Subject: [PATCH 28/72] Remove unnecessary string outputs

---
 app/views/admin/procedures/_onglets.html.haml        |  6 +++---
 app/views/admin/procedures/show.html.haml            |  2 +-
 app/views/dossiers/_dossier_show.html.haml           |  2 +-
 app/views/dossiers/_infos_dossier.html.haml          |  8 ++++----
 app/views/dossiers/_pieces_justificatives.html.haml  |  4 ++--
 ..._panel_admin_procedurescontroller_index.html.haml |  6 +++---
 ...nel_backoffice_dossierscontroller_index.html.haml |  8 ++++----
 ...ft_panel_users_dossierscontroller_index.html.haml | 12 ++++++------
 app/views/users/carte/show.html.haml                 |  2 +-
 9 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/app/views/admin/procedures/_onglets.html.haml b/app/views/admin/procedures/_onglets.html.haml
index 2caac8f1c..c6a98171e 100644
--- a/app/views/admin/procedures/_onglets.html.haml
+++ b/app/views/admin/procedures/_onglets.html.haml
@@ -3,15 +3,15 @@
     %li{class: @draft_class}
       %a{:href => "#{url_for :admin_procedures_draft}"}
         %h5.text-primary
-          = "Brouillons"
+          Brouillons
 
     %li{class: @active_class}
       %a{:href => "#{url_for :admin_procedures}"}
         %h5.text-success
-          = "Actives"
+          Actives
 
     %li{class: @archived_class}
       %a{:href => "#{url_for :admin_procedures_archived}"}
         %h5{style: 'color: black'}
-          = "Archivées"
+          Archivées
 %br
diff --git a/app/views/admin/procedures/show.html.haml b/app/views/admin/procedures/show.html.haml
index e08f0a40e..38297849c 100644
--- a/app/views/admin/procedures/show.html.haml
+++ b/app/views/admin/procedures/show.html.haml
@@ -29,7 +29,7 @@
       = form_tag admin_procedure_archive_path(procedure_id: @facade.procedure.id, archive: !@facade.procedure.archived?), method: :put, style:'float: right; margin-top: 10px' do
         %button#archive.btn.btn-small.btn-default.text-info{type: :button}
           %i.fa.fa-eraser
-          = 'Archiver'
+          Archiver
         #confirm
           %button#valid.btn.btn-small.btn-success{type: :submit}
             %i.fa.fa-check
diff --git a/app/views/dossiers/_dossier_show.html.haml b/app/views/dossiers/_dossier_show.html.haml
index a450fe7d0..5b0114a97 100644
--- a/app/views/dossiers/_dossier_show.html.haml
+++ b/app/views/dossiers/_dossier_show.html.haml
@@ -10,7 +10,7 @@
         - if !@current_gestionnaire && ["draft", "updated", "replied", "initiated"].include?(@facade.dossier.state)
           %a#add_siret.action{href: users_dossier_add_siret_path(dossier_id: @facade.dossier.id)}
             .col-lg-4.col-md-4.col-sm-4.col-xs-4.action
-              = "Renseigner un SIRET"
+              Renseigner un SIRET
 
 - unless @facade.entreprise.nil?
   .default_data_block
diff --git a/app/views/dossiers/_infos_dossier.html.haml b/app/views/dossiers/_infos_dossier.html.haml
index 96524e556..bd7e90fe8 100644
--- a/app/views/dossiers/_infos_dossier.html.haml
+++ b/app/views/dossiers/_infos_dossier.html.haml
@@ -43,10 +43,10 @@
     - if @facade.dossier.mandataire_social && gestionnaire_signed_in?
       .mandataire_social.text-success.center
         %br
-        = "Il est probable que le soumissionnaire du dossier soit un des mandataire social de l'entreprise ("
+        Il est probable que le soumissionnaire du dossier soit un des mandataire social de l'entreprise (
         %b
           = "#{@facade.dossier.user.given_name} #{@facade.dossier.user.family_name}"
-        = ")"
+        )
 .row
   - if @facade.procedure.cerfa_flag? || @facade.dossier.types_de_piece_justificative.count > 0
     .col-xs-12
@@ -70,7 +70,7 @@
                 = link_to "", class: "historique", "data-toggle" => "modal", "data-target" => "#PJmodal", :type => "button", "data-modal_title" => 'formulaires', "data-modal_index" => 'cerfa' do
                   %span.fa.fa-clock-o
               - else
-                = 'Pièce non fournie'
+                Pièce non fournie
     .row
       .col-xs-12
         - @facade.types_de_pieces_justificatives.each do |type_de_piece_justificative|
@@ -90,7 +90,7 @@
                       = link_to "", class: "historique", "data-toggle" => "modal", "data-target" => "#PJmodal", :type => "button", "data-modal_title" => 'formulaires', "data-modal_index" => "type_de_pj_#{type_de_piece_justificative.id}" do
                         %span.fa.fa-clock-o
                   - else
-                    = 'Pièce non fournie'
+                    Pièce non fournie
 
     - unless @facade.dossier.read_only?
       - if user_signed_in? && (@facade.dossier.owner?(current_user.email) || @facade.dossier.invite_by_user?(current_user.email))
diff --git a/app/views/dossiers/_pieces_justificatives.html.haml b/app/views/dossiers/_pieces_justificatives.html.haml
index a9fff2bc7..a3ca7abbf 100644
--- a/app/views/dossiers/_pieces_justificatives.html.haml
+++ b/app/views/dossiers/_pieces_justificatives.html.haml
@@ -3,7 +3,7 @@
     - if @facade.procedure.cerfa_flag?
       %tr{id: "piece_justificative_0"}
         %th.col-lg-6
-          = 'Formulaire'
+          Formulaire
         %td.col-lg-6.col-md-6.col-sm-6.col-xs-6
           - if @facade.dossier.cerfa_available?
             %a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter
@@ -16,7 +16,7 @@
                                                 "data-modal_title" => 'formulaires',
                                                 "data-modal_index" => 'cerfa'}
           - else
-            = 'Pièce non fournie'
+            Pièce non fournie
 
     - @facade.dossier.types_de_piece_justificative.order('order_place ASC').each do |type_de_piece_justificative|
       %tr{ id: "piece_justificative_#{type_de_piece_justificative.id}" }
diff --git a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml
index e4ead8b06..56a78b41b 100644
--- a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml
@@ -11,19 +11,19 @@
   #procedure_list
     %a{:href => "#{url_for :admin_procedures_draft}", id: "draft-procedures"}
       .procedure_list_element{class: @draft_class}
-        = "Brouillons"
+        Brouillons
         .badge.progress-bar-default
           = current_administrateur.procedures.where(published: false, archived: false).count
 
     %a{:href => "#{url_for :admin_procedures}", id: "active-procedures"}
       .procedure_list_element{class: @active_class}
-        = "Actives"
+        Actives
         .badge.progress-bar-success
           = current_administrateur.procedures.where(published: true, archived: false).count
 
     %a{:href => "#{url_for :admin_procedures_archived}", id: "archived-procedures"}
       .procedure_list_element{class: @archived_class}
-        = "Archivées"
+        Archivées
         .badge.progress-bar-purple
           = current_administrateur.procedures.where(archived: true).count
 
diff --git a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml
index 655df11e6..2fe33c8b6 100644
--- a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml
@@ -1,13 +1,13 @@
 %div#first-block
   .dossiers-en-cours
     .count= @facade_data_view.total_dossier_follow
-    .text= "SUIVIS"
+    .text SUIVIS
   .nouveaux-dossiers
     .count= @facade_data_view.total_new_dossier
-    .text= "NOUVEAUX"
+    .text NOUVEAUX
   .nouvelles-notifications
     .count= @facade_data_view.dossiers_with_unread_notifications.count
-    .text= "MODIFIÉS"
+    .text MODIFIÉS
 
 %div#action-block
 
@@ -34,7 +34,7 @@
               = procedure[:unread_notifications]
   #notifications_list.hidden
     - if @facade_data_view.dossiers_with_unread_notifications.empty?
-      .no-notification= "Aucune notification pour le moment."
+      .no-notification Aucune notification pour le moment.
     - else
       - @facade_data_view.dossiers_with_unread_notifications.each do |dossier|
         = link_to backoffice_dossier_path(dossier.id) do
diff --git a/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml
index 09e5853d5..1ea72eaea 100644
--- a/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml
@@ -3,7 +3,7 @@
     = dossier_count = current_user.dossiers.count
     = ("Dossier".pluralize(dossier_count)).upcase
     %br
-    = "EN COURS"
+    EN COURS
 
 %div#action-block
 
@@ -13,31 +13,31 @@
     - unless current_user.dossiers.count == 0
       %a{:href => "#{url_for users_dossiers_path(liste: 'brouillon')}", 'data-toggle' => :tooltip, title: 'Les dossiers jamais proposés à la relecture.'}
         .procedure_list_element{ class: @dossiers_list_facade.brouillon_class, id: 'brouillon' }
-          = "Brouillons"
+          Brouillons
           .badge.progress-bar-default
             = @dossiers_list_facade.brouillon_total
 
       %a{:href => "#{url_for users_dossiers_path(liste: 'a_traiter')}", 'data-toggle' => :tooltip, title: 'Les dossiers qui requièrent une action de votre part.'}
         .procedure_list_element{ class: @dossiers_list_facade.en_construction_class, id: 'a_traiter' }
-          = "En construction"
+          En construction
           .badge.progress-bar-danger
             = @dossiers_list_facade.en_construction_total
 
       %a{:href => "#{url_for users_dossiers_path(liste: 'en_instruction')}", 'data-toggle' => :tooltip, title: 'Les dossiers en cours d\'examen par l\'administration compétante.'}
         .procedure_list_element{ class: @dossiers_list_facade.en_instruction_class, id: 'en_instruction' }
-          = "En instruction"
+          En instruction
           .badge.progress-bar-default
             = @dossiers_list_facade.en_instruction_total
 
       %a{:href => "#{url_for users_dossiers_path(liste: 'termine')}", 'data-toggle' => :tooltip, title: 'Les dossiers cloturés qui peuvent être "Accepté", "Refusé" ou "Sans suite".'}
         .procedure_list_element{ class:  @dossiers_list_facade.termine_class, id: 'termine' }
-          = "Terminé"
+          Terminé
           .badge.progress-bar-success
             = @dossiers_list_facade.termine_total
 
     %a{:href => "#{url_for users_dossiers_path(liste: 'invite')}"}
       .procedure_list_element{ class:  @dossiers_list_facade.invite_class, id: 'invite' }
-        = "Invitation"
+        Invitation
         .badge.progress-bar-warning
           = @dossiers_list_facade.invite_total
   .split-hr-left
diff --git a/app/views/users/carte/show.html.haml b/app/views/users/carte/show.html.haml
index 860a44b03..f38b09327 100644
--- a/app/views/users/carte/show.html.haml
+++ b/app/views/users/carte/show.html.haml
@@ -1,7 +1,7 @@
 .row#carto_page
   .col-lg-12.col-md-12.col-sm-12.col-xs-12
     %h2
-      = 'Localisation'
+      Localisation
     %h4.text-primary
       Positionnez-vous et dessinez sur la carte la zone d'action de votre demande.
     %br

From 6db4a69cb2b17241ab4237c1b90663c53b788945 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 19:10:25 +0200
Subject: [PATCH 29/72] Use spaces inside hashes

---
 .../accompagnateurs/_list_assign.html.haml    |  8 ++---
 .../_list_not_assign.html.haml                |  8 ++---
 .../admin/accompagnateurs/show.html.haml      |  4 +--
 .../change_dossier_state/check.html.haml      |  4 +--
 .../gestionnaires/_informations.html.haml     |  2 +-
 app/views/admin/gestionnaires/_list.html.haml |  6 ++--
 app/views/admin/gestionnaires/index.html.haml |  4 +--
 app/views/admin/mail_templates/edit.html.haml |  2 +-
 .../admin/procedures/_informations.html.haml  |  8 ++---
 app/views/admin/procedures/_list.html.haml    |  2 +-
 .../admin/procedures/_modal_publish.html.haml |  8 ++---
 .../procedures/_modal_transfer.html.haml      | 16 +++++-----
 app/views/admin/procedures/_onglets.html.haml | 14 ++++----
 app/views/admin/procedures/edit.html.haml     |  4 +--
 app/views/admin/procedures/index.html.haml    |  2 +-
 app/views/admin/procedures/new.html.haml      |  4 +--
 app/views/admin/procedures/show.html.haml     | 20 ++++++------
 .../administrateurs/sessions/new.html.haml    |  2 +-
 app/views/administrations/index.html.haml     |  2 +-
 .../dossiers/_filter_framed.html.haml         |  6 ++--
 app/views/backoffice/dossiers/_list.html.haml | 10 +++---
 .../backoffice/dossiers/_pref_list.html.haml  | 10 +++---
 .../dossiers/_state_description.html.haml     |  4 +--
 app/views/cgu/index.html.haml                 | 26 +++++++--------
 app/views/commencer/archived.html.haml        |  6 ++--
 app/views/demo/_list.html.haml                |  2 +-
 app/views/dossiers/_dossier_show.html.haml    | 12 +++----
 app/views/dossiers/_edit_carto.html.haml      |  2 +-
 app/views/dossiers/_edit_dossier.html.haml    |  2 +-
 .../dossiers/_edit_pieces_jointes.html.haml   |  4 +--
 app/views/dossiers/_infos_carto.html.haml     | 10 +++---
 app/views/dossiers/_infos_dossier.html.haml   | 30 ++++++++---------
 .../dossiers/_infos_pieces_jointes.html.haml  | 12 +++----
 .../dossiers/_infos_private_fields.html.haml  |  8 ++---
 app/views/dossiers/_invites.html.haml         |  2 +-
 app/views/dossiers/_messagerie.html.haml      |  2 +-
 .../dossiers/_pieces_justificatives.html.haml | 14 ++++----
 .../dossiers/commentaires/_form.html.haml     |  4 +--
 app/views/dossiers/etapes/_etape1.html.haml   |  6 ++--
 .../etapes/etape_2/_entreprise.html.haml      |  8 ++---
 .../etapes/etape_2/_individual.html.haml      |  6 ++--
 .../particulier/check_email.html.haml         |  4 +--
 .../france_connect/particulier/new.html.haml  |  2 +-
 app/views/layouts/_etape_suivante.html.haml   |  2 +-
 app/views/layouts/_footer.html.haml           |  2 +-
 app/views/layouts/_ie_lt_10.html.haml         |  2 +-
 .../_modifications_terminees.html.haml        |  6 ++--
 app/views/layouts/_navbar.html.haml           |  2 +-
 .../_support_navigator_banner.html.haml       |  2 +-
 .../_switch_devise_profile_module.html.haml   |  2 +-
 app/views/layouts/application.html.haml       | 14 ++++----
 ...n_accompagnateurscontroller_show.html.haml |  2 +-
 ...min_mailtemplatescontroller_edit.html.haml |  2 +-
 ...in_mailtemplatescontroller_index.html.haml |  2 +-
 ...cesjustificativescontroller_show.html.haml |  2 +-
 ...previsualisationscontroller_show.html.haml |  2 +-
 ..._admin_procedurescontroller_edit.html.haml |  2 +-
 ...admin_procedurescontroller_index.html.haml | 12 +++----
 ...dmin_procedurescontroller_navbar.html.haml | 32 +++++++++----------
 ..._admin_procedurescontroller_show.html.haml |  2 +-
 ...dmin_typesdechampcontroller_show.html.haml |  2 +-
 ...pesdechampprivatecontroller_show.html.haml |  2 +-
 ...koffice_dossierscontroller_index.html.haml |  6 ++--
 ...ckoffice_dossierscontroller_show.html.haml |  8 ++---
 .../_left_panel_cgucontroller_index.html.haml |  2 +-
 ...l_users_dossierscontroller_index.html.haml | 10 +++---
 .../left_panels/_search_area.html.haml        |  2 +-
 ...admin_procedurescontroller_index.html.haml |  6 ++--
 ...ssiers_procedurecontroller_index.html.haml |  2 +-
 ...ckoffice_dossierscontroller_show.html.haml |  2 +-
 ...ers_recapitulatifcontroller_show.html.haml |  2 +-
 app/views/root/landing.html.haml              | 16 +++++-----
 app/views/users/carte/_init_carto.html.haml   |  2 +-
 app/views/users/carte/_map.html.haml          |  2 +-
 app/views/users/carte/show.html.haml          | 20 ++++++------
 app/views/users/description/_champs.html.haml |  8 ++---
 .../_pieces_justificatives.html.haml          |  6 ++--
 app/views/users/description/_show.html.haml   | 20 ++++++------
 .../description/champs/_checkbox.html.haml    |  2 +-
 .../description/champs/_datetime.html.haml    | 12 +++----
 .../description/champs/_engagement.html.haml  |  4 +--
 .../champs/_header_private_section.html.haml  |  2 +-
 .../champs/_header_section.html.haml          |  2 +-
 .../champs/_render_list_champs.html.haml      | 10 +++---
 .../description/champs/_textarea.html.haml    |  4 +--
 app/views/users/dossiers/_list.html.haml      |  4 +--
 .../dossiers/_state_description.html.haml     |  4 +--
 app/views/users/dossiers/index.html.haml      |  2 +-
 .../recapitulatif/_modal_upload_pj.html.haml  | 12 +++----
 .../sessions/_resume_procedure.html.haml      |  2 +-
 app/views/users/sessions/new.html.haml        |  4 +--
 app/views/users/siret/_pro.html.haml          |  8 ++---
 92 files changed, 296 insertions(+), 296 deletions(-)

diff --git a/app/views/admin/accompagnateurs/_list_assign.html.haml b/app/views/admin/accompagnateurs/_list_assign.html.haml
index 3dac05419..13cf19de2 100644
--- a/app/views/admin/accompagnateurs/_list_assign.html.haml
+++ b/app/views/admin/accompagnateurs/_list_assign.html.haml
@@ -1,17 +1,17 @@
-.row{style:'height: 34px'}
+.row{ style:'height: 34px' }
 
 - unless smart_listing.empty?
   %table.table#liste_gestionnaire
     %thead
       %th Enlever
-      %th#email{style:'text-align: right'} Email
+      %th#email{ style:'text-align: right' } Email
 
     - @accompagnateurs_assign.each do |accompagnateur|
       %tr
         %td.col-md-1.col-lg-1.col-sm-1.col-xs-1.col-sm-1.col-xs-1.center
-          %a.btn.btn-primary{href: "#{admin_procedure_accompagnateurs_path(procedure_id: @procedure.id, accompagnateur_id: accompagnateur.id, to: AccompagnateurService::NOT_ASSIGN)}", 'data-method' => 'put'}
+          %a.btn.btn-primary{ href: "#{admin_procedure_accompagnateurs_path(procedure_id: @procedure.id, accompagnateur_id: accompagnateur.id, to: AccompagnateurService::NOT_ASSIGN)}", 'data-method' => 'put' }
             .fa.fa-arrow-left
-        %td{style:'padding-top: 11px; font-size:15px; text-align:right'}= accompagnateur.email
+        %td{ style:'padding-top: 11px; font-size:15px; text-align:right' }= accompagnateur.email
 
   = smart_listing.paginate
   = smart_listing.pagination_per_page_links
diff --git a/app/views/admin/accompagnateurs/_list_not_assign.html.haml b/app/views/admin/accompagnateurs/_list_not_assign.html.haml
index 3eb519dcd..253472585 100644
--- a/app/views/admin/accompagnateurs/_list_not_assign.html.haml
+++ b/app/views/admin/accompagnateurs/_list_not_assign.html.haml
@@ -1,8 +1,8 @@
-= smart_listing_controls_for(:accompagnateurs_not_assign, {class: "form-inline text-right"}) do
+= smart_listing_controls_for(:accompagnateurs_not_assign, { class: "form-inline text-right" }) do
   .form-group.filter.input-append
     = text_field_tag :filter, '', class: "search form-control",
                               placeholder: "Recherche...", autocomplete: :off
-  %button.btn.btn-primary{type: :submit}
+  %button.btn.btn-primary{ type: :submit }
     %span.fa.fa-search
 
 - unless smart_listing.empty?
@@ -14,9 +14,9 @@
 
     - @accompagnateurs_not_assign.each do |accompagnateur|
       %tr
-        %td.col-xs-11{style:'padding-top: 11px; font-size:15px'}= accompagnateur.email
+        %td.col-xs-11{ style:'padding-top: 11px; font-size:15px' }= accompagnateur.email
         %td.center
-          %a.btn.btn-success.gestionnaire-affectation{href: "#{admin_procedure_accompagnateurs_path(procedure_id: @procedure.id, accompagnateur_id: accompagnateur.id, to: AccompagnateurService::ASSIGN)}", 'data-method' => 'put'}
+          %a.btn.btn-success.gestionnaire-affectation{ href: "#{admin_procedure_accompagnateurs_path(procedure_id: @procedure.id, accompagnateur_id: accompagnateur.id, to: AccompagnateurService::ASSIGN)}", 'data-method' => 'put' }
             .fa.fa-arrow-right
 
 
diff --git a/app/views/admin/accompagnateurs/show.html.haml b/app/views/admin/accompagnateurs/show.html.haml
index eba44b222..0d75bc522 100644
--- a/app/views/admin/accompagnateurs/show.html.haml
+++ b/app/views/admin/accompagnateurs/show.html.haml
@@ -9,11 +9,11 @@
         %h3
           = t('dynamics.admin.procedure.onglet_accompagnateurs.add.title')
         #procedure_new.section.section-label
-          = form_for @gestionnaire, url: {controller: 'admin/gestionnaires', action: :create} do |f|
+          = form_for @gestionnaire, url: { controller: 'admin/gestionnaires', action: :create } do |f|
             .row
               .col-xs-5
                 = hidden_field_tag :procedure_id, params[:procedure_id]
-                = render partial: 'admin/gestionnaires/informations', locals: {f: f}
+                = render partial: 'admin/gestionnaires/informations', locals: { f: f }
               .col-xs-2
                 %br
                 %br
diff --git a/app/views/admin/change_dossier_state/check.html.haml b/app/views/admin/change_dossier_state/check.html.haml
index 957c4f3c7..e92ed72d8 100644
--- a/app/views/admin/change_dossier_state/check.html.haml
+++ b/app/views/admin/change_dossier_state/check.html.haml
@@ -10,8 +10,8 @@
     = @dossier.decorate.display_state
     %br
     État souhaité :
-    %select{id: :next_state, name: :next_state}
+    %select{ id: :next_state, name: :next_state }
       - Dossier.states.each do |state|
-        %option{value: state[0]}
+        %option{ value: state[0] }
           = DossierDecorator.case_state_fr state[1]
     = f.submit 'Valider'
diff --git a/app/views/admin/gestionnaires/_informations.html.haml b/app/views/admin/gestionnaires/_informations.html.haml
index f7246847c..29b25928d 100644
--- a/app/views/admin/gestionnaires/_informations.html.haml
+++ b/app/views/admin/gestionnaires/_informations.html.haml
@@ -1,4 +1,4 @@
-- {email: 'Email*'}.each do |key, value|
+- { email: 'Email*' }.each do |key, value|
   .form-group
     %h4
       = value
diff --git a/app/views/admin/gestionnaires/_list.html.haml b/app/views/admin/gestionnaires/_list.html.haml
index e2b768e52..5558f6d13 100644
--- a/app/views/admin/gestionnaires/_list.html.haml
+++ b/app/views/admin/gestionnaires/_list.html.haml
@@ -6,13 +6,13 @@
 
     - @gestionnaires.each do |gestionnaire|
       %tr
-        %td{style:'padding-top: 11px; font-size:15px'}= gestionnaire.email
+        %td{ style:'padding-top: 11px; font-size:15px' }= gestionnaire.email
         %td{ style: 'text-align:right' }
           .delete.btn.btn-sm.fa.fa-trash
 
           .confirm
-            = link_to 'Valider', admin_gestionnaire_path(id: gestionnaire.id), {method: :delete, class: 'btn btn-sm btn-success'}
-            .cancel.btn.btn-sm.btn-danger.fa.fa-minus{style: 'top: 0'}
+            = link_to 'Valider', admin_gestionnaire_path(id: gestionnaire.id), { method: :delete, class: 'btn btn-sm btn-success' }
+            .cancel.btn.btn-sm.btn-danger.fa.fa-minus{ style: 'top: 0' }
 
   = smart_listing.paginate
   = smart_listing.pagination_per_page_links
diff --git a/app/views/admin/gestionnaires/index.html.haml b/app/views/admin/gestionnaires/index.html.haml
index aa9836843..3c65e0e3e 100644
--- a/app/views/admin/gestionnaires/index.html.haml
+++ b/app/views/admin/gestionnaires/index.html.haml
@@ -9,10 +9,10 @@
   .col-xs-6
     %h3 Ajouter un accompagnateur
     #procedure_new.section.section-label
-      = form_for @gestionnaire, url: {controller: 'admin/gestionnaires', action: :create} do |f|
+      = form_for @gestionnaire, url: { controller: 'admin/gestionnaires', action: :create } do |f|
         .row
           .col-xs-5
-            = render partial: 'informations', locals: {f: f}
+            = render partial: 'informations', locals: { f: f }
           .col-xs-2
             %br
             %br
diff --git a/app/views/admin/mail_templates/edit.html.haml b/app/views/admin/mail_templates/edit.html.haml
index 8d72c9cc6..99e7e7c1a 100644
--- a/app/views/admin/mail_templates/edit.html.haml
+++ b/app/views/admin/mail_templates/edit.html.haml
@@ -9,7 +9,7 @@
     .row
       .col-md-6
         = f.input :object, label: "Objet de l'email"
-    = f.input :body, label: "Corps de l'email", input_html: {class: 'wysihtml5'}
+    = f.input :body, label: "Corps de l'email", input_html: { class: 'wysihtml5' }
     .text-right
       = link_to "Annuler", admin_procedure_mail_templates_path(@procedure), class: "btn btn-default"
       = f.button :submit, 'Mettre à jour', class: "btn-success"
diff --git a/app/views/admin/procedures/_informations.html.haml b/app/views/admin/procedures/_informations.html.haml
index 5b62353d9..3053278d3 100644
--- a/app/views/admin/procedures/_informations.html.haml
+++ b/app/views/admin/procedures/_informations.html.haml
@@ -2,7 +2,7 @@
   .alert.alert-info
     Cette procédure est publiée, certains éléments de la description ne sont plus modifiables
 
-- {libelle: 'Libellé*', description: 'Description*', organisation: 'Organisation', direction: 'Direction', lien_site_web: 'Lien site internet', lien_notice: 'Lien notice'}.each do |key, value|
+- { libelle: 'Libellé*', description: 'Description*', organisation: 'Organisation', direction: 'Direction', lien_site_web: 'Lien site internet', lien_notice: 'Lien notice' }.each do |key, value|
   .form-group
     %h4
       = value
@@ -16,10 +16,10 @@
   .col-md-6
     %h4 Logo de la procédure
     - unless @procedure.logo.blank?
-      = image_tag @procedure.decorate.logo_img, {style: 'height: 40px; display: inline; margin-right: 6px', id: 'preview_procedure_logo'}
+      = image_tag @procedure.decorate.logo_img, { style: 'height: 40px; display: inline; margin-right: 6px', id: 'preview_procedure_logo' }
     = f.file_field :logo, accept: 'image/png, image/jpg, image/jpeg', style: 'display:inline'
 
-    %div{style:'margin-top:5px'}
+    %div{ style:'margin-top:5px' }
       %i
         Fichier accepté : JPG / JPEG / PNG
   .col-md-6
@@ -83,7 +83,7 @@
   .col-md-6
     %h4 Options avancées
 
-    %label{ for: :auto_archive_on} Archivage automatique le
+    %label{ for: :auto_archive_on } Archivage automatique le
     = f.text_field :auto_archive_on, id: 'auto_archive_on', value: @procedure.auto_archive_on.try{ |d| d.strftime("%d-%m-%Y") }, data: { provide: 'datepicker', 'date-language' => 'fr', 'date-format' => 'dd/mm/yyyy' }
     (à 00h00)
     %p.help-block
diff --git a/app/views/admin/procedures/_list.html.haml b/app/views/admin/procedures/_list.html.haml
index 365c6cab6..cc2f21c65 100644
--- a/app/views/admin/procedures/_list.html.haml
+++ b/app/views/admin/procedures/_list.html.haml
@@ -10,7 +10,7 @@
 
     - @procedures.each do |procedure|
       - procedure = procedure.decorate
-      %tr{id: "tr_dossier_#{procedure.id}", 'data-dossier_url' => admin_procedure_path(id: procedure.id)}
+      %tr{ id: "tr_dossier_#{procedure.id}", 'data-dossier_url' => admin_procedure_path(id: procedure.id) }
         %td= procedure.id
         %td.col-xs-6
           = procedure.libelle
diff --git a/app/views/admin/procedures/_modal_publish.html.haml b/app/views/admin/procedures/_modal_publish.html.haml
index 1749f2e77..746d58325 100644
--- a/app/views/admin/procedures/_modal_publish.html.haml
+++ b/app/views/admin/procedures/_modal_publish.html.haml
@@ -1,10 +1,10 @@
-#publishModal.modal.fade{"aria-labelledby" => "myModalLabel", :role => "dialog", :tabindex => "-1"}
-  .modal-dialog.modal-lg{:role => "document"}
+#publishModal.modal.fade{ "aria-labelledby" => "myModalLabel", :role => "dialog", :tabindex => "-1" }
+  .modal-dialog.modal-lg{ :role => "document" }
     = form_tag admin_procedure_publish_path(procedure_id: @procedure.id), method: :put, remote: true do
       .modal-content
         .modal-header
-          %button.close{"aria-label" => "Close", "data-dismiss" => "modal", :type => "button"}
-            %span{"aria-hidden" => "true"} ×
+          %button.close{ "aria-label" => "Close", "data-dismiss" => "modal", :type => "button" }
+            %span{ "aria-hidden" => "true" } ×
           %h4#myModalLabel.modal-title
             = @procedure.archived?? 'Réactiver' : 'Publier'
             la procédure
diff --git a/app/views/admin/procedures/_modal_transfer.html.haml b/app/views/admin/procedures/_modal_transfer.html.haml
index bda255d8f..777c292da 100644
--- a/app/views/admin/procedures/_modal_transfer.html.haml
+++ b/app/views/admin/procedures/_modal_transfer.html.haml
@@ -1,21 +1,21 @@
-#transferModal.modal.fade{"aria-labelledby" => "TransferProcedureModal", :role => "dialog", :tabindex => "-1"}
-  .modal-dialog.modal-md{:role => "document"}
+#transferModal.modal.fade{ "aria-labelledby" => "TransferProcedureModal", :role => "dialog", :tabindex => "-1" }
+  .modal-dialog.modal-md{ :role => "document" }
     = form_tag admin_procedure_transfer_path(procedure_id: @procedure.id), method: :post, remote: true do
       .modal-content
         .modal-header
-          %button.close{"aria-label" => "Close", "data-dismiss" => "modal", :type => "button"}
-            %span{"aria-hidden" => "true"} ×
+          %button.close{ "aria-label" => "Close", "data-dismiss" => "modal", :type => "button" }
+            %span{ "aria-hidden" => "true" } ×
           %h4#myModalLabel.modal-title
             Petit transfert de procédure entre administrateur
         .modal-body
           %p
             Cette fonctionnalité vous permet de transmettre un clone de votre procédure à un autre administrateur.
-          %div{style:'margin-top:20px'}
-            = text_field_tag :email_admin, '', {class: 'form-control',
+          %div{ style:'margin-top:20px' }
+            = text_field_tag :email_admin, '', { class: 'form-control',
                                                 type: 'email',
                                                 placeholder: 'Email administrateur cible',
-                                                style: 'width: 300px; margin-left:auto; margin-right:auto'}
-          %div#not_found_admin.center.text-danger{style:'display:none; margin-top: 10px'}
+                                                style: 'width: 300px; margin-left:auto; margin-right:auto' }
+          %div#not_found_admin.center.text-danger{ style:'display:none; margin-top: 10px' }
             Cet administrateur n'existe pas.
         .modal-footer
           = submit_tag "Envoyer", class: 'btn btn-success'
diff --git a/app/views/admin/procedures/_onglets.html.haml b/app/views/admin/procedures/_onglets.html.haml
index c6a98171e..0f25a9e36 100644
--- a/app/views/admin/procedures/_onglets.html.haml
+++ b/app/views/admin/procedures/_onglets.html.haml
@@ -1,17 +1,17 @@
 #onglets
   %ul.nav.nav-tabs
-    %li{class: @draft_class}
-      %a{:href => "#{url_for :admin_procedures_draft}"}
+    %li{ class: @draft_class }
+      %a{ :href => "#{url_for :admin_procedures_draft}" }
         %h5.text-primary
           Brouillons
 
-    %li{class: @active_class}
-      %a{:href => "#{url_for :admin_procedures}"}
+    %li{ class: @active_class }
+      %a{ :href => "#{url_for :admin_procedures}" }
         %h5.text-success
           Actives
 
-    %li{class: @archived_class}
-      %a{:href => "#{url_for :admin_procedures_archived}"}
-        %h5{style: 'color: black'}
+    %li{ class: @archived_class }
+      %a{ :href => "#{url_for :admin_procedures_archived}" }
+        %h5{ style: 'color: black' }
           Archivées
 %br
diff --git a/app/views/admin/procedures/edit.html.haml b/app/views/admin/procedures/edit.html.haml
index de42e8835..6ffe6fb12 100644
--- a/app/views/admin/procedures/edit.html.haml
+++ b/app/views/admin/procedures/edit.html.haml
@@ -1,6 +1,6 @@
 .row.white-back
   #procedure_new.section.section-label
-    = form_for @procedure, url: url_for({controller: 'admin/procedures', action: :update, id: @procedure.id}), multipart: true do |f|
-      = render partial: 'informations', locals: {f: f}
+    = form_for @procedure, url: url_for({ controller: 'admin/procedures', action: :update, id: @procedure.id }), multipart: true do |f|
+      = render partial: 'informations', locals: { f: f }
       .text-right
         = f.submit 'Enregistrer', class: 'btn btn-success'
diff --git a/app/views/admin/procedures/index.html.haml b/app/views/admin/procedures/index.html.haml
index cd41c6513..43344b41d 100644
--- a/app/views/admin/procedures/index.html.haml
+++ b/app/views/admin/procedures/index.html.haml
@@ -6,7 +6,7 @@
           .carret-right
           .carret-down
           Procédures
-        %a{href:'/admin/procedures/new'}
+        %a{ href:'/admin/procedures/new' }
           %div#new-procedure.col-lg-2.col-md-2.col-sm-2.col-xs-2.action
             Nouvelle
 
diff --git a/app/views/admin/procedures/new.html.haml b/app/views/admin/procedures/new.html.haml
index 703f98e12..d8bbb4c37 100644
--- a/app/views/admin/procedures/new.html.haml
+++ b/app/views/admin/procedures/new.html.haml
@@ -3,6 +3,6 @@
     = t('dynamics.admin.dossiers.tableau_de_bord.nouvelle_procedure')
 
   #procedure_new.section.section-label
-    = form_for @procedure, url: {controller: 'admin/procedures', action: :create}, multipart: true do |f|
-      = render partial: 'informations', locals: {f: f}
+    = form_for @procedure, url: { controller: 'admin/procedures', action: :create }, multipart: true do |f|
+      = render partial: 'informations', locals: { f: f }
       = f.submit 'Valider', class: 'btn btn-info', id: 'save-procedure', style: 'float:right'
diff --git a/app/views/admin/procedures/show.html.haml b/app/views/admin/procedures/show.html.haml
index 38297849c..28d584650 100644
--- a/app/views/admin/procedures/show.html.haml
+++ b/app/views/admin/procedures/show.html.haml
@@ -2,24 +2,24 @@
   #procedure_show
     - unless @facade.procedure.published?
       - if @facade.procedure.gestionnaires.size == 0
-        %a.action_button.btn.btn-success{style:'float: right; margin-top: 10px', disabled: 'disabled', 'data-toggle' => :tooltip, title: 'Vous ne pouvez pas publier une procédure sans qu\'aucun accompagnateur ne soit affecté à celle-ci.', id: 'publish-procedure'}
+        %a.action_button.btn.btn-success{ style:'float: right; margin-top: 10px', disabled: 'disabled', 'data-toggle' => :tooltip, title: 'Vous ne pouvez pas publier une procédure sans qu\'aucun accompagnateur ne soit affecté à celle-ci.', id: 'publish-procedure' }
           %i.fa.fa-eraser
           Publier
       - else
-        %a.btn.btn-success{"data-target" => "#publishModal", "data-toggle" => "modal", :type => "button", style:'float: right; margin-top: 10px', id: 'publish-procedure'}
+        %a.btn.btn-success{ "data-target" => "#publishModal", "data-toggle" => "modal", :type => "button", style:'float: right; margin-top: 10px', id: 'publish-procedure' }
           %i.fa.fa-eraser
           Publier
 
       = render partial: '/admin/procedures/modal_publish'
 
-    %a#transfer.btn.btn-small.btn-default{"data-target" => "#transferModal", "data-toggle" => "modal", :type => "button", style:'float: right; margin-top: 10px; margin-right: 10px'}
+    %a#transfer.btn.btn-small.btn-default{ "data-target" => "#transferModal", "data-toggle" => "modal", :type => "button", style:'float: right; margin-top: 10px; margin-right: 10px' }
       %i.fa.fa-exchange
       Transférer
 
     = render partial: '/admin/procedures/modal_transfer'
 
     - if @facade.procedure.archived?
-      %a#reenable.btn.btn-small.btn-default.text-info{"data-target" => "#publishModal", "data-toggle" => "modal", :type => "button", style:'float: right; margin-top: 10px'}
+      %a#reenable.btn.btn-small.btn-default.text-info{ "data-target" => "#publishModal", "data-toggle" => "modal", :type => "button", style:'float: right; margin-top: 10px' }
         %i.fa.fa-eraser
         Réactiver
 
@@ -27,14 +27,14 @@
 
     - elsif @facade.procedure.published?
       = form_tag admin_procedure_archive_path(procedure_id: @facade.procedure.id, archive: !@facade.procedure.archived?), method: :put, style:'float: right; margin-top: 10px' do
-        %button#archive.btn.btn-small.btn-default.text-info{type: :button}
+        %button#archive.btn.btn-small.btn-default.text-info{ type: :button }
           %i.fa.fa-eraser
           Archiver
         #confirm
-          %button#valid.btn.btn-small.btn-success{type: :submit}
+          %button#valid.btn.btn-small.btn-success{ type: :submit }
             %i.fa.fa-check
             Valider
-          %button#cancel.btn.btn-small.btn-danger{type: :button}
+          %button#cancel.btn.btn-small.btn-danger{ type: :button }
             %i.fa.fa-remove
             Annuler
 
@@ -45,7 +45,7 @@
 
     %div
       %h3 Lien procédure
-      %div{style:'margin-left:3%'}
+      %div{ style:'margin-left:3%' }
         - if @facade.procedure.published?
           = link_to @facade.procedure.lien, @facade.procedure.lien, target: '_blank'
         - else
@@ -55,7 +55,7 @@
     %br
     %h3 Détails
 
-    .row{style:'margin-right:3%; margin-left:3%;'}
+    .row{ style:'margin-right:3%; margin-left:3%;' }
       .description.col-xs-6.col-md-3.procedure-description
         %h4.text-info
           = @facade.procedure.libelle
@@ -93,7 +93,7 @@
       = t('dynamics.admin.procedure.stats.title')
 
     .row
-      .col-xs-6{style:'margin-left:3%'}
+      .col-xs-6{ style:'margin-left:3%' }
         %h4 Total
         %div
           = @facade.dossiers_total
diff --git a/app/views/administrateurs/sessions/new.html.haml b/app/views/administrateurs/sessions/new.html.haml
index 1d2a616cb..e522d82b1 100644
--- a/app/views/administrateurs/sessions/new.html.haml
+++ b/app/views/administrateurs/sessions/new.html.haml
@@ -8,7 +8,7 @@
   %br
   %br
   #new_user
-    = form_for @administrateur, url: {controller: 'administrateurs/sessions', action: :create } do |f|
+    = form_for @administrateur, url: { controller: 'administrateurs/sessions', action: :create } do |f|
       %h4
         = f.label :email
       .input-group
diff --git a/app/views/administrations/index.html.haml b/app/views/administrations/index.html.haml
index 0262424be..c90769e91 100644
--- a/app/views/administrations/index.html.haml
+++ b/app/views/administrations/index.html.haml
@@ -1,6 +1,6 @@
 .container
   .mt-1
-    = form_for @admin, url: {controller: 'administrations', action: :create} do |f|
+    = form_for @admin, url: { controller: 'administrations', action: :create } do |f|
       .form-group.form-inline.text-center
         = f.text_field :email, placeholder: :email, class: 'form-control'
         = f.text_field :password, placeholder: :password, class: 'form-control'
diff --git a/app/views/backoffice/dossiers/_filter_framed.html.haml b/app/views/backoffice/dossiers/_filter_framed.html.haml
index f8c7b1e55..0112c2d09 100644
--- a/app/views/backoffice/dossiers/_filter_framed.html.haml
+++ b/app/views/backoffice/dossiers/_filter_framed.html.haml
@@ -1,9 +1,9 @@
-.filter_framed.panel.panel-primary{id: "#{filter_framed_id}", style:'width: 300px; height: 100px; position: absolute; top: 0; left: 0; display: none'}
+.filter_framed.panel.panel-primary{ id: "#{filter_framed_id}", style:'width: 300px; height: 100px; position: absolute; top: 0; left: 0; display: none' }
   .panel-heading
     = preference.libelle
 
-  = form_tag @facade_data_view.filter_url, {class: 'panel-body form-inline', method: :post} do
-    %input.form-control.filter_input{name: "filter_input[#{preference.table_attr}]", style:'width: 69%', value: "#{preference.filter}"}
+  = form_tag @facade_data_view.filter_url, { class: 'panel-body form-inline', method: :post } do
+    %input.form-control.filter_input{ name: "filter_input[#{preference.table_attr}]", style:'width: 69%', value: "#{preference.filter}" }
     %button.btn.btn-sm.btn-success
       %i.fa.fa-check
     .btn.btn-sm.btn-danger.erase-filter
diff --git a/app/views/backoffice/dossiers/_list.html.haml b/app/views/backoffice/dossiers/_list.html.haml
index c4c7a796d..e6c7f902b 100644
--- a/app/views/backoffice/dossiers/_list.html.haml
+++ b/app/views/backoffice/dossiers/_list.html.haml
@@ -8,21 +8,21 @@
 
     - @facade_data_view.preference_list_dossiers_filter.each do |preference|
       - unless preference.libelle == 'Statut' || preference.libelle == 'État'
-        %th{class: "col-md-#{preference.bootstrap_lg} col-lg-#{preference.bootstrap_lg}"}
+        %th{ class: "col-md-#{preference.bootstrap_lg} col-lg-#{preference.bootstrap_lg}" }
           - if preference.table.to_s.include? 'champs'
             = preference.libelle
           - else
             = smart_listing.sortable preference.libelle, preference.table_attr
           - if @facade_data_view.active_filter? preference
-            %i.filter.fa.fa-filter{style: "color:#{(preference.filter.blank? ? 'grey' : 'orange')}", id: "filter_#{smart_listing.name.to_s}_#{preference.table_attr.sub('.', '_')}"}
-            = render partial: 'backoffice/dossiers/filter_framed', locals:{preference: preference, filter_framed_id: "framed_filter_#{smart_listing.name.to_s}_#{preference.table_attr.sub('.', '_')}"}
+            %i.filter.fa.fa-filter{ style: "color:#{(preference.filter.blank? ? 'grey' : 'orange')}", id: "filter_#{smart_listing.name.to_s}_#{preference.table_attr.sub('.', '_')}" }
+            = render partial: 'backoffice/dossiers/filter_framed', locals:{ preference: preference, filter_framed_id: "framed_filter_#{smart_listing.name.to_s}_#{preference.table_attr.sub('.', '_')}" }
 
     %th.col-xs-1.center Actions
     %th.col-xs-1.center Abonnés
 
   - unless smart_listing.empty?
     - smart_listing.collection.each do |dossier|
-      %tr.dossier-row{id: "tr_dossier_#{dossier.id}", 'data-dossier_url' => backoffice_dossier_url(id: dossier.id)}
+      %tr.dossier-row{ id: "tr_dossier_#{dossier.id}", 'data-dossier_url' => backoffice_dossier_url(id: dossier.id) }
         - if smart_listing.name.to_s == 'follow_dossiers'
           %td.col-xs-1.center
             - total_notif = dossier.notifications.where(already_read: false).count
@@ -56,7 +56,7 @@
             = link_to('Quitter'.html_safe, backoffice_dossier_follow_path(dossier_id: dossier.id), 'data-method' => :put, class: 'btn-sm btn-danger', id: "suivre_dossier_#{dossier.id}")
           - else
             = link_to('Suivre', backoffice_dossier_follow_path(dossier_id: dossier.id), 'data-method' => :put, class: 'btn-sm btn-primary', id: "suivre_dossier_#{dossier.id}")
-        %td.center{style:"color: #{dossier.total_follow == 0 ? 'red' : ''}"}
+        %td.center{ style:"color: #{dossier.total_follow == 0 ? 'red' : ''}" }
           = dossier.total_follow
 
 = smart_listing.paginate
diff --git a/app/views/backoffice/dossiers/_pref_list.html.haml b/app/views/backoffice/dossiers/_pref_list.html.haml
index 1e171f124..cccd84ba6 100644
--- a/app/views/backoffice/dossiers/_pref_list.html.haml
+++ b/app/views/backoffice/dossiers/_pref_list.html.haml
@@ -3,7 +3,7 @@
 %h3
   = t('dynamics.backoffice.pref_list.title')
 
-%p{style:'margin-top: 15px; margin-bottom: 20px'}
+%p{ style:'margin-top: 15px; margin-bottom: 20px' }
   = t('dynamics.backoffice.pref_list.description')
 
 %h4.text-primary
@@ -16,10 +16,10 @@
         = hidden_field_tag :pref_id, preference.id
         = hidden_field_tag :procedure_id, preference.procedure_id
         = preference.libelle
-        %button.btn.btn-default.btn-xs{type: :submit, id: "delete_pref_list_#{preference[:table]}_#{preference[:attr]}"}
+        %button.btn.btn-default.btn-xs{ type: :submit, id: "delete_pref_list_#{preference[:table]}_#{preference[:attr]}" }
           %i.fa.fa-minus
 
-%h4.text-success{style:'margin-top: 15px'}
+%h4.text-success{ style:'margin-top: 15px' }
   Disponibles
 
 %table
@@ -27,7 +27,7 @@
     - if index%2 == 0 || tables.first.to_s.include?('champs')
       %tr
 
-    %td.col-xs-5{style: 'vertical-align: top', colspan: (tables.first == :champs ? 2 : 1)}
+    %td.col-xs-5{ style: 'vertical-align: top', colspan: (tables.first == :champs ? 2 : 1) }
       %h5= tables.first.to_s.gsub('_', ' ').capitalize
       %ul
         - if tables.second
@@ -42,5 +42,5 @@
                 = hidden_field_tag :procedure_id, @facade_data_view.procedure_id
 
                 = columns.second[:libelle]
-                %button.btn.btn-default.btn-xs{type: :submit, id: "add_pref_list_#{columns.second[:table]}_#{columns.second[:attr]}"}
+                %button.btn.btn-default.btn-xs{ type: :submit, id: "add_pref_list_#{columns.second[:table]}_#{columns.second[:attr]}" }
                   %i.fa.fa-plus
diff --git a/app/views/backoffice/dossiers/_state_description.html.haml b/app/views/backoffice/dossiers/_state_description.html.haml
index 1b726ba0d..03a062ad9 100644
--- a/app/views/backoffice/dossiers/_state_description.html.haml
+++ b/app/views/backoffice/dossiers/_state_description.html.haml
@@ -1,9 +1,9 @@
-#state_description.row{style:'width: 50%; margin-left: auto; margin-right: auto'}
+#state_description.row{ style:'width: 50%; margin-left: auto; margin-right: auto' }
   .panel.panel-info
     .panel-body.center
       .row
         .col-md-1.col-lg-1.col-sm-1.col-xs-1.col-sm-1.col-xs-1
-          .fa.fa-info-circle.text-info{style:'font-size: 2em; margin-top: 20%'}
+          .fa.fa-info-circle.text-info{ style:'font-size: 2em; margin-top: 20%' }
         .col-xs-11
           - if dossiers_list_facade.liste == 'nouveaux'
             Tous les dossiers présents dans cette liste sont ceux qui
diff --git a/app/views/cgu/index.html.haml b/app/views/cgu/index.html.haml
index cb51ab8dc..7f2116cd0 100644
--- a/app/views/cgu/index.html.haml
+++ b/app/views/cgu/index.html.haml
@@ -41,14 +41,14 @@
   %br
   %h3#object_website
     Object du site internet
-    %a{:href => "https://tps.apientreprise.fr/"}
+    %a{ :href => "https://tps.apientreprise.fr/" }
       %strong tps.apientreprise.fr
   %p
     Le site internet tps.apientreprise.fr a pour objet de faciliter la création de démarches administratives en ligne par les acteurs publics, et l’examen par plusieurs services des demandes formulées par les usagers auprès d’un ou organismes publics.
   %br
   %h3#acteurs
     Acteurs de
-    %a{:href => "https://tps.apientreprise.fr/"}
+    %a{ :href => "https://tps.apientreprise.fr/" }
       TPS
   %p Les acteurs de TPS sont les suivants :
   %ul
@@ -64,7 +64,7 @@
     %li N° de sécurité sociale,
     %li Infractions, condamnations, mesures de sécurité,
     %li
-      %a{:href => "https://www.declaration.cnil.fr/declarations/declaration/donneesSensibles_DN.display.action"} Opinions philosophiques, politiques, religieuses, syndicales, vie sexuelle, données de santé, origine raciale.
+      %a{ :href => "https://www.declaration.cnil.fr/declarations/declaration/donneesSensibles_DN.display.action" } Opinions philosophiques, politiques, religieuses, syndicales, vie sexuelle, données de santé, origine raciale.
   %br
   %h3#data_collects
     Données collectées et responsabilité des organismes publics à l’initiative de démarches en ligne avec TPS.
@@ -78,7 +78,7 @@
   %h4 Données personnelles :
   %p
     En application de la loi n°78-17 Informatique et Libertés du 6 janvier 1978, vous disposez d'un droit d'accès, de rectification, de modification et de suppression concernant les données qui vous concernent. Vous pouvez exercer ce droit à travers la rubrique
-    %a{:href => "http://www.faire-simple.gouv.fr/contact"} Contact
+    %a{ :href => "http://www.faire-simple.gouv.fr/contact" } Contact
   %h4 Données de connexion :
   %p Conformément à la loi n°2004-575 du 21 juin 2004 pour la confiance dans l’économie numérique, certaines données de connexion sont conservées par le service aux fins de protection contre les intrusions et de poursuites judiciaires le cas échéant. Ces données sont conservées pendant un an.
 
@@ -97,9 +97,9 @@
     %br/
     Tél. : 01 41 17 50 50
   %p
-    %a{:href => "http://www.insee.fr/fr/bases-de-donnees/default.asp?page=sirene.htm"} Informations de la base SIRENE
+    %a{ :href => "http://www.insee.fr/fr/bases-de-donnees/default.asp?page=sirene.htm" } Informations de la base SIRENE
     %br/
-    %a{:href => "http://www.sirene.fr/sirene/public/static/mentions-legales"} Condition légales d’utilisation de service SIRENE
+    %a{ :href => "http://www.sirene.fr/sirene/public/static/mentions-legales" } Condition légales d’utilisation de service SIRENE
   %br
   %h4 INFOGREFFE :
   %p
@@ -112,9 +112,9 @@
     94300 VINCENNES
   %p
     Les informations transmises aux autorités publiques en charges de l’examen de dossiers de candidature sont définis par le service en ligne suivant proposé aux internautes :
-    %a{:href => "https://www.infogreffe.fr/societes/documents-officiels/demande-kbis.html"} https://www.infogreffe.fr/societes/documents-officiels/demande-kbis.html
+    %a{ :href => "https://www.infogreffe.fr/societes/documents-officiels/demande-kbis.html" } https://www.infogreffe.fr/societes/documents-officiels/demande-kbis.html
   %p
-    %a{:href => "https://www.infogreffe.fr/societes/cgu-cgv.html"} Conditions générales d’utilisation des données d’infogreffe
+    %a{ :href => "https://www.infogreffe.fr/societes/cgu-cgv.html" } Conditions générales d’utilisation des données d’infogreffe
 
   %br
   %h4 TPS fait appel à d’autres services opérés par le SGMAP afin de faciliter les démarches administratives :
@@ -122,18 +122,18 @@
   %p
     %strong> France CONNECT
     \ : informations complémentaires :
-    %a{:href => "https://franceconnect.gouv.fr/"} https://franceconnect.gouv.fr/
+    %a{ :href => "https://franceconnect.gouv.fr/" } https://franceconnect.gouv.fr/
   %p
     %strong La base d’adresse nationale :
-    %a{:href => "https://adresse.data.gouv.fr/"} https://adresse.data.gouv.fr/
+    %a{ :href => "https://adresse.data.gouv.fr/" } https://adresse.data.gouv.fr/
   %p
     %strong TPS est un service de l’Etat Plateforme :
 
-    %a{:href => "http://etatplateforme.modernisation.gouv.fr/"} http://etatplateforme.modernisation.gouv.fr/
+    %a{ :href => "http://etatplateforme.modernisation.gouv.fr/" } http://etatplateforme.modernisation.gouv.fr/
   %p
     %strong Il met en œuvre les principes définis par le programme « Dites-le nous une fois »
   %p
-    %a{:href => "http://www.modernisation.gouv.fr/les-services-publics-se-simplifient-et-innovent/par-des-simplifications-pour-les-entreprises/dites-le-nous-une-fois-un-programme-pour-simplifier-la-vie-des-entreprises"} http://www.modernisation.gouv.fr/les-services-publics-se-simplifient-et-innovent/par-des-simplifications-pour-les-entreprises/dites-le-nous-une-fois-un-programme-pour-simplifier-la-vie-des-entreprises
+    %a{ :href => "http://www.modernisation.gouv.fr/les-services-publics-se-simplifient-et-innovent/par-des-simplifications-pour-les-entreprises/dites-le-nous-une-fois-un-programme-pour-simplifier-la-vie-des-entreprises" } http://www.modernisation.gouv.fr/les-services-publics-se-simplifient-et-innovent/par-des-simplifications-pour-les-entreprises/dites-le-nous-une-fois-un-programme-pour-simplifier-la-vie-des-entreprises
   %br
   %h3#reproduction
     Droit de reproduction :
@@ -143,7 +143,7 @@
   %p L’autorisation de création de liens est valable pour tout support, à l’exception de ceux diffusant des informations à caractère raciste, pornographique, xénophobe ou pouvant porter atteinte à la sensibilité du plus grand nombre.
   %p
     La rubrique
-    %a{:href => "http://www.faire-simple.gouv.fr/contact"} Contactez-nous
+    %a{ :href => "http://www.faire-simple.gouv.fr/contact" } Contactez-nous
     est à votre disposition pour nous faire part de vos remarques et suggestions.
   %br
   %h3#propriete_intellectuelle
diff --git a/app/views/commencer/archived.html.haml b/app/views/commencer/archived.html.haml
index d550d24e4..e41e7ca5a 100644
--- a/app/views/commencer/archived.html.haml
+++ b/app/views/commencer/archived.html.haml
@@ -1,8 +1,8 @@
 %br
-%div{style: 'text-align: center; max-width:500px; margin-left:auto; margin-right:auto; padding: 20px;'}
+%div{ style: 'text-align: center; max-width:500px; margin-left:auto; margin-right:auto; padding: 20px;' }
   = render partial: 'users/sessions/resume_procedure'
 
-.center{style:'margin-top: -20px'}
+.center{ style:'margin-top: -20px' }
   %h3
     La campagne de création de nouveau dossier
     %br
@@ -11,5 +11,5 @@
   %br
   %p
     Si vous avez déjà déposé un ou plusieurs dossiers :
-  %a.btn.btn-lg.btn-info{href: new_user_session_path}
+  %a.btn.btn-lg.btn-info{ href: new_user_session_path }
     Accéder à mon espace en ligne.
diff --git a/app/views/demo/_list.html.haml b/app/views/demo/_list.html.haml
index ebc52f855..60ea99bdc 100644
--- a/app/views/demo/_list.html.haml
+++ b/app/views/demo/_list.html.haml
@@ -1,7 +1,7 @@
 - unless smart_listing.empty?
   %table.table
     %tr
-      %th{colspan: 4}
+      %th{ colspan: 4 }
         %h4 Lien vers les procédures TPS
     %tr
       %th= smart_listing.sortable 'ID', 'id'
diff --git a/app/views/dossiers/_dossier_show.html.haml b/app/views/dossiers/_dossier_show.html.haml
index 5b0114a97..be5f83190 100644
--- a/app/views/dossiers/_dossier_show.html.haml
+++ b/app/views/dossiers/_dossier_show.html.haml
@@ -8,7 +8,7 @@
           .carret-right
           INFORMATIONS DU DEMANDEUR
         - if !@current_gestionnaire && ["draft", "updated", "replied", "initiated"].include?(@facade.dossier.state)
-          %a#add_siret.action{href: users_dossier_add_siret_path(dossier_id: @facade.dossier.id)}
+          %a#add_siret.action{ href: users_dossier_add_siret_path(dossier_id: @facade.dossier.id) }
             .col-lg-4.col-md-4.col-sm-4.col-xs-4.action
               Renseigner un SIRET
 
@@ -44,12 +44,12 @@
           CARTOGRAPHIE
         = render partial: '/dossiers/edit_carto'
       .body.display-block-on-print
-        %input{id: 'json_latlngs',          type: 'hidden', value: "#{@facade.dossier.json_latlngs}", name: 'json_latlngs'}
-        %input{id: 'quartier_prioritaires', type: 'hidden', value: "#{@facade.dossier.quartier_prioritaires.to_json}"}
-        %input{id: 'cadastres',             type: 'hidden', value: "#{@facade.dossier.cadastres.to_json}"}
+        %input{ id: 'json_latlngs',          type: 'hidden', value: "#{@facade.dossier.json_latlngs}", name: 'json_latlngs' }
+        %input{ id: 'quartier_prioritaires', type: 'hidden', value: "#{@facade.dossier.quartier_prioritaires.to_json}" }
+        %input{ id: 'cadastres',             type: 'hidden', value: "#{@facade.dossier.cadastres.to_json}" }
 
-        = render partial: '/users/carte/map', locals: {dossier: @facade.dossier}
-        = render partial: 'users/carte/init_carto', locals: {dossier: @facade.dossier}
+        = render partial: '/users/carte/map', locals: { dossier: @facade.dossier }
+        = render partial: 'users/carte/init_carto', locals: { dossier: @facade.dossier }
 
 
 - if @current_gestionnaire && gestionnaire_signed_in? && @champs_private.count > 0
diff --git a/app/views/dossiers/_edit_carto.html.haml b/app/views/dossiers/_edit_carto.html.haml
index fedcf055d..91ece5bd1 100644
--- a/app/views/dossiers/_edit_carto.html.haml
+++ b/app/views/dossiers/_edit_carto.html.haml
@@ -1,5 +1,5 @@
 - unless @facade.dossier.read_only?
   - if user_signed_in? && (@facade.dossier.owner?(current_user.email) || @facade.dossier.invite_by_user?(current_user.email))
-    %a#maj_carte.action{href: "/users/dossiers/#{@facade.dossier.id}/carte"}
+    %a#maj_carte.action{ href: "/users/dossiers/#{@facade.dossier.id}/carte" }
       .col-lg-2.col-md-2.col-sm-2.col-xs-2.action
         = 'éditer'.upcase
diff --git a/app/views/dossiers/_edit_dossier.html.haml b/app/views/dossiers/_edit_dossier.html.haml
index 5f07d7ccc..d02c08c89 100644
--- a/app/views/dossiers/_edit_dossier.html.haml
+++ b/app/views/dossiers/_edit_dossier.html.haml
@@ -1,5 +1,5 @@
 - unless @facade.dossier.read_only?
   - if user_signed_in? && (@facade.dossier.owner?(current_user.email) || @facade.dossier.invite_by_user?(current_user.email))
-    %a#maj_infos.action{href: "/users/dossiers/#{@facade.dossier.id}/description"}
+    %a#maj_infos.action{ href: "/users/dossiers/#{@facade.dossier.id}/description" }
       %div#edit-dossier.col-lg-2.col-md-2.col-sm-2.col-xs-2.action
         = "éditer".upcase
diff --git a/app/views/dossiers/_edit_pieces_jointes.html.haml b/app/views/dossiers/_edit_pieces_jointes.html.haml
index 88f4bff34..129e551ef 100644
--- a/app/views/dossiers/_edit_pieces_jointes.html.haml
+++ b/app/views/dossiers/_edit_pieces_jointes.html.haml
@@ -2,10 +2,10 @@
   - if user_signed_in? && (@facade.dossier.owner?(current_user.email) || @facade.dossier.invite_by_user?(current_user.email))
     - if @facade.procedure.cerfa_flag? || @facade.dossier.types_de_piece_justificative.size > 0
       .col-lg-4.col-md-4.col-sm-4.col-xs-4.action
-        %a#maj_pj.action{"data-target" => "#UploadPJmodal",
+        %a#maj_pj.action{ "data-target" => "#UploadPJmodal",
                            "data-toggle" => "modal",
                            :type => "button",
-                           style: 'margin-bottom: 15px; margin-top: -30px'}
+                           style: 'margin-bottom: 15px; margin-top: -30px' }
           Modifier les documents
         %br
         = render partial: 'users/recapitulatif/modal_upload_pj'
diff --git a/app/views/dossiers/_infos_carto.html.haml b/app/views/dossiers/_infos_carto.html.haml
index c51812500..467adf177 100644
--- a/app/views/dossiers/_infos_carto.html.haml
+++ b/app/views/dossiers/_infos_carto.html.haml
@@ -1,11 +1,11 @@
 .row
   .col-xs-12
-    #map.mini{class: @facade.dossier.procedure.module_api_carto.classes}
+    #map.mini{ class: @facade.dossier.procedure.module_api_carto.classes }
 
-    %input{id: 'json_latlngs', type:'hidden', value: "#{@facade.dossier.json_latlngs}"}
-    %input{id: 'quartier_prioritaires', type:'hidden', value: "#{@facade.dossier.quartier_prioritaires.to_json}"}
-    %input{id: 'cadastres', type:'hidden', value: "#{@facade.dossier.cadastres.to_json}"}
+    %input{ id: 'json_latlngs', type:'hidden', value: "#{@facade.dossier.json_latlngs}" }
+    %input{ id: 'quartier_prioritaires', type:'hidden', value: "#{@facade.dossier.quartier_prioritaires.to_json}" }
+    %input{ id: 'cadastres', type:'hidden', value: "#{@facade.dossier.cadastres.to_json}" }
 
-    %script{type: 'text/javascript'}
+    %script{ type: 'text/javascript' }
       = "var dossier_id =#{@facade.dossier.id}"
       initCarto();
diff --git a/app/views/dossiers/_infos_dossier.html.haml b/app/views/dossiers/_infos_dossier.html.haml
index bd7e90fe8..ede81e7f8 100644
--- a/app/views/dossiers/_infos_dossier.html.haml
+++ b/app/views/dossiers/_infos_dossier.html.haml
@@ -65,7 +65,7 @@
             .col-xs-5.despositaire-info
               - if @facade.dossier.cerfa_available?
                 %a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter
-                %span{style:'margin-left:12px'}
+                %span{ style:'margin-left:12px' }
                   \-
                 = link_to "", class: "historique", "data-toggle" => "modal", "data-target" => "#PJmodal", :type => "button", "data-modal_title" => 'formulaires', "data-modal_index" => 'cerfa' do
                   %span.fa.fa-clock-o
@@ -84,7 +84,7 @@
                     %span.text-success Nous l'avons récupéré pour vous.
                   - elsif !(@pj = @facade.dossier.retrieve_last_piece_justificative_by_type(type_de_piece_justificative.id)).nil?
                     %a{ href: "#{@pj.content_url}", target: '_blank' } Consulter
-                    %span{style:'margin-left:12px'}
+                    %span{ style:'margin-left:12px' }
                       \-
                     - if @facade.dossier.pieces_justificatives.where(type_de_piece_justificative_id: type_de_piece_justificative.id).count > 1
                       = link_to "", class: "historique", "data-toggle" => "modal", "data-target" => "#PJmodal", :type => "button", "data-modal_title" => 'formulaires', "data-modal_index" => "type_de_pj_#{type_de_piece_justificative.id}" do
@@ -97,7 +97,7 @@
         - if @facade.procedure.cerfa_flag? || @facade.dossier.types_de_piece_justificative.size > 0
           .row
             .col-xs-4
-            %a#maj_pj.action{"data-target" => "#UploadPJmodal", "data-toggle" => "modal", :type => "button"}
+            %a#maj_pj.action{ "data-target" => "#UploadPJmodal", "data-toggle" => "modal", :type => "button" }
               .col-xs-4.action
                 Modifier les documents
               %br
@@ -105,12 +105,12 @@
             .col-xs-4
 
     - if gestionnaire_signed_in?
-      #PJmodal.modal.fade{"aria-labelledby" => "myModalLabel", :role => "dialog", :tabindex => "-1"}
-        .modal-dialog.modal-lg{:role => "document"}
+      #PJmodal.modal.fade{ "aria-labelledby" => "myModalLabel", :role => "dialog", :tabindex => "-1" }
+        .modal-dialog.modal-lg{ :role => "document" }
           .modal-content
             .modal-header
-              %button.close{"aria-label" => "Close", "data-dismiss" => "modal", :type => "button"}
-                %span{"aria-hidden" => "true"} ×
+              %button.close{ "aria-label" => "Close", "data-dismiss" => "modal", :type => "button" }
+                %span{ "aria-hidden" => "true" } ×
               %h4#myModalLabel.modal-title
                 Historique des
                 %span#PJmodal_title
@@ -133,9 +133,9 @@
                           %td.col-md-6.col-sm-6.col-xs-6.col-lg-4
                             = cerfa.created_at
                           %td.col-md-6.col-sm-6.col-xs-6.col-lg-4
-                            = link_to 'Récupérer', cerfa.content_url, {target: :blank}
+                            = link_to 'Récupérer', cerfa.content_url, { target: :blank }
                 - @facade.dossier.types_de_piece_justificative.each do |type_de_piece_justificative|
-                  %tbody.tr_content{id: "type_de_pj_#{type_de_piece_justificative.id}"}
+                  %tbody.tr_content{ id: "type_de_pj_#{type_de_piece_justificative.id}" }
                     - @facade.dossier.retrieve_all_piece_justificative_by_type(type_de_piece_justificative.id).each do |piece_justificative|
                       %tr
                         %td.col-md-6.col-sm-6.col-xs-6.col-lg-4
@@ -143,15 +143,15 @@
                         %td.col-md-6.col-sm-6.col-xs-6.col-lg-4
                           = piece_justificative.created_at
                         %td.col-md-6.col-sm-6.col-xs-6.col-lg-4
-                          = link_to 'Récupérer', piece_justificative.content_url, {target: :blank}
+                          = link_to 'Récupérer', piece_justificative.content_url, { target: :blank }
             .modal-footer
 
-#modalCommentairesDossierParChamp.modal.fade{"tabindex" => -1, "role" => "dialog"}
-  .modal-dialog{"role" => "document"}
+#modalCommentairesDossierParChamp.modal.fade{ "tabindex" => -1, "role" => "dialog" }
+  .modal-dialog{ "role" => "document" }
     .modal-content
       .modal-header
-        %button.close{"data-dismiss" => "modal", "aria-label" => "Fermer"}
-          %span{"aria-hidden" => true}
+        %button.close{ "data-dismiss" => "modal", "aria-label" => "Fermer" }
+          %span{ "aria-hidden" => true }
             &times;
         .modal-title
           Commentaires
@@ -159,5 +159,5 @@
         %p
           Chargement des commentaires en cours...
       .modal-footer
-        %button.btn.btn-primary{"data-dismiss" => "modal"}
+        %button.btn.btn-primary{ "data-dismiss" => "modal" }
           Fermer
diff --git a/app/views/dossiers/_infos_pieces_jointes.html.haml b/app/views/dossiers/_infos_pieces_jointes.html.haml
index de4b03aa1..1481578ad 100644
--- a/app/views/dossiers/_infos_pieces_jointes.html.haml
+++ b/app/views/dossiers/_infos_pieces_jointes.html.haml
@@ -8,14 +8,14 @@
           .col-xs-5
             - if @facade.dossier.cerfa_available?
               %a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter
-              %span{style:'margin-left:12px'}
+              %span{ style:'margin-left:12px' }
                 \-
-              %a.btn.fa.fa-timer{style:'color: black; padding-top: 0',
+              %a.btn.fa.fa-timer{ style:'color: black; padding-top: 0',
                                                 "data-target" => "#PJmodal",
                                                 "data-toggle" => "modal",
                                                 :type => "button",
                                                 "data-modal_title" => 'formulaires',
-                                                "data-modal_index" => 'cerfa'}
+                                                "data-modal_index" => 'cerfa' }
             - else
               = 'Pièce non fournie'
 
@@ -34,14 +34,14 @@
                   -#   = 'Pièce fournie'
                   -# - elsif gestionnaire_signed_in?
                   %a{ href: "#{@pj.content_url}", target: '_blank' } Consulter
-                  %span{style:'margin-left:12px'}
+                  %span{ style:'margin-left:12px' }
                     \-
-                  %a.btn.fa.fa-timer{style:'color: black; padding-top: 0',
+                  %a.btn.fa.fa-timer{ style:'color: black; padding-top: 0',
                                                       "data-target" => "#PJmodal",
                                                       "data-toggle" => "modal",
                                                       :type => "button",
                                                       "data-modal_title" => type_de_piece_justificative.libelle,
-                                                      "data-modal_index" => "type_de_pj_#{type_de_piece_justificative.id}"}
+                                                      "data-modal_index" => "type_de_pj_#{type_de_piece_justificative.id}" }
                 - else
                   = 'Pièce non fournie'
 
diff --git a/app/views/dossiers/_infos_private_fields.html.haml b/app/views/dossiers/_infos_private_fields.html.haml
index 295f6be56..f1bf3816a 100644
--- a/app/views/dossiers/_infos_private_fields.html.haml
+++ b/app/views/dossiers/_infos_private_fields.html.haml
@@ -1,6 +1,6 @@
-.row{style: 'margin-top: -20px'}
+.row{ style: 'margin-top: -20px' }
   .col-xs-12
-    = form_for @facade.dossier, url: {controller: 'backoffice/private_formulaires', action: :update, dossier_id: @facade.dossier.id}, remote: true do
-      = render partial: '/users/description/champs', locals:{private: true}
+    = form_for @facade.dossier, url: { controller: 'backoffice/private_formulaires', action: :update, dossier_id: @facade.dossier.id }, remote: true do
+      = render partial: '/users/description/champs', locals:{ private: true }
       .row.center
-        = submit_tag :Enregistrer, {class: 'btn-action'}
+        = submit_tag :Enregistrer, { class: 'btn-action' }
diff --git a/app/views/dossiers/_invites.html.haml b/app/views/dossiers/_invites.html.haml
index 88bead8bb..0d8f47d58 100644
--- a/app/views/dossiers/_invites.html.haml
+++ b/app/views/dossiers/_invites.html.haml
@@ -14,4 +14,4 @@
   .col-xs-3
     = form_tag invites_dossier_path(dossier_id: @facade.dossier.id), method: :post, class: 'form-inline' do
       = text_field_tag :email, '', class: 'form-control', placeholder: 'Envoyer une invitation'
-      = submit_tag 'Ajouter', class: 'btn btn-success', id: 'send-invitation', data: {confirm: "Envoyer l'invitation ?"}
+      = submit_tag 'Ajouter', class: 'btn btn-success', id: 'send-invitation', data: { confirm: "Envoyer l'invitation ?" }
diff --git a/app/views/dossiers/_messagerie.html.haml b/app/views/dossiers/_messagerie.html.haml
index 58a8ac81b..24729c9a4 100644
--- a/app/views/dossiers/_messagerie.html.haml
+++ b/app/views/dossiers/_messagerie.html.haml
@@ -1,4 +1,4 @@
-.default_data_block{style:'margin-top: 40px'}
+.default_data_block{ style:'margin-top: 40px' }
   .row.show-block.clearfix#messages
     .header
       .col-xs-10.title
diff --git a/app/views/dossiers/_pieces_justificatives.html.haml b/app/views/dossiers/_pieces_justificatives.html.haml
index a3ca7abbf..bc4f660fe 100644
--- a/app/views/dossiers/_pieces_justificatives.html.haml
+++ b/app/views/dossiers/_pieces_justificatives.html.haml
@@ -1,20 +1,20 @@
 #pieces_justificatives
   %table.table
     - if @facade.procedure.cerfa_flag?
-      %tr{id: "piece_justificative_0"}
+      %tr{ id: "piece_justificative_0" }
         %th.col-lg-6
           Formulaire
         %td.col-lg-6.col-md-6.col-sm-6.col-xs-6
           - if @facade.dossier.cerfa_available?
             %a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter
-            %span{style:'margin-left:12px'}
+            %span{ style:'margin-left:12px' }
               \-
-            %a.btn.fa.fa-timer{style:'color: black; padding-top: 0',
+            %a.btn.fa.fa-timer{ style:'color: black; padding-top: 0',
                                                 "data-target" => "#PJmodal",
                                                 "data-toggle" => "modal",
                                                 :type => "button",
                                                 "data-modal_title" => 'formulaires',
-                                                "data-modal_index" => 'cerfa'}
+                                                "data-modal_index" => 'cerfa' }
           - else
             Pièce non fournie
 
@@ -30,14 +30,14 @@
             -#   = 'Pièce fournie'
             -# - elsif gestionnaire_signed_in?
             %a{ href: "#{@pj.content_url}", target: '_blank' } Consulter
-            %span{style:'margin-left:12px'}
+            %span{ style:'margin-left:12px' }
               \-
-            %a.btn.fa.fa-timer{style:'color: black; padding-top: 0',
+            %a.btn.fa.fa-timer{ style:'color: black; padding-top: 0',
                                                 "data-target" => "#PJmodal",
                                                 "data-toggle" => "modal",
                                                 :type => "button",
                                                 "data-modal_title" => type_de_piece_justificative.libelle,
-                                                "data-modal_index" => "type_de_pj_#{type_de_piece_justificative.id}"}
+                                                "data-modal_index" => "type_de_pj_#{type_de_piece_justificative.id}" }
           - else
             = 'Pièce non fournie'
 
diff --git a/app/views/dossiers/commentaires/_form.html.haml b/app/views/dossiers/commentaires/_form.html.haml
index 5296a3f1d..a2b5815e6 100644
--- a/app/views/dossiers/commentaires/_form.html.haml
+++ b/app/views/dossiers/commentaires/_form.html.haml
@@ -1,10 +1,10 @@
 = form_tag(url_for({ controller: 'commentaires', action: :create, dossier_id: dossier_facade.dossier.id, champ_id: dossier_facade.champ_id }), class: 'form-inline', method: 'POST', multipart: true) do
 
-  %textarea.form-control.wysihtml5{id: 'texte_commentaire', name: 'texte_commentaire', style: 'width: 100%; margin-bottom:2%', rows: '5', placeholder:"Commentaire"}
+  %textarea.form-control.wysihtml5{ id: 'texte_commentaire', name: 'texte_commentaire', style: 'width: 100%; margin-bottom:2%', rows: '5', placeholder:"Commentaire" }
 
   .row
     .col-md-6
-      %h4.text-primary{style: 'margin-top: 0px'} Ajouter un fichier
+      %h4.text-primary{ style: 'margin-top: 0px' } Ajouter un fichier
       = file_field_tag "piece_justificative[content]", accept:  PieceJustificative.accept_format, style: 'float: left; margin-left: 20px'
 
     .col-md-6.text-right
diff --git a/app/views/dossiers/etapes/_etape1.html.haml b/app/views/dossiers/etapes/_etape1.html.haml
index 98efbc2ae..d5bce96d1 100644
--- a/app/views/dossiers/etapes/_etape1.html.haml
+++ b/app/views/dossiers/etapes/_etape1.html.haml
@@ -1,7 +1,7 @@
 .col-xs-3.center
   %h3 Ma procédure
 
-  #logos.center{class: (@facade.entreprise.nil? ? '' : 'mask')}
+  #logos.center{ class: (@facade.entreprise.nil? ? '' : 'mask') }
     - if @facade.procedure.euro_flag
       #euro_flag.flag
         = image_tag('drapeau_europe.png')
@@ -15,10 +15,10 @@
       %h2#titre_procedure.text-info
         = @facade.procedure.libelle
 
-      %p#description_procedure{style:'width: 95%;', class: (@facade.entreprise.nil? ? '' : 'mask')}
+      %p#description_procedure{ style:'width: 95%;', class: (@facade.entreprise.nil? ? '' : 'mask') }
         = h @facade.procedure.description.html_safe
 
         - unless @facade.procedure.lien_site_web.blank?
           .center
-            %a{href: "#{@facade.procedure.lien_site_web.html_safe}", target: '_blank'}
+            %a{ href: "#{@facade.procedure.lien_site_web.html_safe}", target: '_blank' }
               En savoir plus ...
diff --git a/app/views/dossiers/etapes/etape_2/_entreprise.html.haml b/app/views/dossiers/etapes/etape_2/_entreprise.html.haml
index 6f0d121f8..5038d4f17 100644
--- a/app/views/dossiers/etapes/etape_2/_entreprise.html.haml
+++ b/app/views/dossiers/etapes/etape_2/_entreprise.html.haml
@@ -3,7 +3,7 @@
     Mes informations
   %br
   - unless @facade.entreprise.nil?
-    .center{style:'margin-left: -5%'}
+    .center{ style:'margin-left: -5%' }
       Vous êtes authentifié avec le SIRET
 
       %h3.text-success
@@ -15,8 +15,8 @@
 .etape.etapes_informations.col-xs-9
   .row
     - if @facade.entreprise.nil?
-      #new_siret{style:'margin-left: 20%; margin-top: 5%'}
-        = form_for @facade.dossier, html: {class: 'form-inline'}, url: users_dossier_siret_informations_path(dossier_id: @facade.dossier.id), method: :post, remote: true do |f|
+      #new_siret{ style:'margin-left: 20%; margin-top: 5%' }
+        = form_for @facade.dossier, html: { class: 'form-inline' }, url: users_dossier_siret_informations_path(dossier_id: @facade.dossier.id), method: :post, remote: true do |f|
           .form-group.form-group-lg
             = f.text_field :siret, class: "form-control", placeholder: "Entrez votre Siret", value: @siret
             = f.hidden_field :dossier_id, value: @facade.dossier.id
@@ -26,7 +26,7 @@
       #recap_info_entreprise
         = render partial: '/dossiers/infos_entreprise'
 
-        %p#insee_infogreffe{style:'color:grey; float:right'}
+        %p#insee_infogreffe{ style:'color:grey; float:right' }
           %i
             Informations récupérées auprès de l'INSEE et d'INFOGREFFE
 
diff --git a/app/views/dossiers/etapes/etape_2/_individual.html.haml b/app/views/dossiers/etapes/etape_2/_individual.html.haml
index d6b78e478..e74506f0b 100644
--- a/app/views/dossiers/etapes/etape_2/_individual.html.haml
+++ b/app/views/dossiers/etapes/etape_2/_individual.html.haml
@@ -21,17 +21,17 @@
             %label
               %h4
                 Nom *
-              = ff.text_field :nom, {class: 'form-control'}
+              = ff.text_field :nom, { class: 'form-control' }
           .form-group
             %label
               %h4
                 Prénom *
-              = ff.text_field :prenom, {class: 'form-control'}
+              = ff.text_field :prenom, { class: 'form-control' }
           .form-group
             %label
               %h4
                 Date de naissance *
-              = ff.date_field :birthdate, {class: 'form-control', placeholder: 'jj/mm/aaaa'}
+              = ff.date_field :birthdate, { class: 'form-control', placeholder: 'jj/mm/aaaa' }
 
         %p
           %label{ style:'font-weight:normal' }
diff --git a/app/views/france_connect/particulier/check_email.html.haml b/app/views/france_connect/particulier/check_email.html.haml
index 9ec330f2b..41e6f1413 100644
--- a/app/views/france_connect/particulier/check_email.html.haml
+++ b/app/views/france_connect/particulier/check_email.html.haml
@@ -3,7 +3,7 @@
   &nbsp;France Connect - Particulier
 
 %h3 Nouvelle connexion
-%h4.text-warning{style:'margin-left: 20px'} Email déjà utilisé
+%h4.text-warning{ style:'margin-left: 20px' } Email déjà utilisé
 
 %br
 %p
@@ -13,7 +13,7 @@
   %br
 .center
   #france_connect_particulier_email
-    = form_for @user, url: {controller: 'france_connect/particulier', action: :check_email}, method: :post do |f|
+    = form_for @user, url: { controller: 'france_connect/particulier', action: :check_email }, method: :post do |f|
       .form-group.form-group-lg
         = f.text_field :email_france_connect, class: "form-control", readonly: 'readonly'
         %br
diff --git a/app/views/france_connect/particulier/new.html.haml b/app/views/france_connect/particulier/new.html.haml
index 494d40c6b..ab3bc7e94 100644
--- a/app/views/france_connect/particulier/new.html.haml
+++ b/app/views/france_connect/particulier/new.html.haml
@@ -24,7 +24,7 @@
 
 .center
   #france_connect_particulier_email
-    = form_for @user, url: {controller: 'france_connect/particulier', action: :check_email}, method: :post do |f|
+    = form_for @user, url: { controller: 'france_connect/particulier', action: :check_email }, method: :post do |f|
       .form-group.form-group-lg
         = f.text_field :email_france_connect, class: "form-control", placeholder: "Entrez votre email"
         = hidden_field_tag :fci_id, params[:fci_id]
diff --git a/app/views/layouts/_etape_suivante.html.haml b/app/views/layouts/_etape_suivante.html.haml
index 145167c0d..259899cc8 100644
--- a/app/views/layouts/_etape_suivante.html.haml
+++ b/app/views/layouts/_etape_suivante.html.haml
@@ -1 +1 @@
-= submit_tag 'Etape suivante', class: %w(btn btn btn-info), style: 'float:right', id: 'etape_suivante', data: { disable_with: 'Etape suivante', submit: true}
+= submit_tag 'Etape suivante', class: %w(btn btn btn-info), style: 'float:right', id: 'etape_suivante', data: { disable_with: 'Etape suivante', submit: true }
diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml
index 41b2dbeff..a16a8ef9c 100644
--- a/app/views/layouts/_footer.html.haml
+++ b/app/views/layouts/_footer.html.haml
@@ -1,5 +1,5 @@
 %div#footer
-  %p{class: "copyright col-md-push-#{12-main_container_size} col-md-#{main_container_size} col-lg-push-#{12-main_container_size} col-lg-#{main_container_size} text-muted small"}
+  %p{ class: "copyright col-md-push-#{12-main_container_size} col-md-#{main_container_size} col-lg-push-#{12-main_container_size} col-lg-#{main_container_size} text-muted small" }
     = link_to 'SGMAP', "http://etatplateforme.modernisation.gouv.fr"
     = Time.now.year
     \-
diff --git a/app/views/layouts/_ie_lt_10.html.haml b/app/views/layouts/_ie_lt_10.html.haml
index d191ed313..772f29b3a 100644
--- a/app/views/layouts/_ie_lt_10.html.haml
+++ b/app/views/layouts/_ie_lt_10.html.haml
@@ -1,6 +1,6 @@
 = "<!--[if lt IE 10]>".html_safe
 
-.center{style:'width: 100%; background-color: white; position: fixed; top:0; left:0; z-index: 100000'}
+.center{ style:'width: 100%; background-color: white; position: fixed; top:0; left:0; z-index: 100000' }
   %h3.text-danger
     %b
       Votre version d'Internet Explorer est trop ancienne pour être utilisée sur le service TPS. Version minimum : Internet Explorer 10
diff --git a/app/views/layouts/_modifications_terminees.html.haml b/app/views/layouts/_modifications_terminees.html.haml
index 731af5544..47d7f7f3c 100644
--- a/app/views/layouts/_modifications_terminees.html.haml
+++ b/app/views/layouts/_modifications_terminees.html.haml
@@ -1,3 +1,3 @@
-%div{style: 'float:right'}
-  %a.btn{href: "/users/dossiers/#{@dossier.id}/recapitulatif"} Retour
-  = submit_tag 'Modification terminée', class: %w(btn btn btn-info), id: 'modification_terminee', data: { disable_with: 'Modification terminée', submit: true}
+%div{ style: 'float:right' }
+  %a.btn{ href: "/users/dossiers/#{@dossier.id}/recapitulatif" } Retour
+  = submit_tag 'Modification terminée', class: %w(btn btn btn-info), id: 'modification_terminee', data: { disable_with: 'Modification terminée', submit: true }
diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml
index b4ab94f15..226fa8396 100644
--- a/app/views/layouts/_navbar.html.haml
+++ b/app/views/layouts/_navbar.html.haml
@@ -1,5 +1,5 @@
 .col-xs-2
-  %a#title_navbar{href: '/'}
+  %a#title_navbar{ href: '/' }
     .row#home
       .col-lg-6.no-padding
         = image_tag('marianne_small.png', class: 'logo')
diff --git a/app/views/layouts/_support_navigator_banner.html.haml b/app/views/layouts/_support_navigator_banner.html.haml
index 16c371807..8f892a3b8 100644
--- a/app/views/layouts/_support_navigator_banner.html.haml
+++ b/app/views/layouts/_support_navigator_banner.html.haml
@@ -5,5 +5,5 @@
       = BROWSER.value.version
       \-
       Attention, votre navigateur n'est pas recommandé pour la navigation sur ce site internet. Aucun support ne pourra vous être prodigué en cas de dysfonctionnement.
-      %a{href: '/cgu/#navigateurs'}
+      %a{ href: '/cgu/#navigateurs' }
         Voir la liste des navigateurs compatibles.
diff --git a/app/views/layouts/_switch_devise_profile_module.html.haml b/app/views/layouts/_switch_devise_profile_module.html.haml
index 53d89fe35..53d3f2134 100644
--- a/app/views/layouts/_switch_devise_profile_module.html.haml
+++ b/app/views/layouts/_switch_devise_profile_module.html.haml
@@ -1,6 +1,6 @@
 - if SwitchDeviseProfileService.new(warden).multiple_devise_profile_connect?
   #switch_menu.dropdown.dropup
-    %button.btn.btn-default.dropdown-toggle{ type: :button, 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false}
+    %button.btn.btn-default.dropdown-toggle{ type: :button, 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false }
       %i.fa.fa-toggle-on
       %span.caret
     %ul.dropdown-menu.dropdown-menu-left
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 4ef794580..565aac613 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,10 +1,10 @@
 %html
   %head
-    %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
+    %meta{ :content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type" }/
     %meta{ name: "turbolinks-cache-control", content: "no-cache" }
     %title
       = t('dynamics.page_title')
-    %meta{'http-equiv' => "X-UA-Compatible", :content => "IE=edge"}
+    %meta{ 'http-equiv' => "X-UA-Compatible", :content => "IE=edge" }
 
     = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
     = stylesheet_link_tag    'print', media: 'print', 'data-turbolinks-track' => true
@@ -14,14 +14,14 @@
     = action_cable_meta_tag
   %body
     = render partial: 'layouts/support_navigator_banner'
-    #beta{class:(Rails.env == 'production' ? '' : 'beta_staging')}
+    #beta{ class:(Rails.env == 'production' ? '' : 'beta_staging') }
       - if Rails.env == 'production'
         Beta
       - else
         Env Test
 
     - if Rails.env == 'test'
-      %script{type: 'text/javascript'}
+      %script{ type: 'text/javascript' }
         (typeof jQuery !== 'undefined') && (jQuery.fx.off = true);
 
 
@@ -44,13 +44,13 @@
         - else
           - main_container_size = 12
 
-        = render partial: 'layouts/main_container', locals: {main_container_size: main_container_size}
+        = render partial: 'layouts/main_container', locals: { main_container_size: main_container_size }
     #mask_search
       %h1
-        %i.fa.fa-times{style:'position: fixed; top: 10; right: 30; color: white;'}
+        %i.fa.fa-times{ style:'position: fixed; top: 10; right: 30; color: white;' }
 
     = render partial: 'layouts/switch_devise_profile_module'
     = render partial: 'layouts/notifications_alert'
 
-    = render partial: 'layouts/footer', locals: {main_container_size: main_container_size}
+    = render partial: 'layouts/footer', locals: { main_container_size: main_container_size }
     = render partial: 'layouts/google_analytics'
diff --git a/app/views/layouts/left_panels/_left_panel_admin_accompagnateurscontroller_show.html.haml b/app/views/layouts/left_panels/_left_panel_admin_accompagnateurscontroller_show.html.haml
index bd8f7bb43..acfb49356 100644
--- a/app/views/layouts/left_panels/_left_panel_admin_accompagnateurscontroller_show.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_admin_accompagnateurscontroller_show.html.haml
@@ -1 +1 @@
-= render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_navbar', locals: {active: 'Accompagnateurs'}
+= render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_navbar', locals: { active: 'Accompagnateurs' }
diff --git a/app/views/layouts/left_panels/_left_panel_admin_mailtemplatescontroller_edit.html.haml b/app/views/layouts/left_panels/_left_panel_admin_mailtemplatescontroller_edit.html.haml
index 1bdf2e3b1..6d4ad3d89 100644
--- a/app/views/layouts/left_panels/_left_panel_admin_mailtemplatescontroller_edit.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_admin_mailtemplatescontroller_edit.html.haml
@@ -1 +1 @@
-= render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_navbar', locals: {active: 'E-mails'}
+= render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_navbar', locals: { active: 'E-mails' }
diff --git a/app/views/layouts/left_panels/_left_panel_admin_mailtemplatescontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_admin_mailtemplatescontroller_index.html.haml
index 1bdf2e3b1..6d4ad3d89 100644
--- a/app/views/layouts/left_panels/_left_panel_admin_mailtemplatescontroller_index.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_admin_mailtemplatescontroller_index.html.haml
@@ -1 +1 @@
-= render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_navbar', locals: {active: 'E-mails'}
+= render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_navbar', locals: { active: 'E-mails' }
diff --git a/app/views/layouts/left_panels/_left_panel_admin_piecesjustificativescontroller_show.html.haml b/app/views/layouts/left_panels/_left_panel_admin_piecesjustificativescontroller_show.html.haml
index c5f7aff8c..ac8b092e3 100644
--- a/app/views/layouts/left_panels/_left_panel_admin_piecesjustificativescontroller_show.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_admin_piecesjustificativescontroller_show.html.haml
@@ -1 +1 @@
-= render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_navbar', locals: {active: 'Pieces'}
+= render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_navbar', locals: { active: 'Pieces' }
diff --git a/app/views/layouts/left_panels/_left_panel_admin_previsualisationscontroller_show.html.haml b/app/views/layouts/left_panels/_left_panel_admin_previsualisationscontroller_show.html.haml
index 2fc92cf37..fc2b3685f 100644
--- a/app/views/layouts/left_panels/_left_panel_admin_previsualisationscontroller_show.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_admin_previsualisationscontroller_show.html.haml
@@ -1 +1 @@
-= render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_navbar', locals: {active: 'Prévisualisation'}
+= render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_navbar', locals: { active: 'Prévisualisation' }
diff --git a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_edit.html.haml b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_edit.html.haml
index 65c5ce32e..43587373d 100644
--- a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_edit.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_edit.html.haml
@@ -1 +1 @@
-= render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_navbar', locals: {active: 'Description'}
+= render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_navbar', locals: { active: 'Description' }
diff --git a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml
index 56a78b41b..53fcb38c2 100644
--- a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml
@@ -9,20 +9,20 @@
 %div#menu-block
   .split-hr-left
   #procedure_list
-    %a{:href => "#{url_for :admin_procedures_draft}", id: "draft-procedures"}
-      .procedure_list_element{class: @draft_class}
+    %a{ :href => "#{url_for :admin_procedures_draft}", id: "draft-procedures" }
+      .procedure_list_element{ class: @draft_class }
         Brouillons
         .badge.progress-bar-default
           = current_administrateur.procedures.where(published: false, archived: false).count
 
-    %a{:href => "#{url_for :admin_procedures}", id: "active-procedures"}
-      .procedure_list_element{class: @active_class}
+    %a{ :href => "#{url_for :admin_procedures}", id: "active-procedures" }
+      .procedure_list_element{ class: @active_class }
         Actives
         .badge.progress-bar-success
           = current_administrateur.procedures.where(published: true, archived: false).count
 
-    %a{:href => "#{url_for :admin_procedures_archived}", id: "archived-procedures"}
-      .procedure_list_element{class: @archived_class}
+    %a{ :href => "#{url_for :admin_procedures_archived}", id: "archived-procedures" }
+      .procedure_list_element{ class: @archived_class }
         Archivées
         .badge.progress-bar-purple
           = current_administrateur.procedures.where(archived: true).count
diff --git a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml
index f2a345992..a0c887cb2 100644
--- a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml
@@ -10,39 +10,39 @@
 %div#menu-block
   .split-hr-left
   #procedure_list
-    %a{:href => "#{url_for admin_procedure_path(@procedure)}", id: 'onglet-infos'}
-      .procedure_list_element{class: ('active' if active == 'Informations')}
+    %a{ :href => "#{url_for admin_procedure_path(@procedure)}", id: 'onglet-infos' }
+      .procedure_list_element{ class: ('active' if active == 'Informations') }
         Informations
 
-    %a{:href => "#{url_for admin_procedure_accompagnateurs_path(@procedure)}", id: 'onglet-accompagnateurs'}
-      .procedure_list_element{class: ('active' if active == 'Accompagnateurs')}
+    %a{ :href => "#{url_for admin_procedure_accompagnateurs_path(@procedure)}", id: 'onglet-accompagnateurs' }
+      .procedure_list_element{ class: ('active' if active == 'Accompagnateurs') }
         = t('dynamics.admin.procedure.onglets.accompagnateurs')
 
-    %a{:href => "#{url_for edit_admin_procedure_path(@procedure)}", id: 'onglet-description'}
-      .procedure_list_element{class: ('active' if active == 'Description')}
+    %a{ :href => "#{url_for edit_admin_procedure_path(@procedure)}", id: 'onglet-description' }
+      .procedure_list_element{ class: ('active' if active == 'Description') }
         Description
 
     - unless @procedure.locked?
-      %a{:href => "#{url_for admin_procedure_types_de_champ_path(@procedure)}", id: 'onglet-champs'}
-        .procedure_list_element{class: ('active' if active == 'Champs')}
+      %a{ :href => "#{url_for admin_procedure_types_de_champ_path(@procedure)}", id: 'onglet-champs' }
+        .procedure_list_element{ class: ('active' if active == 'Champs') }
           Champs
 
     - unless @procedure.locked?
-      %a{:href => "#{url_for admin_procedure_pieces_justificatives_path(@procedure)}", id: 'onglet-pieces'}
-        .procedure_list_element{class: ('active' if active == 'Pieces')}
+      %a{ :href => "#{url_for admin_procedure_pieces_justificatives_path(@procedure)}", id: 'onglet-pieces' }
+        .procedure_list_element{ class: ('active' if active == 'Pieces') }
           Pièces jointes
 
     - unless @procedure.locked?
-      %a{:href => "#{url_for admin_procedure_types_de_champ_private_path(@procedure)}", id: 'onglet-private-champs'}
-        .procedure_list_element{class: ('active' if active == 'Champs privés')}
+      %a{ :href => "#{url_for admin_procedure_types_de_champ_private_path(@procedure)}", id: 'onglet-private-champs' }
+        .procedure_list_element{ class: ('active' if active == 'Champs privés') }
           Champs privés
 
-    %a{:href => "#{url_for admin_procedure_mail_templates_path(@procedure)}", id: 'onglet-inemailsfos'}
-      .procedure_list_element{class: ('active' if active == 'E-mails')}
+    %a{ :href => "#{url_for admin_procedure_mail_templates_path(@procedure)}", id: 'onglet-inemailsfos' }
+      .procedure_list_element{ class: ('active' if active == 'E-mails') }
         E-mails
 
-    %a{:href => "#{url_for admin_procedure_previsualisation_path(@procedure)}", id: 'onglet-preview'}
-      .procedure_list_element{class: ('active' if active == 'Prévisualisation')}
+    %a{ :href => "#{url_for admin_procedure_previsualisation_path(@procedure)}", id: 'onglet-preview' }
+      .procedure_list_element{ class: ('active' if active == 'Prévisualisation') }
         Prévisualisation
 
   .split-hr-left
diff --git a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_show.html.haml b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_show.html.haml
index 261049466..ffc8baf08 100644
--- a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_show.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_show.html.haml
@@ -1 +1 @@
-= render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_navbar', locals: {active: 'Informations'}
+= render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_navbar', locals: { active: 'Informations' }
diff --git a/app/views/layouts/left_panels/_left_panel_admin_typesdechampcontroller_show.html.haml b/app/views/layouts/left_panels/_left_panel_admin_typesdechampcontroller_show.html.haml
index 4e455ad7a..b1ee2bd6f 100644
--- a/app/views/layouts/left_panels/_left_panel_admin_typesdechampcontroller_show.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_admin_typesdechampcontroller_show.html.haml
@@ -1 +1 @@
-= render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_navbar', locals: {active: @types_de_champ_facade.active}
+= render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_navbar', locals: { active: @types_de_champ_facade.active }
diff --git a/app/views/layouts/left_panels/_left_panel_admin_typesdechampprivatecontroller_show.html.haml b/app/views/layouts/left_panels/_left_panel_admin_typesdechampprivatecontroller_show.html.haml
index b7e8e7336..7c678cf26 100644
--- a/app/views/layouts/left_panels/_left_panel_admin_typesdechampprivatecontroller_show.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_admin_typesdechampprivatecontroller_show.html.haml
@@ -1 +1 @@
-= render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_navbar', locals: {active: "Champs privés"}
+= render partial: 'layouts/left_panels/left_panel_admin_procedurescontroller_navbar', locals: { active: "Champs privés" }
diff --git a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml
index 2fe33c8b6..db1159f4d 100644
--- a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml
@@ -22,15 +22,15 @@
   #procedure_list
     - @facade_data_view.gestionnaire_procedures_name_and_id_list.each do |procedure|
 
-      = link_to backoffice_dossiers_procedure_path(procedure[:id]), {title: procedure[:libelle]} do
+      = link_to backoffice_dossiers_procedure_path(procedure[:id]), { title: procedure[:libelle] } do
         .procedure_list_element{ class: ('active' if procedure[:id] == @facade_data_view.procedure.id rescue '') }
           = truncate(procedure[:libelle], length: 50)
           - total_new = @facade_data_view.new_dossier_number procedure[:id]
           - if total_new > 0
-            .badge.progress-bar-success{title:'Nouveaux dossiers'}
+            .badge.progress-bar-success{ title:'Nouveaux dossiers' }
               = total_new
           - if procedure[:unread_notifications] > 0
-            .badge.progress-bar-warning{title: 'Notifications'}
+            .badge.progress-bar-warning{ title: 'Notifications' }
               = procedure[:unread_notifications]
   #notifications_list.hidden
     - if @facade_data_view.dossiers_with_unread_notifications.empty?
diff --git a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.html.haml b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.html.haml
index 12f7b4e7c..8ffd1196e 100644
--- a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.html.haml
@@ -10,13 +10,13 @@
     - elsif @facade.dossier.received?
       %ul.list-inline
         %li
-          = link_to url_for({controller: 'backoffice/dossiers', action: :close, dossier_id: @facade.dossier.id}), class: 'btn btn-success', method: :post, title: 'Accepter', data: { toggle: :tooltip, confirm: "Accepter ce dossier ?" } do
+          = link_to url_for({ controller: 'backoffice/dossiers', action: :close, dossier_id: @facade.dossier.id }), class: 'btn btn-success', method: :post, title: 'Accepter', data: { toggle: :tooltip, confirm: "Accepter ce dossier ?" } do
             %i.fa.fa-check
         %li
-          = link_to url_for({controller: 'backoffice/dossiers', action: :without_continuation, dossier_id: @facade.dossier.id}), class: 'btn btn-warning', method: :post, title: 'Classer sans suite', data: { toggle: :tooltip, confirm: "Classer sans suite ce dossier ?" } do
+          = link_to url_for({ controller: 'backoffice/dossiers', action: :without_continuation, dossier_id: @facade.dossier.id }), class: 'btn btn-warning', method: :post, title: 'Classer sans suite', data: { toggle: :tooltip, confirm: "Classer sans suite ce dossier ?" } do
             %i.fa.fa-circle-o
         %li
-          = link_to url_for({controller: 'backoffice/dossiers', action: :refuse, dossier_id: @facade.dossier.id}), class: 'btn btn-danger', method: :post, title: 'Refuser', data: { toggle: :tooltip, confirm: "Refuser ce dossier ?" } do
+          = link_to url_for({ controller: 'backoffice/dossiers', action: :refuse, dossier_id: @facade.dossier.id }), class: 'btn btn-danger', method: :post, title: 'Refuser', data: { toggle: :tooltip, confirm: "Refuser ce dossier ?" } do
             %i.fa.fa-times
 
       = link_to 'Reouvrir', backoffice_dossier_reopen_path(@facade.dossier), method: :post, class: 'btn btn-default btn-block', data: { confirm: "Confirmer vous la réouverture de ce dossier ?" }
@@ -46,7 +46,7 @@
       - @facade.last_notifications.each do |notification|
         .notification
           .updated-at= notification.updated_at.strftime('%d/%m/%Y %H:%M')
-          = render partial: "layouts/left_panels/type_notif_fa", locals: {notification: notification}
+          = render partial: "layouts/left_panels/type_notif_fa", locals: { notification: notification }
           - if ['champs'].include?(notification.type_notif)
             - if notification.liste.size > 1
               .type= "Plusieurs attributs ont été changés, dont: #{notification.liste.join(" ")}"
diff --git a/app/views/layouts/left_panels/_left_panel_cgucontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_cgucontroller_index.html.haml
index 8668d4115..1d386a756 100644
--- a/app/views/layouts/left_panels/_left_panel_cgucontroller_index.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_cgucontroller_index.html.haml
@@ -1,5 +1,5 @@
 %div#cgu_menu_block
-  #procedure_list{style: 'margin-top: 0;'}
+  #procedure_list{ style: 'margin-top: 0;' }
     = link_to cgu_path(:anchor => "editeur") do
       .procedure_list_element
         Editeur
diff --git a/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml
index 1ea72eaea..06d8817d7 100644
--- a/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_users_dossierscontroller_index.html.haml
@@ -11,31 +11,31 @@
   .split-hr-left
   #procedure_list
     - unless current_user.dossiers.count == 0
-      %a{:href => "#{url_for users_dossiers_path(liste: 'brouillon')}", 'data-toggle' => :tooltip, title: 'Les dossiers jamais proposés à la relecture.'}
+      %a{ :href => "#{url_for users_dossiers_path(liste: 'brouillon')}", 'data-toggle' => :tooltip, title: 'Les dossiers jamais proposés à la relecture.' }
         .procedure_list_element{ class: @dossiers_list_facade.brouillon_class, id: 'brouillon' }
           Brouillons
           .badge.progress-bar-default
             = @dossiers_list_facade.brouillon_total
 
-      %a{:href => "#{url_for users_dossiers_path(liste: 'a_traiter')}", 'data-toggle' => :tooltip, title: 'Les dossiers qui requièrent une action de votre part.'}
+      %a{ :href => "#{url_for users_dossiers_path(liste: 'a_traiter')}", 'data-toggle' => :tooltip, title: 'Les dossiers qui requièrent une action de votre part.' }
         .procedure_list_element{ class: @dossiers_list_facade.en_construction_class, id: 'a_traiter' }
           En construction
           .badge.progress-bar-danger
             = @dossiers_list_facade.en_construction_total
 
-      %a{:href => "#{url_for users_dossiers_path(liste: 'en_instruction')}", 'data-toggle' => :tooltip, title: 'Les dossiers en cours d\'examen par l\'administration compétante.'}
+      %a{ :href => "#{url_for users_dossiers_path(liste: 'en_instruction')}", 'data-toggle' => :tooltip, title: 'Les dossiers en cours d\'examen par l\'administration compétante.' }
         .procedure_list_element{ class: @dossiers_list_facade.en_instruction_class, id: 'en_instruction' }
           En instruction
           .badge.progress-bar-default
             = @dossiers_list_facade.en_instruction_total
 
-      %a{:href => "#{url_for users_dossiers_path(liste: 'termine')}", 'data-toggle' => :tooltip, title: 'Les dossiers cloturés qui peuvent être "Accepté", "Refusé" ou "Sans suite".'}
+      %a{ :href => "#{url_for users_dossiers_path(liste: 'termine')}", 'data-toggle' => :tooltip, title: 'Les dossiers cloturés qui peuvent être "Accepté", "Refusé" ou "Sans suite".' }
         .procedure_list_element{ class:  @dossiers_list_facade.termine_class, id: 'termine' }
           Terminé
           .badge.progress-bar-success
             = @dossiers_list_facade.termine_total
 
-    %a{:href => "#{url_for users_dossiers_path(liste: 'invite')}"}
+    %a{ :href => "#{url_for users_dossiers_path(liste: 'invite')}" }
       .procedure_list_element{ class:  @dossiers_list_facade.invite_class, id: 'invite' }
         Invitation
         .badge.progress-bar-warning
diff --git a/app/views/layouts/left_panels/_search_area.html.haml b/app/views/layouts/left_panels/_search_area.html.haml
index 09577eaa6..5d653e77e 100644
--- a/app/views/layouts/left_panels/_search_area.html.haml
+++ b/app/views/layouts/left_panels/_search_area.html.haml
@@ -1,7 +1,7 @@
 #search_area
   = form_tag(backoffice_dossiers_search_url, method: :get) do
     .input-group
-      = text_field_tag('q', "#{@search_terms unless @search_terms.nil? }", id: 'q', placeholder: "Recherchez parmi tous vos dossiers", class:'form-control')
+      = text_field_tag('q', "#{@search_terms unless @search_terms.nil?}", id: 'q', placeholder: "Recherchez parmi tous vos dossiers", class:'form-control')
       %span.input-group-btn
         %button.btn.btn-default{ id:'search_button' }
           %i.fa.fa-search
diff --git a/app/views/layouts/navbars/_navbar_admin_procedurescontroller_index.html.haml b/app/views/layouts/navbars/_navbar_admin_procedurescontroller_index.html.haml
index becba7d6a..b7ca98219 100644
--- a/app/views/layouts/navbars/_navbar_admin_procedurescontroller_index.html.haml
+++ b/app/views/layouts/navbars/_navbar_admin_procedurescontroller_index.html.haml
@@ -5,13 +5,13 @@
     %div{ style: "vertical-align: middle; margin-right: 10px; margin-top: auto; margin-bottom: auto;" }
       = current_administrateur.email
     .dropdown#admin_menu
-      %button.btn.btn-default.dropdown-toggle#dropdownMenuAdmin{ type: :button, 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false}
+      %button.btn.btn-default.dropdown-toggle#dropdownMenuAdmin{ type: :button, 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false }
         %i.fa.fa-cog
         %span.caret
       %ul.dropdown-menu.dropdown-menu-right
         %li
           = link_to(admin_procedures_path, id: :menu_item_procedure) do
-            %i.fa.fa-list{ style: "background-size: 10px;"}
+            %i.fa.fa-list{ style: "background-size: 10px;" }
             &nbsp;
             = t('dynamics.admin.menu.procedures')
         %li
@@ -19,7 +19,7 @@
             %i.fa.fa-user
             &nbsp;
             = t('dynamics.admin.menu.accompagnateurs')
-        %li.divider{ role: :separator}
+        %li.divider{ role: :separator }
         %li
           = link_to(admin_profile_path, id: :profile) do
             %i.fa.fa-user
diff --git a/app/views/layouts/navbars/_navbar_backoffice_dossiers_procedurecontroller_index.html.haml b/app/views/layouts/navbars/_navbar_backoffice_dossiers_procedurecontroller_index.html.haml
index b6698512c..64e5e776d 100644
--- a/app/views/layouts/navbars/_navbar_backoffice_dossiers_procedurecontroller_index.html.haml
+++ b/app/views/layouts/navbars/_navbar_backoffice_dossiers_procedurecontroller_index.html.haml
@@ -3,7 +3,7 @@
 .col-lg-3.col-md-3.col-sm-3.col-xs-3.options
   .row
     .col-lg-12.col-md-12.col-sm-12.col-xs-12
-      %a.button_navbar#pref_list_dossier_open_action{href: '#', type: :button, 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false }
+      %a.button_navbar#pref_list_dossier_open_action{ href: '#', type: :button, 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false }
         %i.fa.fa-pencil
         Modifier le tableau
       %span.caret-right
diff --git a/app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml b/app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml
index 55500a0be..86b94f8c4 100644
--- a/app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml
+++ b/app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml
@@ -38,4 +38,4 @@
           %li
             = form_tag invites_dossier_path(dossier_id: @facade.dossier.id), method: :post, class: 'form-inline', id: 'send-invitation' do
               = text_field_tag :email, '', class: 'form-control', placeholder: 'Envoyer une invitation', id: 'invitation-email'
-              = submit_tag 'Ajouter', class: 'btn btn-success', data: {confirm: "Envoyer l'invitation ?"}
+              = submit_tag 'Ajouter', class: 'btn btn-success', data: { confirm: "Envoyer l'invitation ?" }
diff --git a/app/views/layouts/navbars/_navbar_users_recapitulatifcontroller_show.html.haml b/app/views/layouts/navbars/_navbar_users_recapitulatifcontroller_show.html.haml
index 54ade1d47..f9eb9e83c 100644
--- a/app/views/layouts/navbars/_navbar_users_recapitulatifcontroller_show.html.haml
+++ b/app/views/layouts/navbars/_navbar_users_recapitulatifcontroller_show.html.haml
@@ -28,4 +28,4 @@
           %li
             = form_tag invites_dossier_path(dossier_id: @facade.dossier.id), method: :post, class: 'form-inline', id: 'send-invitation' do
               = text_field_tag :email, '', class: 'form-control', placeholder: 'Envoyer une invitation', id: 'invitation-email'
-              = submit_tag 'Ajouter', class: 'btn btn-success', data: {confirm: "Envoyer l'invitation ?"}
+              = submit_tag 'Ajouter', class: 'btn btn-success', data: { confirm: "Envoyer l'invitation ?" }
diff --git a/app/views/root/landing.html.haml b/app/views/root/landing.html.haml
index 4ca3c7355..84d46a1a3 100644
--- a/app/views/root/landing.html.haml
+++ b/app/views/root/landing.html.haml
@@ -19,22 +19,22 @@
 #landing_body.max-size
   .row#etapes.center
     #create_1.col-lg-3.col-md-3.col-sm-3.col-xs-3
-      %img{src:image_url('etapes/create_1.png')}
+      %img{ src:image_url('etapes/create_1.png') }
       %br
       %h4 Administration
       %h3.text-info Je construis ma démarche 100% en ligne
     #complet_2.col-lg-3.col-md-3.col-sm-3.col-xs-3
-      %img{src:image_url('etapes/complet_2.png')}
+      %img{ src:image_url('etapes/complet_2.png') }
       %br
       %h4 Usager
       %h3.text-success Je remplis un dossier de manière simplifiée
     #message_3.col-lg-3.col-md-3.col-sm-3.col-xs-3
-      %img{src:image_url('etapes/message_3.png')}
+      %img{ src:image_url('etapes/message_3.png') }
       %br
       %h4 Usager
       %h3.text-warning Je dialogue avec mon administration en ligne
     #shared_4.col-lg-3.col-md-3.col-sm-3.col-xs-3
-      %img{src:image_url('etapes/shared_4.png')}
+      %img{ src:image_url('etapes/shared_4.png') }
       %br
       %h4 Usager et Administrations
       %h3.text-danger
@@ -46,17 +46,17 @@
     .col-md-4.col-lg-4
       %h3.text-primary Acteurs publics
       %h4 Créez des démarches en ligne simplifiées et sécurisées.
-      = link_to 'Démonstration', "#{@demo_environment_host}/administrateurs/sign_in/demo", {class: 'btn btn-lg btn-primary'}
+      = link_to 'Démonstration', "#{@demo_environment_host}/administrateurs/sign_in/demo", { class: 'btn btn-lg btn-primary' }
 
     .col-md-4.col-lg-4
       %h3.text-warning Agents et services
       %h4 Accompagnez et co-traitez les projets avec les usagers.
-      = link_to 'Démonstration', "#{@demo_environment_host}/gestionnaires/sign_in/demo", {class: 'btn btn-lg btn-warning'}
+      = link_to 'Démonstration', "#{@demo_environment_host}/gestionnaires/sign_in/demo", { class: 'btn btn-lg btn-warning' }
 
     .col-md-4.col-lg-4
       %h3.text-success Usagers
       %h4 Profitez de démarches simplifiées et d’échanges continus avec les services traitants.
-      = link_to 'Démonstration', "#{@demo_environment_host}/users/sign_in/demo", {class: 'btn btn-lg btn-success'}
+      = link_to 'Démonstration', "#{@demo_environment_host}/users/sign_in/demo", { class: 'btn btn-lg btn-success' }
 
   .split-hr-left
 
@@ -82,6 +82,6 @@
     .col-xs-12.col-sm-12.col-md-12.col-lg-12
     %h3 Envie de commencer à créer votre démarche ?
 
-    = link_to 'Demander un accès administrateur', 'https://tps.apientreprise.fr/users/dossiers/new?procedure_id=31', {class: 'btn btn-lg background-tps', target: '_blank'}
+    = link_to 'Demander un accès administrateur', 'https://tps.apientreprise.fr/users/dossiers/new?procedure_id=31', { class: 'btn btn-lg background-tps', target: '_blank' }
 
   .split-hr-left
diff --git a/app/views/users/carte/_init_carto.html.haml b/app/views/users/carte/_init_carto.html.haml
index 533f121ec..53ff3a6ba 100644
--- a/app/views/users/carte/_init_carto.html.haml
+++ b/app/views/users/carte/_init_carto.html.haml
@@ -1,3 +1,3 @@
-%script{type: 'text/javascript'}
+%script{ type: 'text/javascript' }
   = "var dossier_id =#{dossier.id}"
   $(document).on('turbolinks:load', initCarto);
diff --git a/app/views/users/carte/_map.html.haml b/app/views/users/carte/_map.html.haml
index db98c073b..8915c35d0 100644
--- a/app/views/users/carte/_map.html.haml
+++ b/app/views/users/carte/_map.html.haml
@@ -1,5 +1,5 @@
 #carte_page.row
-  #map{class: dossier.procedure.module_api_carto.classes }
+  #map{ class: dossier.procedure.module_api_carto.classes }
 
   - if dossier.procedure.module_api_carto.quartiers_prioritaires
     #qp.list
diff --git a/app/views/users/carte/show.html.haml b/app/views/users/carte/show.html.haml
index f38b09327..800f648ed 100644
--- a/app/views/users/carte/show.html.haml
+++ b/app/views/users/carte/show.html.haml
@@ -6,27 +6,27 @@
       Positionnez-vous et dessinez sur la carte la zone d'action de votre demande.
     %br
 
-    .content{style:'margin-bottom:60px'}
-      %button#new.btn.btn-md.btn-success{type:'button'}
+    .content{ style:'margin-bottom:60px' }
+      %button#new.btn.btn-md.btn-success{ type:'button' }
         %i.fa.fa-pencil
         Ajouter une zone
 
-      %span#search_by_address{style: 'margin-left: 20px'}
-        %input.form-control{type: :address, placeholder: 'Rechercher une adresse'}
+      %span#search_by_address{ style: 'margin-left: 20px' }
+        %input.form-control{ type: :address, placeholder: 'Rechercher une adresse' }
       %br
       %br
 
-      = render partial: 'users/carte/map', locals: {dossier: @dossier}
+      = render partial: 'users/carte/map', locals: { dossier: @dossier }
 
-      = form_tag(url_for({controller: :carte, action: :save, dossier_id: @dossier.id}), class: 'form-inline', method: 'POST') do
+      = form_tag(url_for({ controller: :carte, action: :save, dossier_id: @dossier.id }), class: 'form-inline', method: 'POST') do
         %br
-        %input{type: 'hidden', value: "#{@dossier.json_latlngs}", name: 'json_latlngs', id: 'json_latlngs'}
-        %input{id: 'quartier_prioritaires', type:'hidden', value: "#{@dossier.quartier_prioritaires.to_json}"}
-        %input{id: 'cadastres', type:'hidden', value: "#{@dossier.cadastres.to_json}"}
+        %input{ type: 'hidden', value: "#{@dossier.json_latlngs}", name: 'json_latlngs', id: 'json_latlngs' }
+        %input{ id: 'quartier_prioritaires', type:'hidden', value: "#{@dossier.quartier_prioritaires.to_json}" }
+        %input{ id: 'cadastres', type:'hidden', value: "#{@dossier.cadastres.to_json}" }
 
         - if @dossier.draft?
           = render partial: '/layouts/etape_suivante'
         - else
           = render partial: '/layouts/modifications_terminees'
 
-    = render partial: 'users/carte/init_carto', locals: {dossier: @dossier}
+    = render partial: 'users/carte/init_carto', locals: { dossier: @dossier }
diff --git a/app/views/users/description/_champs.html.haml b/app/views/users/description/_champs.html.haml
index 2d7f6faf6..d6c5184b7 100644
--- a/app/views/users/description/_champs.html.haml
+++ b/app/views/users/description/_champs.html.haml
@@ -4,11 +4,11 @@
 
 - unless @headers.blank?
   - if @champs.first.type_champ != 'header_section'
-    = render partial: render_partial_url, locals: {libelle: 'Dossier', order_place: -1, champs: @champs}
+    = render partial: render_partial_url, locals: { libelle: 'Dossier', order_place: -1, champs: @champs }
   - @headers.each do |header|
     .row
-      %div{class: "type_champ-#{header.type_champ}"}
-        = render partial: render_partial_url, locals: {libelle: header.libelle, order_place: header.order_place, champs: @champs}
+      %div{ class: "type_champ-#{header.type_champ}" }
+        = render partial: render_partial_url, locals: { libelle: header.libelle, order_place: header.order_place, champs: @champs }
 - else
   .row
-    = render partial: render_partial_url, locals: {libelle: 'Dossier', order_place: -1, champs: @champs}
+    = render partial: render_partial_url, locals: { libelle: 'Dossier', order_place: -1, champs: @champs }
diff --git a/app/views/users/description/_pieces_justificatives.html.haml b/app/views/users/description/_pieces_justificatives.html.haml
index 4e9877ba3..4ba870fdf 100644
--- a/app/views/users/description/_pieces_justificatives.html.haml
+++ b/app/views/users/description/_pieces_justificatives.html.haml
@@ -8,15 +8,15 @@
           %em
             Récupérer le formulaire de demande ou CERFA vierge pour mon dossier :
             = link_to "Télécharger", "#{dossier.procedure.lien_demarche}", target: :blank, id: :lien_cerfa
-            -# %a{ id: 'lien_cerfa', href: "#{dossier.procedure.lien_demarche}", target: '_blank'} Télécharger
+            -# %a{ id: 'lien_cerfa', href: "#{dossier.procedure.lien_demarche}", target: '_blank' } Télécharger
 
       %td
         - if dossier.cerfa_available?
           %span.btn.btn-sm.btn-file.btn-success
             Modifier
-            %input{type: 'file', name:'cerfa_pdf', id:'cerfa_pdf', accept: PieceJustificative.accept_format, :max_file_size => 6.megabytes }
+            %input{ type: 'file', name:'cerfa_pdf', id:'cerfa_pdf', accept: PieceJustificative.accept_format, :max_file_size => 6.megabytes }
         - else
-          %input{type: 'file', name:'cerfa_pdf', id:'cerfa_pdf', accept:  PieceJustificative.accept_format, :max_file_size => 6.megabytes }
+          %input{ type: 'file', name:'cerfa_pdf', id:'cerfa_pdf', accept:  PieceJustificative.accept_format, :max_file_size => 6.megabytes }
 
   - dossier.types_de_piece_justificative.order('order_place ASC').each do |type_de_piece_justificative|
     %tr
diff --git a/app/views/users/description/_show.html.haml b/app/views/users/description/_show.html.haml
index f398ab062..92637674c 100644
--- a/app/views/users/description/_show.html.haml
+++ b/app/views/users/description/_show.html.haml
@@ -1,24 +1,24 @@
 .container#description_page
   - unless @dossier.procedure.lien_notice.blank?
-    #lien_notice_panel.row{style:'width: 280px; position: fixed; background-color: white; right: 5%; top: 80px; z-index: 200'}
-      .panel.panel-info{style:'margin-bottom:0'}
+    #lien_notice_panel.row{ style:'width: 280px; position: fixed; background-color: white; right: 5%; top: 80px; z-index: 200' }
+      .panel.panel-info{ style:'margin-bottom:0' }
         .panel-body.center
           .row
             .col-xs-1
-              .fa.fa-info-circle.text-info{style:'font-size: 2em; margin-top: 20%'}
-            .col-xs-10{style:'padding-right: 0px'}
+              .fa.fa-info-circle.text-info{ style:'font-size: 2em; margin-top: 20%' }
+            .col-xs-10{ style:'padding-right: 0px' }
               %b
-                = link_to 'Accéder au guide', @dossier.procedure.lien_notice, {target: '_blank'}
+                = link_to 'Accéder au guide', @dossier.procedure.lien_notice, { target: '_blank' }
               pour remplir pour votre dossier
 
   %h2.text-info
     = @dossier.procedure.libelle
 
   -# TODO use form_for
-  = form_tag(url_for({controller: 'users/description', action: :update, dossier_id: @dossier.id}), class: 'form', method: 'POST', multipart: true) do
+  = form_tag(url_for({ controller: 'users/description', action: :update, dossier_id: @dossier.id }), class: 'form', method: 'POST', multipart: true) do
     - unless @champs.nil?
       #liste_champs
-        = render partial: 'users/description/champs', locals:{private: false}
+        = render partial: 'users/description/champs', locals:{ private: false }
 
     - if !@procedure.lien_demarche.blank? || @procedure.cerfa_flag || @dossier.types_de_piece_justificative.size > 0
       %br
@@ -33,7 +33,7 @@
     -# WTF ?
     - route = Rails.application.routes.recognize_path(request.referrer)
     - unless route[:controller].match('admin')
-      %div{style: 'text-align:right'}
+      %div{ style: 'text-align:right' }
         %h6 Tous les champs portant un * sont obligatoires.
 
       - if !@dossier.can_be_initiated?
@@ -42,5 +42,5 @@
       - elsif !@dossier.draft?
         = render partial: '/layouts/modifications_terminees'
       - else
-        = submit_tag 'Soumettre mon dossier', id: 'suivant', name: 'submit[nouveaux]', class: 'btn btn btn-success', style: 'float:right', disabled: @procedure.archived?, data: { disable_with: 'Soumettre votre dossier', submit: true}
-        = submit_tag 'Enregistrer un brouillon', id: 'brouillon', name: 'submit[brouillon]', class: 'btn btn-xs btn-default', style: 'float:right; margin-right: 10px; margin-top: 6px', disabled: @procedure.archived?, data: {disable_with: 'Enregistrer un brouillon', submit: true}
+        = submit_tag 'Soumettre mon dossier', id: 'suivant', name: 'submit[nouveaux]', class: 'btn btn btn-success', style: 'float:right', disabled: @procedure.archived?, data: { disable_with: 'Soumettre votre dossier', submit: true }
+        = submit_tag 'Enregistrer un brouillon', id: 'brouillon', name: 'submit[brouillon]', class: 'btn btn-xs btn-default', style: 'float:right; margin-right: 10px; margin-top: 6px', disabled: @procedure.archived?, data: { disable_with: 'Enregistrer un brouillon', submit: true }
diff --git a/app/views/users/description/champs/_checkbox.html.haml b/app/views/users/description/champs/_checkbox.html.haml
index db7928656..e06e69153 100644
--- a/app/views/users/description/champs/_checkbox.html.haml
+++ b/app/views/users/description/champs/_checkbox.html.haml
@@ -1 +1 @@
-%input{type: 'checkbox', style:'margin-left: 15px;', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", checked: ('checked' if champ.object.value == 'on')}
+%input{ type: 'checkbox', style:'margin-left: 15px;', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", checked: ('checked' if champ.object.value == 'on') }
diff --git a/app/views/users/description/champs/_datetime.html.haml b/app/views/users/description/champs/_datetime.html.haml
index b79cb05c6..abd78fc6b 100644
--- a/app/views/users/description/champs/_datetime.html.haml
+++ b/app/views/users/description/champs/_datetime.html.haml
@@ -1,21 +1,21 @@
-%input.form-control{name:"champs['#{champ.id}']",
+%input.form-control{ name:"champs['#{champ.id}']",
                   placeholder: champ.libelle,
                   id: "champs_#{champ.id}",
                   value: (champ.value.split(/[ ][0-9]*:[0-9]*/).first unless champ.value.nil?),
                   type: champ.type_champ,
                   'data-provide' => champ.data_provide,
-                  'data-date-format' => champ.data_date_format}
+                  'data-date-format' => champ.data_date_format }
 
-%select.form-control{name:"time_hour['#{champ.id}']", style: 'margin-left: 5px', id:"time_hour_#{champ.id}"}
+%select.form-control{ name:"time_hour['#{champ.id}']", style: 'margin-left: 5px', id:"time_hour_#{champ.id}" }
   - (0..23).each do |num|
     - num = "%.2i" %num
-    %option{value: num, selected: (:selected if champ.same_hour?(num))}
+    %option{ value: num, selected: (:selected if champ.same_hour?(num)) }
       = num
 h
-%select.form-control{name:"time_minute['#{champ.id}']", id:"time_minute_#{champ.id}"}
+%select.form-control{ name:"time_minute['#{champ.id}']", id:"time_minute_#{champ.id}" }
   - (0..59).each do |num|
     - num = "%.2i" %num
     - if num.to_i%5 == 0
-      %option{value: num, selected: (:selected if champ.same_minute?(num))}
+      %option{ value: num, selected: (:selected if champ.same_minute?(num)) }
         = num
 min
diff --git a/app/views/users/description/champs/_engagement.html.haml b/app/views/users/description/champs/_engagement.html.haml
index bae7b55ad..a5b9253c3 100644
--- a/app/views/users/description/champs/_engagement.html.haml
+++ b/app/views/users/description/champs/_engagement.html.haml
@@ -1,2 +1,2 @@
-%input{type: 'hidden', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", value: ''}
-%input{type: 'checkbox', style:'margin-left: 15px;', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", checked: ('checked' if champ.value == 'on')}
+%input{ type: 'hidden', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", value: '' }
+%input{ type: 'checkbox', style:'margin-left: 15px;', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", checked: ('checked' if champ.value == 'on') }
diff --git a/app/views/users/description/champs/_header_private_section.html.haml b/app/views/users/description/champs/_header_private_section.html.haml
index b5be240c6..b9d8bdacd 100644
--- a/app/views/users/description/champs/_header_private_section.html.haml
+++ b/app/views/users/description/champs/_header_private_section.html.haml
@@ -3,4 +3,4 @@
     %br
     %h3.text-info
       = libelle
-    = render partial: 'users/description/champs/render_list_champs', locals: {champs: champs, order_place: order_place}
+    = render partial: 'users/description/champs/render_list_champs', locals: { champs: champs, order_place: order_place }
diff --git a/app/views/users/description/champs/_header_section.html.haml b/app/views/users/description/champs/_header_section.html.haml
index 8415bfdee..410563165 100644
--- a/app/views/users/description/champs/_header_section.html.haml
+++ b/app/views/users/description/champs/_header_section.html.haml
@@ -6,4 +6,4 @@
         .carret-down
         = libelle
     .body
-      = render partial: 'users/description/champs/render_list_champs', locals: {champs: champs, order_place: order_place}
+      = render partial: 'users/description/champs/render_list_champs', locals: { champs: champs, order_place: order_place }
diff --git a/app/views/users/description/champs/_render_list_champs.html.haml b/app/views/users/description/champs/_render_list_champs.html.haml
index 1c131361e..f8f43b650 100644
--- a/app/views/users/description/champs/_render_list_champs.html.haml
+++ b/app/views/users/description/champs/_render_list_champs.html.haml
@@ -6,7 +6,7 @@
     .row
       %div{ class: if champ.type_champ == 'textarea' || champ.type_champ == 'engagement' then 'col-md-12' else 'col-md-6' end }
         .form-group
-          %label{ for: "champs_#{ champ.id }"}
+          %label{ for: "champs_#{champ.id}" }
             = champ.libelle
             - if champ.mandatory?
               *
@@ -44,14 +44,14 @@
           - elsif champ.type_champ == 'explication'
 
           - else
-            %input.form-control{name:"champs['#{ champ.id }']",
+            %input.form-control{ name:"champs['#{champ.id}']",
                             placeholder: champ.libelle,
-                            id: "champs_#{ champ.id }",
+                            id: "champs_#{champ.id}",
                             value: champ.value,
                             type: champ.type_champ,
                             'data-provide' => champ.data_provide,
-                            'data-date-format' => champ.data_date_format}
+                            'data-date-format' => champ.data_date_format }
 
           - unless champ.description.empty?
-            %div{ id:"description_champs_#{ champ.id }", class: ('help-block' unless champ.type_champ == 'engagement') }
+            %div{ id:"description_champs_#{champ.id}", class: ('help-block' unless champ.type_champ == 'engagement') }
               = champ.description_with_links
diff --git a/app/views/users/description/champs/_textarea.html.haml b/app/views/users/description/champs/_textarea.html.haml
index 9ea66d68e..dca38bfcf 100644
--- a/app/views/users/description/champs/_textarea.html.haml
+++ b/app/views/users/description/champs/_textarea.html.haml
@@ -1,5 +1,5 @@
-%textarea.form-control.wysihtml5{name:"champs['#{champ.id}']",
+%textarea.form-control.wysihtml5{ name:"champs['#{champ.id}']",
                   placeholder: champ.description,
                   id: "champs_#{champ.id}",
-                  row: '6'}
+                  row: '6' }
   = champ.value
diff --git a/app/views/users/dossiers/_list.html.haml b/app/views/users/dossiers/_list.html.haml
index 9707d9e68..89d902533 100644
--- a/app/views/users/dossiers/_list.html.haml
+++ b/app/views/users/dossiers/_list.html.haml
@@ -19,13 +19,13 @@
         - dossier_url = users_dossier_recapitulatif_path(dossier) unless dossier.brouillon?
         - dossier_url = users_dossier_description_path(dossier) if dossier.brouillon?
 
-      %tr{id: "tr_dossier_#{dossier.id}", 'data-dossier_url' => dossier_url}
+      %tr{ id: "tr_dossier_#{dossier.id}", 'data-dossier_url' => dossier_url }
         %td.center
           = dossier.id
         %td
           = dossier.procedure.libelle
 
-        %td{id: "dossier_#{dossier.id}_state"}= dossier.display_state
+        %td{ id: "dossier_#{dossier.id}_state" }= dossier.display_state
         %td= dossier.last_update
         %td= link_to('X', url_for(controller: 'dossiers', action: :destroy, id: dossier.id), 'data-method' => :delete, class: 'btn-sm btn-danger') if @liste == "brouillon"
 
diff --git a/app/views/users/dossiers/_state_description.html.haml b/app/views/users/dossiers/_state_description.html.haml
index 8ef35af08..1d0d99e3d 100644
--- a/app/views/users/dossiers/_state_description.html.haml
+++ b/app/views/users/dossiers/_state_description.html.haml
@@ -1,9 +1,9 @@
-#state_description.row{style:'width: 55%; margin-left: auto; margin-right: auto'}
+#state_description.row{ style:'width: 55%; margin-left: auto; margin-right: auto' }
   .panel.panel-info
     .panel-body.center
       .row
         .col-md-1.col-lg-1.col-sm-1.col-xs-1
-          .fa.fa-info-circle.text-info{style:'font-size: 2em; margin-top: 20%'}
+          .fa.fa-info-circle.text-info{ style:'font-size: 2em; margin-top: 20%' }
         .col-xs-11
           - if dossiers_list_facade.liste == 'brouillon'
             Les dossiers présents dans cette liste
diff --git a/app/views/users/dossiers/index.html.haml b/app/views/users/dossiers/index.html.haml
index a3baaba4b..3811c1ed8 100644
--- a/app/views/users/dossiers/index.html.haml
+++ b/app/views/users/dossiers/index.html.haml
@@ -12,4 +12,4 @@
       .body
         = smart_listing_render :dossiers
 
-  = render partial: 'state_description', locals: {dossiers_list_facade: @dossiers_list_facade}
+  = render partial: 'state_description', locals: { dossiers_list_facade: @dossiers_list_facade }
diff --git a/app/views/users/recapitulatif/_modal_upload_pj.html.haml b/app/views/users/recapitulatif/_modal_upload_pj.html.haml
index cba2b0b7d..63c3e5322 100644
--- a/app/views/users/recapitulatif/_modal_upload_pj.html.haml
+++ b/app/views/users/recapitulatif/_modal_upload_pj.html.haml
@@ -1,12 +1,12 @@
-#UploadPJmodal.modal.fade{"aria-labelledby" => "myModalLabel", :role => "dialog", :tabindex => "-1"}
-  .modal-dialog{:role => "document"}
+#UploadPJmodal.modal.fade{ "aria-labelledby" => "myModalLabel", :role => "dialog", :tabindex => "-1" }
+  .modal-dialog{ :role => "document" }
     .modal-content
       - @dossier = @facade.dossier
-      = form_tag(url_for({controller: '/users/description', action: :pieces_justificatives, dossier_id: @dossier.id}), class: 'form-inline', method: 'PATCH', multipart: true) do
+      = form_tag(url_for({ controller: '/users/description', action: :pieces_justificatives, dossier_id: @dossier.id }), class: 'form-inline', method: 'PATCH', multipart: true) do
 
         .modal-header
-          %button.close{"aria-label" => "Close", "data-dismiss" => "modal", :type => "button"}
-            %span{"aria-hidden" => "true"} ×
+          %button.close{ "aria-label" => "Close", "data-dismiss" => "modal", :type => "button" }
+            %span{ "aria-hidden" => "true" } ×
           %h4.modal-title
             Modification des documents
 
@@ -14,4 +14,4 @@
           = render partial: 'users/description/pieces_justificatives', locals: { dossier: @dossier }
 
         .modal-footer
-          = submit_tag 'Modification terminée', class: %w(btn btn btn-info), id: 'modification_terminee', data: { disable_with: 'Modification terminée', submit: true}
+          = submit_tag 'Modification terminée', class: %w(btn btn btn-info), id: 'modification_terminee', data: { disable_with: 'Modification terminée', submit: true }
diff --git a/app/views/users/sessions/_resume_procedure.html.haml b/app/views/users/sessions/_resume_procedure.html.haml
index d05af8c9c..5091e7aeb 100644
--- a/app/views/users/sessions/_resume_procedure.html.haml
+++ b/app/views/users/sessions/_resume_procedure.html.haml
@@ -17,4 +17,4 @@
 
 - else
   #logo_procedure.flag
-    = image_tag(image_url(LOGO_NAME), {id: 'logo_tps'})
+    = image_tag(image_url(LOGO_NAME), { id: 'logo_tps' })
diff --git a/app/views/users/sessions/new.html.haml b/app/views/users/sessions/new.html.haml
index fd7e38efb..a4733b46b 100644
--- a/app/views/users/sessions/new.html.haml
+++ b/app/views/users/sessions/new.html.haml
@@ -5,11 +5,11 @@
   %h2#login_user
     = t('dynamics.users.connexion_title')
 
-  %a.btn_fc#btn_fcp{href: '/france_connect/particulier'}
+  %a.btn_fc#btn_fcp{ href: '/france_connect/particulier' }
     = image_tag 'franceconnect_logo.png'
 
   %br
-  %a.text-info{href: 'https://fcp.integ01.dev-franceconnect.fr/a-propos', target: '_blank'}
+  %a.text-info{ href: 'https://fcp.integ01.dev-franceconnect.fr/a-propos', target: '_blank' }
     Qu’est-ce que FranceConnect ?
 
   %hr
diff --git a/app/views/users/siret/_pro.html.haml b/app/views/users/siret/_pro.html.haml
index 43836722b..eb13e50fe 100644
--- a/app/views/users/siret/_pro.html.haml
+++ b/app/views/users/siret/_pro.html.haml
@@ -1,4 +1,4 @@
-%p.lead{id: 'pro_section'}
+%p.lead{ id: 'pro_section' }
   .flag
     = image_tag(image_url(LOGO_NAME))
   %br
@@ -9,9 +9,9 @@
     = @procedure.description.html_safe
 
   %br
-  = form_tag(url_for({controller: :dossiers, action: :create}), class: 'form-inline', method: 'POST') do |f|
+  = form_tag(url_for({ controller: :dossiers, action: :create }), class: 'form-inline', method: 'POST') do |f|
     .form-group.form-group-lg
       = text_field_tag :siret, nil, :class => "form-control", :placeholder => "Entrez votre Siret", :id => "siret", :name => "siret", :maxlength => 14, :style => 'margin-bottom:10px', value: @siret
       %br
-      = submit_tag "Commencer", class: %w(btn btn-lg btn-success), style: 'margin-top:20px;', data: { disable_with: "Commencer", submit: true}
-      %input{type: 'hidden', value: "#{@procedure.id}", name: 'procedure_id', id: 'procedure_id'}
+      = submit_tag "Commencer", class: %w(btn btn-lg btn-success), style: 'margin-top:20px;', data: { disable_with: "Commencer", submit: true }
+      %input{ type: 'hidden', value: "#{@procedure.id}", name: 'procedure_id', id: 'procedure_id' }

From 97df69bcd8e26af20ad115fb261fed3122c23765 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 17:12:39 +0200
Subject: [PATCH 30/72] In HAML files, separate arguments by a comma and a
 single space

---
 app/views/admin/pieces_justificatives/_form.html.haml         | 2 +-
 app/views/admin/types_de_champ/_form.html.haml                | 2 +-
 app/views/dossiers/_download_dossiers.html.haml               | 4 ++--
 .../_navbar_backoffice_dossierscontroller_show.html.haml      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/admin/pieces_justificatives/_form.html.haml b/app/views/admin/pieces_justificatives/_form.html.haml
index 7891ae363..5b183eb36 100644
--- a/app/views/admin/pieces_justificatives/_form.html.haml
+++ b/app/views/admin/pieces_justificatives/_form.html.haml
@@ -1,4 +1,4 @@
-= form_for [:admin, @procedure], url: admin_procedure_pieces_justificatives_path(@procedure)  , remote: true do |f|
+= form_for [:admin, @procedure], url: admin_procedure_pieces_justificatives_path(@procedure), remote: true do |f|
   #liste_piece_justificative
     = render partial: 'fields', locals:{ types_de_piece_justificative: @procedure.types_de_piece_justificative_ordered.decorate, f: f }
     = f.submit "Enregistrer", class: 'btn btn-success', id: :save
diff --git a/app/views/admin/types_de_champ/_form.html.haml b/app/views/admin/types_de_champ/_form.html.haml
index 2c5aaa880..fad5752ec 100644
--- a/app/views/admin/types_de_champ/_form.html.haml
+++ b/app/views/admin/types_de_champ/_form.html.haml
@@ -1,4 +1,4 @@
-= form_for [:admin, @procedure], url: @types_de_champ_facade.url , remote: true do |f|
+= form_for [:admin, @procedure], url: @types_de_champ_facade.url, remote: true do |f|
   = render partial: 'admin/types_de_champ/fields', locals: { types_de_champ: @types_de_champ_facade.types_de_champ, f: f }
   = f.submit "Enregistrer", class: 'btn btn-success', id: :save
   %hr
diff --git a/app/views/dossiers/_download_dossiers.html.haml b/app/views/dossiers/_download_dossiers.html.haml
index 71a010a84..369bd4327 100644
--- a/app/views/dossiers/_download_dossiers.html.haml
+++ b/app/views/dossiers/_download_dossiers.html.haml
@@ -5,11 +5,11 @@
     %span.caret
   %ul.dropdown-menu.dropdown-menu-right
     %li
-      = link_to backoffice_download_dossiers_tps_path(format: :csv, procedure_id: params[:id]),  { class: 'btn btn-sm export-link' } do
+      = link_to backoffice_download_dossiers_tps_path(format: :csv, procedure_id: params[:id]), { class: 'btn btn-sm export-link' } do
         = t('dynamics.backoffice.format_csv')
     %li
       = link_to backoffice_download_dossiers_tps_path(format: :xlsx, procedure_id: params[:id]), { class: 'btn btn-sm export-link' } do
         = t('dynamics.backoffice.format_xlsx')
     %li
-      = link_to backoffice_download_dossiers_tps_path(format: :ods, procedure_id: params[:id]),  { class: 'btn btn-sm export-link' } do
+      = link_to backoffice_download_dossiers_tps_path(format: :ods, procedure_id: params[:id]), { class: 'btn btn-sm export-link' } do
         = t('dynamics.backoffice.format_ods')
diff --git a/app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml b/app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml
index 86b94f8c4..194f5d82f 100644
--- a/app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml
+++ b/app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml
@@ -5,7 +5,7 @@
   .row
     .col-xs-12
       - if current_gestionnaire.follow?(@facade.dossier.id)
-        = link_to backoffice_dossier_follow_path(dossier_id: @facade.dossier.id), "data-method" => :put, class: "button-navbar-action",id: "suivre_dossier_#{@facade.dossier.id}" do
+        = link_to backoffice_dossier_follow_path(dossier_id: @facade.dossier.id), "data-method" => :put, class: "button-navbar-action", id: "suivre_dossier_#{@facade.dossier.id}" do
           %i.fa.fa-user-times
           Ne plus suivre
       - else

From 379701590843f13a875be7609ad32d03995fb88a Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 17:18:03 +0200
Subject: [PATCH 31/72] All colons must be followed by a single space

---
 .../admin/accompagnateurs/_list_assign.html.haml |  6 +++---
 .../accompagnateurs/_list_not_assign.html.haml   |  2 +-
 app/views/admin/accompagnateurs/show.html.haml   |  2 +-
 app/views/admin/gestionnaires/_list.html.haml    |  4 ++--
 app/views/admin/gestionnaires/index.html.haml    |  2 +-
 .../admin/pieces_justificatives/_form.html.haml  |  4 ++--
 .../admin/procedures/_informations.html.haml     |  4 ++--
 .../admin/procedures/_modal_publish.html.haml    |  2 +-
 .../admin/procedures/_modal_transfer.html.haml   |  2 +-
 app/views/admin/procedures/index.html.haml       |  2 +-
 app/views/admin/procedures/new.html.haml         |  2 +-
 app/views/admin/procedures/show.html.haml        | 16 ++++++++--------
 app/views/administrateurs/sessions/new.html.haml |  2 +-
 .../backoffice/dossiers/_filter_framed.html.haml |  4 ++--
 app/views/backoffice/dossiers/_list.html.haml    |  6 +++---
 .../backoffice/dossiers/_pref_list.html.haml     |  4 ++--
 .../dossiers/_state_description.html.haml        |  4 ++--
 app/views/backoffice/dossiers/index.html.haml    |  8 ++++----
 app/views/commencer/archived.html.haml           |  4 ++--
 app/views/dossiers/_commentaires_files.html.haml |  2 +-
 app/views/dossiers/_infos_carto.html.haml        |  6 +++---
 app/views/dossiers/_infos_dossier.html.haml      |  4 ++--
 .../dossiers/_infos_pieces_jointes.html.haml     |  8 ++++----
 .../dossiers/_infos_private_fields.html.haml     |  2 +-
 app/views/dossiers/_messagerie.html.haml         |  2 +-
 .../dossiers/_pieces_justificatives.html.haml    |  8 ++++----
 app/views/dossiers/commentaires/_form.html.haml  |  2 +-
 app/views/dossiers/etapes/_etape1.html.haml      |  2 +-
 .../etapes/etape_2/_entreprise.html.haml         | 10 +++++-----
 .../etapes/etape_2/_individual.html.haml         |  2 +-
 .../particulier/check_email.html.haml            |  4 ++--
 .../france_connect/particulier/new.html.haml     |  2 +-
 app/views/gestionnaires/passwords/edit.html.haml |  2 +-
 app/views/gestionnaires/passwords/new.html.haml  |  2 +-
 app/views/gestionnaires/sessions/new.html.haml   |  2 +-
 app/views/layouts/_etape_suivante.html.haml      |  2 +-
 app/views/layouts/_ie_lt_10.html.haml            |  2 +-
 .../layouts/_modifications_terminees.html.haml   |  2 +-
 app/views/layouts/application.html.haml          |  4 ++--
 ...backoffice_dossierscontroller_index.html.haml |  2 +-
 .../layouts/left_panels/_search_area.html.haml   |  4 ++--
 ...ar_admin_procedurescontroller_index.html.haml |  2 +-
 app/views/root/landing.html.haml                 |  8 ++++----
 app/views/users/carte/show.html.haml             |  8 ++++----
 .../description/_pieces_justificatives.html.haml |  4 ++--
 app/views/users/description/_show.html.haml      | 16 ++++++++--------
 .../users/description/champs/_checkbox.html.haml |  2 +-
 .../users/description/champs/_datetime.html.haml |  6 +++---
 .../description/champs/_engagement.html.haml     |  4 ++--
 .../champs/_render_list_champs.html.haml         |  4 ++--
 .../users/description/champs/_textarea.html.haml |  2 +-
 .../users/dossiers/_state_description.html.haml  |  4 ++--
 app/views/users/passwords/edit.html.haml         |  2 +-
 app/views/users/passwords/new.html.haml          |  2 +-
 app/views/users/registrations/new.html.haml      |  2 +-
 .../users/sessions/_resume_procedure.html.haml   |  2 +-
 app/views/users/sessions/new.html.haml           |  2 +-
 app/views/users/siret/_pro.html.haml             |  4 ++--
 58 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/app/views/admin/accompagnateurs/_list_assign.html.haml b/app/views/admin/accompagnateurs/_list_assign.html.haml
index 13cf19de2..e2b049756 100644
--- a/app/views/admin/accompagnateurs/_list_assign.html.haml
+++ b/app/views/admin/accompagnateurs/_list_assign.html.haml
@@ -1,17 +1,17 @@
-.row{ style:'height: 34px' }
+.row{ style: 'height: 34px' }
 
 - unless smart_listing.empty?
   %table.table#liste_gestionnaire
     %thead
       %th Enlever
-      %th#email{ style:'text-align: right' } Email
+      %th#email{ style: 'text-align: right' } Email
 
     - @accompagnateurs_assign.each do |accompagnateur|
       %tr
         %td.col-md-1.col-lg-1.col-sm-1.col-xs-1.col-sm-1.col-xs-1.center
           %a.btn.btn-primary{ href: "#{admin_procedure_accompagnateurs_path(procedure_id: @procedure.id, accompagnateur_id: accompagnateur.id, to: AccompagnateurService::NOT_ASSIGN)}", 'data-method' => 'put' }
             .fa.fa-arrow-left
-        %td{ style:'padding-top: 11px; font-size:15px; text-align:right' }= accompagnateur.email
+        %td{ style: 'padding-top: 11px; font-size: 15px; text-align: right' }= accompagnateur.email
 
   = smart_listing.paginate
   = smart_listing.pagination_per_page_links
diff --git a/app/views/admin/accompagnateurs/_list_not_assign.html.haml b/app/views/admin/accompagnateurs/_list_not_assign.html.haml
index 253472585..fcc5c763d 100644
--- a/app/views/admin/accompagnateurs/_list_not_assign.html.haml
+++ b/app/views/admin/accompagnateurs/_list_not_assign.html.haml
@@ -14,7 +14,7 @@
 
     - @accompagnateurs_not_assign.each do |accompagnateur|
       %tr
-        %td.col-xs-11{ style:'padding-top: 11px; font-size:15px' }= accompagnateur.email
+        %td.col-xs-11{ style: 'padding-top: 11px; font-size: 15px' }= accompagnateur.email
         %td.center
           %a.btn.btn-success.gestionnaire-affectation{ href: "#{admin_procedure_accompagnateurs_path(procedure_id: @procedure.id, accompagnateur_id: accompagnateur.id, to: AccompagnateurService::ASSIGN)}", 'data-method' => 'put' }
             .fa.fa-arrow-right
diff --git a/app/views/admin/accompagnateurs/show.html.haml b/app/views/admin/accompagnateurs/show.html.haml
index 0d75bc522..747827f3c 100644
--- a/app/views/admin/accompagnateurs/show.html.haml
+++ b/app/views/admin/accompagnateurs/show.html.haml
@@ -17,7 +17,7 @@
               .col-xs-2
                 %br
                 %br
-                = f.submit 'Valider', class: 'btn btn-info', style: 'float:left', id: 'add-gestionnaire-email'
+                = f.submit 'Valider', class: 'btn btn-info', style: 'float: left', id: 'add-gestionnaire-email'
       .col-xs-6
         %h3.text-success Affectés
         = smart_listing_render :accompagnateurs_assign
diff --git a/app/views/admin/gestionnaires/_list.html.haml b/app/views/admin/gestionnaires/_list.html.haml
index 5558f6d13..b9b2bfced 100644
--- a/app/views/admin/gestionnaires/_list.html.haml
+++ b/app/views/admin/gestionnaires/_list.html.haml
@@ -6,8 +6,8 @@
 
     - @gestionnaires.each do |gestionnaire|
       %tr
-        %td{ style:'padding-top: 11px; font-size:15px' }= gestionnaire.email
-        %td{ style: 'text-align:right' }
+        %td{ style: 'padding-top: 11px; font-size: 15px' }= gestionnaire.email
+        %td{ style: 'text-align: right' }
           .delete.btn.btn-sm.fa.fa-trash
 
           .confirm
diff --git a/app/views/admin/gestionnaires/index.html.haml b/app/views/admin/gestionnaires/index.html.haml
index 3c65e0e3e..d1e4226c6 100644
--- a/app/views/admin/gestionnaires/index.html.haml
+++ b/app/views/admin/gestionnaires/index.html.haml
@@ -16,4 +16,4 @@
           .col-xs-2
             %br
             %br
-            = f.submit 'Valider', class: 'btn btn-info', style: 'float:left'
+            = f.submit 'Valider', class: 'btn btn-info', style: 'float: left'
diff --git a/app/views/admin/pieces_justificatives/_form.html.haml b/app/views/admin/pieces_justificatives/_form.html.haml
index 5b183eb36..6bdb2c4b4 100644
--- a/app/views/admin/pieces_justificatives/_form.html.haml
+++ b/app/views/admin/pieces_justificatives/_form.html.haml
@@ -1,7 +1,7 @@
 = form_for [:admin, @procedure], url: admin_procedure_pieces_justificatives_path(@procedure), remote: true do |f|
   #liste_piece_justificative
-    = render partial: 'fields', locals:{ types_de_piece_justificative: @procedure.types_de_piece_justificative_ordered.decorate, f: f }
+    = render partial: 'fields', locals: { types_de_piece_justificative: @procedure.types_de_piece_justificative_ordered.decorate, f: f }
     = f.submit "Enregistrer", class: 'btn btn-success', id: :save
     %hr
   #new_type_de_piece_justificative
-    = render partial: 'fields', locals:{ types_de_piece_justificative: TypeDePieceJustificative.new.decorate, f: f }
+    = render partial: 'fields', locals: { types_de_piece_justificative: TypeDePieceJustificative.new.decorate, f: f }
diff --git a/app/views/admin/procedures/_informations.html.haml b/app/views/admin/procedures/_informations.html.haml
index 3053278d3..745a35e55 100644
--- a/app/views/admin/procedures/_informations.html.haml
+++ b/app/views/admin/procedures/_informations.html.haml
@@ -17,9 +17,9 @@
     %h4 Logo de la procédure
     - unless @procedure.logo.blank?
       = image_tag @procedure.decorate.logo_img, { style: 'height: 40px; display: inline; margin-right: 6px', id: 'preview_procedure_logo' }
-    = f.file_field :logo, accept: 'image/png, image/jpg, image/jpeg', style: 'display:inline'
+    = f.file_field :logo, accept: 'image/png, image/jpg, image/jpeg', style: 'display: inline'
 
-    %div{ style:'margin-top:5px' }
+    %div{ style: 'margin-top: 5px' }
       %i
         Fichier accepté : JPG / JPEG / PNG
   .col-md-6
diff --git a/app/views/admin/procedures/_modal_publish.html.haml b/app/views/admin/procedures/_modal_publish.html.haml
index 746d58325..cfc25e1ff 100644
--- a/app/views/admin/procedures/_modal_publish.html.haml
+++ b/app/views/admin/procedures/_modal_publish.html.haml
@@ -27,7 +27,7 @@
               = text_field_tag('procedure_path', @procedure.default_path,
                                 id: 'procedure_path',
                                 placeholder: 'Chemin vers la procédure',
-                                class:'form-control',
+                                class: 'form-control',
                                 maxlength: 30,
                                 style: 'width: 300px; display: inline')
             #path_messages
diff --git a/app/views/admin/procedures/_modal_transfer.html.haml b/app/views/admin/procedures/_modal_transfer.html.haml
index 777c292da..8594d2c95 100644
--- a/app/views/admin/procedures/_modal_transfer.html.haml
+++ b/app/views/admin/procedures/_modal_transfer.html.haml
@@ -15,7 +15,7 @@
                                                 type: 'email',
                                                 placeholder: 'Email administrateur cible',
                                                 style: 'width: 300px; margin-left:auto; margin-right:auto' }
-          %div#not_found_admin.center.text-danger{ style:'display:none; margin-top: 10px' }
+          %div#not_found_admin.center.text-danger{ style:'display: none; margin-top: 10px' }
             Cet administrateur n'existe pas.
         .modal-footer
           = submit_tag "Envoyer", class: 'btn btn-success'
diff --git a/app/views/admin/procedures/index.html.haml b/app/views/admin/procedures/index.html.haml
index 43344b41d..570a8cb9b 100644
--- a/app/views/admin/procedures/index.html.haml
+++ b/app/views/admin/procedures/index.html.haml
@@ -6,7 +6,7 @@
           .carret-right
           .carret-down
           Procédures
-        %a{ href:'/admin/procedures/new' }
+        %a{ href: '/admin/procedures/new' }
           %div#new-procedure.col-lg-2.col-md-2.col-sm-2.col-xs-2.action
             Nouvelle
 
diff --git a/app/views/admin/procedures/new.html.haml b/app/views/admin/procedures/new.html.haml
index d8bbb4c37..cdd77b14b 100644
--- a/app/views/admin/procedures/new.html.haml
+++ b/app/views/admin/procedures/new.html.haml
@@ -5,4 +5,4 @@
   #procedure_new.section.section-label
     = form_for @procedure, url: { controller: 'admin/procedures', action: :create }, multipart: true do |f|
       = render partial: 'informations', locals: { f: f }
-      = f.submit 'Valider', class: 'btn btn-info', id: 'save-procedure', style: 'float:right'
+      = f.submit 'Valider', class: 'btn btn-info', id: 'save-procedure', style: 'float: right'
diff --git a/app/views/admin/procedures/show.html.haml b/app/views/admin/procedures/show.html.haml
index 28d584650..c9abca2e5 100644
--- a/app/views/admin/procedures/show.html.haml
+++ b/app/views/admin/procedures/show.html.haml
@@ -2,31 +2,31 @@
   #procedure_show
     - unless @facade.procedure.published?
       - if @facade.procedure.gestionnaires.size == 0
-        %a.action_button.btn.btn-success{ style:'float: right; margin-top: 10px', disabled: 'disabled', 'data-toggle' => :tooltip, title: 'Vous ne pouvez pas publier une procédure sans qu\'aucun accompagnateur ne soit affecté à celle-ci.', id: 'publish-procedure' }
+        %a.action_button.btn.btn-success{ style: 'float: right; margin-top: 10px', disabled: 'disabled', 'data-toggle' => :tooltip, title: 'Vous ne pouvez pas publier une procédure sans qu\'aucun accompagnateur ne soit affecté à celle-ci.', id: 'publish-procedure' }
           %i.fa.fa-eraser
           Publier
       - else
-        %a.btn.btn-success{ "data-target" => "#publishModal", "data-toggle" => "modal", :type => "button", style:'float: right; margin-top: 10px', id: 'publish-procedure' }
+        %a.btn.btn-success{ "data-target" => "#publishModal", "data-toggle" => "modal", :type => "button", style: 'float: right; margin-top: 10px', id: 'publish-procedure' }
           %i.fa.fa-eraser
           Publier
 
       = render partial: '/admin/procedures/modal_publish'
 
-    %a#transfer.btn.btn-small.btn-default{ "data-target" => "#transferModal", "data-toggle" => "modal", :type => "button", style:'float: right; margin-top: 10px; margin-right: 10px' }
+    %a#transfer.btn.btn-small.btn-default{ "data-target" => "#transferModal", "data-toggle" => "modal", :type => "button", style: 'float: right; margin-top: 10px; margin-right: 10px' }
       %i.fa.fa-exchange
       Transférer
 
     = render partial: '/admin/procedures/modal_transfer'
 
     - if @facade.procedure.archived?
-      %a#reenable.btn.btn-small.btn-default.text-info{ "data-target" => "#publishModal", "data-toggle" => "modal", :type => "button", style:'float: right; margin-top: 10px' }
+      %a#reenable.btn.btn-small.btn-default.text-info{ "data-target" => "#publishModal", "data-toggle" => "modal", :type => "button", style: 'float: right; margin-top: 10px' }
         %i.fa.fa-eraser
         Réactiver
 
       = render partial: '/admin/procedures/modal_publish'
 
     - elsif @facade.procedure.published?
-      = form_tag admin_procedure_archive_path(procedure_id: @facade.procedure.id, archive: !@facade.procedure.archived?), method: :put, style:'float: right; margin-top: 10px' do
+      = form_tag admin_procedure_archive_path(procedure_id: @facade.procedure.id, archive: !@facade.procedure.archived?), method: :put, style: 'float: right; margin-top: 10px' do
         %button#archive.btn.btn-small.btn-default.text-info{ type: :button }
           %i.fa.fa-eraser
           Archiver
@@ -45,7 +45,7 @@
 
     %div
       %h3 Lien procédure
-      %div{ style:'margin-left:3%' }
+      %div{ style: 'margin-left: 3%' }
         - if @facade.procedure.published?
           = link_to @facade.procedure.lien, @facade.procedure.lien, target: '_blank'
         - else
@@ -55,7 +55,7 @@
     %br
     %h3 Détails
 
-    .row{ style:'margin-right:3%; margin-left:3%;' }
+    .row{ style: 'margin-right: 3%; margin-left: 3%;' }
       .description.col-xs-6.col-md-3.procedure-description
         %h4.text-info
           = @facade.procedure.libelle
@@ -93,7 +93,7 @@
       = t('dynamics.admin.procedure.stats.title')
 
     .row
-      .col-xs-6{ style:'margin-left:3%' }
+      .col-xs-6{ style: 'margin-left: 3%' }
         %h4 Total
         %div
           = @facade.dossiers_total
diff --git a/app/views/administrateurs/sessions/new.html.haml b/app/views/administrateurs/sessions/new.html.haml
index e522d82b1..7ebe37ba9 100644
--- a/app/views/administrateurs/sessions/new.html.haml
+++ b/app/views/administrateurs/sessions/new.html.haml
@@ -25,5 +25,5 @@
       %br
       %br
       .actions
-        = f.submit "Se connecter", class:'btn btn-primary'
+        = f.submit "Se connecter", class: 'btn btn-primary'
       %br
diff --git a/app/views/backoffice/dossiers/_filter_framed.html.haml b/app/views/backoffice/dossiers/_filter_framed.html.haml
index 0112c2d09..737fe1ad7 100644
--- a/app/views/backoffice/dossiers/_filter_framed.html.haml
+++ b/app/views/backoffice/dossiers/_filter_framed.html.haml
@@ -1,9 +1,9 @@
-.filter_framed.panel.panel-primary{ id: "#{filter_framed_id}", style:'width: 300px; height: 100px; position: absolute; top: 0; left: 0; display: none' }
+.filter_framed.panel.panel-primary{ id: "#{filter_framed_id}", style: 'width: 300px; height: 100px; position: absolute; top: 0; left: 0; display: none' }
   .panel-heading
     = preference.libelle
 
   = form_tag @facade_data_view.filter_url, { class: 'panel-body form-inline', method: :post } do
-    %input.form-control.filter_input{ name: "filter_input[#{preference.table_attr}]", style:'width: 69%', value: "#{preference.filter}" }
+    %input.form-control.filter_input{ name: "filter_input[#{preference.table_attr}]", style: 'width: 69%', value: "#{preference.filter}" }
     %button.btn.btn-sm.btn-success
       %i.fa.fa-check
     .btn.btn-sm.btn-danger.erase-filter
diff --git a/app/views/backoffice/dossiers/_list.html.haml b/app/views/backoffice/dossiers/_list.html.haml
index e6c7f902b..1aebea3ba 100644
--- a/app/views/backoffice/dossiers/_list.html.haml
+++ b/app/views/backoffice/dossiers/_list.html.haml
@@ -14,8 +14,8 @@
           - else
             = smart_listing.sortable preference.libelle, preference.table_attr
           - if @facade_data_view.active_filter? preference
-            %i.filter.fa.fa-filter{ style: "color:#{(preference.filter.blank? ? 'grey' : 'orange')}", id: "filter_#{smart_listing.name.to_s}_#{preference.table_attr.sub('.', '_')}" }
-            = render partial: 'backoffice/dossiers/filter_framed', locals:{ preference: preference, filter_framed_id: "framed_filter_#{smart_listing.name.to_s}_#{preference.table_attr.sub('.', '_')}" }
+            %i.filter.fa.fa-filter{ style: "color: #{(preference.filter.blank? ? 'grey' : 'orange')}", id: "filter_#{smart_listing.name.to_s}_#{preference.table_attr.sub('.', '_')}" }
+            = render partial: 'backoffice/dossiers/filter_framed', locals: { preference: preference, filter_framed_id: "framed_filter_#{smart_listing.name.to_s}_#{preference.table_attr.sub('.', '_')}" }
 
     %th.col-xs-1.center Actions
     %th.col-xs-1.center Abonnés
@@ -56,7 +56,7 @@
             = link_to('Quitter'.html_safe, backoffice_dossier_follow_path(dossier_id: dossier.id), 'data-method' => :put, class: 'btn-sm btn-danger', id: "suivre_dossier_#{dossier.id}")
           - else
             = link_to('Suivre', backoffice_dossier_follow_path(dossier_id: dossier.id), 'data-method' => :put, class: 'btn-sm btn-primary', id: "suivre_dossier_#{dossier.id}")
-        %td.center{ style:"color: #{dossier.total_follow == 0 ? 'red' : ''}" }
+        %td.center{ style: "color: #{dossier.total_follow == 0 ? 'red' : ''}" }
           = dossier.total_follow
 
 = smart_listing.paginate
diff --git a/app/views/backoffice/dossiers/_pref_list.html.haml b/app/views/backoffice/dossiers/_pref_list.html.haml
index cccd84ba6..a221de380 100644
--- a/app/views/backoffice/dossiers/_pref_list.html.haml
+++ b/app/views/backoffice/dossiers/_pref_list.html.haml
@@ -3,7 +3,7 @@
 %h3
   = t('dynamics.backoffice.pref_list.title')
 
-%p{ style:'margin-top: 15px; margin-bottom: 20px' }
+%p{ style: 'margin-top: 15px; margin-bottom: 20px' }
   = t('dynamics.backoffice.pref_list.description')
 
 %h4.text-primary
@@ -19,7 +19,7 @@
         %button.btn.btn-default.btn-xs{ type: :submit, id: "delete_pref_list_#{preference[:table]}_#{preference[:attr]}" }
           %i.fa.fa-minus
 
-%h4.text-success{ style:'margin-top: 15px' }
+%h4.text-success{ style: 'margin-top: 15px' }
   Disponibles
 
 %table
diff --git a/app/views/backoffice/dossiers/_state_description.html.haml b/app/views/backoffice/dossiers/_state_description.html.haml
index 03a062ad9..7c20ec7f1 100644
--- a/app/views/backoffice/dossiers/_state_description.html.haml
+++ b/app/views/backoffice/dossiers/_state_description.html.haml
@@ -1,9 +1,9 @@
-#state_description.row{ style:'width: 50%; margin-left: auto; margin-right: auto' }
+#state_description.row{ style: 'width: 50%; margin-left: auto; margin-right: auto' }
   .panel.panel-info
     .panel-body.center
       .row
         .col-md-1.col-lg-1.col-sm-1.col-xs-1.col-sm-1.col-xs-1
-          .fa.fa-info-circle.text-info{ style:'font-size: 2em; margin-top: 20%' }
+          .fa.fa-info-circle.text-info{ style: 'font-size: 2em; margin-top: 20%' }
         .col-xs-11
           - if dossiers_list_facade.liste == 'nouveaux'
             Tous les dossiers présents dans cette liste sont ceux qui
diff --git a/app/views/backoffice/dossiers/index.html.haml b/app/views/backoffice/dossiers/index.html.haml
index e1ce91192..f10570616 100644
--- a/app/views/backoffice/dossiers/index.html.haml
+++ b/app/views/backoffice/dossiers/index.html.haml
@@ -16,13 +16,13 @@
 
   .row.center
     .col-xs-3
-      = link_to 'Tous les états', '?liste=all_state', class: 'text-info', style:"text-decoration: #{@facade_data_view.liste == 'all_state'? 'underline' : ''}"
+      = link_to 'Tous les états', '?liste=all_state', class: 'text-info', style: "text-decoration: #{@facade_data_view.liste == 'all_state'? 'underline' : ''}"
     .col-xs-3
-      = link_to 'En construction', '?liste=a_traiter', class: 'text-danger', style:"text-decoration: #{@facade_data_view.liste == 'a_traiter'? 'underline' : ''}"
+      = link_to 'En construction', '?liste=a_traiter', class: 'text-danger', style: "text-decoration: #{@facade_data_view.liste == 'a_traiter'? 'underline' : ''}"
     .col-xs-3
-      = link_to  'En instruction', '?liste=a_instruire', class: 'text-warning', style:"text-decoration: #{@facade_data_view.liste == 'a_instruire'? 'underline' : ''}"
+      = link_to  'En instruction', '?liste=a_instruire', class: 'text-warning', style: "text-decoration: #{@facade_data_view.liste == 'a_instruire'? 'underline' : ''}"
     .col-xs-3
-      = link_to  'Terminés', '?liste=termine', class: 'text-success', style:"text-decoration: #{@facade_data_view.liste == 'termine'? 'underline' : ''}"
+      = link_to  'Terminés', '?liste=termine', class: 'text-success', style: "text-decoration: #{@facade_data_view.liste == 'termine'? 'underline' : ''}"
 
   .default_data_block.default_visible
     .row.show-block#follow_dossiers
diff --git a/app/views/commencer/archived.html.haml b/app/views/commencer/archived.html.haml
index e41e7ca5a..a726ffa26 100644
--- a/app/views/commencer/archived.html.haml
+++ b/app/views/commencer/archived.html.haml
@@ -1,8 +1,8 @@
 %br
-%div{ style: 'text-align: center; max-width:500px; margin-left:auto; margin-right:auto; padding: 20px;' }
+%div{ style: 'text-align: center; max-width: 500px; margin-left: auto; margin-right: auto; padding: 20px;' }
   = render partial: 'users/sessions/resume_procedure'
 
-.center{ style:'margin-top: -20px' }
+.center{ style: 'margin-top: -20px' }
   %h3
     La campagne de création de nouveau dossier
     %br
diff --git a/app/views/dossiers/_commentaires_files.html.haml b/app/views/dossiers/_commentaires_files.html.haml
index 86980162a..c50931ca1 100644
--- a/app/views/dossiers/_commentaires_files.html.haml
+++ b/app/views/dossiers/_commentaires_files.html.haml
@@ -16,7 +16,7 @@
       %tr
         %td= file.user.nil? ? 'Accompagnateur' : file.user.email
         %td= file.created_at.localtime
-        %td= link_to file.original_filename, file.content_url, style:'color: green', target: '_blank'
+        %td= link_to file.original_filename, file.content_url, style: 'color: green', target: '_blank'
 - else
   %h4.text-primary
     Pas de fichier dans le flux de commentaires.
diff --git a/app/views/dossiers/_infos_carto.html.haml b/app/views/dossiers/_infos_carto.html.haml
index 467adf177..fc5971888 100644
--- a/app/views/dossiers/_infos_carto.html.haml
+++ b/app/views/dossiers/_infos_carto.html.haml
@@ -2,9 +2,9 @@
   .col-xs-12
     #map.mini{ class: @facade.dossier.procedure.module_api_carto.classes }
 
-    %input{ id: 'json_latlngs', type:'hidden', value: "#{@facade.dossier.json_latlngs}" }
-    %input{ id: 'quartier_prioritaires', type:'hidden', value: "#{@facade.dossier.quartier_prioritaires.to_json}" }
-    %input{ id: 'cadastres', type:'hidden', value: "#{@facade.dossier.cadastres.to_json}" }
+    %input{ id: 'json_latlngs', type: 'hidden', value: "#{@facade.dossier.json_latlngs}" }
+    %input{ id: 'quartier_prioritaires', type: 'hidden', value: "#{@facade.dossier.quartier_prioritaires.to_json}" }
+    %input{ id: 'cadastres', type: 'hidden', value: "#{@facade.dossier.cadastres.to_json}" }
 
     %script{ type: 'text/javascript' }
       = "var dossier_id =#{@facade.dossier.id}"
diff --git a/app/views/dossiers/_infos_dossier.html.haml b/app/views/dossiers/_infos_dossier.html.haml
index ede81e7f8..d664b274c 100644
--- a/app/views/dossiers/_infos_dossier.html.haml
+++ b/app/views/dossiers/_infos_dossier.html.haml
@@ -65,7 +65,7 @@
             .col-xs-5.despositaire-info
               - if @facade.dossier.cerfa_available?
                 %a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter
-                %span{ style:'margin-left:12px' }
+                %span{ style: 'margin-left: 12px' }
                   \-
                 = link_to "", class: "historique", "data-toggle" => "modal", "data-target" => "#PJmodal", :type => "button", "data-modal_title" => 'formulaires', "data-modal_index" => 'cerfa' do
                   %span.fa.fa-clock-o
@@ -84,7 +84,7 @@
                     %span.text-success Nous l'avons récupéré pour vous.
                   - elsif !(@pj = @facade.dossier.retrieve_last_piece_justificative_by_type(type_de_piece_justificative.id)).nil?
                     %a{ href: "#{@pj.content_url}", target: '_blank' } Consulter
-                    %span{ style:'margin-left:12px' }
+                    %span{ style: 'margin-left: 12px' }
                       \-
                     - if @facade.dossier.pieces_justificatives.where(type_de_piece_justificative_id: type_de_piece_justificative.id).count > 1
                       = link_to "", class: "historique", "data-toggle" => "modal", "data-target" => "#PJmodal", :type => "button", "data-modal_title" => 'formulaires', "data-modal_index" => "type_de_pj_#{type_de_piece_justificative.id}" do
diff --git a/app/views/dossiers/_infos_pieces_jointes.html.haml b/app/views/dossiers/_infos_pieces_jointes.html.haml
index 1481578ad..b38c0bf93 100644
--- a/app/views/dossiers/_infos_pieces_jointes.html.haml
+++ b/app/views/dossiers/_infos_pieces_jointes.html.haml
@@ -8,9 +8,9 @@
           .col-xs-5
             - if @facade.dossier.cerfa_available?
               %a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter
-              %span{ style:'margin-left:12px' }
+              %span{ style: 'margin-left: 12px' }
                 \-
-              %a.btn.fa.fa-timer{ style:'color: black; padding-top: 0',
+              %a.btn.fa.fa-timer{ style: 'color: black; padding-top: 0',
                                                 "data-target" => "#PJmodal",
                                                 "data-toggle" => "modal",
                                                 :type => "button",
@@ -34,9 +34,9 @@
                   -#   = 'Pièce fournie'
                   -# - elsif gestionnaire_signed_in?
                   %a{ href: "#{@pj.content_url}", target: '_blank' } Consulter
-                  %span{ style:'margin-left:12px' }
+                  %span{ style: 'margin-left: 12px' }
                     \-
-                  %a.btn.fa.fa-timer{ style:'color: black; padding-top: 0',
+                  %a.btn.fa.fa-timer{ style: 'color: black; padding-top: 0',
                                                       "data-target" => "#PJmodal",
                                                       "data-toggle" => "modal",
                                                       :type => "button",
diff --git a/app/views/dossiers/_infos_private_fields.html.haml b/app/views/dossiers/_infos_private_fields.html.haml
index f1bf3816a..2813604fc 100644
--- a/app/views/dossiers/_infos_private_fields.html.haml
+++ b/app/views/dossiers/_infos_private_fields.html.haml
@@ -1,6 +1,6 @@
 .row{ style: 'margin-top: -20px' }
   .col-xs-12
     = form_for @facade.dossier, url: { controller: 'backoffice/private_formulaires', action: :update, dossier_id: @facade.dossier.id }, remote: true do
-      = render partial: '/users/description/champs', locals:{ private: true }
+      = render partial: '/users/description/champs', locals: { private: true }
       .row.center
         = submit_tag :Enregistrer, { class: 'btn-action' }
diff --git a/app/views/dossiers/_messagerie.html.haml b/app/views/dossiers/_messagerie.html.haml
index 24729c9a4..b37f68765 100644
--- a/app/views/dossiers/_messagerie.html.haml
+++ b/app/views/dossiers/_messagerie.html.haml
@@ -1,4 +1,4 @@
-.default_data_block{ style:'margin-top: 40px' }
+.default_data_block{ style: 'margin-top: 40px' }
   .row.show-block.clearfix#messages
     .header
       .col-xs-10.title
diff --git a/app/views/dossiers/_pieces_justificatives.html.haml b/app/views/dossiers/_pieces_justificatives.html.haml
index bc4f660fe..e2689f7e0 100644
--- a/app/views/dossiers/_pieces_justificatives.html.haml
+++ b/app/views/dossiers/_pieces_justificatives.html.haml
@@ -7,9 +7,9 @@
         %td.col-lg-6.col-md-6.col-sm-6.col-xs-6
           - if @facade.dossier.cerfa_available?
             %a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter
-            %span{ style:'margin-left:12px' }
+            %span{ style: 'margin-left: 12px' }
               \-
-            %a.btn.fa.fa-timer{ style:'color: black; padding-top: 0',
+            %a.btn.fa.fa-timer{ style: 'color: black; padding-top: 0',
                                                 "data-target" => "#PJmodal",
                                                 "data-toggle" => "modal",
                                                 :type => "button",
@@ -30,9 +30,9 @@
             -#   = 'Pièce fournie'
             -# - elsif gestionnaire_signed_in?
             %a{ href: "#{@pj.content_url}", target: '_blank' } Consulter
-            %span{ style:'margin-left:12px' }
+            %span{ style: 'margin-left: 12px' }
               \-
-            %a.btn.fa.fa-timer{ style:'color: black; padding-top: 0',
+            %a.btn.fa.fa-timer{ style: 'color: black; padding-top: 0',
                                                 "data-target" => "#PJmodal",
                                                 "data-toggle" => "modal",
                                                 :type => "button",
diff --git a/app/views/dossiers/commentaires/_form.html.haml b/app/views/dossiers/commentaires/_form.html.haml
index a2b5815e6..6463773dd 100644
--- a/app/views/dossiers/commentaires/_form.html.haml
+++ b/app/views/dossiers/commentaires/_form.html.haml
@@ -1,6 +1,6 @@
 = form_tag(url_for({ controller: 'commentaires', action: :create, dossier_id: dossier_facade.dossier.id, champ_id: dossier_facade.champ_id }), class: 'form-inline', method: 'POST', multipart: true) do
 
-  %textarea.form-control.wysihtml5{ id: 'texte_commentaire', name: 'texte_commentaire', style: 'width: 100%; margin-bottom:2%', rows: '5', placeholder:"Commentaire" }
+  %textarea.form-control.wysihtml5{ id: 'texte_commentaire', name: 'texte_commentaire', style: 'width: 100%; margin-bottom: 2%', rows: '5', placeholder: "Commentaire" }
 
   .row
     .col-md-6
diff --git a/app/views/dossiers/etapes/_etape1.html.haml b/app/views/dossiers/etapes/_etape1.html.haml
index d5bce96d1..5e1d46dbc 100644
--- a/app/views/dossiers/etapes/_etape1.html.haml
+++ b/app/views/dossiers/etapes/_etape1.html.haml
@@ -15,7 +15,7 @@
       %h2#titre_procedure.text-info
         = @facade.procedure.libelle
 
-      %p#description_procedure{ style:'width: 95%;', class: (@facade.entreprise.nil? ? '' : 'mask') }
+      %p#description_procedure{ style: 'width: 95%;', class: (@facade.entreprise.nil? ? '' : 'mask') }
         = h @facade.procedure.description.html_safe
 
         - unless @facade.procedure.lien_site_web.blank?
diff --git a/app/views/dossiers/etapes/etape_2/_entreprise.html.haml b/app/views/dossiers/etapes/etape_2/_entreprise.html.haml
index 5038d4f17..5a4b3fd69 100644
--- a/app/views/dossiers/etapes/etape_2/_entreprise.html.haml
+++ b/app/views/dossiers/etapes/etape_2/_entreprise.html.haml
@@ -3,7 +3,7 @@
     Mes informations
   %br
   - unless @facade.entreprise.nil?
-    .center{ style:'margin-left: -5%' }
+    .center{ style: 'margin-left: -5%' }
       Vous êtes authentifié avec le SIRET
 
       %h3.text-success
@@ -15,7 +15,7 @@
 .etape.etapes_informations.col-xs-9
   .row
     - if @facade.entreprise.nil?
-      #new_siret{ style:'margin-left: 20%; margin-top: 5%' }
+      #new_siret{ style: 'margin-left: 20%; margin-top: 5%' }
         = form_for @facade.dossier, html: { class: 'form-inline' }, url: users_dossier_siret_informations_path(dossier_id: @facade.dossier.id), method: :post, remote: true do |f|
           .form-group.form-group-lg
             = f.text_field :siret, class: "form-control", placeholder: "Entrez votre Siret", value: @siret
@@ -26,15 +26,15 @@
       #recap_info_entreprise
         = render partial: '/dossiers/infos_entreprise'
 
-        %p#insee_infogreffe{ style:'color:grey; float:right' }
+        %p#insee_infogreffe{ style: 'color: grey; float: right' }
           %i
             Informations récupérées auprès de l'INSEE et d'INFOGREFFE
 
         %br
         = form_for @facade.dossier, url: { controller: '/users/dossiers', action: :update } do |f|
           = f.hidden_field :id
-          %label{ style:'font-weight:normal' }
+          %label{ style: 'font-weight: normal' }
             = f.check_box :autorisation_donnees
             J'autorise les décideurs publics à vérifier les informations de mon organisation auprès des administrations concernées. Ces informations resteront strictement confidentielles.
           %br
-          = f.submit 'Etape suivante', class: "btn btn btn-info", style: 'float:right', id: 'etape_suivante', disabled: :disabled
+          = f.submit 'Etape suivante', class: "btn btn btn-info", style: 'float: right', id: 'etape_suivante', disabled: :disabled
diff --git a/app/views/dossiers/etapes/etape_2/_individual.html.haml b/app/views/dossiers/etapes/etape_2/_individual.html.haml
index e74506f0b..4daa73c98 100644
--- a/app/views/dossiers/etapes/etape_2/_individual.html.haml
+++ b/app/views/dossiers/etapes/etape_2/_individual.html.haml
@@ -34,7 +34,7 @@
               = ff.date_field :birthdate, { class: 'form-control', placeholder: 'jj/mm/aaaa' }
 
         %p
-          %label{ style:'font-weight:normal' }
+          %label{ style: 'font-weight: normal' }
             = f.check_box :autorisation_donnees
             = "&nbsp;".html_safe
             Vos informations personnelles ne seront jamais utilisées dans un but lucratif ou commercial. Elles ne pourront être communiquées à de tiers personnes sans votre accord préalable. Elles pourront en revanche être communiquées aux administrations compétentes afin d'instruire votre dossier, conformément à la déclaration CNIL effectué par le service TPS.
diff --git a/app/views/france_connect/particulier/check_email.html.haml b/app/views/france_connect/particulier/check_email.html.haml
index 41e6f1413..5cd29bfda 100644
--- a/app/views/france_connect/particulier/check_email.html.haml
+++ b/app/views/france_connect/particulier/check_email.html.haml
@@ -3,7 +3,7 @@
   &nbsp;France Connect - Particulier
 
 %h3 Nouvelle connexion
-%h4.text-warning{ style:'margin-left: 20px' } Email déjà utilisé
+%h4.text-warning{ style: 'margin-left: 20px' } Email déjà utilisé
 
 %br
 %p
@@ -20,4 +20,4 @@
         = f.password_field :password, class: "form-control", placeholder: "Entrez votre mot de passe"
         = hidden_field_tag :fci_id, params[:fci_id]
         = hidden_field_tag :salt, params[:salt]
-        = f.submit 'Terminer', class: %w(btn btn-lg btn-success), style: 'margin-top:20px;', id: 'valid_new_fcp'
+        = f.submit 'Terminer', class: %w(btn btn-lg btn-success), style: 'margin-top: 20px;', id: 'valid_new_fcp'
diff --git a/app/views/france_connect/particulier/new.html.haml b/app/views/france_connect/particulier/new.html.haml
index ab3bc7e94..92418f3ba 100644
--- a/app/views/france_connect/particulier/new.html.haml
+++ b/app/views/france_connect/particulier/new.html.haml
@@ -29,4 +29,4 @@
         = f.text_field :email_france_connect, class: "form-control", placeholder: "Entrez votre email"
         = hidden_field_tag :fci_id, params[:fci_id]
         = hidden_field_tag :salt, params[:salt]
-        = f.submit 'Terminer', class: %w(btn btn-lg btn-success), style: 'margin-top:20px;', id: 'valid_new_fcp'
+        = f.submit 'Terminer', class: %w(btn btn-lg btn-success), style: 'margin-top: 20px;', id: 'valid_new_fcp'
diff --git a/app/views/gestionnaires/passwords/edit.html.haml b/app/views/gestionnaires/passwords/edit.html.haml
index 7e41675f0..13888a958 100644
--- a/app/views/gestionnaires/passwords/edit.html.haml
+++ b/app/views/gestionnaires/passwords/edit.html.haml
@@ -27,5 +27,5 @@
       %br
       %br
       .actions
-        = f.submit "Changer", class:'btn btn-primary'
+        = f.submit "Changer", class: 'btn btn-primary'
       %br
diff --git a/app/views/gestionnaires/passwords/new.html.haml b/app/views/gestionnaires/passwords/new.html.haml
index 45e53763f..5cb58e0b1 100644
--- a/app/views/gestionnaires/passwords/new.html.haml
+++ b/app/views/gestionnaires/passwords/new.html.haml
@@ -19,5 +19,5 @@
       %br
       %br
       .actions
-        = f.submit "Renvoyer", class:'btn btn-primary'
+        = f.submit "Renvoyer", class: 'btn btn-primary'
       %br
diff --git a/app/views/gestionnaires/sessions/new.html.haml b/app/views/gestionnaires/sessions/new.html.haml
index 0180bd760..051112da6 100644
--- a/app/views/gestionnaires/sessions/new.html.haml
+++ b/app/views/gestionnaires/sessions/new.html.haml
@@ -24,6 +24,6 @@
       %br
       %br
       .actions
-        = f.submit "Se connecter", class:'btn btn-primary'
+        = f.submit "Se connecter", class: 'btn btn-primary'
       %br
     = render "gestionnaires/shared/links"
diff --git a/app/views/layouts/_etape_suivante.html.haml b/app/views/layouts/_etape_suivante.html.haml
index 259899cc8..2cac64b90 100644
--- a/app/views/layouts/_etape_suivante.html.haml
+++ b/app/views/layouts/_etape_suivante.html.haml
@@ -1 +1 @@
-= submit_tag 'Etape suivante', class: %w(btn btn btn-info), style: 'float:right', id: 'etape_suivante', data: { disable_with: 'Etape suivante', submit: true }
+= submit_tag 'Etape suivante', class: %w(btn btn btn-info), style: 'float: right', id: 'etape_suivante', data: { disable_with: 'Etape suivante', submit: true }
diff --git a/app/views/layouts/_ie_lt_10.html.haml b/app/views/layouts/_ie_lt_10.html.haml
index 772f29b3a..ca32e16f7 100644
--- a/app/views/layouts/_ie_lt_10.html.haml
+++ b/app/views/layouts/_ie_lt_10.html.haml
@@ -1,6 +1,6 @@
 = "<!--[if lt IE 10]>".html_safe
 
-.center{ style:'width: 100%; background-color: white; position: fixed; top:0; left:0; z-index: 100000' }
+.center{ style: 'width: 100%; background-color: white; position: fixed; top: 0; left: 0; z-index: 100000' }
   %h3.text-danger
     %b
       Votre version d'Internet Explorer est trop ancienne pour être utilisée sur le service TPS. Version minimum : Internet Explorer 10
diff --git a/app/views/layouts/_modifications_terminees.html.haml b/app/views/layouts/_modifications_terminees.html.haml
index 47d7f7f3c..c28110747 100644
--- a/app/views/layouts/_modifications_terminees.html.haml
+++ b/app/views/layouts/_modifications_terminees.html.haml
@@ -1,3 +1,3 @@
-%div{ style: 'float:right' }
+%div{ style: 'float: right' }
   %a.btn{ href: "/users/dossiers/#{@dossier.id}/recapitulatif" } Retour
   = submit_tag 'Modification terminée', class: %w(btn btn btn-info), id: 'modification_terminee', data: { disable_with: 'Modification terminée', submit: true }
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 565aac613..053d04646 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -14,7 +14,7 @@
     = action_cable_meta_tag
   %body
     = render partial: 'layouts/support_navigator_banner'
-    #beta{ class:(Rails.env == 'production' ? '' : 'beta_staging') }
+    #beta{ class: (Rails.env == 'production' ? '' : 'beta_staging') }
       - if Rails.env == 'production'
         Beta
       - else
@@ -47,7 +47,7 @@
         = render partial: 'layouts/main_container', locals: { main_container_size: main_container_size }
     #mask_search
       %h1
-        %i.fa.fa-times{ style:'position: fixed; top: 10; right: 30; color: white;' }
+        %i.fa.fa-times{ style: 'position: fixed; top: 10; right: 30; color: white;' }
 
     = render partial: 'layouts/switch_devise_profile_module'
     = render partial: 'layouts/notifications_alert'
diff --git a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml
index db1159f4d..cd378550c 100644
--- a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml
@@ -27,7 +27,7 @@
           = truncate(procedure[:libelle], length: 50)
           - total_new = @facade_data_view.new_dossier_number procedure[:id]
           - if total_new > 0
-            .badge.progress-bar-success{ title:'Nouveaux dossiers' }
+            .badge.progress-bar-success{ title: 'Nouveaux dossiers' }
               = total_new
           - if procedure[:unread_notifications] > 0
             .badge.progress-bar-warning{ title: 'Notifications' }
diff --git a/app/views/layouts/left_panels/_search_area.html.haml b/app/views/layouts/left_panels/_search_area.html.haml
index 5d653e77e..c4a49ea26 100644
--- a/app/views/layouts/left_panels/_search_area.html.haml
+++ b/app/views/layouts/left_panels/_search_area.html.haml
@@ -1,7 +1,7 @@
 #search_area
   = form_tag(backoffice_dossiers_search_url, method: :get) do
     .input-group
-      = text_field_tag('q', "#{@search_terms unless @search_terms.nil?}", id: 'q', placeholder: "Recherchez parmi tous vos dossiers", class:'form-control')
+      = text_field_tag('q', "#{@search_terms unless @search_terms.nil?}", id: 'q', placeholder: "Recherchez parmi tous vos dossiers", class: 'form-control')
       %span.input-group-btn
-        %button.btn.btn-default{ id:'search_button' }
+        %button.btn.btn-default{ id: 'search_button' }
           %i.fa.fa-search
diff --git a/app/views/layouts/navbars/_navbar_admin_procedurescontroller_index.html.haml b/app/views/layouts/navbars/_navbar_admin_procedurescontroller_index.html.haml
index b7ca98219..6202a734e 100644
--- a/app/views/layouts/navbars/_navbar_admin_procedurescontroller_index.html.haml
+++ b/app/views/layouts/navbars/_navbar_admin_procedurescontroller_index.html.haml
@@ -1,7 +1,7 @@
 .col-xs-7.main-info
 
 .col-xs-3.options
-  %div{ style: "decorate:none; display: flex;box-shadow:none; float:right; display: flex; margin-top: 5px" }
+  %div{ style: "decorate: none; display: flex; box-shadow: none; float: right; display: flex; margin-top: 5px" }
     %div{ style: "vertical-align: middle; margin-right: 10px; margin-top: auto; margin-bottom: auto;" }
       = current_administrateur.email
     .dropdown#admin_menu
diff --git a/app/views/root/landing.html.haml b/app/views/root/landing.html.haml
index 84d46a1a3..513517202 100644
--- a/app/views/root/landing.html.haml
+++ b/app/views/root/landing.html.haml
@@ -19,22 +19,22 @@
 #landing_body.max-size
   .row#etapes.center
     #create_1.col-lg-3.col-md-3.col-sm-3.col-xs-3
-      %img{ src:image_url('etapes/create_1.png') }
+      %img{ src: image_url('etapes/create_1.png') }
       %br
       %h4 Administration
       %h3.text-info Je construis ma démarche 100% en ligne
     #complet_2.col-lg-3.col-md-3.col-sm-3.col-xs-3
-      %img{ src:image_url('etapes/complet_2.png') }
+      %img{ src: image_url('etapes/complet_2.png') }
       %br
       %h4 Usager
       %h3.text-success Je remplis un dossier de manière simplifiée
     #message_3.col-lg-3.col-md-3.col-sm-3.col-xs-3
-      %img{ src:image_url('etapes/message_3.png') }
+      %img{ src: image_url('etapes/message_3.png') }
       %br
       %h4 Usager
       %h3.text-warning Je dialogue avec mon administration en ligne
     #shared_4.col-lg-3.col-md-3.col-sm-3.col-xs-3
-      %img{ src:image_url('etapes/shared_4.png') }
+      %img{ src: image_url('etapes/shared_4.png') }
       %br
       %h4 Usager et Administrations
       %h3.text-danger
diff --git a/app/views/users/carte/show.html.haml b/app/views/users/carte/show.html.haml
index 800f648ed..d20a88a3a 100644
--- a/app/views/users/carte/show.html.haml
+++ b/app/views/users/carte/show.html.haml
@@ -6,8 +6,8 @@
       Positionnez-vous et dessinez sur la carte la zone d'action de votre demande.
     %br
 
-    .content{ style:'margin-bottom:60px' }
-      %button#new.btn.btn-md.btn-success{ type:'button' }
+    .content{ style: 'margin-bottom: 60px' }
+      %button#new.btn.btn-md.btn-success{ type: 'button' }
         %i.fa.fa-pencil
         Ajouter une zone
 
@@ -21,8 +21,8 @@
       = form_tag(url_for({ controller: :carte, action: :save, dossier_id: @dossier.id }), class: 'form-inline', method: 'POST') do
         %br
         %input{ type: 'hidden', value: "#{@dossier.json_latlngs}", name: 'json_latlngs', id: 'json_latlngs' }
-        %input{ id: 'quartier_prioritaires', type:'hidden', value: "#{@dossier.quartier_prioritaires.to_json}" }
-        %input{ id: 'cadastres', type:'hidden', value: "#{@dossier.cadastres.to_json}" }
+        %input{ id: 'quartier_prioritaires', type: 'hidden', value: "#{@dossier.quartier_prioritaires.to_json}" }
+        %input{ id: 'cadastres', type: 'hidden', value: "#{@dossier.cadastres.to_json}" }
 
         - if @dossier.draft?
           = render partial: '/layouts/etape_suivante'
diff --git a/app/views/users/description/_pieces_justificatives.html.haml b/app/views/users/description/_pieces_justificatives.html.haml
index 4ba870fdf..e3a109ba9 100644
--- a/app/views/users/description/_pieces_justificatives.html.haml
+++ b/app/views/users/description/_pieces_justificatives.html.haml
@@ -14,9 +14,9 @@
         - if dossier.cerfa_available?
           %span.btn.btn-sm.btn-file.btn-success
             Modifier
-            %input{ type: 'file', name:'cerfa_pdf', id:'cerfa_pdf', accept: PieceJustificative.accept_format, :max_file_size => 6.megabytes }
+            %input{ type: 'file', name: 'cerfa_pdf', id: 'cerfa_pdf', accept: PieceJustificative.accept_format, :max_file_size => 6.megabytes }
         - else
-          %input{ type: 'file', name:'cerfa_pdf', id:'cerfa_pdf', accept:  PieceJustificative.accept_format, :max_file_size => 6.megabytes }
+          %input{ type: 'file', name: 'cerfa_pdf', id: 'cerfa_pdf', accept:  PieceJustificative.accept_format, :max_file_size => 6.megabytes }
 
   - dossier.types_de_piece_justificative.order('order_place ASC').each do |type_de_piece_justificative|
     %tr
diff --git a/app/views/users/description/_show.html.haml b/app/views/users/description/_show.html.haml
index 92637674c..3b0e98a64 100644
--- a/app/views/users/description/_show.html.haml
+++ b/app/views/users/description/_show.html.haml
@@ -1,12 +1,12 @@
 .container#description_page
   - unless @dossier.procedure.lien_notice.blank?
-    #lien_notice_panel.row{ style:'width: 280px; position: fixed; background-color: white; right: 5%; top: 80px; z-index: 200' }
-      .panel.panel-info{ style:'margin-bottom:0' }
+    #lien_notice_panel.row{ style: 'width: 280px; position: fixed; background-color: white; right: 5%; top: 80px; z-index: 200' }
+      .panel.panel-info{ style: 'margin-bottom: 0' }
         .panel-body.center
           .row
             .col-xs-1
-              .fa.fa-info-circle.text-info{ style:'font-size: 2em; margin-top: 20%' }
-            .col-xs-10{ style:'padding-right: 0px' }
+              .fa.fa-info-circle.text-info{ style: 'font-size: 2em; margin-top: 20%' }
+            .col-xs-10{ style: 'padding-right: 0px' }
               %b
                 = link_to 'Accéder au guide', @dossier.procedure.lien_notice, { target: '_blank' }
               pour remplir pour votre dossier
@@ -18,7 +18,7 @@
   = form_tag(url_for({ controller: 'users/description', action: :update, dossier_id: @dossier.id }), class: 'form', method: 'POST', multipart: true) do
     - unless @champs.nil?
       #liste_champs
-        = render partial: 'users/description/champs', locals:{ private: false }
+        = render partial: 'users/description/champs', locals: { private: false }
 
     - if !@procedure.lien_demarche.blank? || @procedure.cerfa_flag || @dossier.types_de_piece_justificative.size > 0
       %br
@@ -33,7 +33,7 @@
     -# WTF ?
     - route = Rails.application.routes.recognize_path(request.referrer)
     - unless route[:controller].match('admin')
-      %div{ style: 'text-align:right' }
+      %div{ style: 'text-align: right' }
         %h6 Tous les champs portant un * sont obligatoires.
 
       - if !@dossier.can_be_initiated?
@@ -42,5 +42,5 @@
       - elsif !@dossier.draft?
         = render partial: '/layouts/modifications_terminees'
       - else
-        = submit_tag 'Soumettre mon dossier', id: 'suivant', name: 'submit[nouveaux]', class: 'btn btn btn-success', style: 'float:right', disabled: @procedure.archived?, data: { disable_with: 'Soumettre votre dossier', submit: true }
-        = submit_tag 'Enregistrer un brouillon', id: 'brouillon', name: 'submit[brouillon]', class: 'btn btn-xs btn-default', style: 'float:right; margin-right: 10px; margin-top: 6px', disabled: @procedure.archived?, data: { disable_with: 'Enregistrer un brouillon', submit: true }
+        = submit_tag 'Soumettre mon dossier', id: 'suivant', name: 'submit[nouveaux]', class: 'btn btn btn-success', style: 'float: right', disabled: @procedure.archived?, data: { disable_with: 'Soumettre votre dossier', submit: true }
+        = submit_tag 'Enregistrer un brouillon', id: 'brouillon', name: 'submit[brouillon]', class: 'btn btn-xs btn-default', style: 'float: right; margin-right: 10px; margin-top: 6px', disabled: @procedure.archived?, data: { disable_with: 'Enregistrer un brouillon', submit: true }
diff --git a/app/views/users/description/champs/_checkbox.html.haml b/app/views/users/description/champs/_checkbox.html.haml
index e06e69153..1471a1873 100644
--- a/app/views/users/description/champs/_checkbox.html.haml
+++ b/app/views/users/description/champs/_checkbox.html.haml
@@ -1 +1 @@
-%input{ type: 'checkbox', style:'margin-left: 15px;', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", checked: ('checked' if champ.object.value == 'on') }
+%input{ type: 'checkbox', style: 'margin-left: 15px;', name: "champs['#{champ.id}']", id: "champs_#{champ.id}", checked: ('checked' if champ.object.value == 'on') }
diff --git a/app/views/users/description/champs/_datetime.html.haml b/app/views/users/description/champs/_datetime.html.haml
index abd78fc6b..99a6a4c83 100644
--- a/app/views/users/description/champs/_datetime.html.haml
+++ b/app/views/users/description/champs/_datetime.html.haml
@@ -1,4 +1,4 @@
-%input.form-control{ name:"champs['#{champ.id}']",
+%input.form-control{ name: "champs['#{champ.id}']",
                   placeholder: champ.libelle,
                   id: "champs_#{champ.id}",
                   value: (champ.value.split(/[ ][0-9]*:[0-9]*/).first unless champ.value.nil?),
@@ -6,13 +6,13 @@
                   'data-provide' => champ.data_provide,
                   'data-date-format' => champ.data_date_format }
 
-%select.form-control{ name:"time_hour['#{champ.id}']", style: 'margin-left: 5px', id:"time_hour_#{champ.id}" }
+%select.form-control{ name: "time_hour['#{champ.id}']", style: 'margin-left: 5px', id: "time_hour_#{champ.id}" }
   - (0..23).each do |num|
     - num = "%.2i" %num
     %option{ value: num, selected: (:selected if champ.same_hour?(num)) }
       = num
 h
-%select.form-control{ name:"time_minute['#{champ.id}']", id:"time_minute_#{champ.id}" }
+%select.form-control{ name: "time_minute['#{champ.id}']", id: "time_minute_#{champ.id}" }
   - (0..59).each do |num|
     - num = "%.2i" %num
     - if num.to_i%5 == 0
diff --git a/app/views/users/description/champs/_engagement.html.haml b/app/views/users/description/champs/_engagement.html.haml
index a5b9253c3..2b51d09c9 100644
--- a/app/views/users/description/champs/_engagement.html.haml
+++ b/app/views/users/description/champs/_engagement.html.haml
@@ -1,2 +1,2 @@
-%input{ type: 'hidden', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", value: '' }
-%input{ type: 'checkbox', style:'margin-left: 15px;', name:"champs['#{champ.id}']", id: "champs_#{champ.id}", checked: ('checked' if champ.value == 'on') }
+%input{ type: 'hidden', name: "champs['#{champ.id}']", id: "champs_#{champ.id}", value: '' }
+%input{ type: 'checkbox', style: 'margin-left: 15px;', name: "champs['#{champ.id}']", id: "champs_#{champ.id}", checked: ('checked' if champ.value == 'on') }
diff --git a/app/views/users/description/champs/_render_list_champs.html.haml b/app/views/users/description/champs/_render_list_champs.html.haml
index f8f43b650..f24932516 100644
--- a/app/views/users/description/champs/_render_list_champs.html.haml
+++ b/app/views/users/description/champs/_render_list_champs.html.haml
@@ -44,7 +44,7 @@
           - elsif champ.type_champ == 'explication'
 
           - else
-            %input.form-control{ name:"champs['#{champ.id}']",
+            %input.form-control{ name: "champs['#{champ.id}']",
                             placeholder: champ.libelle,
                             id: "champs_#{champ.id}",
                             value: champ.value,
@@ -53,5 +53,5 @@
                             'data-date-format' => champ.data_date_format }
 
           - unless champ.description.empty?
-            %div{ id:"description_champs_#{champ.id}", class: ('help-block' unless champ.type_champ == 'engagement') }
+            %div{ id: "description_champs_#{champ.id}", class: ('help-block' unless champ.type_champ == 'engagement') }
               = champ.description_with_links
diff --git a/app/views/users/description/champs/_textarea.html.haml b/app/views/users/description/champs/_textarea.html.haml
index dca38bfcf..1ca81e00f 100644
--- a/app/views/users/description/champs/_textarea.html.haml
+++ b/app/views/users/description/champs/_textarea.html.haml
@@ -1,4 +1,4 @@
-%textarea.form-control.wysihtml5{ name:"champs['#{champ.id}']",
+%textarea.form-control.wysihtml5{ name: "champs['#{champ.id}']",
                   placeholder: champ.description,
                   id: "champs_#{champ.id}",
                   row: '6' }
diff --git a/app/views/users/dossiers/_state_description.html.haml b/app/views/users/dossiers/_state_description.html.haml
index 1d0d99e3d..754e9310f 100644
--- a/app/views/users/dossiers/_state_description.html.haml
+++ b/app/views/users/dossiers/_state_description.html.haml
@@ -1,9 +1,9 @@
-#state_description.row{ style:'width: 55%; margin-left: auto; margin-right: auto' }
+#state_description.row{ style: 'width: 55%; margin-left: auto; margin-right: auto' }
   .panel.panel-info
     .panel-body.center
       .row
         .col-md-1.col-lg-1.col-sm-1.col-xs-1
-          .fa.fa-info-circle.text-info{ style:'font-size: 2em; margin-top: 20%' }
+          .fa.fa-info-circle.text-info{ style: 'font-size: 2em; margin-top: 20%' }
         .col-xs-11
           - if dossiers_list_facade.liste == 'brouillon'
             Les dossiers présents dans cette liste
diff --git a/app/views/users/passwords/edit.html.haml b/app/views/users/passwords/edit.html.haml
index 45c85be70..2e6a246f4 100644
--- a/app/views/users/passwords/edit.html.haml
+++ b/app/views/users/passwords/edit.html.haml
@@ -56,5 +56,5 @@
       %br
       %br
       .actions
-        = f.submit "Changer", class:'btn btn-primary'
+        = f.submit "Changer", class: 'btn btn-primary'
       %br
diff --git a/app/views/users/passwords/new.html.haml b/app/views/users/passwords/new.html.haml
index eff778110..8a62b7652 100644
--- a/app/views/users/passwords/new.html.haml
+++ b/app/views/users/passwords/new.html.haml
@@ -48,5 +48,5 @@
       %br
       %br
       .actions
-        = f.submit "Renvoyer", class:'btn btn-primary'
+        = f.submit "Renvoyer", class: 'btn btn-primary'
       %br
diff --git a/app/views/users/registrations/new.html.haml b/app/views/users/registrations/new.html.haml
index dc8ba009f..82da47322 100644
--- a/app/views/users/registrations/new.html.haml
+++ b/app/views/users/registrations/new.html.haml
@@ -60,5 +60,5 @@
       %br
       %br
       .actions
-        = f.submit "S'enregistrer", class:'btn btn-primary'
+        = f.submit "S'enregistrer", class: 'btn btn-primary'
       %br
diff --git a/app/views/users/sessions/_resume_procedure.html.haml b/app/views/users/sessions/_resume_procedure.html.haml
index 5091e7aeb..f47137d57 100644
--- a/app/views/users/sessions/_resume_procedure.html.haml
+++ b/app/views/users/sessions/_resume_procedure.html.haml
@@ -1,7 +1,7 @@
 - if @dossier
   .panel.panel-default
     .panel-body
-      = link_to 'X', users_no_procedure_url, class: 'btn btn-xs', style:'float: right'
+      = link_to 'X', users_no_procedure_url, class: 'btn btn-xs', style: 'float: right'
 
       - if @dossier.procedure.euro_flag
         #euro_flag.flag
diff --git a/app/views/users/sessions/new.html.haml b/app/views/users/sessions/new.html.haml
index a4733b46b..add5365c3 100644
--- a/app/views/users/sessions/new.html.haml
+++ b/app/views/users/sessions/new.html.haml
@@ -21,7 +21,7 @@
       - if devise_mapping.rememberable?
         = f.input :remember_me, as: :boolean, label: 'Se souvenir de moi'
       .text-center
-        = f.submit "Se connecter", class:'btn btn-primary'
+        = f.submit "Se connecter", class: 'btn btn-primary'
 
   - if @user.email != DemoEmails[:gestionnaire] && @user.email != DemoEmails[:admin]
     = render "users/shared/links"
diff --git a/app/views/users/siret/_pro.html.haml b/app/views/users/siret/_pro.html.haml
index eb13e50fe..34fe7aaaf 100644
--- a/app/views/users/siret/_pro.html.haml
+++ b/app/views/users/siret/_pro.html.haml
@@ -11,7 +11,7 @@
   %br
   = form_tag(url_for({ controller: :dossiers, action: :create }), class: 'form-inline', method: 'POST') do |f|
     .form-group.form-group-lg
-      = text_field_tag :siret, nil, :class => "form-control", :placeholder => "Entrez votre Siret", :id => "siret", :name => "siret", :maxlength => 14, :style => 'margin-bottom:10px', value: @siret
+      = text_field_tag :siret, nil, :class => "form-control", :placeholder => "Entrez votre Siret", :id => "siret", :name => "siret", :maxlength => 14, :style => 'margin-bottom: 10px', value: @siret
       %br
-      = submit_tag "Commencer", class: %w(btn btn-lg btn-success), style: 'margin-top:20px;', data: { disable_with: "Commencer", submit: true }
+      = submit_tag "Commencer", class: %w(btn btn-lg btn-success), style: 'margin-top: 20px;', data: { disable_with: "Commencer", submit: true }
       %input{ type: 'hidden', value: "#{@procedure.id}", name: 'procedure_id', id: 'procedure_id' }

From 9c04d3ff93f9689716660324166985db6e0dcd30 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 19:58:11 +0200
Subject: [PATCH 32/72] All CSS declarations must end with a semi-colon

---
 app/assets/images/landing/users/Pilat.sketch    | Bin 0 -> 81920 bytes
 .../accompagnateurs/_list_assign.html.haml      |   6 +++---
 .../accompagnateurs/_list_not_assign.html.haml  |   2 +-
 app/views/admin/accompagnateurs/show.html.haml  |   2 +-
 app/views/admin/gestionnaires/_list.html.haml   |   6 +++---
 app/views/admin/gestionnaires/index.html.haml   |   2 +-
 .../admin/procedures/_informations.html.haml    |   4 ++--
 .../admin/procedures/_modal_publish.html.haml   |   2 +-
 .../admin/procedures/_modal_transfer.html.haml  |   2 +-
 app/views/admin/procedures/_onglets.html.haml   |   2 +-
 app/views/admin/procedures/new.html.haml        |   2 +-
 app/views/admin/procedures/show.html.haml       |  14 +++++++-------
 .../admin/types_de_champ/_fields.html.haml      |   2 +-
 app/views/administrations/index.html.haml       |   2 +-
 .../dossiers/_filter_framed.html.haml           |   4 ++--
 .../backoffice/dossiers/_pref_list.html.haml    |   6 +++---
 .../dossiers/_state_description.html.haml       |   4 ++--
 app/views/commencer/archived.html.haml          |   2 +-
 .../dossiers/_commentaires_files.html.haml      |   2 +-
 .../dossiers/_edit_pieces_jointes.html.haml     |   2 +-
 app/views/dossiers/_infos_dossier.html.haml     |   4 ++--
 .../dossiers/_infos_pieces_jointes.html.haml    |   8 ++++----
 .../dossiers/_infos_private_fields.html.haml    |   2 +-
 app/views/dossiers/_messagerie.html.haml        |   2 +-
 .../dossiers/_pieces_justificatives.html.haml   |   8 ++++----
 app/views/dossiers/commentaires/_form.html.haml |   7 +++----
 .../etapes/etape_2/_entreprise.html.haml        |  10 +++++-----
 .../etapes/etape_2/_individual.html.haml        |   2 +-
 .../particulier/check_email.html.haml           |   4 ++--
 .../france_connect/particulier/new.html.haml    |   2 +-
 app/views/layouts/_etape_suivante.html.haml     |   2 +-
 app/views/layouts/_ie_lt_10.html.haml           |   2 +-
 .../layouts/_modifications_terminees.html.haml  |   2 +-
 ..._admin_procedurescontroller_navbar.html.haml |   2 +-
 app/views/users/carte/show.html.haml            |   4 ++--
 app/views/users/description/_show.html.haml     |  14 +++++++-------
 .../description/champs/_datetime.html.haml      |   2 +-
 .../users/dossiers/_state_description.html.haml |   4 ++--
 .../users/sessions/_resume_procedure.html.haml  |   2 +-
 39 files changed, 75 insertions(+), 76 deletions(-)
 create mode 100644 app/assets/images/landing/users/Pilat.sketch

diff --git a/app/assets/images/landing/users/Pilat.sketch b/app/assets/images/landing/users/Pilat.sketch
new file mode 100644
index 0000000000000000000000000000000000000000..43648403d1c177800cd611d0bf4155482f1f17a6
GIT binary patch
literal 81920
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

literal 0
HcmV?d00001

diff --git a/app/views/admin/accompagnateurs/_list_assign.html.haml b/app/views/admin/accompagnateurs/_list_assign.html.haml
index e2b049756..faeec752d 100644
--- a/app/views/admin/accompagnateurs/_list_assign.html.haml
+++ b/app/views/admin/accompagnateurs/_list_assign.html.haml
@@ -1,17 +1,17 @@
-.row{ style: 'height: 34px' }
+.row{ style: 'height: 34px;' }
 
 - unless smart_listing.empty?
   %table.table#liste_gestionnaire
     %thead
       %th Enlever
-      %th#email{ style: 'text-align: right' } Email
+      %th#email{ style: 'text-align: right;' } Email
 
     - @accompagnateurs_assign.each do |accompagnateur|
       %tr
         %td.col-md-1.col-lg-1.col-sm-1.col-xs-1.col-sm-1.col-xs-1.center
           %a.btn.btn-primary{ href: "#{admin_procedure_accompagnateurs_path(procedure_id: @procedure.id, accompagnateur_id: accompagnateur.id, to: AccompagnateurService::NOT_ASSIGN)}", 'data-method' => 'put' }
             .fa.fa-arrow-left
-        %td{ style: 'padding-top: 11px; font-size: 15px; text-align: right' }= accompagnateur.email
+        %td{ style: 'padding-top: 11px; font-size: 15px; text-align: right;' }= accompagnateur.email
 
   = smart_listing.paginate
   = smart_listing.pagination_per_page_links
diff --git a/app/views/admin/accompagnateurs/_list_not_assign.html.haml b/app/views/admin/accompagnateurs/_list_not_assign.html.haml
index fcc5c763d..d016ffe90 100644
--- a/app/views/admin/accompagnateurs/_list_not_assign.html.haml
+++ b/app/views/admin/accompagnateurs/_list_not_assign.html.haml
@@ -14,7 +14,7 @@
 
     - @accompagnateurs_not_assign.each do |accompagnateur|
       %tr
-        %td.col-xs-11{ style: 'padding-top: 11px; font-size: 15px' }= accompagnateur.email
+        %td.col-xs-11{ style: 'padding-top: 11px; font-size: 15px;' }= accompagnateur.email
         %td.center
           %a.btn.btn-success.gestionnaire-affectation{ href: "#{admin_procedure_accompagnateurs_path(procedure_id: @procedure.id, accompagnateur_id: accompagnateur.id, to: AccompagnateurService::ASSIGN)}", 'data-method' => 'put' }
             .fa.fa-arrow-right
diff --git a/app/views/admin/accompagnateurs/show.html.haml b/app/views/admin/accompagnateurs/show.html.haml
index 747827f3c..251f89880 100644
--- a/app/views/admin/accompagnateurs/show.html.haml
+++ b/app/views/admin/accompagnateurs/show.html.haml
@@ -17,7 +17,7 @@
               .col-xs-2
                 %br
                 %br
-                = f.submit 'Valider', class: 'btn btn-info', style: 'float: left', id: 'add-gestionnaire-email'
+                = f.submit 'Valider', class: 'btn btn-info', style: 'float: left;', id: 'add-gestionnaire-email'
       .col-xs-6
         %h3.text-success Affectés
         = smart_listing_render :accompagnateurs_assign
diff --git a/app/views/admin/gestionnaires/_list.html.haml b/app/views/admin/gestionnaires/_list.html.haml
index b9b2bfced..259f3c31f 100644
--- a/app/views/admin/gestionnaires/_list.html.haml
+++ b/app/views/admin/gestionnaires/_list.html.haml
@@ -6,13 +6,13 @@
 
     - @gestionnaires.each do |gestionnaire|
       %tr
-        %td{ style: 'padding-top: 11px; font-size: 15px' }= gestionnaire.email
-        %td{ style: 'text-align: right' }
+        %td{ style: 'padding-top: 11px; font-size: 15px;' }= gestionnaire.email
+        %td{ style: 'text-align: right;' }
           .delete.btn.btn-sm.fa.fa-trash
 
           .confirm
             = link_to 'Valider', admin_gestionnaire_path(id: gestionnaire.id), { method: :delete, class: 'btn btn-sm btn-success' }
-            .cancel.btn.btn-sm.btn-danger.fa.fa-minus{ style: 'top: 0' }
+            .cancel.btn.btn-sm.btn-danger.fa.fa-minus{ style: 'top: 0;' }
 
   = smart_listing.paginate
   = smart_listing.pagination_per_page_links
diff --git a/app/views/admin/gestionnaires/index.html.haml b/app/views/admin/gestionnaires/index.html.haml
index d1e4226c6..13efab7f2 100644
--- a/app/views/admin/gestionnaires/index.html.haml
+++ b/app/views/admin/gestionnaires/index.html.haml
@@ -16,4 +16,4 @@
           .col-xs-2
             %br
             %br
-            = f.submit 'Valider', class: 'btn btn-info', style: 'float: left'
+            = f.submit 'Valider', class: 'btn btn-info', style: 'float: left;'
diff --git a/app/views/admin/procedures/_informations.html.haml b/app/views/admin/procedures/_informations.html.haml
index 745a35e55..476b8d250 100644
--- a/app/views/admin/procedures/_informations.html.haml
+++ b/app/views/admin/procedures/_informations.html.haml
@@ -16,10 +16,10 @@
   .col-md-6
     %h4 Logo de la procédure
     - unless @procedure.logo.blank?
-      = image_tag @procedure.decorate.logo_img, { style: 'height: 40px; display: inline; margin-right: 6px', id: 'preview_procedure_logo' }
+      = image_tag @procedure.decorate.logo_img, { style: 'height: 40px; display: inline; margin-right: 6px;', id: 'preview_procedure_logo' }
     = f.file_field :logo, accept: 'image/png, image/jpg, image/jpeg', style: 'display: inline'
 
-    %div{ style: 'margin-top: 5px' }
+    %div{ style: 'margin-top: 5px;' }
       %i
         Fichier accepté : JPG / JPEG / PNG
   .col-md-6
diff --git a/app/views/admin/procedures/_modal_publish.html.haml b/app/views/admin/procedures/_modal_publish.html.haml
index cfc25e1ff..b4617bbf3 100644
--- a/app/views/admin/procedures/_modal_publish.html.haml
+++ b/app/views/admin/procedures/_modal_publish.html.haml
@@ -29,7 +29,7 @@
                                 placeholder: 'Chemin vers la procédure',
                                 class: 'form-control',
                                 maxlength: 30,
-                                style: 'width: 300px; display: inline')
+                                style: 'width: 300px; display: inline;')
             #path_messages
               #path_is_mine.text-warning.center.message
                 Ce lien est déjà utilisé par une de vos procédure.
diff --git a/app/views/admin/procedures/_modal_transfer.html.haml b/app/views/admin/procedures/_modal_transfer.html.haml
index 8594d2c95..02a1a121e 100644
--- a/app/views/admin/procedures/_modal_transfer.html.haml
+++ b/app/views/admin/procedures/_modal_transfer.html.haml
@@ -15,7 +15,7 @@
                                                 type: 'email',
                                                 placeholder: 'Email administrateur cible',
                                                 style: 'width: 300px; margin-left:auto; margin-right:auto' }
-          %div#not_found_admin.center.text-danger{ style:'display: none; margin-top: 10px' }
+          %div#not_found_admin.center.text-danger{ style:'display: none; margin-top: 10px;' }
             Cet administrateur n'existe pas.
         .modal-footer
           = submit_tag "Envoyer", class: 'btn btn-success'
diff --git a/app/views/admin/procedures/_onglets.html.haml b/app/views/admin/procedures/_onglets.html.haml
index 0f25a9e36..bede00304 100644
--- a/app/views/admin/procedures/_onglets.html.haml
+++ b/app/views/admin/procedures/_onglets.html.haml
@@ -12,6 +12,6 @@
 
     %li{ class: @archived_class }
       %a{ :href => "#{url_for :admin_procedures_archived}" }
-        %h5{ style: 'color: black' }
+        %h5{ style: 'color: black;' }
           Archivées
 %br
diff --git a/app/views/admin/procedures/new.html.haml b/app/views/admin/procedures/new.html.haml
index cdd77b14b..1b203b146 100644
--- a/app/views/admin/procedures/new.html.haml
+++ b/app/views/admin/procedures/new.html.haml
@@ -5,4 +5,4 @@
   #procedure_new.section.section-label
     = form_for @procedure, url: { controller: 'admin/procedures', action: :create }, multipart: true do |f|
       = render partial: 'informations', locals: { f: f }
-      = f.submit 'Valider', class: 'btn btn-info', id: 'save-procedure', style: 'float: right'
+      = f.submit 'Valider', class: 'btn btn-info', id: 'save-procedure', style: 'float: right;'
diff --git a/app/views/admin/procedures/show.html.haml b/app/views/admin/procedures/show.html.haml
index c9abca2e5..3913a4235 100644
--- a/app/views/admin/procedures/show.html.haml
+++ b/app/views/admin/procedures/show.html.haml
@@ -2,31 +2,31 @@
   #procedure_show
     - unless @facade.procedure.published?
       - if @facade.procedure.gestionnaires.size == 0
-        %a.action_button.btn.btn-success{ style: 'float: right; margin-top: 10px', disabled: 'disabled', 'data-toggle' => :tooltip, title: 'Vous ne pouvez pas publier une procédure sans qu\'aucun accompagnateur ne soit affecté à celle-ci.', id: 'publish-procedure' }
+        %a.action_button.btn.btn-success{ style: 'float: right; margin-top: 10px;', disabled: 'disabled', 'data-toggle' => :tooltip, title: 'Vous ne pouvez pas publier une procédure sans qu\'aucun accompagnateur ne soit affecté à celle-ci.', id: 'publish-procedure' }
           %i.fa.fa-eraser
           Publier
       - else
-        %a.btn.btn-success{ "data-target" => "#publishModal", "data-toggle" => "modal", :type => "button", style: 'float: right; margin-top: 10px', id: 'publish-procedure' }
+        %a.btn.btn-success{ "data-target" => "#publishModal", "data-toggle" => "modal", :type => "button", style: 'float: right; margin-top: 10px;', id: 'publish-procedure' }
           %i.fa.fa-eraser
           Publier
 
       = render partial: '/admin/procedures/modal_publish'
 
-    %a#transfer.btn.btn-small.btn-default{ "data-target" => "#transferModal", "data-toggle" => "modal", :type => "button", style: 'float: right; margin-top: 10px; margin-right: 10px' }
+    %a#transfer.btn.btn-small.btn-default{ "data-target" => "#transferModal", "data-toggle" => "modal", :type => "button", style: 'float: right; margin-top: 10px; margin-right: 10px;' }
       %i.fa.fa-exchange
       Transférer
 
     = render partial: '/admin/procedures/modal_transfer'
 
     - if @facade.procedure.archived?
-      %a#reenable.btn.btn-small.btn-default.text-info{ "data-target" => "#publishModal", "data-toggle" => "modal", :type => "button", style: 'float: right; margin-top: 10px' }
+      %a#reenable.btn.btn-small.btn-default.text-info{ "data-target" => "#publishModal", "data-toggle" => "modal", :type => "button", style: 'float: right; margin-top: 10px;' }
         %i.fa.fa-eraser
         Réactiver
 
       = render partial: '/admin/procedures/modal_publish'
 
     - elsif @facade.procedure.published?
-      = form_tag admin_procedure_archive_path(procedure_id: @facade.procedure.id, archive: !@facade.procedure.archived?), method: :put, style: 'float: right; margin-top: 10px' do
+      = form_tag admin_procedure_archive_path(procedure_id: @facade.procedure.id, archive: !@facade.procedure.archived?), method: :put, style: 'float: right; margin-top: 10px;' do
         %button#archive.btn.btn-small.btn-default.text-info{ type: :button }
           %i.fa.fa-eraser
           Archiver
@@ -45,7 +45,7 @@
 
     %div
       %h3 Lien procédure
-      %div{ style: 'margin-left: 3%' }
+      %div{ style: 'margin-left: 3%;' }
         - if @facade.procedure.published?
           = link_to @facade.procedure.lien, @facade.procedure.lien, target: '_blank'
         - else
@@ -93,7 +93,7 @@
       = t('dynamics.admin.procedure.stats.title')
 
     .row
-      .col-xs-6{ style: 'margin-left: 3%' }
+      .col-xs-6{ style: 'margin-left: 3%;' }
         %h4 Total
         %div
           = @facade.dossiers_total
diff --git a/app/views/admin/types_de_champ/_fields.html.haml b/app/views/admin/types_de_champ/_fields.html.haml
index d69bf51a3..3e84b68d7 100644
--- a/app/views/admin/types_de_champ/_fields.html.haml
+++ b/app/views/admin/types_de_champ/_fields.html.haml
@@ -14,7 +14,7 @@
       %h4 Description
       = ff.text_area :description, class: 'form-control description', placeholder: 'Description', rows: 3
 
-    .form-group.drop_down_list{ class: (%w(drop_down_list multiple_drop_down_list).include?(type_champ) ? 'show_inline' : nil), style: 'margin-right: 5px' }
+    .form-group.drop_down_list{ class: (%w(drop_down_list multiple_drop_down_list).include?(type_champ) ? 'show_inline' : nil), style: 'margin-right: 5px;' }
       %h4 Liste déroulante
       = ff.fields_for :drop_down_list_attributes, ff.object.object.drop_down_list do |fff|
         ~ fff.text_area :value, class: 'form-control drop_down_list', placeholder: "Ecrire une valeur par ligne et --valeur-- pour un séparateur.", rows: 3, cols: 30
diff --git a/app/views/administrations/index.html.haml b/app/views/administrations/index.html.haml
index c90769e91..dc8c27cc1 100644
--- a/app/views/administrations/index.html.haml
+++ b/app/views/administrations/index.html.haml
@@ -8,7 +8,7 @@
         = f.submit 'Créer un administrateur', class: 'btn btn-success', id: 'submit_new_administrateur'
 
     .text-center
-      = link_to 'Stats', administrations_stats_path, style: 'margin-bottom: 50px; display: block', 'data-no-turbolink': true
+      = link_to 'Stats', administrations_stats_path, style: 'margin-bottom: 50px; display: block;', 'data-no-turbolink': true
 
     = smart_listing_render :admins
 
diff --git a/app/views/backoffice/dossiers/_filter_framed.html.haml b/app/views/backoffice/dossiers/_filter_framed.html.haml
index 737fe1ad7..cbf9c1d2e 100644
--- a/app/views/backoffice/dossiers/_filter_framed.html.haml
+++ b/app/views/backoffice/dossiers/_filter_framed.html.haml
@@ -1,9 +1,9 @@
-.filter_framed.panel.panel-primary{ id: "#{filter_framed_id}", style: 'width: 300px; height: 100px; position: absolute; top: 0; left: 0; display: none' }
+.filter_framed.panel.panel-primary{ id: "#{filter_framed_id}", style: 'width: 300px; height: 100px; position: absolute; top: 0; left: 0; display: none;' }
   .panel-heading
     = preference.libelle
 
   = form_tag @facade_data_view.filter_url, { class: 'panel-body form-inline', method: :post } do
-    %input.form-control.filter_input{ name: "filter_input[#{preference.table_attr}]", style: 'width: 69%', value: "#{preference.filter}" }
+    %input.form-control.filter_input{ name: "filter_input[#{preference.table_attr}]", style: 'width: 69%;', value: "#{preference.filter}" }
     %button.btn.btn-sm.btn-success
       %i.fa.fa-check
     .btn.btn-sm.btn-danger.erase-filter
diff --git a/app/views/backoffice/dossiers/_pref_list.html.haml b/app/views/backoffice/dossiers/_pref_list.html.haml
index a221de380..b92e4a41c 100644
--- a/app/views/backoffice/dossiers/_pref_list.html.haml
+++ b/app/views/backoffice/dossiers/_pref_list.html.haml
@@ -3,7 +3,7 @@
 %h3
   = t('dynamics.backoffice.pref_list.title')
 
-%p{ style: 'margin-top: 15px; margin-bottom: 20px' }
+%p{ style: 'margin-top: 15px; margin-bottom: 20px;' }
   = t('dynamics.backoffice.pref_list.description')
 
 %h4.text-primary
@@ -19,7 +19,7 @@
         %button.btn.btn-default.btn-xs{ type: :submit, id: "delete_pref_list_#{preference[:table]}_#{preference[:attr]}" }
           %i.fa.fa-minus
 
-%h4.text-success{ style: 'margin-top: 15px' }
+%h4.text-success{ style: 'margin-top: 15px;' }
   Disponibles
 
 %table
@@ -27,7 +27,7 @@
     - if index%2 == 0 || tables.first.to_s.include?('champs')
       %tr
 
-    %td.col-xs-5{ style: 'vertical-align: top', colspan: (tables.first == :champs ? 2 : 1) }
+    %td.col-xs-5{ style: 'vertical-align: top;', colspan: (tables.first == :champs ? 2 : 1) }
       %h5= tables.first.to_s.gsub('_', ' ').capitalize
       %ul
         - if tables.second
diff --git a/app/views/backoffice/dossiers/_state_description.html.haml b/app/views/backoffice/dossiers/_state_description.html.haml
index 7c20ec7f1..b7d58ceea 100644
--- a/app/views/backoffice/dossiers/_state_description.html.haml
+++ b/app/views/backoffice/dossiers/_state_description.html.haml
@@ -1,9 +1,9 @@
-#state_description.row{ style: 'width: 50%; margin-left: auto; margin-right: auto' }
+#state_description.row{ style: 'width: 50%; margin-left: auto; margin-right: auto;' }
   .panel.panel-info
     .panel-body.center
       .row
         .col-md-1.col-lg-1.col-sm-1.col-xs-1.col-sm-1.col-xs-1
-          .fa.fa-info-circle.text-info{ style: 'font-size: 2em; margin-top: 20%' }
+          .fa.fa-info-circle.text-info{ style: 'font-size: 2em; margin-top: 20%;' }
         .col-xs-11
           - if dossiers_list_facade.liste == 'nouveaux'
             Tous les dossiers présents dans cette liste sont ceux qui
diff --git a/app/views/commencer/archived.html.haml b/app/views/commencer/archived.html.haml
index a726ffa26..84c72ab34 100644
--- a/app/views/commencer/archived.html.haml
+++ b/app/views/commencer/archived.html.haml
@@ -2,7 +2,7 @@
 %div{ style: 'text-align: center; max-width: 500px; margin-left: auto; margin-right: auto; padding: 20px;' }
   = render partial: 'users/sessions/resume_procedure'
 
-.center{ style: 'margin-top: -20px' }
+.center{ style: 'margin-top: -20px;' }
   %h3
     La campagne de création de nouveau dossier
     %br
diff --git a/app/views/dossiers/_commentaires_files.html.haml b/app/views/dossiers/_commentaires_files.html.haml
index c50931ca1..f8414e4db 100644
--- a/app/views/dossiers/_commentaires_files.html.haml
+++ b/app/views/dossiers/_commentaires_files.html.haml
@@ -16,7 +16,7 @@
       %tr
         %td= file.user.nil? ? 'Accompagnateur' : file.user.email
         %td= file.created_at.localtime
-        %td= link_to file.original_filename, file.content_url, style: 'color: green', target: '_blank'
+        %td= link_to file.original_filename, file.content_url, style: 'color: green;', target: '_blank'
 - else
   %h4.text-primary
     Pas de fichier dans le flux de commentaires.
diff --git a/app/views/dossiers/_edit_pieces_jointes.html.haml b/app/views/dossiers/_edit_pieces_jointes.html.haml
index 129e551ef..61a8dc794 100644
--- a/app/views/dossiers/_edit_pieces_jointes.html.haml
+++ b/app/views/dossiers/_edit_pieces_jointes.html.haml
@@ -5,7 +5,7 @@
         %a#maj_pj.action{ "data-target" => "#UploadPJmodal",
                            "data-toggle" => "modal",
                            :type => "button",
-                           style: 'margin-bottom: 15px; margin-top: -30px' }
+                           style: 'margin-bottom: 15px; margin-top: -30px;' }
           Modifier les documents
         %br
         = render partial: 'users/recapitulatif/modal_upload_pj'
diff --git a/app/views/dossiers/_infos_dossier.html.haml b/app/views/dossiers/_infos_dossier.html.haml
index d664b274c..5aea3610b 100644
--- a/app/views/dossiers/_infos_dossier.html.haml
+++ b/app/views/dossiers/_infos_dossier.html.haml
@@ -65,7 +65,7 @@
             .col-xs-5.despositaire-info
               - if @facade.dossier.cerfa_available?
                 %a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter
-                %span{ style: 'margin-left: 12px' }
+                %span{ style: 'margin-left: 12px;' }
                   \-
                 = link_to "", class: "historique", "data-toggle" => "modal", "data-target" => "#PJmodal", :type => "button", "data-modal_title" => 'formulaires', "data-modal_index" => 'cerfa' do
                   %span.fa.fa-clock-o
@@ -84,7 +84,7 @@
                     %span.text-success Nous l'avons récupéré pour vous.
                   - elsif !(@pj = @facade.dossier.retrieve_last_piece_justificative_by_type(type_de_piece_justificative.id)).nil?
                     %a{ href: "#{@pj.content_url}", target: '_blank' } Consulter
-                    %span{ style: 'margin-left: 12px' }
+                    %span{ style: 'margin-left: 12px;' }
                       \-
                     - if @facade.dossier.pieces_justificatives.where(type_de_piece_justificative_id: type_de_piece_justificative.id).count > 1
                       = link_to "", class: "historique", "data-toggle" => "modal", "data-target" => "#PJmodal", :type => "button", "data-modal_title" => 'formulaires', "data-modal_index" => "type_de_pj_#{type_de_piece_justificative.id}" do
diff --git a/app/views/dossiers/_infos_pieces_jointes.html.haml b/app/views/dossiers/_infos_pieces_jointes.html.haml
index b38c0bf93..78d1df89f 100644
--- a/app/views/dossiers/_infos_pieces_jointes.html.haml
+++ b/app/views/dossiers/_infos_pieces_jointes.html.haml
@@ -8,9 +8,9 @@
           .col-xs-5
             - if @facade.dossier.cerfa_available?
               %a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter
-              %span{ style: 'margin-left: 12px' }
+              %span{ style: 'margin-left: 12px;' }
                 \-
-              %a.btn.fa.fa-timer{ style: 'color: black; padding-top: 0',
+              %a.btn.fa.fa-timer{ style: 'color: black; padding-top: 0;',
                                                 "data-target" => "#PJmodal",
                                                 "data-toggle" => "modal",
                                                 :type => "button",
@@ -34,9 +34,9 @@
                   -#   = 'Pièce fournie'
                   -# - elsif gestionnaire_signed_in?
                   %a{ href: "#{@pj.content_url}", target: '_blank' } Consulter
-                  %span{ style: 'margin-left: 12px' }
+                  %span{ style: 'margin-left: 12px;' }
                     \-
-                  %a.btn.fa.fa-timer{ style: 'color: black; padding-top: 0',
+                  %a.btn.fa.fa-timer{ style: 'color: black; padding-top: 0;',
                                                       "data-target" => "#PJmodal",
                                                       "data-toggle" => "modal",
                                                       :type => "button",
diff --git a/app/views/dossiers/_infos_private_fields.html.haml b/app/views/dossiers/_infos_private_fields.html.haml
index 2813604fc..f1b75dc53 100644
--- a/app/views/dossiers/_infos_private_fields.html.haml
+++ b/app/views/dossiers/_infos_private_fields.html.haml
@@ -1,4 +1,4 @@
-.row{ style: 'margin-top: -20px' }
+.row{ style: 'margin-top: -20px;' }
   .col-xs-12
     = form_for @facade.dossier, url: { controller: 'backoffice/private_formulaires', action: :update, dossier_id: @facade.dossier.id }, remote: true do
       = render partial: '/users/description/champs', locals: { private: true }
diff --git a/app/views/dossiers/_messagerie.html.haml b/app/views/dossiers/_messagerie.html.haml
index b37f68765..eb8b59324 100644
--- a/app/views/dossiers/_messagerie.html.haml
+++ b/app/views/dossiers/_messagerie.html.haml
@@ -1,4 +1,4 @@
-.default_data_block{ style: 'margin-top: 40px' }
+.default_data_block{ style: 'margin-top: 40px;' }
   .row.show-block.clearfix#messages
     .header
       .col-xs-10.title
diff --git a/app/views/dossiers/_pieces_justificatives.html.haml b/app/views/dossiers/_pieces_justificatives.html.haml
index e2689f7e0..f547b1a4d 100644
--- a/app/views/dossiers/_pieces_justificatives.html.haml
+++ b/app/views/dossiers/_pieces_justificatives.html.haml
@@ -7,9 +7,9 @@
         %td.col-lg-6.col-md-6.col-sm-6.col-xs-6
           - if @facade.dossier.cerfa_available?
             %a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter
-            %span{ style: 'margin-left: 12px' }
+            %span{ style: 'margin-left: 12px;' }
               \-
-            %a.btn.fa.fa-timer{ style: 'color: black; padding-top: 0',
+            %a.btn.fa.fa-timer{ style: 'color: black; padding-top: 0;',
                                                 "data-target" => "#PJmodal",
                                                 "data-toggle" => "modal",
                                                 :type => "button",
@@ -30,9 +30,9 @@
             -#   = 'Pièce fournie'
             -# - elsif gestionnaire_signed_in?
             %a{ href: "#{@pj.content_url}", target: '_blank' } Consulter
-            %span{ style: 'margin-left: 12px' }
+            %span{ style: 'margin-left: 12px;' }
               \-
-            %a.btn.fa.fa-timer{ style: 'color: black; padding-top: 0',
+            %a.btn.fa.fa-timer{ style: 'color: black; padding-top: 0;',
                                                 "data-target" => "#PJmodal",
                                                 "data-toggle" => "modal",
                                                 :type => "button",
diff --git a/app/views/dossiers/commentaires/_form.html.haml b/app/views/dossiers/commentaires/_form.html.haml
index 6463773dd..d2b56b0f8 100644
--- a/app/views/dossiers/commentaires/_form.html.haml
+++ b/app/views/dossiers/commentaires/_form.html.haml
@@ -1,11 +1,10 @@
 = form_tag(url_for({ controller: 'commentaires', action: :create, dossier_id: dossier_facade.dossier.id, champ_id: dossier_facade.champ_id }), class: 'form-inline', method: 'POST', multipart: true) do
 
-  %textarea.form-control.wysihtml5{ id: 'texte_commentaire', name: 'texte_commentaire', style: 'width: 100%; margin-bottom: 2%', rows: '5', placeholder: "Commentaire" }
+  %textarea.form-control.wysihtml5{ id: 'texte_commentaire', name: 'texte_commentaire', style: 'width: 100%; margin-bottom: 2%;', rows: '5', placeholder: "Commentaire" }
 
   .row
     .col-md-6
-      %h4.text-primary{ style: 'margin-top: 0px' } Ajouter un fichier
-      = file_field_tag "piece_justificative[content]", accept:  PieceJustificative.accept_format, style: 'float: left; margin-left: 20px'
-
+      %h4.text-primary{ style: 'margin-top: 0px;' } Ajouter un fichier
+      = file_field_tag "piece_justificative[content]", accept:  PieceJustificative.accept_format, style: 'float: left; margin-left: 20px;'
     .col-md-6.text-right
       %input#save-message.form-control.btn.btn-danger{ type: 'submit', value: 'ENVOYER' }
diff --git a/app/views/dossiers/etapes/etape_2/_entreprise.html.haml b/app/views/dossiers/etapes/etape_2/_entreprise.html.haml
index 5a4b3fd69..c817a95a9 100644
--- a/app/views/dossiers/etapes/etape_2/_entreprise.html.haml
+++ b/app/views/dossiers/etapes/etape_2/_entreprise.html.haml
@@ -3,7 +3,7 @@
     Mes informations
   %br
   - unless @facade.entreprise.nil?
-    .center{ style: 'margin-left: -5%' }
+    .center{ style: 'margin-left: -5%;' }
       Vous êtes authentifié avec le SIRET
 
       %h3.text-success
@@ -15,7 +15,7 @@
 .etape.etapes_informations.col-xs-9
   .row
     - if @facade.entreprise.nil?
-      #new_siret{ style: 'margin-left: 20%; margin-top: 5%' }
+      #new_siret{ style: 'margin-left: 20%; margin-top: 5%;' }
         = form_for @facade.dossier, html: { class: 'form-inline' }, url: users_dossier_siret_informations_path(dossier_id: @facade.dossier.id), method: :post, remote: true do |f|
           .form-group.form-group-lg
             = f.text_field :siret, class: "form-control", placeholder: "Entrez votre Siret", value: @siret
@@ -26,15 +26,15 @@
       #recap_info_entreprise
         = render partial: '/dossiers/infos_entreprise'
 
-        %p#insee_infogreffe{ style: 'color: grey; float: right' }
+        %p#insee_infogreffe{ style: 'color: grey; float: right;' }
           %i
             Informations récupérées auprès de l'INSEE et d'INFOGREFFE
 
         %br
         = form_for @facade.dossier, url: { controller: '/users/dossiers', action: :update } do |f|
           = f.hidden_field :id
-          %label{ style: 'font-weight: normal' }
+          %label{ style: 'font-weight: normal;' }
             = f.check_box :autorisation_donnees
             J'autorise les décideurs publics à vérifier les informations de mon organisation auprès des administrations concernées. Ces informations resteront strictement confidentielles.
           %br
-          = f.submit 'Etape suivante', class: "btn btn btn-info", style: 'float: right', id: 'etape_suivante', disabled: :disabled
+          = f.submit 'Etape suivante', class: "btn btn btn-info", style: 'float: right;', id: 'etape_suivante', disabled: :disabled
diff --git a/app/views/dossiers/etapes/etape_2/_individual.html.haml b/app/views/dossiers/etapes/etape_2/_individual.html.haml
index 4daa73c98..a21b08ae7 100644
--- a/app/views/dossiers/etapes/etape_2/_individual.html.haml
+++ b/app/views/dossiers/etapes/etape_2/_individual.html.haml
@@ -34,7 +34,7 @@
               = ff.date_field :birthdate, { class: 'form-control', placeholder: 'jj/mm/aaaa' }
 
         %p
-          %label{ style: 'font-weight: normal' }
+          %label{ style: 'font-weight: normal;' }
             = f.check_box :autorisation_donnees
             = "&nbsp;".html_safe
             Vos informations personnelles ne seront jamais utilisées dans un but lucratif ou commercial. Elles ne pourront être communiquées à de tiers personnes sans votre accord préalable. Elles pourront en revanche être communiquées aux administrations compétentes afin d'instruire votre dossier, conformément à la déclaration CNIL effectué par le service TPS.
diff --git a/app/views/france_connect/particulier/check_email.html.haml b/app/views/france_connect/particulier/check_email.html.haml
index 5cd29bfda..da4efd5be 100644
--- a/app/views/france_connect/particulier/check_email.html.haml
+++ b/app/views/france_connect/particulier/check_email.html.haml
@@ -1,9 +1,9 @@
 %h2.text-info
-  = image_tag('logo_FC_02_small.png', style: 'height: 55px')
+  = image_tag('logo_FC_02_small.png', style: 'height: 55px;')
   &nbsp;France Connect - Particulier
 
 %h3 Nouvelle connexion
-%h4.text-warning{ style: 'margin-left: 20px' } Email déjà utilisé
+%h4.text-warning{ style: 'margin-left: 20px;' } Email déjà utilisé
 
 %br
 %p
diff --git a/app/views/france_connect/particulier/new.html.haml b/app/views/france_connect/particulier/new.html.haml
index 92418f3ba..22f6c8e72 100644
--- a/app/views/france_connect/particulier/new.html.haml
+++ b/app/views/france_connect/particulier/new.html.haml
@@ -1,5 +1,5 @@
 %h2.text-info
-  = image_tag('logo_FC_02_small.png', style: 'height: 55px')
+  = image_tag('logo_FC_02_small.png', style: 'height: 55px;')
   &nbsp;France Connect - Particulier
 
 %h3 Nouvelle connexion
diff --git a/app/views/layouts/_etape_suivante.html.haml b/app/views/layouts/_etape_suivante.html.haml
index 2cac64b90..23b68d504 100644
--- a/app/views/layouts/_etape_suivante.html.haml
+++ b/app/views/layouts/_etape_suivante.html.haml
@@ -1 +1 @@
-= submit_tag 'Etape suivante', class: %w(btn btn btn-info), style: 'float: right', id: 'etape_suivante', data: { disable_with: 'Etape suivante', submit: true }
+= submit_tag 'Etape suivante', class: %w(btn btn btn-info), style: 'float: right;', id: 'etape_suivante', data: { disable_with: 'Etape suivante', submit: true }
diff --git a/app/views/layouts/_ie_lt_10.html.haml b/app/views/layouts/_ie_lt_10.html.haml
index ca32e16f7..da6c5365f 100644
--- a/app/views/layouts/_ie_lt_10.html.haml
+++ b/app/views/layouts/_ie_lt_10.html.haml
@@ -1,6 +1,6 @@
 = "<!--[if lt IE 10]>".html_safe
 
-.center{ style: 'width: 100%; background-color: white; position: fixed; top: 0; left: 0; z-index: 100000' }
+.center{ style: 'width: 100%; background-color: white; position: fixed; top: 0; left: 0; z-index: 100000;' }
   %h3.text-danger
     %b
       Votre version d'Internet Explorer est trop ancienne pour être utilisée sur le service TPS. Version minimum : Internet Explorer 10
diff --git a/app/views/layouts/_modifications_terminees.html.haml b/app/views/layouts/_modifications_terminees.html.haml
index c28110747..d653f1044 100644
--- a/app/views/layouts/_modifications_terminees.html.haml
+++ b/app/views/layouts/_modifications_terminees.html.haml
@@ -1,3 +1,3 @@
-%div{ style: 'float: right' }
+%div{ style: 'float: right;' }
   %a.btn{ href: "/users/dossiers/#{@dossier.id}/recapitulatif" } Retour
   = submit_tag 'Modification terminée', class: %w(btn btn btn-info), id: 'modification_terminee', data: { disable_with: 'Modification terminée', submit: true }
diff --git a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml
index a0c887cb2..60036b2a5 100644
--- a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml
@@ -1,7 +1,7 @@
 %div#first-block
   .en-cours
     - unless @procedure.logo.blank?
-      = image_tag @procedure.decorate.logo_img, style: 'width: 30px'
+      = image_tag @procedure.decorate.logo_img, style: 'width: 30px;'
     %b
       = @procedure.libelle
 
diff --git a/app/views/users/carte/show.html.haml b/app/views/users/carte/show.html.haml
index d20a88a3a..de4a0505f 100644
--- a/app/views/users/carte/show.html.haml
+++ b/app/views/users/carte/show.html.haml
@@ -6,12 +6,12 @@
       Positionnez-vous et dessinez sur la carte la zone d'action de votre demande.
     %br
 
-    .content{ style: 'margin-bottom: 60px' }
+    .content{ style: 'margin-bottom: 60px;' }
       %button#new.btn.btn-md.btn-success{ type: 'button' }
         %i.fa.fa-pencil
         Ajouter une zone
 
-      %span#search_by_address{ style: 'margin-left: 20px' }
+      %span#search_by_address{ style: 'margin-left: 20px;' }
         %input.form-control{ type: :address, placeholder: 'Rechercher une adresse' }
       %br
       %br
diff --git a/app/views/users/description/_show.html.haml b/app/views/users/description/_show.html.haml
index 3b0e98a64..627773625 100644
--- a/app/views/users/description/_show.html.haml
+++ b/app/views/users/description/_show.html.haml
@@ -1,12 +1,12 @@
 .container#description_page
   - unless @dossier.procedure.lien_notice.blank?
-    #lien_notice_panel.row{ style: 'width: 280px; position: fixed; background-color: white; right: 5%; top: 80px; z-index: 200' }
-      .panel.panel-info{ style: 'margin-bottom: 0' }
+    #lien_notice_panel.row{ style: 'width: 280px; position: fixed; background-color: white; right: 5%; top: 80px; z-index: 200;' }
+      .panel.panel-info{ style: 'margin-bottom: 0;' }
         .panel-body.center
           .row
             .col-xs-1
-              .fa.fa-info-circle.text-info{ style: 'font-size: 2em; margin-top: 20%' }
-            .col-xs-10{ style: 'padding-right: 0px' }
+              .fa.fa-info-circle.text-info{ style: 'font-size: 2em; margin-top: 20%;' }
+            .col-xs-10{ style: 'padding-right: 0px;' }
               %b
                 = link_to 'Accéder au guide', @dossier.procedure.lien_notice, { target: '_blank' }
               pour remplir pour votre dossier
@@ -33,7 +33,7 @@
     -# WTF ?
     - route = Rails.application.routes.recognize_path(request.referrer)
     - unless route[:controller].match('admin')
-      %div{ style: 'text-align: right' }
+      %div{ style: 'text-align: right;' }
         %h6 Tous les champs portant un * sont obligatoires.
 
       - if !@dossier.can_be_initiated?
@@ -42,5 +42,5 @@
       - elsif !@dossier.draft?
         = render partial: '/layouts/modifications_terminees'
       - else
-        = submit_tag 'Soumettre mon dossier', id: 'suivant', name: 'submit[nouveaux]', class: 'btn btn btn-success', style: 'float: right', disabled: @procedure.archived?, data: { disable_with: 'Soumettre votre dossier', submit: true }
-        = submit_tag 'Enregistrer un brouillon', id: 'brouillon', name: 'submit[brouillon]', class: 'btn btn-xs btn-default', style: 'float: right; margin-right: 10px; margin-top: 6px', disabled: @procedure.archived?, data: { disable_with: 'Enregistrer un brouillon', submit: true }
+        = submit_tag 'Soumettre mon dossier', id: 'suivant', name: 'submit[nouveaux]', class: 'btn btn btn-success', style: 'float: right;', disabled: @procedure.archived?, data: { disable_with: 'Soumettre votre dossier', submit: true }
+        = submit_tag 'Enregistrer un brouillon', id: 'brouillon', name: 'submit[brouillon]', class: 'btn btn-xs btn-default', style: 'float: right; margin-right: 10px; margin-top: 6px;', disabled: @procedure.archived?, data: { disable_with: 'Enregistrer un brouillon', submit: true }
diff --git a/app/views/users/description/champs/_datetime.html.haml b/app/views/users/description/champs/_datetime.html.haml
index 99a6a4c83..e50212c17 100644
--- a/app/views/users/description/champs/_datetime.html.haml
+++ b/app/views/users/description/champs/_datetime.html.haml
@@ -6,7 +6,7 @@
                   'data-provide' => champ.data_provide,
                   'data-date-format' => champ.data_date_format }
 
-%select.form-control{ name: "time_hour['#{champ.id}']", style: 'margin-left: 5px', id: "time_hour_#{champ.id}" }
+%select.form-control{ name: "time_hour['#{champ.id}']", style: 'margin-left: 5px;', id: "time_hour_#{champ.id}" }
   - (0..23).each do |num|
     - num = "%.2i" %num
     %option{ value: num, selected: (:selected if champ.same_hour?(num)) }
diff --git a/app/views/users/dossiers/_state_description.html.haml b/app/views/users/dossiers/_state_description.html.haml
index 754e9310f..52d13cab2 100644
--- a/app/views/users/dossiers/_state_description.html.haml
+++ b/app/views/users/dossiers/_state_description.html.haml
@@ -1,9 +1,9 @@
-#state_description.row{ style: 'width: 55%; margin-left: auto; margin-right: auto' }
+#state_description.row{ style: 'width: 55%; margin-left: auto; margin-right: auto;' }
   .panel.panel-info
     .panel-body.center
       .row
         .col-md-1.col-lg-1.col-sm-1.col-xs-1
-          .fa.fa-info-circle.text-info{ style: 'font-size: 2em; margin-top: 20%' }
+          .fa.fa-info-circle.text-info{ style: 'font-size: 2em; margin-top: 20%;' }
         .col-xs-11
           - if dossiers_list_facade.liste == 'brouillon'
             Les dossiers présents dans cette liste
diff --git a/app/views/users/sessions/_resume_procedure.html.haml b/app/views/users/sessions/_resume_procedure.html.haml
index f47137d57..236bf7a10 100644
--- a/app/views/users/sessions/_resume_procedure.html.haml
+++ b/app/views/users/sessions/_resume_procedure.html.haml
@@ -1,7 +1,7 @@
 - if @dossier
   .panel.panel-default
     .panel-body
-      = link_to 'X', users_no_procedure_url, class: 'btn btn-xs', style: 'float: right'
+      = link_to 'X', users_no_procedure_url, class: 'btn btn-xs', style: 'float: right;'
 
       - if @dossier.procedure.euro_flag
         #euro_flag.flag

From 57ee3c5b3f1ab05fe0688bd202fea0bc3fecb82c Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 17:46:39 +0200
Subject: [PATCH 33/72] Separate ternary operators with spaces on both sides

---
 app/views/admin/procedures/_modal_publish.html.haml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/admin/procedures/_modal_publish.html.haml b/app/views/admin/procedures/_modal_publish.html.haml
index b4617bbf3..2619ca5e5 100644
--- a/app/views/admin/procedures/_modal_publish.html.haml
+++ b/app/views/admin/procedures/_modal_publish.html.haml
@@ -6,12 +6,12 @@
           %button.close{ "aria-label" => "Close", "data-dismiss" => "modal", :type => "button" }
             %span{ "aria-hidden" => "true" } ×
           %h4#myModalLabel.modal-title
-            = @procedure.archived?? 'Réactiver' : 'Publier'
+            = @procedure.archived? ? 'Réactiver' : 'Publier'
             la procédure
             %span#publishModal_title
         .modal-body
           Vous vous apprêtez à
-          = @procedure.archived?? 'republier' : 'publier'
+          = @procedure.archived? ? 'republier' : 'publier'
           votre procédure au public.
           - unless @procedure.archived?
             %b
@@ -42,7 +42,7 @@
               #path_is_invalid.text-danger.center.message
                 Ce lien n'est pas valide. Il doit comporter au moins 3 caractères et seuls les caractères a-z, 0-9 et '_' sont autorisés.
         .modal-footer
-          = submit_tag "#{@procedure.archived?? 'Réactiver' : 'Publier'}", class: %w(btn btn btn-success),
+          = submit_tag "#{@procedure.archived? ? 'Réactiver' : 'Publier'}", class: %w(btn btn btn-success),
                                   id: 'publish',
                                   disabled: :disabled
           = button_tag 'Annuler', class: %w(btn btn btn-default), id: 'cancel', data: { dismiss: 'modal' }

From 48f91eca463e9a4db82d6620a06793815b4fc604 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 16:49:04 +0200
Subject: [PATCH 34/72] Add .haml-lint.yml

---
 .haml-lint.yml | 119 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 119 insertions(+)
 create mode 100644 .haml-lint.yml

diff --git a/.haml-lint.yml b/.haml-lint.yml
new file mode 100644
index 000000000..e1fc25e4d
--- /dev/null
+++ b/.haml-lint.yml
@@ -0,0 +1,119 @@
+linters:
+  AlignmentTabs:
+    enabled: true
+
+  AltText:
+    enabled: false
+
+  ClassAttributeWithStaticValue:
+    enabled: true
+
+  ClassesBeforeIds:
+    enabled: false
+
+  ConsecutiveComments:
+    enabled: false
+
+  ConsecutiveSilentScripts:
+    enabled: false
+    max_consecutive: 2
+
+  EmptyObjectReference:
+    enabled: true
+
+  EmptyScript:
+    enabled: true
+
+  FinalNewline:
+    enabled: true
+    present: true
+
+  HtmlAttributes:
+    enabled: true
+
+  IdNames:
+    enabled: false
+    style: lisp_case
+
+  ImplicitDiv:
+    enabled: false
+
+  Indentation:
+    enabled: true
+    character: space # or tab
+    width: 2 # ignored if character == tab
+
+  InstanceVariables:
+    enabled: false
+    file_types: partials
+    matchers:
+      all: .*
+      partials: \A_.*\.haml\z
+
+  LeadingCommentSpace:
+    enabled: true
+
+  LineLength:
+    enabled: false
+    max: 80
+
+  MultilinePipe:
+    enabled: true
+
+  MultilineScript:
+    enabled: true
+
+  ObjectReferenceAttributes:
+    enabled: true
+
+  RepeatedId:
+    enabled: false
+    severity: error
+
+  RuboCop:
+    enabled: false
+    # These cops are incredibly noisy when it comes to HAML templates, so we
+    # ignore them.
+    ignored_cops:
+      - Lint/BlockAlignment
+      - Lint/EndAlignment
+      - Lint/Void
+      - Metrics/BlockLength
+      - Metrics/LineLength
+      - Style/AlignParameters
+      - Style/BlockNesting
+      - Style/ElseAlignment
+      - Style/EndOfLine
+      - Style/FileName
+      - Style/FinalNewline
+      - Style/FrozenStringLiteralComment
+      - Style/IfUnlessModifier
+      - Style/IndentationWidth
+      - Style/Next
+      - Style/TrailingBlankLines
+      - Style/TrailingWhitespace
+      - Style/WhileUntilModifier
+
+  RubyComments:
+    enabled: true
+
+  SpaceBeforeScript:
+    enabled: true
+
+  SpaceInsideHashAttributes:
+    enabled: true
+    style: space
+
+  TagName:
+    enabled: true
+
+  TrailingWhitespace:
+    enabled: true
+
+  UnnecessaryInterpolation:
+    enabled: true
+
+  # Disabled because too agressive, but to enable
+  # locally from time to time
+  UnnecessaryStringOutput:
+    enabled: false

From c54f95ecbbf08309261bf9a936169f3e98b1772d Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 18:22:26 +0200
Subject: [PATCH 35/72] Add haml-lint to the Gemfile

---
 Gemfile      |  1 +
 Gemfile.lock | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/Gemfile b/Gemfile
index aaa5c392f..24f75ba73 100644
--- a/Gemfile
+++ b/Gemfile
@@ -123,6 +123,7 @@ group :development do
   gem 'web-console'
   gem 'rack-handlers'
   gem 'xray-rails'
+  gem 'haml-lint'
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 7cd099c9f..b6a8ceacf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -78,6 +78,7 @@ GEM
       actionpack (>= 3.0)
       activemodel (>= 3.0)
       responders
+    ast (2.3.0)
     attr_required (1.0.1)
     autoprefixer-rails (6.5.4)
       execjs
@@ -313,12 +314,20 @@ GEM
       rspec (>= 2.99.0, < 4.0)
     haml (4.0.7)
       tilt
+    haml-lint (0.999.999)
+      haml_lint
     haml-rails (0.9.0)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
       haml (>= 4.0.6, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
+    haml_lint (0.24.0)
+      haml (>= 4.0, < 5.1)
+      rainbow
+      rake (>= 10, < 13)
+      rubocop (>= 0.47.0)
+      sysexits (~> 1.1)
     hashdiff (0.3.1)
     hashie (3.4.6)
     html2haml (2.0.0)
@@ -412,11 +421,14 @@ GEM
     openstack (3.3.7)
       json
     orm_adapter (0.5.0)
+    parser (2.4.0.0)
+      ast (~> 2.2)
     pg (0.19.0)
     poltergeist (1.14.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
+    powerpack (0.1.1)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -463,6 +475,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
+    rainbow (2.2.1)
     raindrops (0.17.0)
     rake (12.0.0)
     rb-fsevent (0.9.8)
@@ -513,6 +526,13 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
+    rubocop (0.48.1)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
     ruby_dep (1.5.0)
     ruby_parser (3.8.3)
       sexp_processor (~> 4.1)
@@ -580,6 +600,7 @@ GEM
       httpclient (>= 2.4)
       i18n
       json (>= 1.4.3)
+    sysexits (1.2.0)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
@@ -598,6 +619,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
+    unicode-display_width (1.1.3)
     unicode_utils (1.4.0)
     unicorn (5.2.0)
       kgio (~> 2.6)
@@ -666,6 +688,7 @@ DEPENDENCIES
   guard
   guard-livereload (~> 2.4)
   guard-rspec
+  haml-lint
   haml-rails
   hashie
   jquery-rails

From 0c41509d7030e1c17c197bf56ff4d1a5a3b2941a Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 18:25:47 +0200
Subject: [PATCH 36/72] Add HAML linting to the CI process

---
 circle.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/circle.yml b/circle.yml
index 8fbdcce89..f8a57d372 100644
--- a/circle.yml
+++ b/circle.yml
@@ -3,6 +3,11 @@ database:
     - cp config/database.yml.ci config/database.yml
     - bundle exec rake db:create db:schema:load db:migrate RAILS_ENV=test
 
+test:
+  override:
+    - bundle exec rspec
+    - bundle exec haml-lint app/views/
+
 deployment:
   staging:
     branch: staging

From ba9477970563db7dc88c7a7599bc02491f3d6040 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Apr 2017 18:26:31 +0200
Subject: [PATCH 37/72] Add the haml-lint command to the README

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index b4b35074e..d9d6bcd23 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,9 @@ Pour éxécuter les tests de l'application, plusieurs possibilités :
         rake spec SPEC=file_path/file_name_spec.rb
         rspec file_path/file_name_spec.rb
 
+## Linting
+
+- Linter les fichiers HAML : `bundle exec haml-lint app/views/`
 
 ## Regénérer les binstubs
 

From c4e73186432ab11d793fac9e2b51e1002a12f284 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Tue, 4 Apr 2017 13:40:07 +0200
Subject: [PATCH 38/72] =?UTF-8?q?Remove=20=E2=80=9CTechnologies=20utilis?=
 =?UTF-8?q?=C3=A9es=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Read .ruby-version and Gemfile
---
 README.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/README.md b/README.md
index d9d6bcd23..7216ae416 100644
--- a/README.md
+++ b/README.md
@@ -5,12 +5,6 @@
 TéléProcédure Simplifiée, ou TPS pour les intimes, est une plateforme 100% web et 0% email, conçue afin de répondre au besoin urgent de l'État d'appliquer la directive sur le 100% démat' à l'horizon 2018 pour les démarches administratives.
 
 
-## Technologies utilisées
-
-Ruby  : 2.3.1
-Rails : 5.0.0.1
-
-
 ## Initialisation de l'environnement de développement
 
 Afin d'initialiser l'environnement de développement, éxécutez la commande suivante :

From fb3bb45c1169907a620d6ed59e17906a9e11ed28 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Tue, 4 Apr 2017 13:48:13 +0200
Subject: [PATCH 39/72] =?UTF-8?q?Add=20a=20=E2=80=9CD=C3=A9pendances?=
 =?UTF-8?q?=E2=80=9D=20part,=20remove=20the=20=E2=80=9CPhantomJS=E2=80=9D?=
 =?UTF-8?q?=20part?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 7216ae416..119fac25d 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,17 @@
 TéléProcédure Simplifiée, ou TPS pour les intimes, est une plateforme 100% web et 0% email, conçue afin de répondre au besoin urgent de l'État d'appliquer la directive sur le 100% démat' à l'horizon 2018 pour les démarches administratives.
 
 
+## Dépendances
+
+### Tous environnements
+
+- postgresql
+
+### Tests
+
+- PhantomJS
+
+
 ## Initialisation de l'environnement de développement
 
 Afin d'initialiser l'environnement de développement, éxécutez la commande suivante :
@@ -14,10 +25,6 @@ Afin d'initialiser l'environnement de développement, éxécutez la commande sui
 
 ## Création de la base de données
 
-L'application utilise une base de donnée Postgresql. Pour en installer une, utilisez la commande suivante :
-
-    sudo apt-get install postgresql
-
 Les informations nécessaire à l'initialisation de la base doivent être pré-configurer à la main grâce à la procédure suivante :
 
     su - postgres
@@ -33,11 +40,6 @@ Afin de générer la BDD de l'application, il est nécessaire d'éxécuter les c
     rake db:create db:schema:load db:migrate RAILS_ENV=test
 
 
-## Installation de Phantom JS
-
-Installer PhantomJS qui est utilisé par les tests automatisés de l'application.
-
-
 ## Exécution des tests (Rspec)
 
 Pour éxécuter les tests de l'application, plusieurs possibilités :

From 8e1f9b3d1774c9d9cd1b7dc3fd9117844f196258 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Tue, 4 Apr 2017 13:48:26 +0200
Subject: [PATCH 40/72] Delete some extra empty lines

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 119fac25d..22e1b906c 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,6 @@ Les informations nécessaire à l'initialisation de la base doivent être pré-c
     > create user tps_test with password 'tps_test' superuser;
     > \q
 
-
 Afin de générer la BDD de l'application, il est nécessaire d'éxécuter les commandes suivantes :
 
     rake db:create db:schema:load db:migrate

From f0575f0d41c1358afe2694862afe839141fcc37c Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Tue, 4 Apr 2017 13:48:57 +0200
Subject: [PATCH 41/72] Fix the RSpec spelling

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 22e1b906c..d25a9c4a3 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ Afin de générer la BDD de l'application, il est nécessaire d'éxécuter les c
     rake db:create db:schema:load db:migrate RAILS_ENV=test
 
 
-## Exécution des tests (Rspec)
+## Exécution des tests (RSpec)
 
 Pour éxécuter les tests de l'application, plusieurs possibilités :
 

From 4b15684fdf6e712f7a18601fac4083236ae55c0c Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Tue, 4 Apr 2017 13:52:17 +0200
Subject: [PATCH 42/72] Fix some spelling errors

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index d25a9c4a3..e82e2d791 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# TPS - TéléProcédure Simplifié
+# TPS - TéléProcédure Simplifiée
 
 ## Context
 
@@ -25,7 +25,7 @@ Afin d'initialiser l'environnement de développement, éxécutez la commande sui
 
 ## Création de la base de données
 
-Les informations nécessaire à l'initialisation de la base doivent être pré-configurer à la main grâce à la procédure suivante :
+Les informations nécessaire à l'initialisation de la base doivent être pré-configurées à la main grâce à la procédure suivante :
 
     su - postgres
     psql
@@ -41,7 +41,7 @@ Afin de générer la BDD de l'application, il est nécessaire d'éxécuter les c
 
 ## Exécution des tests (RSpec)
 
-Pour éxécuter les tests de l'application, plusieurs possibilités :
+Pour exécuter les tests de l'application, plusieurs possibilités :
 
 - Lancer tous les tests
 
@@ -62,7 +62,7 @@ Pour éxécuter les tests de l'application, plusieurs possibilités :
 
 - Linter les fichiers HAML : `bundle exec haml-lint app/views/`
 
-## Regénérer les binstubs
+## Régénérer les binstubs
 
     bundle binstub railties --force
     rake rails:update:bin

From 1c7ef352789394e48e7d64edc44db3d716f82f2c Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Tue, 4 Apr 2017 13:53:07 +0200
Subject: [PATCH 43/72] Fix some typographic mistakes

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e82e2d791..2d9a96a0b 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ## Context
 
-TéléProcédure Simplifiée, ou TPS pour les intimes, est une plateforme 100% web et 0% email, conçue afin de répondre au besoin urgent de l'État d'appliquer la directive sur le 100% démat' à l'horizon 2018 pour les démarches administratives.
+TéléProcédure Simplifiée, ou TPS pour les intimes, est une plateforme 100 % web et 0 % email, conçue afin de répondre au besoin urgent de l'État d'appliquer la directive sur le 100 % démat' à l'horizon 2018 pour les démarches administratives.
 
 
 ## Dépendances

From 64fdc7a2af319bcf1cf7a7cbc0503c5c43f3a2ba Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Wed, 5 Apr 2017 15:07:00 +0200
Subject: [PATCH 44/72] Remove a
 Dossier#convert_specific_array_values_to_string useless test

---
 spec/models/dossier_spec.rb | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/spec/models/dossier_spec.rb b/spec/models/dossier_spec.rb
index ddc469b50..328e21d28 100644
--- a/spec/models/dossier_spec.rb
+++ b/spec/models/dossier_spec.rb
@@ -512,14 +512,6 @@ describe Dossier do
     it { expect(subject[:state]).to be_a(String) }
   end
 
-  describe '#convert_specific_array_values_to_string(array_to_convert)' do
-    let(:procedure) { create(:procedure) }
-    let(:dossier) { create(:dossier, :with_entreprise, user: user, procedure: procedure) }
-    let(:dossier_data_with_champs) { dossier.data_with_champs }
-
-    subject { dossier.convert_specific_hash_values_to_string(dossier_data_with_champs) }
-  end
-
   describe '#export_entreprise_data' do
     let(:procedure) { create(:procedure) }
     let(:dossier) { create(:dossier, :with_entreprise, user: user, procedure: procedure) }

From df878b9ef442c99c6ab02bab0b98d59d12c22099 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Wed, 5 Apr 2017 15:10:58 +0200
Subject: [PATCH 45/72] =?UTF-8?q?Change=20Dossier#convert=5Fspecific=5Farr?=
 =?UTF-8?q?ay=5Fvalues=5Fto=5Fstring=E2=80=99s=20signature=20and=20name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- It is always called with the data_with_champs
  argument

- Changing the signature requires a change of name
  in this case
---
 app/models/dossier.rb       |  4 ++--
 app/models/procedure.rb     |  2 +-
 spec/models/dossier_spec.rb | 46 +++++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/app/models/dossier.rb b/app/models/dossier.rb
index 5cf14b5ea..f0401ccc0 100644
--- a/app/models/dossier.rb
+++ b/app/models/dossier.rb
@@ -216,9 +216,9 @@ class Dossier < ActiveRecord::Base
     return hash
   end
 
-  def convert_specific_array_values_to_string(array_to_convert)
+  def full_data_strings_array
     array = []
-    array_to_convert.each do |value|
+    data_with_champs.each do |value|
       value = value.to_s if !value.kind_of?(Time) && !value.nil?
       array << value
     end
diff --git a/app/models/procedure.rb b/app/models/procedure.rb
index 0ffbc4714..0a1b46f92 100644
--- a/app/models/procedure.rb
+++ b/app/models/procedure.rb
@@ -135,7 +135,7 @@ class Procedure < ActiveRecord::Base
 
     headers = exportable_dossiers.any? ? exportable_dossiers.first.export_headers : []
     data = exportable_dossiers.map do |dossier|
-      dossier.convert_specific_array_values_to_string(dossier.data_with_champs)
+      dossier.full_data_strings_array
     end
 
     {
diff --git a/spec/models/dossier_spec.rb b/spec/models/dossier_spec.rb
index 328e21d28..63092998b 100644
--- a/spec/models/dossier_spec.rb
+++ b/spec/models/dossier_spec.rb
@@ -616,6 +616,52 @@ describe Dossier do
       it { expect(subject[9]).to eq(dossier.followers_gestionnaires_emails) }
       it { expect(subject.count).to eq(DossierProcedureSerializer.new(dossier).attributes.count + dossier.procedure.types_de_champ.count + dossier.export_entreprise_data.count) }
     end
+
+    describe "#full_data_string" do
+      let(:expected_string) {
+        [
+          dossier.id.to_s,
+          dossier.created_at,
+          dossier.updated_at,
+          "false",
+          "false",
+          "draft",
+          dossier.initiated_at,
+          dossier.received_at,
+          dossier.processed_at,
+          gestionnaire.email,
+          nil,
+          "44011762001530",
+          "true",
+          "4950Z",
+          "Transports par conduites",
+          "GRTGAZ IMMEUBLE BORA 6 RUE RAOUL NORDLING 92270 BOIS COLOMBES",
+          "6",
+          "RUE",
+          "RAOUL NORDLING",
+          "IMMEUBLE BORA",
+          "92270",
+          "BOIS COLOMBES",
+          "92009",
+          "440117620",
+          "537100000",
+          "FR27440117620",
+          "SA à conseil d'administration (s.a.i.)",
+          "5599",
+          "GRTGAZ",
+          "GRTGAZ",
+          "44011762001530",
+          "51",
+          dossier.entreprise.date_creation,
+          nil,
+          nil
+        ]
+      }
+
+      subject { dossier }
+
+      it { expect(dossier.full_data_strings_array).to eq(expected_string)}
+    end
   end
 
   describe '#Dossier.to_csv' do

From ae5b4f62493a069b99916d394f7bc9fcfb5253a6 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Wed, 5 Apr 2017 15:11:44 +0200
Subject: [PATCH 46/72] Refactor Dossier#full_data_strings_array

---
 app/models/dossier.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/models/dossier.rb b/app/models/dossier.rb
index f0401ccc0..fda340de9 100644
--- a/app/models/dossier.rb
+++ b/app/models/dossier.rb
@@ -217,12 +217,9 @@ class Dossier < ActiveRecord::Base
   end
 
   def full_data_strings_array
-    array = []
-    data_with_champs.each do |value|
-      value = value.to_s if !value.kind_of?(Time) && !value.nil?
-      array << value
+    data_with_champs.map do |value|
+      value.nil? || value.kind_of?(Time) ? value : value.to_s
     end
-    return array
   end
 
   def export_entreprise_data

From 1db37894c206c859c3b417499c185d9c37a31c3b Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Tue, 11 Apr 2017 11:38:48 +0200
Subject: [PATCH 47/72] Factorize some code in
 Dossier#serialize_value_for_export

---
 app/models/dossier.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/models/dossier.rb b/app/models/dossier.rb
index fda340de9..bdadb8c00 100644
--- a/app/models/dossier.rb
+++ b/app/models/dossier.rb
@@ -210,7 +210,7 @@ class Dossier < ActiveRecord::Base
   def convert_specific_hash_values_to_string(hash_to_convert)
     hash = {}
     hash_to_convert.each do |key, value|
-      value = value.to_s if !value.kind_of?(Time) && !value.nil?
+      value = serialize_value_for_export(value)
       hash.store(key, value)
     end
     return hash
@@ -218,7 +218,7 @@ class Dossier < ActiveRecord::Base
 
   def full_data_strings_array
     data_with_champs.map do |value|
-      value.nil? || value.kind_of?(Time) ? value : value.to_s
+      serialize_value_for_export(value)
     end
   end
 
@@ -303,4 +303,8 @@ class Dossier < ActiveRecord::Base
     end
   end
 
+  def serialize_value_for_export(value)
+    value.nil? || value.kind_of?(Time) ? value : value.to_s
+  end
+
 end

From 4df03fc28e164ef8daeb18936741dc953e0069b7 Mon Sep 17 00:00:00 2001
From: Simon Lehericey <simon.lehericey@gmail.com>
Date: Wed, 29 Mar 2017 13:37:07 +0200
Subject: [PATCH 48/72] ChampsService: add tests and refactor

---
 .../private_formulaires_controller.rb         |  2 +-
 .../users/description_controller.rb           |  6 ++-
 app/models/champ.rb                           |  4 ++
 app/services/champs_service.rb                | 54 ++++++++++++-------
 spec/models/champ_shared_example.rb           | 27 ++++++++++
 spec/services/champs_service_spec.rb          | 49 +++++++++++++++++
 6 files changed, 119 insertions(+), 23 deletions(-)
 create mode 100644 spec/services/champs_service_spec.rb

diff --git a/app/controllers/backoffice/private_formulaires_controller.rb b/app/controllers/backoffice/private_formulaires_controller.rb
index 8a9283959..81a728085 100644
--- a/app/controllers/backoffice/private_formulaires_controller.rb
+++ b/app/controllers/backoffice/private_formulaires_controller.rb
@@ -5,7 +5,7 @@ class Backoffice::PrivateFormulairesController < ApplicationController
     dossier = current_gestionnaire.dossiers.find(params[:dossier_id])
 
     unless params[:champs].nil?
-      champs_service_errors = ChampsService.save_formulaire dossier.champs_private, params
+      champs_service_errors = ChampsService.save_champs dossier.champs_private, params
 
       if champs_service_errors.empty?
         flash[:notice] = "Formulaire enregistré"
diff --git a/app/controllers/users/description_controller.rb b/app/controllers/users/description_controller.rb
index 71bc8aa29..5dcfb162e 100644
--- a/app/controllers/users/description_controller.rb
+++ b/app/controllers/users/description_controller.rb
@@ -44,8 +44,10 @@ class Users::DescriptionController < UsersController
       return redirect_to users_dossier_description_path(dossier_id: @dossier.id)
     end
 
-    unless params[:champs].nil?
-      champs_service_errors = ChampsService.save_formulaire @dossier.champs, params, mandatory
+    if params[:champs]
+      champs_service_errors = ChampsService.save_champs @dossier.champs,
+                                                        params,
+                                                        mandatory
 
       unless champs_service_errors.empty?
         flash.alert = (champs_service_errors.inject('') { |acc, error| acc+= error[:message]+'<br>' }).html_safe
diff --git a/app/models/champ.rb b/app/models/champ.rb
index e4a6e820e..ce12e32a3 100644
--- a/app/models/champ.rb
+++ b/app/models/champ.rb
@@ -28,6 +28,10 @@ class Champ < ActiveRecord::Base
     same_date? num, '%M'
   end
 
+  def mandatory_and_blank?
+    mandatory? && value.blank?
+  end
+
   def same_date? num, compare
     if type_champ == 'datetime' && !value.nil?
       if value.to_datetime.strftime(compare) == num
diff --git a/app/services/champs_service.rb b/app/services/champs_service.rb
index 04fdf9602..31b53973f 100644
--- a/app/services/champs_service.rb
+++ b/app/services/champs_service.rb
@@ -1,27 +1,41 @@
 class ChampsService
-  def self.save_formulaire champs, params, check_mandatory=true
-    errors = Array.new
+  class << self
+    def save_champs(champs, params, check_mandatory = true)
+      fill_champs(champs, params)
 
-    champs.each do |champ|
-      champ.value = params[:champs]["'#{champ.id}'"]
+      champs.select(&:changed?).each(&:save)
 
-      if champ.type_champ == 'datetime'
-        champ.value = params[:champs]["'#{champ.id}'"]+
-            ' ' +
-            params[:time_hour]["'#{champ.id}'"] +
-            ':' +
-            params[:time_minute]["'#{champ.id}'"]
-      end
-
-      if check_mandatory
-        if champ.mandatory? && (champ.value.nil? || champ.value.blank?)
-          errors.push({message: "Le champ #{champ.libelle} doit être rempli."})
-        end
-      end
-
-      champ.save if champ.changed?
+      check_mandatory ? build_error_messages(champs) : []
     end
 
-    errors
+    private
+
+    def fill_champs(champs, h)
+      datetimes, not_datetimes = champs.partition { |c| c.type_champ == 'datetime' }
+
+      not_datetimes.each { |c| c.value = h[:champs]["'#{c.id}'"] }
+      datetimes.each { |c| c.value = parse_datetime(c.id, h) }
+    end
+
+    def parse_datetime(champ_id, h)
+      "#{h[:champs]["'#{champ_id}'"]} #{extract_hour(champ_id, h)}:#{extract_minute(champ_id, h)}"
+    end
+
+    def extract_hour(champ_id, h)
+      h[:time_hour]["'#{champ_id}'"]
+    end
+
+    def extract_minute(champ_id, h)
+      h[:time_minute]["'#{champ_id}'"]
+    end
+
+    def build_error_messages(champs)
+      champs.select(&:mandatory_and_blank?)
+            .map { |c| build_champ_error_message(c) }
+    end
+
+    def build_champ_error_message(champ)
+      { message: "Le champ #{champ.libelle} doit être rempli." }
+    end
   end
 end
diff --git a/spec/models/champ_shared_example.rb b/spec/models/champ_shared_example.rb
index 9922fd38d..b404154df 100644
--- a/spec/models/champ_shared_example.rb
+++ b/spec/models/champ_shared_example.rb
@@ -14,6 +14,33 @@ shared_examples 'champ_spec' do
     it { is_expected.to delegate_method(:order_place).to(:type_de_champ) }
   end
 
+  describe 'mandatory_and_blank?' do
+    let(:type_de_champ) { TypeDeChamp.new(mandatory: mandatory) }
+    let(:champ) { Champ.new(type_de_champ: type_de_champ, value: value) }
+    let(:value) { '' }
+    let(:mandatory) { true }
+
+    context 'when mandatory and blank' do
+      it { expect(champ.mandatory_and_blank?).to be(true) }
+    end
+
+    context 'when not blank' do
+      let(:value) { 'yop' }
+      it { expect(champ.mandatory_and_blank?).to be(false) }
+    end
+
+    context 'when not mandatory' do
+      let(:mandatory) { false }
+      it { expect(champ.mandatory_and_blank?).to be(false) }
+    end
+
+    context 'when not mandatory or blank' do
+      let(:value) { 'u' }
+      let(:mandatory) { false }
+      it { expect(champ.mandatory_and_blank?).to be(false) }
+    end
+  end
+
   describe 'data_provide' do
     let(:champ) { create :champ }
 
diff --git a/spec/services/champs_service_spec.rb b/spec/services/champs_service_spec.rb
new file mode 100644
index 000000000..4e8ce53a1
--- /dev/null
+++ b/spec/services/champs_service_spec.rb
@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe ChampsService do
+  describe 'save_champs' do
+    let!(:champ) { Champ.create(value: 'toto', type_de_champ: TypeDeChamp.new) }
+    let!(:champ_mandatory_empty) { Champ.create(type_de_champ: TypeDeChamp.new(libelle: 'mandatory', mandatory: true)) }
+    let!(:champ_datetime) do
+      champ_datetime = TypeDeChamp.new(type_champ: 'datetime')
+      Champ.create(type_de_champ: champ_datetime)
+    end
+    let!(:champs) { [champ, champ_mandatory_empty, champ_datetime] }
+
+    before :each do
+      params_hash = {
+        champs: {
+          "'#{champ.id}'" => 'yop',
+          "'#{champ_datetime.id}'" => 'd'
+        },
+        time_hour:  { "'#{champ_datetime.id}'" => '12' },
+        time_minute: { "'#{champ_datetime.id}'" => '24' }
+      }
+      @errors = ChampsService.save_champs(champs, params_hash, check_mandatory)
+      champs.each(&:reload)
+    end
+
+    context 'check_mandatory is true' do
+      let(:check_mandatory) { true }
+      it 'saves the changed champ' do
+        expect(champ.value).to eq('yop')
+      end
+
+      it 'parses and save the date' do
+        expect(champ_datetime.value).to eq('d 12:24')
+      end
+
+      it 'adds error for the missing mandatory champ' do
+        expect(@errors).to match([{ message: 'Le champ mandatory doit être rempli.' }])
+      end
+    end
+
+    context 'check_mandatory is false' do
+      let(:check_mandatory) { false }
+
+      it 'does not add errors' do
+        expect(@errors).to match([])
+      end
+    end
+  end
+end

From c4e128a506bb70e453be6d8e2756ad99fe59d46e Mon Sep 17 00:00:00 2001
From: Simon Lehericey <simon.lehericey@gmail.com>
Date: Wed, 29 Mar 2017 14:35:50 +0200
Subject: [PATCH 49/72] DescriptionController: rename variable

---
 app/controllers/users/description_controller.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/users/description_controller.rb b/app/controllers/users/description_controller.rb
index 5dcfb162e..97df42657 100644
--- a/app/controllers/users/description_controller.rb
+++ b/app/controllers/users/description_controller.rb
@@ -34,8 +34,8 @@ class Users::DescriptionController < UsersController
 
     @champs = @dossier.ordered_champs
 
-    mandatory = true
-    mandatory = !(params[:submit].keys.first == 'brouillon') unless params[:submit].nil?
+    check_mandatory_fields = true
+    check_mandatory_fields = !(params[:submit].keys.first == 'brouillon') unless params[:submit].nil?
 
     unless @dossier.update_attributes(create_params)
       @dossier = @dossier.decorate
@@ -47,7 +47,7 @@ class Users::DescriptionController < UsersController
     if params[:champs]
       champs_service_errors = ChampsService.save_champs @dossier.champs,
                                                         params,
-                                                        mandatory
+                                                        check_mandatory_fields
 
       unless champs_service_errors.empty?
         flash.alert = (champs_service_errors.inject('') { |acc, error| acc+= error[:message]+'<br>' }).html_safe
@@ -71,7 +71,7 @@ class Users::DescriptionController < UsersController
     end
 
 
-    if mandatory
+    if check_mandatory_fields
       if @dossier.draft?
         @dossier.initiated!
         NotificationMailer.send_notification(@dossier, @dossier.procedure.initiated_mail).deliver_now!

From 3a9065e4c116b29946b053e4071af0ff159ad29a Mon Sep 17 00:00:00 2001
From: Simon Lehericey <simon.lehericey@gmail.com>
Date: Wed, 29 Mar 2017 15:35:55 +0200
Subject: [PATCH 50/72] DescriptionController: remove useless code

---
 app/controllers/users/description_controller.rb | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/app/controllers/users/description_controller.rb b/app/controllers/users/description_controller.rb
index 97df42657..c4944775f 100644
--- a/app/controllers/users/description_controller.rb
+++ b/app/controllers/users/description_controller.rb
@@ -37,13 +37,6 @@ class Users::DescriptionController < UsersController
     check_mandatory_fields = true
     check_mandatory_fields = !(params[:submit].keys.first == 'brouillon') unless params[:submit].nil?
 
-    unless @dossier.update_attributes(create_params)
-      @dossier = @dossier.decorate
-
-      flash.alert = @dossier.errors.full_messages.join('<br />').html_safe
-      return redirect_to users_dossier_description_path(dossier_id: @dossier.id)
-    end
-
     if params[:champs]
       champs_service_errors = ChampsService.save_champs @dossier.champs,
                                                         params,
@@ -139,9 +132,4 @@ class Users::DescriptionController < UsersController
       redirect_to url_for(users_dossier_path(@dossier.id))
     end
   end
-
-  def create_params
-    params.permit()
-  end
-
 end

From 191b29aff5c34bf235ea5a942252a5157889df78 Mon Sep 17 00:00:00 2001
From: Simon Lehericey <simon.lehericey@gmail.com>
Date: Mon, 10 Apr 2017 11:45:16 +0200
Subject: [PATCH 51/72] DescriptionController: simplify update logic

---
 .../users/description_controller.rb            | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/controllers/users/description_controller.rb b/app/controllers/users/description_controller.rb
index c4944775f..9798ea3cf 100644
--- a/app/controllers/users/description_controller.rb
+++ b/app/controllers/users/description_controller.rb
@@ -35,7 +35,7 @@ class Users::DescriptionController < UsersController
     @champs = @dossier.ordered_champs
 
     check_mandatory_fields = true
-    check_mandatory_fields = !(params[:submit].keys.first == 'brouillon') unless params[:submit].nil?
+    check_mandatory_fields = !(params[:submit].keys.first == 'brouillon') if params[:submit]
 
     if params[:champs]
       champs_service_errors = ChampsService.save_champs @dossier.champs,
@@ -48,22 +48,20 @@ class Users::DescriptionController < UsersController
       end
     end
 
-    if @procedure.cerfa_flag?
-      unless params[:cerfa_pdf].nil?
-        cerfa = Cerfa.new(content: params[:cerfa_pdf], dossier: @dossier, user: current_user)
-        unless cerfa.save
-          flash.alert = cerfa.errors.full_messages.join('<br />').html_safe
-          return redirect_to users_dossier_description_path(dossier_id: @dossier.id)
-        end
+    if @procedure.cerfa_flag? && params[:cerfa_pdf]
+      cerfa = Cerfa.new(content: params[:cerfa_pdf], dossier: @dossier, user: current_user)
+      unless cerfa.save
+        flash.alert = cerfa.errors.full_messages.join('<br />').html_safe
+        return redirect_to users_dossier_description_path(dossier_id: @dossier.id)
       end
     end
 
-    unless (errors_upload = PiecesJustificativesService.upload!(@dossier, current_user, params)).empty?
+    errors_upload = PiecesJustificativesService.upload!(@dossier, current_user, params)
+    unless errors_upload.empty?
       flash.alert = errors_upload.html_safe
       return redirect_to users_dossier_description_path(dossier_id: @dossier.id)
     end
 
-
     if check_mandatory_fields
       if @dossier.draft?
         @dossier.initiated!

From d14a75c24a1fdb7211eebf414e47bf303e35c2aa Mon Sep 17 00:00:00 2001
From: Simon Lehericey <simon.lehericey@gmail.com>
Date: Wed, 29 Mar 2017 23:18:37 +0200
Subject: [PATCH 52/72] DescriptionController: refactor check_mandatory_fields

---
 app/controllers/users/description_controller.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/users/description_controller.rb b/app/controllers/users/description_controller.rb
index 9798ea3cf..c792777ae 100644
--- a/app/controllers/users/description_controller.rb
+++ b/app/controllers/users/description_controller.rb
@@ -34,8 +34,7 @@ class Users::DescriptionController < UsersController
 
     @champs = @dossier.ordered_champs
 
-    check_mandatory_fields = true
-    check_mandatory_fields = !(params[:submit].keys.first == 'brouillon') if params[:submit]
+    check_mandatory_fields = !draft_submission?
 
     if params[:champs]
       champs_service_errors = ChampsService.save_champs @dossier.champs,
@@ -116,6 +115,10 @@ class Users::DescriptionController < UsersController
 
   private
 
+  def draft_submission?
+    params[:submit] && params[:submit].keys.first == 'brouillon'
+  end
+
   def check_autorisation_donnees
     @dossier = current_user_dossier
 

From ccf956ec0162303d9d21cec4d137b7337e4681ef Mon Sep 17 00:00:00 2001
From: Simon Lehericey <simon.lehericey@gmail.com>
Date: Thu, 30 Mar 2017 09:31:46 +0200
Subject: [PATCH 53/72] DescriptionController: refactor redirection for draft

---
 app/controllers/users/description_controller.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/controllers/users/description_controller.rb b/app/controllers/users/description_controller.rb
index c792777ae..e8d83cd20 100644
--- a/app/controllers/users/description_controller.rb
+++ b/app/controllers/users/description_controller.rb
@@ -61,17 +61,16 @@ class Users::DescriptionController < UsersController
       return redirect_to users_dossier_description_path(dossier_id: @dossier.id)
     end
 
-    if check_mandatory_fields
+    if draft_submission?
+      flash.notice = 'Votre brouillon a bien été sauvegardé.'
+      redirect_to url_for(controller: :dossiers, action: :index, liste: :brouillon)
+    else
       if @dossier.draft?
         @dossier.initiated!
         NotificationMailer.send_notification(@dossier, @dossier.procedure.initiated_mail).deliver_now!
       end
-
       flash.notice = 'Félicitations, votre demande a bien été enregistrée.'
       redirect_to url_for(controller: :recapitulatif, action: :show, dossier_id: @dossier.id)
-    else
-      flash.notice = 'Votre brouillon a bien été sauvegardé.'
-      redirect_to url_for(controller: :dossiers, action: :index, liste: :brouillon)
     end
   end
 

From ed368973376348b620439e3a0440cfe1f13218ec Mon Sep 17 00:00:00 2001
From: Simon Lehericey <simon.lehericey@gmail.com>
Date: Tue, 28 Mar 2017 13:17:58 +0200
Subject: [PATCH 54/72] DossiersController: add get procedure libelle

---
 app/controllers/users/dossiers_controller.rb  |  7 ++++++
 config/routes.rb                              |  2 ++
 .../users/dossiers_controller_spec.rb         | 24 +++++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/app/controllers/users/dossiers_controller.rb b/app/controllers/users/dossiers_controller.rb
index fe4421dab..4eade942c 100644
--- a/app/controllers/users/dossiers_controller.rb
+++ b/app/controllers/users/dossiers_controller.rb
@@ -154,6 +154,13 @@ class Users::DossiersController < UsersController
     redirect_to url_for users_dossiers_path
   end
 
+  def procedure_libelle
+    dossier = Dossier.find(params[:dossier_id])
+    render json: { procedureLibelle: dossier.procedure.libelle }
+  rescue ActiveRecord::RecordNotFound
+    render json: {}, status: 404
+  end
+
   private
 
   def check_siret
diff --git a/config/routes.rb b/config/routes.rb
index 5811b4890..216951ace 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -94,6 +94,8 @@ Rails.application.routes.draw do
 
       post '/siret_informations' => 'dossiers#siret_informations'
       put '/change_siret' => 'dossiers#change_siret'
+
+      get 'procedure_libelle' => 'dossiers#procedure_libelle'
     end
     resource :dossiers
   end
diff --git a/spec/controllers/users/dossiers_controller_spec.rb b/spec/controllers/users/dossiers_controller_spec.rb
index 6d77ce488..601b243bc 100644
--- a/spec/controllers/users/dossiers_controller_spec.rb
+++ b/spec/controllers/users/dossiers_controller_spec.rb
@@ -554,4 +554,28 @@ describe Users::DossiersController, type: :controller do
     end
   end
 
+  describe 'Get #procedure_libelle' do
+    let!(:dossier) { create(:dossier, procedure: procedure) }
+
+    context 'when user is connected' do
+      before { sign_in user }
+
+      context 'when the dossier exist' do
+        before { get :procedure_libelle, params: { dossier_id: dossier.id } }
+        it 'returns the procedure name' do
+          expect(JSON.parse(response.body)).to eq('procedureLibelle' => procedure.libelle)
+        end
+      end
+
+      context 'when the dossier does not exist' do
+        before { get :procedure_libelle, params: { dossier_id: 666 } }
+        it { expect(response.code).to eq('404') }
+      end
+    end
+
+    context 'when user is not connected' do
+      before { get :procedure_libelle, params: { dossier_id: dossier.id } }
+      it { expect(response.code).to eq('302') }
+    end
+  end
 end

From 785219c956b42c6d36c9ad174234d13ca9522e0b Mon Sep 17 00:00:00 2001
From: Simon Lehericey <simon.lehericey@gmail.com>
Date: Tue, 28 Mar 2017 15:08:36 +0200
Subject: [PATCH 55/72] DossierLink: add type de champ

---
 app/models/type_de_champ.rb                | 3 ++-
 config/locales/models/type_de_champ/fr.yml | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb
index 2dbfb2d90..dcdf0a102 100644
--- a/app/models/type_de_champ.rb
+++ b/app/models/type_de_champ.rb
@@ -18,7 +18,8 @@ class TypeDeChamp < ActiveRecord::Base
            departements: 'departements',
            engagement: 'engagement',
            header_section: 'header_section',
-           explication: 'explication'
+           explication: 'explication',
+           dossier_link: 'dossier_link'
        }
 
   belongs_to :procedure
diff --git a/config/locales/models/type_de_champ/fr.yml b/config/locales/models/type_de_champ/fr.yml
index 06206a682..1e3414f1f 100644
--- a/config/locales/models/type_de_champ/fr.yml
+++ b/config/locales/models/type_de_champ/fr.yml
@@ -24,3 +24,4 @@ fr:
           header_section: 'Titre de section'
           explication: 'Explication'
           multiple_drop_down_list: 'Menu déroulant à choix multiples'
+          dossier_link: 'Lien vers un autre dossier'

From 3228737a8715416edc49d2fa2cef594faeffb377 Mon Sep 17 00:00:00 2001
From: Simon Lehericey <simon.lehericey@gmail.com>
Date: Tue, 28 Mar 2017 15:09:03 +0200
Subject: [PATCH 56/72] DossierLink: add edition template

---
 app/assets/javascripts/new-description.js     | 36 ++++++++++++++
 .../champs/_dossier_link.html.haml            | 21 +++++++++
 .../champs/_render_list_champs.html.haml      |  3 ++
 .../champs/_dossier_link.html.haml_spec.rb    | 47 +++++++++++++++++++
 .../_render_list_champs.html.haml_spec.rb     | 14 ++++++
 5 files changed, 121 insertions(+)
 create mode 100644 app/assets/javascripts/new-description.js
 create mode 100644 app/views/users/description/champs/_dossier_link.html.haml
 create mode 100644 spec/views/users/description/champs/_dossier_link.html.haml_spec.rb

diff --git a/app/assets/javascripts/new-description.js b/app/assets/javascripts/new-description.js
new file mode 100644
index 000000000..8de71855e
--- /dev/null
+++ b/app/assets/javascripts/new-description.js
@@ -0,0 +1,36 @@
+(function() {
+  var showNotFound = function() {
+    $('.dossier-link .text-info').hide();
+    $('.dossier-link .text-warning').show();
+  };
+
+  var showData = function(data) {
+    $('.dossier-link .procedureLibelle').text(data.procedureLibelle);
+    $('.dossier-link .text-info').show();
+    $('.dossier-link .text-warning').hide();
+  };
+
+  var hideEverything = function() {
+    $('.dossier-link .text-info').hide();
+    $('.dossier-link .text-warning').hide();
+  };
+
+  var fetchProcedureLibelle = function(e) {
+    var dossierId = $(e.target).val();
+    if(dossierId) {
+      $.get('/users/dossiers/' + dossierId + '/procedure_libelle')
+        .done(showData)
+        .fail(showNotFound);
+    } else {
+      hideEverything();
+    }
+  };
+
+  var timeOut = null;
+  var debounceFetchProcedureLibelle = function(e) {
+    if(timeOut){ clearTimeout(timeOut); }
+    timeOut = setTimeout(function() { fetchProcedureLibelle(e); }, 300);
+  };
+
+  $(document).on('input', '[data-type=dossier-link]', debounceFetchProcedureLibelle);
+})();
diff --git a/app/views/users/description/champs/_dossier_link.html.haml b/app/views/users/description/champs/_dossier_link.html.haml
new file mode 100644
index 000000000..41d6f0526
--- /dev/null
+++ b/app/views/users/description/champs/_dossier_link.html.haml
@@ -0,0 +1,21 @@
+- dossier = Dossier.find_by(id: champ.value)
+- show_procedure_libelle = dossier ? true : false
+- show_warning = !show_procedure_libelle && champ.value.present?
+- procedure_libelle = dossier.nil? ? '' : dossier.procedure.libelle
+
+.dossier-link
+  %input.form-control{ name: "champs['#{ champ.id }']",
+                       placeholder: champ.libelle,
+                       id: "champs_#{ champ.id }",
+                       value: champ.value,
+                       type: 'number',
+                       'autocomplete' => 'off',
+                       'data-type' => 'dossier-link' }
+
+  .help-block
+    %p.text-info{ style: show_procedure_libelle ? nil : 'display: none;' }
+      ce dossier répond à la procédure :
+      %br
+      %span.procedureLibelle= procedure_libelle
+    %p.text-warning{ style: show_warning ? nil : 'display: none;' }
+      ce dossier est inconnu
diff --git a/app/views/users/description/champs/_render_list_champs.html.haml b/app/views/users/description/champs/_render_list_champs.html.haml
index f24932516..0d1f91f76 100644
--- a/app/views/users/description/champs/_render_list_champs.html.haml
+++ b/app/views/users/description/champs/_render_list_champs.html.haml
@@ -41,6 +41,9 @@
           - elsif champ.type_champ == 'departements'
             = render partial: 'users/description/champs/departements', locals: { champ: champ }
 
+          - elsif champ.type_champ == 'dossier_link'
+            = render partial: 'users/description/champs/dossier_link', locals: { champ: champ }
+
           - elsif champ.type_champ == 'explication'
 
           - else
diff --git a/spec/views/users/description/champs/_dossier_link.html.haml_spec.rb b/spec/views/users/description/champs/_dossier_link.html.haml_spec.rb
new file mode 100644
index 000000000..a61f09532
--- /dev/null
+++ b/spec/views/users/description/champs/_dossier_link.html.haml_spec.rb
@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe 'users/description/champs/dossier_link.html.haml', type: :view do
+  let(:type_champ) { create(:type_de_champ_public, type_champ: :dossier_link) }
+
+  before do
+    render 'users/description/champs/dossier_link.html.haml', champ: champ
+  end
+
+  context 'When no dossier is provided' do
+    let!(:champ) { create(:champ, type_de_champ: type_champ, value: nil) }
+
+    it 'should not display the procedure libelle' do
+      expect(rendered).to have_css('.text-info[style*="display: none"]')
+    end
+
+    it 'should not display a warning' do
+      expect(rendered).to have_css('.text-warning[style*="display: none"]')
+    end
+  end
+
+  context 'When a dossier whith a procedure is provided' do
+    let!(:procedure) { create(:procedure) }
+    let!(:dossier) { create(:dossier, procedure: procedure) }
+    let!(:champ) { create(:champ, type_de_champ: type_champ, value: dossier.id) }
+
+    it 'should display the procedure libelle' do
+      expect(rendered).not_to have_css('.text-info[style*="display: none"]')
+    end
+
+    it 'should not display a warning' do
+      expect(rendered).to have_css('.text-warning[style*="display: none"]')
+    end
+  end
+
+  context 'When a unknown dossier id is provided' do
+    let!(:champ) { create(:champ, type_de_champ: type_champ, value: 666) }
+
+    it 'should not display the procedure libelle' do
+      expect(rendered).to have_css('.text-info[style*="display: none"]')
+    end
+
+    it 'should display a warning' do
+      expect(rendered).not_to have_css('.text-warning[style*="display: none"]')
+    end
+  end
+end
diff --git a/spec/views/users/description/champs/_render_list_champs.html.haml_spec.rb b/spec/views/users/description/champs/_render_list_champs.html.haml_spec.rb
index a60d0e86b..17ca6d9d3 100644
--- a/spec/views/users/description/champs/_render_list_champs.html.haml_spec.rb
+++ b/spec/views/users/description/champs/_render_list_champs.html.haml_spec.rb
@@ -24,4 +24,18 @@ describe 'users/description/champs/render_list_champs.html.haml', type: :view do
       expect(rendered).to have_css('input[type=checkbox][checked]')
     end
   end
+
+  context 'with a dossier_link' do
+    let(:type_champ) { create(:type_de_champ_public, type_champ: :dossier_link) }
+    let!(:champ) { create(:champ, type_de_champ: type_champ, value: nil) }
+
+    before do
+      render 'users/description/champs/render_list_champs.html.haml', champs: Champ.all, order_place: 0
+    end
+
+    it 'should render a number input with the right data-attribute' do
+      expect(view).to render_template(partial: 'users/description/champs/_dossier_link',
+                                      locals: { champ: champ })
+    end
+  end
 end

From a324a22ba27a6aa69978197a74ef778605a7a823 Mon Sep 17 00:00:00 2001
From: Simon Lehericey <simon.lehericey@gmail.com>
Date: Tue, 28 Mar 2017 15:09:35 +0200
Subject: [PATCH 57/72] DossierLink: add show template

---
 app/views/dossiers/_infos_dossier.html.haml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/views/dossiers/_infos_dossier.html.haml b/app/views/dossiers/_infos_dossier.html.haml
index 5aea3610b..954aa6856 100644
--- a/app/views/dossiers/_infos_dossier.html.haml
+++ b/app/views/dossiers/_infos_dossier.html.haml
@@ -34,11 +34,18 @@
         - else
           .row
             .col-xs-6.depositaire-label= champ.libelle
-            .col-md-1.col-lg-1.col-sm-1.col-xs-1.comments-off
+            .col-xs-1.comments-off
               = "-"
             .col-xs-5.depositaire-info{ id: "champ-#{champ.id}-value" }
               - unless champ.decorate.value.blank?
-                = champ.decorate.value.html_safe
+                - if champ.type_champ == 'dossier_link'
+                  - dossier = Dossier.find_by(id: champ.decorate.value)
+                  - if dossier && gestionnaire_signed_in?
+                    = link_to(dossier.procedure.libelle, backoffice_dossier_path(champ.decorate.value), target: '_blank')
+                  - else
+                    = dossier.nil? ? 'pas de dossier associé' : dossier.procedure.libelle
+                - else
+                  = champ.decorate.value.html_safe
 
     - if @facade.dossier.mandataire_social && gestionnaire_signed_in?
       .mandataire_social.text-success.center

From dd1fd419c783468c78152374b29ede99a5ab6b01 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Tue, 28 Mar 2017 18:07:43 +0200
Subject: [PATCH 58/72] Require mandatory fields on the frontend side

---
 app/views/dossiers/etapes/etape_2/_individual.html.haml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/dossiers/etapes/etape_2/_individual.html.haml b/app/views/dossiers/etapes/etape_2/_individual.html.haml
index a21b08ae7..2e2298c33 100644
--- a/app/views/dossiers/etapes/etape_2/_individual.html.haml
+++ b/app/views/dossiers/etapes/etape_2/_individual.html.haml
@@ -21,17 +21,17 @@
             %label
               %h4
                 Nom *
-              = ff.text_field :nom, { class: 'form-control' }
+              = ff.text_field :nom, { class: 'form-control', required: true }
           .form-group
             %label
               %h4
                 Prénom *
-              = ff.text_field :prenom, { class: 'form-control' }
+              = ff.text_field :prenom, { class: 'form-control', required: true }
           .form-group
             %label
               %h4
                 Date de naissance *
-              = ff.date_field :birthdate, { class: 'form-control', placeholder: 'jj/mm/aaaa' }
+              = ff.date_field :birthdate, { class: 'form-control', placeholder: 'jj/mm/aaaa', required: true }
 
         %p
           %label{ style: 'font-weight: normal;' }

From 4a16fb2ce252d9ceae7b61ecde3cea02e544f1b7 Mon Sep 17 00:00:00 2001
From: Simon Lehericey <simon.lehericey@gmail.com>
Date: Wed, 29 Mar 2017 22:17:50 +0200
Subject: [PATCH 59/72] DescriptionController: refacto

---
 app/controllers/users/description_controller.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/controllers/users/description_controller.rb b/app/controllers/users/description_controller.rb
index e8d83cd20..a45a402fb 100644
--- a/app/controllers/users/description_controller.rb
+++ b/app/controllers/users/description_controller.rb
@@ -12,10 +12,7 @@ class Users::DescriptionController < UsersController
     @procedure = @dossier.procedure
     @champs = @dossier.ordered_champs
 
-    @headers = @champs.inject([]) do |acc, champ|
-      acc.push(champ) if champ.type_champ == 'header_section'
-      acc
-    end
+    @headers = @champs.select { |c| c.type_champ == 'header_section' }
 
     unless @dossier.can_be_initiated?
       flash[:alert] = t('errors.messages.procedure_archived')

From 4997bf54cd83131eed8d047f51c85609c38b27a8 Mon Sep 17 00:00:00 2001
From: Simon Lehericey <simon.lehericey@gmail.com>
Date: Wed, 29 Mar 2017 13:37:28 +0200
Subject: [PATCH 60/72] Guardfile: watch services directory

---
 Guardfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Guardfile b/Guardfile
index 22f0a831c..5a91521bb 100644
--- a/Guardfile
+++ b/Guardfile
@@ -73,6 +73,7 @@ guard :rspec, cmd: 'spring rspec' do
   watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
   watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
   watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^app/services/(.+)_(service)\.rb$})        { |m| "spec/services/#{m[1]}_service_spec.rb" }
   watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
   watch('config/routes.rb')                           { "spec/routing" }
   watch('app/controllers/application_controller.rb')  { "spec/controllers" }

From f84cd7f11b455c1d04d88cc3c126883b91335237 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Fri, 24 Mar 2017 18:04:37 +0100
Subject: [PATCH 61/72] Make Stats a public page

---
 .../{administrations => }/stats.scss          |  0
 .../administrations/stats_controller.rb       | 24 -------------------
 app/controllers/stats_controller.rb           | 21 ++++++++++++++++
 app/views/administrations/index.html.haml     |  3 ---
 .../stats/index.html.haml                     |  0
 config/routes.rb                              |  4 ++--
 6 files changed, 23 insertions(+), 29 deletions(-)
 rename app/assets/stylesheets/{administrations => }/stats.scss (100%)
 delete mode 100644 app/controllers/administrations/stats_controller.rb
 create mode 100644 app/controllers/stats_controller.rb
 rename app/views/{administrations => }/stats/index.html.haml (100%)

diff --git a/app/assets/stylesheets/administrations/stats.scss b/app/assets/stylesheets/stats.scss
similarity index 100%
rename from app/assets/stylesheets/administrations/stats.scss
rename to app/assets/stylesheets/stats.scss
diff --git a/app/controllers/administrations/stats_controller.rb b/app/controllers/administrations/stats_controller.rb
deleted file mode 100644
index ea04c0ebb..000000000
--- a/app/controllers/administrations/stats_controller.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-module Administrations
-  class StatsController < ApplicationController
-    before_action :authenticate_administration!
-
-    def index
-      procedures = Procedure.where(created_at: Time.current.all_quarter).group("date_trunc('day', created_at)").count
-      dossiers = Dossier.where(created_at: Time.current.all_quarter).group("date_trunc('day', created_at)").count
-      @procedures = clean_hash(procedures)
-      @dossiers = clean_hash(dossiers)
-    end
-
-    private
-
-    def clean_hash h
-      h.keys.each{ |key| h[key.to_date] = h[key]; h.delete(key) }
-      min_date = h.keys.min
-      max_date = h.keys.max
-      (min_date..max_date).each do |date|
-        h[date] = 0 if h[date].nil?
-      end
-      h
-    end
-  end
-end
diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
new file mode 100644
index 000000000..45a37327d
--- /dev/null
+++ b/app/controllers/stats_controller.rb
@@ -0,0 +1,21 @@
+class StatsController < ApplicationController
+
+  def index
+    procedures = Procedure.where(created_at: Time.current.all_quarter).group("date_trunc('day', created_at)").count
+    dossiers = Dossier.where(created_at: Time.current.all_quarter).group("date_trunc('day', created_at)").count
+    @procedures = clean_hash(procedures)
+    @dossiers = clean_hash(dossiers)
+  end
+
+  private
+
+  def clean_hash h
+    h.keys.each{ |key| h[key.to_date] = h[key]; h.delete(key) }
+    min_date = h.keys.min
+    max_date = h.keys.max
+    (min_date..max_date).each do |date|
+      h[date] = 0 if h[date].nil?
+    end
+    h
+  end
+end
diff --git a/app/views/administrations/index.html.haml b/app/views/administrations/index.html.haml
index dc8c27cc1..c4e7eefc5 100644
--- a/app/views/administrations/index.html.haml
+++ b/app/views/administrations/index.html.haml
@@ -7,9 +7,6 @@
 
         = f.submit 'Créer un administrateur', class: 'btn btn-success', id: 'submit_new_administrateur'
 
-    .text-center
-      = link_to 'Stats', administrations_stats_path, style: 'margin-bottom: 50px; display: block;', 'data-no-turbolink': true
-
     = smart_listing_render :admins
 
     %br
diff --git a/app/views/administrations/stats/index.html.haml b/app/views/stats/index.html.haml
similarity index 100%
rename from app/views/administrations/stats/index.html.haml
rename to app/views/stats/index.html.haml
diff --git a/config/routes.rb b/config/routes.rb
index 216951ace..6f0d9edad 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -45,14 +45,14 @@ Rails.application.routes.draw do
   authenticate :administration do
     resources :administrations, only: [:index, :create]
     namespace :administrations do
-      resources :stats, only: [:index]
-
       require 'sidekiq/web'
       require 'sidekiq/cron/web'
       mount Sidekiq::Web => '/sidekiq'
     end
   end
 
+  resources :stats, only: [:index]
+
   namespace :france_connect do
     get 'particulier' => 'particulier#login'
     get 'particulier/callback' => 'particulier#callback'

From 664d821dc07171f78f7444593982862cdcec650f Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Mon, 27 Mar 2017 15:43:58 +0200
Subject: [PATCH 62/72] Add a link to the Stats page in the footer

---
 app/views/layouts/_footer.html.haml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml
index a16a8ef9c..aa3ee661b 100644
--- a/app/views/layouts/_footer.html.haml
+++ b/app/views/layouts/_footer.html.haml
@@ -5,6 +5,8 @@
     \-
     = link_to 'Nouveautés', 'https://github.com/sgmap/tps/releases', target: '_blank'
     \-
+    = link_to 'Statistiques', stats_path
+    \-
     = link_to 'CGU / Mentions légales', cgu_path
     \-
     = link_to 'Contact', "mailto:"+t('dynamics.contact_email')

From de01914fa7a814e3f03f70b6942d14997acfafee Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Mon, 3 Apr 2017 15:00:26 +0200
Subject: [PATCH 63/72] Fix the where clause in Stats

Now properly show the last 90 days of data instead
of strict quarters.

With the previous code, on the
1st of january, april, july and october, only one
day of data would be shown.
---
 app/controllers/stats_controller.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
index 45a37327d..a2af0e9cb 100644
--- a/app/controllers/stats_controller.rb
+++ b/app/controllers/stats_controller.rb
@@ -1,8 +1,9 @@
 class StatsController < ApplicationController
 
   def index
-    procedures = Procedure.where(created_at: Time.current.all_quarter).group("date_trunc('day', created_at)").count
-    dossiers = Dossier.where(created_at: Time.current.all_quarter).group("date_trunc('day', created_at)").count
+    procedures = Procedure.where(:created_at => 90.days.ago..Time.now).group("date_trunc('day', created_at)").count
+    dossiers = Dossier.where(:created_at => 90.days.ago..Time.now).group("date_trunc('day', created_at)").count
+
     @procedures = clean_hash(procedures)
     @dossiers = clean_hash(dossiers)
   end

From c4c6095abd20e8dcd7fe247b7c32fe26a58ccc0e Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Mon, 3 Apr 2017 16:42:38 +0200
Subject: [PATCH 64/72] Only show the last 30 days of data in Stats

---
 app/controllers/stats_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
index a2af0e9cb..901b7a974 100644
--- a/app/controllers/stats_controller.rb
+++ b/app/controllers/stats_controller.rb
@@ -1,8 +1,8 @@
 class StatsController < ApplicationController
 
   def index
-    procedures = Procedure.where(:created_at => 90.days.ago..Time.now).group("date_trunc('day', created_at)").count
-    dossiers = Dossier.where(:created_at => 90.days.ago..Time.now).group("date_trunc('day', created_at)").count
+    procedures = Procedure.where(:created_at => 30.days.ago..Time.now).group("date_trunc('day', created_at)").count
+    dossiers = Dossier.where(:created_at => 30.days.ago..Time.now).group("date_trunc('day', created_at)").count
 
     @procedures = clean_hash(procedures)
     @dossiers = clean_hash(dossiers)

From e19203804558e458bfe81d87f072bbb6f6672873 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Mon, 3 Apr 2017 16:42:51 +0200
Subject: [PATCH 65/72] Rename the variables in StatsController#index

---
 app/controllers/stats_controller.rb | 4 ++--
 app/views/stats/index.html.haml     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
index 901b7a974..383d57986 100644
--- a/app/controllers/stats_controller.rb
+++ b/app/controllers/stats_controller.rb
@@ -4,8 +4,8 @@ class StatsController < ApplicationController
     procedures = Procedure.where(:created_at => 30.days.ago..Time.now).group("date_trunc('day', created_at)").count
     dossiers = Dossier.where(:created_at => 30.days.ago..Time.now).group("date_trunc('day', created_at)").count
 
-    @procedures = clean_hash(procedures)
-    @dossiers = clean_hash(dossiers)
+    @procedures_30_days_flow = clean_hash(procedures)
+    @dossiers_30_days_flow = clean_hash(dossiers)
   end
 
   private
diff --git a/app/views/stats/index.html.haml b/app/views/stats/index.html.haml
index e24ecb500..004028101 100644
--- a/app/views/stats/index.html.haml
+++ b/app/views/stats/index.html.haml
@@ -4,8 +4,8 @@
   .stats
     .stat-card
       %h1 Procédures créées
-      = line_chart @procedures
+      = line_chart @procedures_30_days_flow,
 
     .stat-card
       %h1 Dossiers créés
-      = line_chart @dossiers
+      = line_chart @dossiers_30_days_flow,

From 2074ac93ba9543327343b3e69dbcbf6be9e311dd Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Mon, 3 Apr 2017 16:26:05 +0200
Subject: [PATCH 66/72] Add StatsController#thirty_days_flow_hash

---
 app/controllers/stats_controller.rb       | 17 +++++++++++----
 spec/controllers/stats_controller_spec.rb | 26 +++++++++++++++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 spec/controllers/stats_controller_spec.rb

diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
index 383d57986..8689f5294 100644
--- a/app/controllers/stats_controller.rb
+++ b/app/controllers/stats_controller.rb
@@ -1,15 +1,24 @@
 class StatsController < ApplicationController
 
   def index
-    procedures = Procedure.where(:created_at => 30.days.ago..Time.now).group("date_trunc('day', created_at)").count
-    dossiers = Dossier.where(:created_at => 30.days.ago..Time.now).group("date_trunc('day', created_at)").count
+    procedures = Procedure
+    dossiers = Dossier
 
-    @procedures_30_days_flow = clean_hash(procedures)
-    @dossiers_30_days_flow = clean_hash(dossiers)
+    @procedures_30_days_flow = thirty_days_flow_hash(procedures)
+    @dossiers_30_days_flow = thirty_days_flow_hash(dossiers)
   end
 
   private
 
+  def thirty_days_flow_hash(association)
+    thirty_days_flow_hash = association
+      .where(:created_at => 30.days.ago..Time.now)
+      .group("date_trunc('day', created_at)")
+      .count
+
+    clean_hash(thirty_days_flow_hash)
+  end
+
   def clean_hash h
     h.keys.each{ |key| h[key.to_date] = h[key]; h.delete(key) }
     min_date = h.keys.min
diff --git a/spec/controllers/stats_controller_spec.rb b/spec/controllers/stats_controller_spec.rb
new file mode 100644
index 000000000..f555a402f
--- /dev/null
+++ b/spec/controllers/stats_controller_spec.rb
@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe StatsController, type: :controller do
+  describe '#thirty_days_flow_hash' do
+    before do
+      FactoryGirl.create(:procedure, :created_at => 45.days.ago)
+      FactoryGirl.create(:procedure, :created_at => 15.days.ago)
+      FactoryGirl.create(:procedure, :created_at => 1.day.ago)
+
+      @expected_hash = {}
+      (15.days.ago.to_date..1.day.ago.to_date).each do |day|
+        if [15.days.ago.to_date, 1.day.ago.to_date].include?(day)
+          @expected_hash[day] = 1
+        else
+          @expected_hash[day] = 0
+        end
+      end
+    end
+
+    let (:association) { Procedure.all }
+
+    subject { StatsController.new.send(:thirty_days_flow_hash, association) }
+
+    it { expect(subject).to eq(@expected_hash) }
+  end
+end

From e370c4e3935790a7c53359a7f26cfb683781660d Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Mon, 3 Apr 2017 15:02:12 +0200
Subject: [PATCH 67/72] Exclude draft Dossiers and unpublished Procedures from
 Stats

---
 app/controllers/stats_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
index 8689f5294..56ca12b6e 100644
--- a/app/controllers/stats_controller.rb
+++ b/app/controllers/stats_controller.rb
@@ -1,8 +1,8 @@
 class StatsController < ApplicationController
 
   def index
-    procedures = Procedure
-    dossiers = Dossier
+    procedures = Procedure.where(:published => true)
+    dossiers = Dossier.where.not(:state => :draft)
 
     @procedures_30_days_flow = thirty_days_flow_hash(procedures)
     @dossiers_30_days_flow = thirty_days_flow_hash(dossiers)

From 9dc49012945a20670403b7c07c89e69230166bac Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Mon, 3 Apr 2017 14:19:22 +0200
Subject: [PATCH 68/72] Change the template and style of the Stats page

---
 app/assets/stylesheets/stats.scss | 57 ++++++++++++++++++++++++++++---
 app/views/stats/index.html.haml   | 28 ++++++++++-----
 2 files changed, 72 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/stats.scss b/app/assets/stylesheets/stats.scss
index 005075eff..e5579254a 100644
--- a/app/assets/stylesheets/stats.scss
+++ b/app/assets/stylesheets/stats.scss
@@ -1,9 +1,56 @@
 @import "card";
 
-.stats {
-  .stat-card {
-    @extend .card;
-    margin: 15px auto;
-    max-width: 1200px;
+$dark-grey: #333333;
+
+$default-space: 15px;
+
+$new-h1-margin-bottom: 4 * $default-space;
+.new-h1 {
+  color: $dark-grey;
+  text-align: center;
+  margin-top: 0;
+  margin-bottom: $new-h1-margin-bottom;
+}
+
+$statistiques-padding-top: $default-space * 2;
+.statistiques {
+  width: 1040px;
+  margin: 0 auto;
+  padding-top: $statistiques-padding-top;
+}
+
+.stat-cards {
+  .stat-card:nth-of-type(even) {
+    margin-right: 0px;
   }
 }
+
+$stat-card-margin-bottom: 3 * $default-space;
+.stat-card {
+  @extend .card;
+  margin-bottom: $stat-card-margin-bottom;
+  border-radius: 5px;
+  box-shadow: none;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+}
+
+$stat-card-half-horizontal-spacing: 4 * $default-space;
+.stat-card-half {
+  width: calc((100% - #{$stat-card-half-horizontal-spacing}) / 2);
+  margin-right: 3 * $default-space;
+}
+
+.stat-card-title {
+  color: $dark-grey;
+  margin-top: -2px;
+  font-size: 26px;
+  font-weight: 500;
+}
+
+.chart-container {
+  margin-top: 36px;
+}
+
+.chart {
+  width: 100%;
+}
diff --git a/app/views/stats/index.html.haml b/app/views/stats/index.html.haml
index 004028101..5fe3fca0d 100644
--- a/app/views/stats/index.html.haml
+++ b/app/views/stats/index.html.haml
@@ -1,11 +1,23 @@
 = javascript_include_tag 'https://code.highcharts.com/highcharts.js', 'chartkick'
 
-.container
-  .stats
-    .stat-card
-      %h1 Procédures créées
-      = line_chart @procedures_30_days_flow,
+.statistiques
 
-    .stat-card
-      %h1 Dossiers créés
-      = line_chart @dossiers_30_days_flow,
+  %h1.new-h1 Statistiques
+
+  .stat-cards
+
+    .stat-card.stat-card-half.pull-left
+      %span.stat-card-title.pull-left Procédures
+      .chart-container
+        .chart.flux-procedures-chart
+          = line_chart @procedures_30_days_flow,
+            :colors => ["rgba(61, 149, 236, 1)"]
+
+    .stat-card.stat-card-half.pull-left
+      %span.stat-card-title.pull-left Dossiers
+      .chart-container
+        .chart.flux-dossiers-chart
+          = line_chart @dossiers_30_days_flow,
+            :colors => ["rgba(61, 149, 236, 1)"]
+
+    .clearfix

From 52ea4a1b8dfe5d286d227d25fce3cd6573487c61 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Tue, 28 Mar 2017 15:42:48 +0200
Subject: [PATCH 69/72] Add new charts and a segmented control to the Stats
 page

---
 app/assets/javascripts/toggle_chart.js    | 20 ++++++++++
 app/assets/stylesheets/stats.scss         | 48 ++++++++++++++++++++++-
 app/controllers/stats_controller.rb       | 14 +++++++
 app/views/stats/index.html.haml           | 28 +++++++++++--
 spec/controllers/stats_controller_spec.rb | 17 ++++++++
 5 files changed, 122 insertions(+), 5 deletions(-)
 create mode 100644 app/assets/javascripts/toggle_chart.js

diff --git a/app/assets/javascripts/toggle_chart.js b/app/assets/javascripts/toggle_chart.js
new file mode 100644
index 000000000..b415619c7
--- /dev/null
+++ b/app/assets/javascripts/toggle_chart.js
@@ -0,0 +1,20 @@
+var TPS = TPS || {};
+
+TPS.toggleChart = function(event, chartClass) {
+  var nextSelectorItem = $(event.target),
+      nextChart = $(chartClass),
+      nextChartId = nextChart.children().first().attr('id'),
+      currentSelectorItem = nextSelectorItem.parent().find(".segmented-control-item-active"),
+      currentChart = nextSelectorItem.parent().parent().find(".chart:not(.hidden)");
+
+  // Change the current selector and the next selector states
+  currentSelectorItem.toggleClass("segmented-control-item-active");
+  nextSelectorItem.toggleClass("segmented-control-item-active");
+
+  // Hide the currently shown chart and show the new one
+  currentChart.toggleClass("hidden");
+  nextChart.toggleClass("hidden");
+
+  // Reflow needed, see https://github.com/highcharts/highcharts/issues/1979
+  Chartkick.charts[nextChartId].getChartObject().reflow();
+}
diff --git a/app/assets/stylesheets/stats.scss b/app/assets/stylesheets/stats.scss
index e5579254a..f7a33df32 100644
--- a/app/assets/stylesheets/stats.scss
+++ b/app/assets/stylesheets/stats.scss
@@ -1,6 +1,8 @@
 @import "card";
 
 $dark-grey: #333333;
+$blue: rgba(61, 149, 236, 1);
+$blue-hover: rgba(61, 149, 236, 0.8);
 
 $default-space: 15px;
 
@@ -42,9 +44,53 @@ $stat-card-half-horizontal-spacing: 4 * $default-space;
 
 .stat-card-title {
   color: $dark-grey;
-  margin-top: -2px;
   font-size: 26px;
   font-weight: 500;
+  width: 200px;
+}
+
+$segmented-control-margin-top: $default-space;
+.segmented-control {
+  border-radius: 36px;
+  height: 36px;
+  line-height: 36px;
+  font-size: 0;
+  padding: 0;
+  display: inline-block;
+  margin-top: $segmented-control-margin-top;
+}
+
+$segmented-control-item-horizontal-padding: $default-space;
+$segmented-control-item-border-radius: 2 * $default-space;
+.segmented-control-item {
+  color: $blue;
+  display: inline-block;
+  font-size: 15px;
+  border: 2px solid $blue;
+  margin-right: -2px;
+  padding-left: $segmented-control-item-horizontal-padding;
+  padding-right: $segmented-control-item-horizontal-padding;
+  color: $blue;
+
+  &:first-of-type {
+    border-radius: $segmented-control-item-border-radius 0px 0px $segmented-control-item-border-radius;
+  }
+
+  &:last-of-type {
+    border-radius: 0px $segmented-control-item-border-radius $segmented-control-item-border-radius 0px;
+    margin-right: 0;
+  }
+
+  &:hover {
+    background-color: $blue-hover;
+    color: white;
+    cursor: pointer;
+  }
+}
+
+.segmented-control-item-active {
+  background-color: $blue;
+  color: white;
 }
 
 .chart-container {
diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
index 56ca12b6e..b099b2a17 100644
--- a/app/controllers/stats_controller.rb
+++ b/app/controllers/stats_controller.rb
@@ -6,6 +6,9 @@ class StatsController < ApplicationController
 
     @procedures_30_days_flow = thirty_days_flow_hash(procedures)
     @dossiers_30_days_flow = thirty_days_flow_hash(dossiers)
+
+    @procedures_cumulative = cumulative_hash(procedures)
+    @dossiers_cumulative = cumulative_hash(dossiers)
   end
 
   private
@@ -28,4 +31,15 @@ class StatsController < ApplicationController
     end
     h
   end
+
+  def cumulative_hash(association)
+    sum = 0
+    association
+      .group("DATE_TRUNC('month', created_at)")
+      .count
+      .to_a
+      .sort{ |x, y| x[0] <=> y[0] }
+      .map { |x, y| { x => (sum += y)} }
+      .reduce({}, :merge)
+  end
 end
diff --git a/app/views/stats/index.html.haml b/app/views/stats/index.html.haml
index 5fe3fca0d..88d5b4d1b 100644
--- a/app/views/stats/index.html.haml
+++ b/app/views/stats/index.html.haml
@@ -7,16 +7,36 @@
   .stat-cards
 
     .stat-card.stat-card-half.pull-left
-      %span.stat-card-title.pull-left Procédures
+      %ul.segmented-control.pull-right
+        %li.segmented-control-item.segmented-control-item-active{ :onclick => "TPS.toggleChart(event, '.cumulative-procedures-chart');" }
+          Cumul
+        %li.segmented-control-item{ :onclick => "TPS.toggleChart(event, '.flux-procedures-chart');" }
+          Flux (30 jours)
+      %span.stat-card-title.pull-left Démarches dématérialisées
+      .clearfix
+
       .chart-container
-        .chart.flux-procedures-chart
+        .chart.cumulative-procedures-chart
+          = area_chart @procedures_cumulative,
+            :colors => ["rgba(61, 149, 236, 1)"]
+        .chart.flux-procedures-chart.hidden
           = line_chart @procedures_30_days_flow,
             :colors => ["rgba(61, 149, 236, 1)"]
 
     .stat-card.stat-card-half.pull-left
-      %span.stat-card-title.pull-left Dossiers
+      %ul.segmented-control.pull-right
+        %li.segmented-control-item.segmented-control-item-active{ :onclick => "TPS.toggleChart(event, '.cumulative-dossiers-chart');" }
+          Cumul
+        %li.segmented-control-item{ :onclick => "TPS.toggleChart(event, '.flux-dossiers-chart');" }
+          Flux (30 jours)
+      %span.stat-card-title.pull-left Dossiers déposés
+      .clearfix
+
       .chart-container
-        .chart.flux-dossiers-chart
+        .chart.cumulative-dossiers-chart
+          = area_chart @dossiers_cumulative,
+            :colors => ["rgba(61, 149, 236, 1)"]
+        .chart.flux-dossiers-chart.hidden
           = line_chart @dossiers_30_days_flow,
             :colors => ["rgba(61, 149, 236, 1)"]
 
diff --git a/spec/controllers/stats_controller_spec.rb b/spec/controllers/stats_controller_spec.rb
index f555a402f..bcaaeb409 100644
--- a/spec/controllers/stats_controller_spec.rb
+++ b/spec/controllers/stats_controller_spec.rb
@@ -23,4 +23,21 @@ describe StatsController, type: :controller do
 
     it { expect(subject).to eq(@expected_hash) }
   end
+
+  describe '#cumulative_hash' do
+    before do
+      FactoryGirl.create(:procedure, :created_at => 45.days.ago)
+      FactoryGirl.create(:procedure, :created_at => 15.days.ago)
+      FactoryGirl.create(:procedure, :created_at => 15.days.ago)
+    end
+
+    let (:association) { Procedure.all }
+
+    subject { StatsController.new.send(:cumulative_hash, association) }
+
+    it { expect(subject).to eq({
+      45.days.ago.beginning_of_month => 1,
+      15.days.ago.beginning_of_month => 3
+    }) }
+  end
 end

From 11015787bffb19643dd84caf5c82a560e4e4ef13 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Mon, 3 Apr 2017 17:04:31 +0200
Subject: [PATCH 70/72] Add new total numbers to the Stats page

---
 app/assets/javascripts/toggle_chart.js |  2 +-
 app/assets/stylesheets/stats.scss      | 22 ++++++++++++++++++++++
 app/controllers/stats_controller.rb    |  3 +++
 app/views/stats/index.html.haml        | 10 ++++++++++
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/toggle_chart.js b/app/assets/javascripts/toggle_chart.js
index b415619c7..e2ed52b3c 100644
--- a/app/assets/javascripts/toggle_chart.js
+++ b/app/assets/javascripts/toggle_chart.js
@@ -3,7 +3,7 @@ var TPS = TPS || {};
 TPS.toggleChart = function(event, chartClass) {
   var nextSelectorItem = $(event.target),
       nextChart = $(chartClass),
-      nextChartId = nextChart.children().first().attr('id'),
+      nextChartId = nextChart.children().first().attr("id"),
       currentSelectorItem = nextSelectorItem.parent().find(".segmented-control-item-active"),
       currentChart = nextSelectorItem.parent().parent().find(".chart:not(.hidden)");
 
diff --git a/app/assets/stylesheets/stats.scss b/app/assets/stylesheets/stats.scss
index f7a33df32..48d602275 100644
--- a/app/assets/stylesheets/stats.scss
+++ b/app/assets/stylesheets/stats.scss
@@ -1,6 +1,7 @@
 @import "card";
 
 $dark-grey: #333333;
+$light-grey: #999999;
 $blue: rgba(61, 149, 236, 1);
 $blue-hover: rgba(61, 149, 236, 0.8);
 
@@ -100,3 +101,24 @@ $segmented-control-item-border-radius: 2 * $default-space;
 .chart {
   width: 100%;
 }
+
+$big-number-card-padding: 2 * $segmented-control-item-border-radius;
+.big-number-card {
+  padding: $big-number-card-padding;
+}
+
+.big-number-card-title {
+  display: block;
+  text-align: center;
+  margin: 0 auto;
+  color: $light-grey;
+}
+
+.big-number-card-number {
+  display: block;
+  text-align: center;
+  font-size: 90px;
+  line-height: 90px;
+  font-weight: bold;
+  color: $blue;
+}
diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
index b099b2a17..bbaf9ccca 100644
--- a/app/controllers/stats_controller.rb
+++ b/app/controllers/stats_controller.rb
@@ -9,6 +9,9 @@ class StatsController < ApplicationController
 
     @procedures_cumulative = cumulative_hash(procedures)
     @dossiers_cumulative = cumulative_hash(dossiers)
+
+    @procedures_count = procedures.count
+    @dossiers_count = dossiers.count
   end
 
   private
diff --git a/app/views/stats/index.html.haml b/app/views/stats/index.html.haml
index 88d5b4d1b..42d6ea90c 100644
--- a/app/views/stats/index.html.haml
+++ b/app/views/stats/index.html.haml
@@ -40,4 +40,14 @@
           = line_chart @dossiers_30_days_flow,
             :colors => ["rgba(61, 149, 236, 1)"]
 
+    .stat-card.stat-card-half.big-number-card.pull-left
+      %span.big-number-card-title TOTAL DÉMARCHES DÉMATÉRIALISÉES
+      %span.big-number-card-number
+        = @procedures_count
+
+    .stat-card.stat-card-half.big-number-card.pull-left
+      %span.big-number-card-title TOTAL DOSSIERS DÉPOSÉS
+      %span.big-number-card-number
+        = @dossiers_count
+
     .clearfix

From 913735554cc370da3be11853d2505e25e1f21b3b Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Tue, 11 Apr 2017 16:48:55 +0200
Subject: [PATCH 71/72] Improve StatsController#thirty_days_flow and
 #clean_hash

---
 app/controllers/stats_controller.rb       | 21 ++++++++++++++-------
 spec/controllers/stats_controller_spec.rb |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
index bbaf9ccca..f13f725c5 100644
--- a/app/controllers/stats_controller.rb
+++ b/app/controllers/stats_controller.rb
@@ -17,21 +17,28 @@ class StatsController < ApplicationController
   private
 
   def thirty_days_flow_hash(association)
+    min_date = 30.days.ago.to_date
+    max_date = Time.now.to_date
+
     thirty_days_flow_hash = association
-      .where(:created_at => 30.days.ago..Time.now)
+      .where(:created_at => min_date..max_date)
       .group("date_trunc('day', created_at)")
       .count
 
-    clean_hash(thirty_days_flow_hash)
+    clean_hash(thirty_days_flow_hash, min_date, max_date)
   end
 
-  def clean_hash h
-    h.keys.each{ |key| h[key.to_date] = h[key]; h.delete(key) }
-    min_date = h.keys.min
-    max_date = h.keys.max
+  def clean_hash(h, min_date, max_date)
+    # Convert keys to date
+    h = Hash[h.map { |(k, v)| [k.to_date, v] }]
+
+    # Add missing vales where count is 0
     (min_date..max_date).each do |date|
-      h[date] = 0 if h[date].nil?
+      if h[date].nil?
+        h[date] = 0
+      end
     end
+
     h
   end
 
diff --git a/spec/controllers/stats_controller_spec.rb b/spec/controllers/stats_controller_spec.rb
index bcaaeb409..58727e970 100644
--- a/spec/controllers/stats_controller_spec.rb
+++ b/spec/controllers/stats_controller_spec.rb
@@ -8,7 +8,7 @@ describe StatsController, type: :controller do
       FactoryGirl.create(:procedure, :created_at => 1.day.ago)
 
       @expected_hash = {}
-      (15.days.ago.to_date..1.day.ago.to_date).each do |day|
+      (30.days.ago.to_date..Time.now.to_date).each do |day|
         if [15.days.ago.to_date, 1.day.ago.to_date].include?(day)
           @expected_hash[day] = 1
         else

From f4ff778a5cc905dfcc43e140f214bbfc7ff5c078 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Tue, 11 Apr 2017 16:55:13 +0200
Subject: [PATCH 72/72] Add a missing newline before the end of the controller

Same spacing rules at the top and at the bottom
of the file
---
 app/controllers/stats_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
index f13f725c5..04a1f303c 100644
--- a/app/controllers/stats_controller.rb
+++ b/app/controllers/stats_controller.rb
@@ -52,4 +52,5 @@ class StatsController < ApplicationController
       .map { |x, y| { x => (sum += y)} }
       .reduce({}, :merge)
   end
+
 end