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

Merge pull request #4757 from betagouv/dinum

Browse source 
Remplacement des dernières références restants à la DINSIC par DINUM
This commit is contained in:
Pierre de La Morinerie 2020-02-10 18:54:49 +01:00 committed by GitHub
commit fe1833e1cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/images/footer/logo-dinsic.svg
View file

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

Before

Width:  |  Height:  |  Size: 72 KiB

1
app/assets/images/footer/logo-dinum.svg Normal file
View file

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

After

Width:  |  Height:  |  Size: 72 KiB

4
app/assets/stylesheets/new_design/new_footer.scss
View file

@ -69,8 +69,8 @@ footer {
opacity: 0.8;
}
.footer-logo-dinsic {
@include ie-compatible-background-image("footer/logo-dinsic.svg");
.footer-logo-dinum {
@include ie-compatible-background-image("footer/logo-dinum.svg");
height: 104px;
width: 90px;

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

@ -1,6 +1,6 @@
#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" }
= link_to 'DINSIC', "http://etatplateforme.modernisation.gouv.fr"
= link_to 'DINUM', 'https://www.numerique.gouv.fr/dinum/'
= Time.zone.now.year
\-
= link_to 'Nouveautés', 'https://doc.demarches-simplifiees.fr/nouveautes', target: '_blank'

2
app/views/layouts/mailers/notifications_layout.html.erb
View file

@ -145,7 +145,7 @@
<tr>
<td style="word-wrap:break-word;font-size:0px;padding:0px 20px 0px 20px;padding-top:0px;padding-bottom:0px;" align="center">
<div class="" style="cursor:auto;color:#55575d;font-family:Helvetica, Arial, sans-serif;font-size:11px;line-height:22px;text-align:center;">
demarches-simplifiees.fr est un service fourni par la DINSIC et incubé par beta.gouv.fr
demarches-simplifiees.fr est un service fourni par la DINUM et incubé par beta.gouv.fr
</div>
</td>
</tr>

2
app/views/root/_footer.html.haml
View file

@ -12,7 +12,7 @@
= link_to "beta.gouv.fr", "https://beta.gouv.fr", title: "le site de Beta.gouv.fr"
%li
= link_to "http://www.modernisation.gouv.fr/", title: "DINUM" do
%span.footer-logo.footer-logo-dinsic{ role: 'img', 'aria-label': 'DINSIC' }
%span.footer-logo.footer-logo-dinum{ role: 'img', 'aria-label': 'DINUM' }
= link_to "https://beta.gouv.fr", title: "le site de Beta.gouv.fr" do
%span.footer-logo.footer-logo-beta-gouv-fr{ role: 'img', 'aria-label': 'beta.gouv.fr' }

4
spec/factories/procedure.rb
View file

@ -3,8 +3,8 @@ FactoryBot.define do
factory :procedure do
sequence(:libelle) { |n| "Procedure #{n}" }
description { "Demande de subvention à l'intention des associations" }
organisation { "Orga DINSIC" }
direction { "direction DINSIC" }
organisation { "Orga DINUM" }
direction { "direction DINUM" }
cadre_juridique { "un cadre juridique important" }
published_at { nil }
duree_conservation_dossiers_dans_ds { 3 }