DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2659 from betagouv/fix-1511

Browse source 
Remplace l'ancien logo DS par une Marianne
This commit is contained in:
gregoirenovel 2018-09-24 12:24:53 +02:00 committed by GitHub
commit a8bcc19044
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 4 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/logos/logo-ds.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.7 KiB

1
app/assets/images/marianne.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 32 KiB

BIN
app/assets/images/marianne_small.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.7 KiB

2
app/decorators/procedure_decorator.rb
View file

@ -13,7 +13,7 @@ class ProcedureDecorator < Draper::Decorator
def logo_img
if logo.blank?
h.image_url(LOGO_NAME)
h.image_url("marianne.svg")
else
if Flipflop.remote_storage?
(RemoteDownloader.new logo.filename).url

3
app/views/administrateurs/sessions/new.html.haml
View file

@ -1,7 +1,4 @@
#form-login
%br
= image_tag(image_url(LOGO_NAME))
%br
%h2#login_admin
= t('dynamics.admin.connexion_title')

2
app/views/gestionnaires/passwords/edit.html.haml
View file

@ -1,8 +1,6 @@
= devise_error_messages!
#form-login
= image_tag(image_url(LOGO_NAME))
%br
%h2#gestionnaire_login Changement de mot de passe
%br

2
app/views/gestionnaires/passwords/new.html.haml
View file

@ -2,8 +2,6 @@
%br
#form-login
= image_tag(image_url(LOGO_NAME))
%br
%h2#gestionnaire_login Mot de passe oublié
%br

3
app/views/gestionnaires/sessions/new.html.haml
View file

@ -1,7 +1,4 @@
#form-login
%br
= image_tag(image_url(LOGO_NAME))
%br
%h2#gestionnaire_login Instructeur
%br

2
app/views/layouts/_navbar.html.haml
View file

@ -2,7 +2,7 @@
%a#title-navbar{ href: root_path }
.row#home
.col-lg-6.no-padding
= image_tag('marianne_small.png', class: 'logo')
= image_tag('marianne.svg', class: 'logo')
.col-lg-6.no-padding#tps-title
demarches-simplifiees.fr

3
app/views/users/passwords/edit.html.haml
View file

@ -1,9 +1,6 @@
= devise_error_messages!
#form-login
.flag
= image_tag(image_url(LOGO_NAME))
%br
%h2#gestionnaire_login Changement de mot de passe
%br

3
app/views/users/passwords/new.html.haml
View file

@ -2,9 +2,6 @@
%br
#form-login
.flag
= image_tag(image_url(LOGO_NAME))
%br
%h2#gestionnaire_login Mot de passe oublié
%br

4
app/views/users/sessions/_resume_procedure.html.haml
View file

@ -14,7 +14,3 @@
= @dossier.procedure.libelle
%p.procedure-description
= h string_to_html(@dossier.procedure.description)
- else
#logo_procedure.flag
= image_tag(image_url(LOGO_NAME), { id: 'logo_tps' })

3
app/views/users/siret/_pro.html.haml
View file

@ -1,7 +1,4 @@
%p.lead#pro_section
.flag
= image_tag(image_url(LOGO_NAME))
%br
%h2#titre-procedure.text-info
= @procedure.libelle

1
config/initializers/logos.rb
View file

@ -1 +0,0 @@
LOGO_NAME = 'logos/logo-ds.png'

2
spec/decorators/procedure_decorator_spec.rb
View file

@ -24,7 +24,7 @@ describe ProcedureDecorator do
describe 'logo_img' do
subject { super().logo_img }
it { is_expected.to match(/http.*#{ActionController::Base.helpers.image_url(LOGO_NAME)}/) }
it { is_expected.to match(/http.*#{ActionController::Base.helpers.image_url("marianne.svg")}/) }
end
describe 'geographic_information' do