Merge pull request #2659 from betagouv/fix-1511

Remplace l'ancien logo DS par une Marianne

app/decorators/procedure_decorator.rb

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

app/views/administrateurs/sessions/new.html.haml

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

app/views/gestionnaires/passwords/edit.html.haml

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

app/views/gestionnaires/passwords/new.html.haml

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

app/views/gestionnaires/sessions/new.html.haml

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

app/views/layouts/_navbar.html.haml

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

app/views/users/passwords/edit.html.haml

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

app/views/users/passwords/new.html.haml

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

app/views/users/sessions/_resume_procedure.html.haml

@@ -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' })

app/views/users/siret/_pro.html.haml

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

config/initializers/logos.rb

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

spec/decorators/procedure_decorator_spec.rb

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