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

Fix logo image_url

Browse source
This commit is contained in:
Xavier J 2016-11-03 17:29:59 +01:00
parent e10c218d3a
commit a08ded5322
13 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/logos/logo-opensimplif.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 30 KiB

2
app/decorators/procedure_decorator.rb
View file

@ -10,7 +10,7 @@ class ProcedureDecorator < Draper::Decorator
end end
def logo_img def logo_img
return LOGO_NAME if logo.blank? return image_url(LOGO_NAME) if logo.blank?
File.join(STORAGE_URL, File.basename(logo.path)) File.join(STORAGE_URL, File.basename(logo.path))
end end
def geographic_information def geographic_information

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

@ -1,6 +1,6 @@
#form_login #form_login
%br %br
= image_tag(LOGO_NAME) = image_tag(image_url(LOGO_NAME))
%br %br
%h2#login_admin %h2#login_admin
=t('dynamics.admin.connexion_title') =t('dynamics.admin.connexion_title')

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

@ -1,7 +1,7 @@
= devise_error_messages! = devise_error_messages!
#form_login #form_login
= image_tag(LOGO_NAME) = image_tag(image_url(LOGO_NAME))
%br %br
%h2#gestionnaire_login Changement de mot de passe %h2#gestionnaire_login Changement de mot de passe

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

@ -2,7 +2,7 @@
%br %br
#form_login #form_login
= image_tag(LOGO_NAME) = image_tag(image_url(LOGO_NAME))
%br %br
%h2#gestionnaire_login Mot de passe oublié %h2#gestionnaire_login Mot de passe oublié

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

@ -1,6 +1,6 @@
#form_login #form_login
%br %br
= image_tag(LOGO_NAME) = image_tag(image_url(LOGO_NAME))
%br %br
%h2#gestionnaire_login Accompagnateur %h2#gestionnaire_login Accompagnateur

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

@ -5,7 +5,7 @@
Env Test Env Test
= image_tag('marianne_small.png', class: 'logo') = image_tag('marianne_small.png', class: 'logo')
%a{href: '/'} %a{href: '/'}
= image_tag(LOGO_NAME, class: 'logo') = image_tag(image_url(LOGO_NAME), class: 'logo')
- if gestionnaire_signed_in? && user_signed_in? - if gestionnaire_signed_in? && user_signed_in?
%a{href: (current_gestionnaire.procedure_filter.blank? ? backoffice_dossiers_path : backoffice_dossiers_procedure_path(current_gestionnaire.procedure_filter)), class: 'btn btn-md'} %a{href: (current_gestionnaire.procedure_filter.blank? ? backoffice_dossiers_path : backoffice_dossiers_procedure_path(current_gestionnaire.procedure_filter)), class: 'btn btn-md'}

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

@ -29,7 +29,7 @@
= devise_error_messages! = devise_error_messages!
#form_login #form_login
= image_tag(LOGO_NAME) = image_tag(image_url(LOGO_NAME))
%br %br
%h2#gestionnaire_login Changement de mot de passe %h2#gestionnaire_login Changement de mot de passe

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

@ -30,7 +30,7 @@
%br %br
#form_login #form_login
= image_tag(LOGO_NAME) = image_tag(image_url(LOGO_NAME))
%br %br
%h2#gestionnaire_login Mot de passe oublié %h2#gestionnaire_login Mot de passe oublié

2
app/views/users/registrations/new.html.haml
View file

@ -30,7 +30,7 @@
#form_login #form_login
%br %br
= image_tag(LOGO_NAME) = image_tag(image_url(LOGO_NAME))
%br %br
%h2#gestionnaire_login Inscription %h2#gestionnaire_login Inscription

2
app/views/users/sessions/new.html.haml
View file

@ -17,7 +17,7 @@
- else - else
= image_tag(LOGO_NAME, {id: 'logo_tps'}) = image_tag(image_url(LOGO_NAME), {id: 'logo_tps'})
%br %br
%h2#login_user %h2#login_user

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

@ -1,6 +1,6 @@
%p.lead{id: 'pro_section'} %p.lead{id: 'pro_section'}
= image_tag(LOGO_NAME) = image_tag(image_url(LOGO_NAME))
%br %br
%h2#titre_procedure.text-info %h2#titre_procedure.text-info
= @procedure.libelle = @procedure.libelle

2
spec/decorators/procedure_decorator_spec.rb
View file

@ -16,7 +16,7 @@ describe ProcedureDecorator do
describe 'logo_img' do describe 'logo_img' do
subject { super().logo_img } subject { super().logo_img }
it { is_expected.to eq(LOGO_NAME) } it { is_expected.to eq(image_url(LOGO_NAME)) }
end end
describe 'geographic_information' do describe 'geographic_information' do