From 917c6b8a328aa053882c76efbba8a07f2d43b232 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Mon, 26 Feb 2018 16:52:02 +0100 Subject: [PATCH 1/9] Fix accessibilite link --- app/views/layouts/_new_footer.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_new_footer.html.haml b/app/views/layouts/_new_footer.html.haml index 51d4b9945..345ce7408 100644 --- a/app/views/layouts/_new_footer.html.haml +++ b/app/views/layouts/_new_footer.html.haml @@ -38,4 +38,4 @@ %li.footer-link = link_to "FAQ", "http://tps.helpscoutdocs.com/", :class => "footer-link", :target => "_blank" %li.footer-link - = link_to "Accessibilité", "", :class => "footer-link" + = link_to "Accessibilité", accessibilite_index_path, :class => "footer-link" From 2b6edc0fa40cf6d5921f8aefd0f2d6981a81fef7 Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Mon, 26 Feb 2018 17:25:28 +0100 Subject: [PATCH 2/9] Remove unused procedure_filter --- app/models/gestionnaire.rb | 10 ----- ...ove_procedure_filter_from_gestionnaires.rb | 5 +++ spec/models/gestionnaire_spec.rb | 40 +------------------ 3 files changed, 6 insertions(+), 49 deletions(-) create mode 100644 db/migrate/20180226162351_remove_procedure_filter_from_gestionnaires.rb diff --git a/app/models/gestionnaire.rb b/app/models/gestionnaire.rb index 4b4a98aa2..32624b6bd 100644 --- a/app/models/gestionnaire.rb +++ b/app/models/gestionnaire.rb @@ -18,16 +18,6 @@ class Gestionnaire < ActiveRecord::Base procedures.publiees_ou_archivees end - def procedure_filter - procedure_id = self[:procedure_filter] - if procedures.find_by(id: procedure_id).present? - procedure_id - else - self.update_column(:procedure_filter, nil) - nil - end - end - def can_view_dossier?(dossier_id) avis.where(dossier_id: dossier_id).any? || dossiers.where(id: dossier_id).any? diff --git a/db/migrate/20180226162351_remove_procedure_filter_from_gestionnaires.rb b/db/migrate/20180226162351_remove_procedure_filter_from_gestionnaires.rb new file mode 100644 index 000000000..95020cb14 --- /dev/null +++ b/db/migrate/20180226162351_remove_procedure_filter_from_gestionnaires.rb @@ -0,0 +1,5 @@ +class RemoveProcedureFilterFromGestionnaires < ActiveRecord::Migration[5.2] + def change + remove_column :gestionnaires, :procedure_filter, :integer, default: nil + end +end diff --git a/spec/models/gestionnaire_spec.rb b/spec/models/gestionnaire_spec.rb index 0a92a7bad..25c5fc3c1 100644 --- a/spec/models/gestionnaire_spec.rb +++ b/spec/models/gestionnaire_spec.rb @@ -5,8 +5,7 @@ describe Gestionnaire, type: :model do let!(:procedure) { create :procedure, :published, administrateur: admin } let!(:procedure_2) { create :procedure, :published, administrateur: admin } let!(:procedure_3) { create :procedure, :published, administrateur: admin } - let(:gestionnaire) { create :gestionnaire, procedure_filter: procedure_filter, administrateurs: [admin] } - let(:procedure_filter) { nil } + let(:gestionnaire) { create :gestionnaire, administrateurs: [admin] } let!(:procedure_assign) { create :assign_to, gestionnaire: gestionnaire, procedure: procedure } before do @@ -136,43 +135,6 @@ describe Gestionnaire, type: :model do end end - describe '#procedure_filter' do - subject { gestionnaire.procedure_filter } - - context 'when procedure_filter_id is nil' do - it { is_expected.to eq nil } - end - - context 'when procedure_filter is not nil' do - context 'when gestionnaire is assign_to the procedure filter id' do - before do - gestionnaire.update_column :procedure_filter, procedure.id - end - - it { expect(AssignTo.where(gestionnaire: gestionnaire, procedure: procedure).count).to eq 1 } - it { is_expected.to eq procedure_assign.procedure.id } - end - - context 'when gestionnaire is not any more assign to the procedure filter id' do - before do - gestionnaire.update_column :procedure_filter, procedure_3.id - end - - it { expect(AssignTo.where(gestionnaire: gestionnaire, procedure: procedure_3).count).to eq 0 } - it { is_expected.to be_nil } - end - - context "when procedure is hidden clear procedure_filter" do - before do - gestionnaire.update_column :procedure_filter, procedure_3.id - procedure_3.hide! - end - - it { is_expected.to be_nil } - end - end - end - describe 'last_week_overview' do let!(:gestionnaire2) { create(:gestionnaire) } subject { gestionnaire2.last_week_overview } From 5cd6767593087e1300a158b26ad4895496ffdb1d Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Mon, 26 Feb 2018 17:25:28 +0100 Subject: [PATCH 3/9] Remove unused procedure_filter --- app/models/gestionnaire.rb | 10 ----- ...ove_procedure_filter_from_gestionnaires.rb | 5 +++ db/schema.rb | 3 +- spec/models/gestionnaire_spec.rb | 40 +------------------ 4 files changed, 7 insertions(+), 51 deletions(-) create mode 100644 db/migrate/20180226162351_remove_procedure_filter_from_gestionnaires.rb diff --git a/app/models/gestionnaire.rb b/app/models/gestionnaire.rb index 4b4a98aa2..32624b6bd 100644 --- a/app/models/gestionnaire.rb +++ b/app/models/gestionnaire.rb @@ -18,16 +18,6 @@ class Gestionnaire < ActiveRecord::Base procedures.publiees_ou_archivees end - def procedure_filter - procedure_id = self[:procedure_filter] - if procedures.find_by(id: procedure_id).present? - procedure_id - else - self.update_column(:procedure_filter, nil) - nil - end - end - def can_view_dossier?(dossier_id) avis.where(dossier_id: dossier_id).any? || dossiers.where(id: dossier_id).any? diff --git a/db/migrate/20180226162351_remove_procedure_filter_from_gestionnaires.rb b/db/migrate/20180226162351_remove_procedure_filter_from_gestionnaires.rb new file mode 100644 index 000000000..95020cb14 --- /dev/null +++ b/db/migrate/20180226162351_remove_procedure_filter_from_gestionnaires.rb @@ -0,0 +1,5 @@ +class RemoveProcedureFilterFromGestionnaires < ActiveRecord::Migration[5.2] + def change + remove_column :gestionnaires, :procedure_filter, :integer, default: nil + end +end diff --git a/db/schema.rb b/db/schema.rb index 41dfe638a..c85827d5a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_02_19_170553) do +ActiveRecord::Schema.define(version: 2018_02_26_162351) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -311,7 +311,6 @@ ActiveRecord::Schema.define(version: 2018_02_19_170553) do t.string "last_sign_in_ip" t.datetime "created_at" t.datetime "updated_at" - t.integer "procedure_filter" t.index ["email"], name: "index_gestionnaires_on_email", unique: true t.index ["reset_password_token"], name: "index_gestionnaires_on_reset_password_token", unique: true end diff --git a/spec/models/gestionnaire_spec.rb b/spec/models/gestionnaire_spec.rb index 0a92a7bad..25c5fc3c1 100644 --- a/spec/models/gestionnaire_spec.rb +++ b/spec/models/gestionnaire_spec.rb @@ -5,8 +5,7 @@ describe Gestionnaire, type: :model do let!(:procedure) { create :procedure, :published, administrateur: admin } let!(:procedure_2) { create :procedure, :published, administrateur: admin } let!(:procedure_3) { create :procedure, :published, administrateur: admin } - let(:gestionnaire) { create :gestionnaire, procedure_filter: procedure_filter, administrateurs: [admin] } - let(:procedure_filter) { nil } + let(:gestionnaire) { create :gestionnaire, administrateurs: [admin] } let!(:procedure_assign) { create :assign_to, gestionnaire: gestionnaire, procedure: procedure } before do @@ -136,43 +135,6 @@ describe Gestionnaire, type: :model do end end - describe '#procedure_filter' do - subject { gestionnaire.procedure_filter } - - context 'when procedure_filter_id is nil' do - it { is_expected.to eq nil } - end - - context 'when procedure_filter is not nil' do - context 'when gestionnaire is assign_to the procedure filter id' do - before do - gestionnaire.update_column :procedure_filter, procedure.id - end - - it { expect(AssignTo.where(gestionnaire: gestionnaire, procedure: procedure).count).to eq 1 } - it { is_expected.to eq procedure_assign.procedure.id } - end - - context 'when gestionnaire is not any more assign to the procedure filter id' do - before do - gestionnaire.update_column :procedure_filter, procedure_3.id - end - - it { expect(AssignTo.where(gestionnaire: gestionnaire, procedure: procedure_3).count).to eq 0 } - it { is_expected.to be_nil } - end - - context "when procedure is hidden clear procedure_filter" do - before do - gestionnaire.update_column :procedure_filter, procedure_3.id - procedure_3.hide! - end - - it { is_expected.to be_nil } - end - end - end - describe 'last_week_overview' do let!(:gestionnaire2) { create(:gestionnaire) } subject { gestionnaire2.last_week_overview } From 6ff1e518478e98a91144924146fe113296ad486c Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Mon, 26 Feb 2018 16:58:40 +0100 Subject: [PATCH 4/9] =?UTF-8?q?Minist=C3=A8re=20de=20l=E2=80=99environneme?= =?UTF-8?q?nt=20->=20MTES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../landing/users/ministere-environnement.jpg | Bin 17071 -> 0 bytes app/assets/images/landing/users/mtes.jpg | Bin 0 -> 18020 bytes app/views/root/landing.html.haml | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 app/assets/images/landing/users/ministere-environnement.jpg create mode 100644 app/assets/images/landing/users/mtes.jpg diff --git a/app/assets/images/landing/users/ministere-environnement.jpg b/app/assets/images/landing/users/ministere-environnement.jpg deleted file mode 100644 index 086c252b07b4bc4450e7a2e7284fa73060ddc205..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17071 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 z 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 diff --git a/app/assets/images/landing/users/mtes.jpg b/app/assets/images/landing/users/mtes.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b4b8f29962425a23c4e936d0a29016d4dc55180f GIT binary patch literal 18020 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 KFomt>#s3Wx{2liI literal 0 HcmV?d00001 diff --git a/app/views/root/landing.html.haml b/app/views/root/landing.html.haml index f74ba918f..a0712c972 100644 --- a/app/views/root/landing.html.haml +++ b/app/views/root/landing.html.haml @@ -108,8 +108,8 @@ %ul.users %li.user - %a{ :href => "http://www.developpement-durable.gouv.fr/", :target => "_blank " } - %img.user-image{ :src => image_url("landing/users/ministere-environnement.jpg") } + %a{ :href => "https://www.ecologique-solidaire.gouv.fr/", :target => "_blank " } + %img.user-image{ :src => image_url("landing/users/mtes.jpg") } %li.user %a{ :href => "https://www.iledefrance.fr/", :target => "_blank " } %img.user-image{ :src => image_url("landing/users/region-idf.jpg") } From 4e8dcb08a7cd65df005a170abe5ad96fb7c773bf Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Mon, 26 Feb 2018 17:21:21 +0100 Subject: [PATCH 5/9] Change CSS colors --- app/assets/stylesheets/navbar.scss | 2 +- app/assets/stylesheets/new_design/_colors.scss | 14 +++++++------- app/assets/stylesheets/new_design/new_alert.scss | 2 +- .../last_week_overview.html.haml | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/assets/stylesheets/navbar.scss b/app/assets/stylesheets/navbar.scss index 8022dedcb..4976c82e2 100644 --- a/app/assets/stylesheets/navbar.scss +++ b/app/assets/stylesheets/navbar.scss @@ -146,7 +146,7 @@ } .btn-nav.text-danger:hover { - color: #A94442; + color: #A10005; } .navbar { diff --git a/app/assets/stylesheets/new_design/_colors.scss b/app/assets/stylesheets/new_design/_colors.scss index 059b41ef1..14663ebb0 100644 --- a/app/assets/stylesheets/new_design/_colors.scss +++ b/app/assets/stylesheets/new_design/_colors.scss @@ -1,15 +1,15 @@ -$blue: #4393F3; -$light-blue: rgba(61, 149, 236, 0.8); +$blue: #0069CC; +$light-blue: #1C7EC9; $black: #333333; $grey: #999999; $light-grey: #F8F8F8; $border-grey: #CCCCCC; -$dark-red: #A94442; -$light-red: #EBCCD1; -$lighter-red: #F2DEDE; -$green: #35D49E; +$dark-red: #A10005; +$light-red: #ED1C24; +$lighter-red: #F52A2A; +$green: #15AD70; $lighter-green: lighten($green, 30%); $light-green: lighten($green, 25%); $dark-green: darken($green, 20%); -$orange: #F59415; +$orange: #F28900; $orange-bg: lighten($orange, 35%); diff --git a/app/assets/stylesheets/new_design/new_alert.scss b/app/assets/stylesheets/new_design/new_alert.scss index d88c9d6f0..eb554839e 100644 --- a/app/assets/stylesheets/new_design/new_alert.scss +++ b/app/assets/stylesheets/new_design/new_alert.scss @@ -8,7 +8,7 @@ .alert-danger { background-color: $lighter-red; border-color: $light-red; - color: $dark-red; + color: #FFFFFF; } .alert-success { diff --git a/app/views/gestionnaire_mailer/last_week_overview.html.haml b/app/views/gestionnaire_mailer/last_week_overview.html.haml index 3e91be452..617da2128 100644 --- a/app/views/gestionnaire_mailer/last_week_overview.html.haml +++ b/app/views/gestionnaire_mailer/last_week_overview.html.haml @@ -4,7 +4,7 @@ %h2{ style: 'font-size: 20px; font-weight: 300; margin: 25px 0 5px;' } #{procedure_overview.procedure.libelle} - = link_to 'voir', gestionnaire_procedure_url(procedure_overview.procedure), style: 'color: #4393F3; font-size: 14px;' + = link_to 'voir', gestionnaire_procedure_url(procedure_overview.procedure), style: 'color: #0069CC; font-size: 14px;' %table{ cellpadding: '0', cellspacing: '0', style: 'width: 100%; padding-bottom: 20px;' } %tbody @@ -24,7 +24,7 @@ - if procedure_overview.old_dossiers_en_construction.count < 6 \: - old_dossiers_en_construction = procedure_overview.old_dossiers_en_construction.map do |old_dossier| - - link_to "nº #{old_dossier.id}", gestionnaire_dossier_url(procedure_overview.procedure, old_dossier), style: 'color: #4393F3;' + - link_to "nº #{old_dossier.id}", gestionnaire_dossier_url(procedure_overview.procedure, old_dossier), style: 'color: #0069CC;' - end.join(', ') = sanitize(old_dossiers_en_construction, attributes: %w(href style)) @@ -38,7 +38,7 @@ - if procedure_overview.old_dossiers_en_instruction.count < 6 \: - old_dossiers_en_instruction = procedure_overview.old_dossiers_en_instruction.map do |old_dossier| - - link_to "nº #{old_dossier.id}", gestionnaire_dossier_url(procedure_overview.procedure, old_dossier), style: 'color: #4393F3;' + - link_to "nº #{old_dossier.id}", gestionnaire_dossier_url(procedure_overview.procedure, old_dossier), style: 'color: #0069CC;' - end.join(', ') = sanitize(old_dossiers_en_instruction, attributes: %w(href style)) From 2284e9b40a41a0b2189726d50ddf6cc7bf2604cc Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Mon, 26 Feb 2018 17:26:54 +0100 Subject: [PATCH 6/9] Change SVG colors --- app/assets/images/header/logo-tps.svg | 2 +- app/assets/images/icons/accept.svg | 2 +- app/assets/images/icons/account-circle.svg | 2 +- app/assets/images/icons/archive.svg | 2 +- app/assets/images/icons/attachment.svg | 2 +- app/assets/images/icons/blue-person.svg | 2 +- app/assets/images/icons/edit-folder-blue.svg | 2 +- app/assets/images/icons/folder.svg | 2 +- app/assets/images/icons/follow-folder.svg | 2 +- app/assets/images/icons/in-progress-blue.svg | 2 +- app/assets/images/icons/mail.svg | 2 +- app/assets/images/icons/printer.svg | 2 +- app/assets/images/icons/refuse.svg | 2 +- app/assets/images/icons/search-blue.svg | 2 +- app/assets/images/icons/sign-out.svg | 2 +- app/assets/images/icons/super-admin.svg | 2 +- app/assets/images/icons/switch-profile.svg | 2 +- app/assets/images/icons/unarchive.svg | 2 +- app/assets/images/icons/unfollow-folder.svg | 2 +- app/assets/images/landing/hero/dematerialiser.svg | 2 +- app/assets/images/landing/testimonials/quotation-mark.svg | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/assets/images/header/logo-tps.svg b/app/assets/images/header/logo-tps.svg index fe6557db5..5ee9d1eb8 100644 --- a/app/assets/images/header/logo-tps.svg +++ b/app/assets/images/header/logo-tps.svg @@ -1 +1 @@ -C03A1FFC-B3DD-48D2-8111-A47EEA63E68F \ No newline at end of file +C03A1FFC-B3DD-48D2-8111-A47EEA63E68F \ No newline at end of file diff --git a/app/assets/images/icons/accept.svg b/app/assets/images/icons/accept.svg index 71fde1f5e..20d2da4e9 100644 --- a/app/assets/images/icons/accept.svg +++ b/app/assets/images/icons/accept.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/assets/images/icons/account-circle.svg b/app/assets/images/icons/account-circle.svg index ec478f66c..a5b28414c 100644 --- a/app/assets/images/icons/account-circle.svg +++ b/app/assets/images/icons/account-circle.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/assets/images/icons/archive.svg b/app/assets/images/icons/archive.svg index 845cd1e70..747911053 100644 --- a/app/assets/images/icons/archive.svg +++ b/app/assets/images/icons/archive.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/assets/images/icons/attachment.svg b/app/assets/images/icons/attachment.svg index 2ffd41273..eb8c18b2c 100644 --- a/app/assets/images/icons/attachment.svg +++ b/app/assets/images/icons/attachment.svg @@ -1 +1 @@ -ic_attach \ No newline at end of file +ic_attach \ No newline at end of file diff --git a/app/assets/images/icons/blue-person.svg b/app/assets/images/icons/blue-person.svg index a5693cac9..fd8046f9d 100644 --- a/app/assets/images/icons/blue-person.svg +++ b/app/assets/images/icons/blue-person.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/assets/images/icons/edit-folder-blue.svg b/app/assets/images/icons/edit-folder-blue.svg index 1c4e0d187..d4a5fa68e 100644 --- a/app/assets/images/icons/edit-folder-blue.svg +++ b/app/assets/images/icons/edit-folder-blue.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/assets/images/icons/folder.svg b/app/assets/images/icons/folder.svg index 55cccb64e..c5776633b 100644 --- a/app/assets/images/icons/folder.svg +++ b/app/assets/images/icons/folder.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/assets/images/icons/follow-folder.svg b/app/assets/images/icons/follow-folder.svg index bfb36faa1..b3ea05d70 100644 --- a/app/assets/images/icons/follow-folder.svg +++ b/app/assets/images/icons/follow-folder.svg @@ -1 +1 @@ -ic_follow_folder \ No newline at end of file +ic_follow_folder \ No newline at end of file diff --git a/app/assets/images/icons/in-progress-blue.svg b/app/assets/images/icons/in-progress-blue.svg index 29d7b574e..e7436ce83 100644 --- a/app/assets/images/icons/in-progress-blue.svg +++ b/app/assets/images/icons/in-progress-blue.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/assets/images/icons/mail.svg b/app/assets/images/icons/mail.svg index 7a84b97da..986e8da66 100644 --- a/app/assets/images/icons/mail.svg +++ b/app/assets/images/icons/mail.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/assets/images/icons/printer.svg b/app/assets/images/icons/printer.svg index cd459bf25..4f7ad96f3 100644 --- a/app/assets/images/icons/printer.svg +++ b/app/assets/images/icons/printer.svg @@ -1 +1 @@ -printer \ No newline at end of file +printer \ No newline at end of file diff --git a/app/assets/images/icons/refuse.svg b/app/assets/images/icons/refuse.svg index 9aff82679..f03174094 100644 --- a/app/assets/images/icons/refuse.svg +++ b/app/assets/images/icons/refuse.svg @@ -1 +1 @@ -close \ No newline at end of file +close \ No newline at end of file diff --git a/app/assets/images/icons/search-blue.svg b/app/assets/images/icons/search-blue.svg index e1b35abf2..7ffdf300e 100644 --- a/app/assets/images/icons/search-blue.svg +++ b/app/assets/images/icons/search-blue.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/assets/images/icons/sign-out.svg b/app/assets/images/icons/sign-out.svg index 30022a12b..184162794 100644 --- a/app/assets/images/icons/sign-out.svg +++ b/app/assets/images/icons/sign-out.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/assets/images/icons/super-admin.svg b/app/assets/images/icons/super-admin.svg index bb9584ed5..698a7b108 100644 --- a/app/assets/images/icons/super-admin.svg +++ b/app/assets/images/icons/super-admin.svg @@ -1 +1 @@ -Shape \ No newline at end of file +Shape \ No newline at end of file diff --git a/app/assets/images/icons/switch-profile.svg b/app/assets/images/icons/switch-profile.svg index e5d63c13c..9469b7e25 100644 --- a/app/assets/images/icons/switch-profile.svg +++ b/app/assets/images/icons/switch-profile.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/assets/images/icons/unarchive.svg b/app/assets/images/icons/unarchive.svg index b0098fd53..99673aeac 100644 --- a/app/assets/images/icons/unarchive.svg +++ b/app/assets/images/icons/unarchive.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/assets/images/icons/unfollow-folder.svg b/app/assets/images/icons/unfollow-folder.svg index 272efc828..2b2be62b2 100644 --- a/app/assets/images/icons/unfollow-folder.svg +++ b/app/assets/images/icons/unfollow-folder.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/assets/images/landing/hero/dematerialiser.svg b/app/assets/images/landing/hero/dematerialiser.svg index 8398e066f..e7e51acb7 100755 --- a/app/assets/images/landing/hero/dematerialiser.svg +++ b/app/assets/images/landing/hero/dematerialiser.svg @@ -1 +1 @@ -0EA652BC-3A4A-4613-BA33-535DF72E7337 \ No newline at end of file +0EA652BC-3A4A-4613-BA33-535DF72E7337 \ No newline at end of file diff --git a/app/assets/images/landing/testimonials/quotation-mark.svg b/app/assets/images/landing/testimonials/quotation-mark.svg index 7c49b4e05..ed18e9e01 100644 --- a/app/assets/images/landing/testimonials/quotation-mark.svg +++ b/app/assets/images/landing/testimonials/quotation-mark.svg @@ -1 +1 @@ -Slice \ No newline at end of file +Slice \ No newline at end of file From 3e02c62f45df63c4bb181b033c2cbdf1866711b9 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Mon, 26 Feb 2018 17:36:08 +0100 Subject: [PATCH 7/9] Add the DINSIC logo to the footer --- app/assets/images/footer/logo-dinsic.svg | 1 + app/assets/images/footer/logo-rf.svg | 1 - .../stylesheets/new_design/new_footer.scss | 16 ++++++++-------- app/views/layouts/_new_footer.html.haml | 7 +++---- 4 files changed, 12 insertions(+), 13 deletions(-) create mode 100644 app/assets/images/footer/logo-dinsic.svg delete mode 100644 app/assets/images/footer/logo-rf.svg diff --git a/app/assets/images/footer/logo-dinsic.svg b/app/assets/images/footer/logo-dinsic.svg new file mode 100644 index 000000000..85fa7e780 --- /dev/null +++ b/app/assets/images/footer/logo-dinsic.svg @@ -0,0 +1 @@ +BM_DINSIC \ No newline at end of file diff --git a/app/assets/images/footer/logo-rf.svg b/app/assets/images/footer/logo-rf.svg deleted file mode 100644 index 283fe4c57..000000000 --- a/app/assets/images/footer/logo-rf.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/stylesheets/new_design/new_footer.scss b/app/assets/stylesheets/new_design/new_footer.scss index 21e7a9185..5f34bc894 100644 --- a/app/assets/stylesheets/new_design/new_footer.scss +++ b/app/assets/stylesheets/new_design/new_footer.scss @@ -54,19 +54,19 @@ footer { opacity: 0.8; } -.footer-logo-rf { - @include ie-compatible-background-image("footer/logo-rf.svg"); - - width: 75px; - height: 44px; - margin-bottom: 14px; -} - .footer-logo-beta-gouv-fr { @include ie-compatible-background-image("footer/logo-beta-gouv-fr.svg"); width: 190px; height: 32px; + margin-bottom: 14px; +} + +.footer-logo-dinsic { + @include ie-compatible-background-image("footer/logo-dinsic.svg"); + + height: 85px; + width: 74px; } .footer-link a { diff --git a/app/views/layouts/_new_footer.html.haml b/app/views/layouts/_new_footer.html.haml index 345ce7408..d04de7f71 100644 --- a/app/views/layouts/_new_footer.html.haml +++ b/app/views/layouts/_new_footer.html.haml @@ -3,13 +3,12 @@ %ul.footer-columns %li.footer-column %ul.footer-logos - %li - = link_to "http://www.gouvernement.fr/" do - %span.footer-logo.footer-logo-rf{ role: 'img', 'aria-label': 'Logo du gouvernement' } - %li = link_to "https://beta.gouv.fr/" do %span.footer-logo.footer-logo-beta-gouv-fr{ role: 'img', 'aria-label': 'Logo de beta.gouv.fr' } + %li + = link_to "http://www.modernisation.gouv.fr/" do + %span.footer-logo.footer-logo-dinsic{ role: 'img', 'aria-label': 'Logo de la DINSIC' } %li.footer-column From e154dbdbaf944bc7602d5ef86149c98ca0636660 Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Mon, 26 Feb 2018 17:25:28 +0100 Subject: [PATCH 8/9] Remove unused procedure_filter --- db/schema.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 41dfe638a..c85827d5a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_02_19_170553) do +ActiveRecord::Schema.define(version: 2018_02_26_162351) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -311,7 +311,6 @@ ActiveRecord::Schema.define(version: 2018_02_19_170553) do t.string "last_sign_in_ip" t.datetime "created_at" t.datetime "updated_at" - t.integer "procedure_filter" t.index ["email"], name: "index_gestionnaires_on_email", unique: true t.index ["reset_password_token"], name: "index_gestionnaires_on_reset_password_token", unique: true end From 3f3c4897c3babc71e663b3f1a8a6e273c84de086 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Mon, 26 Feb 2018 19:19:01 +0100 Subject: [PATCH 9/9] Add a Skylight badge to the README --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 237c33a0b..ea6dd0dc3 100644 --- a/README.md +++ b/README.md @@ -158,3 +158,9 @@ L'application supporte les navigateurs récents Firefox, Chrome, Internet Explor La compatibilité est testée par Browserstack. [](https://www.browserstack.com/) + +## Performance + +[![View performance data on Skylight](https://badges.skylight.io/status/zAvWTaqO0mu1.svg)](https://oss.skylight.io/app/applications/zAvWTaqO0mu1) + +Nous utilisons Skylight pour suivre les performances de notre application.