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

Merge pull request #6916 from adullact/feature/6873-dinum-vars

Browse source 
Déplacer toutes les mentions à la DINUM dans des variables
This commit is contained in:
LeSim 2022-02-08 11:58:05 +01:00 • committed by GitHub
commit fe9adf061c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/stylesheets/new_footer.scss
View file

@ -67,19 +67,12 @@ footer {
opacity: 0.8; opacity: 0.8;
} }
.footer-logo-dinum {
@include ie-compatible-background-image("footer/logo-dinum.png");
height: 150px;
width: 202px;
margin-bottom: 14px;
}
.footer-logo-beta-gouv-fr { .footer-logo-beta-gouv-fr {
@include ie-compatible-background-image("footer/logo-beta-gouv-fr.svg"); @include ie-compatible-background-image("footer/logo-beta-gouv-fr.svg");
width: 150px; width: 150px;
height: 25px; height: 25px;
margin-top: 14px;
} }
.footer-logo-france { .footer-logo-france {

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

@ -1,6 +1,6 @@
#footer #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" } %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 'DINUM', 'https://www.numerique.gouv.fr/dinum/' = link_to PROVIDER_NAME, PROVIDER_URL
= Time.zone.now.year = Time.zone.now.year
\- \-
= link_to 'Nouveautés', DOC_NOUVEAUTES_URL, target: '_blank' = link_to 'Nouveautés', DOC_NOUVEAUTES_URL, target: '_blank'

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

@ -145,7 +145,7 @@
<tr> <tr>
<td style="word-wrap:break-word;font-size:0px;padding:0px 20px 0px 20px;padding-top:0px;padding-bottom:0px;" align="center"> <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;"> <div class="" style="cursor:auto;color:#55575d;font-family:Helvetica, Arial, sans-serif;font-size:11px;line-height:22px;text-align:center;">
<%= "#{APPLICATION_NAME}" %> est un service fourni par la DINUM <%= "#{APPLICATION_NAME}" %> est un service fourni par <%= PROVIDED_BY %>
</div> </div>
</td> </td>
</tr> </tr>

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

@ -5,12 +5,13 @@
%li.footer-column %li.footer-column
%ul.footer-logos %ul.footer-logos
%li.footer-text %li.footer-text
Un service fourni par la Un service fourni par
= link_to "DINUM", "https://numerique.gouv.fr/", title: "Direction Interministérielle au Numérique" = link_to PROVIDED_BY, PROVIDER_URL, title: PROVIDER_TITLE
%br %br
%li %li
= link_to "https://numerique.gouv.fr/", title: "DINUM", 'aria-label': 'DINUM' do = link_to PROVIDER_URL, title: PROVIDER_NAME, 'aria-label': PROVIDER_NAME do
%span.footer-logo.footer-logo-dinum{ role: 'img', 'aria-label': 'Logo DINUM' } %span.footer-logo{ role: 'img', 'aria-label': PROVIDER_LOGO_ALT }
= image_tag PROVIDER_LOGO_SRC, alt: PROVIDER_LOGO_ALT, width: PROVIDER_LOGO_WIDTH, height: PROVIDER_LOGO_HEIGHT, loading: 'lazy'
= link_to "https://beta.gouv.fr", title: "le site de Beta.gouv.fr", 'aria-label': 'beta.gouv.fr' do = link_to "https://beta.gouv.fr", title: "le site de Beta.gouv.fr", 'aria-label': 'beta.gouv.fr' do
%span.footer-logo.footer-logo-beta-gouv-fr{ role: 'img', 'aria-label': 'Logo beta.gouv.fr' } %span.footer-logo.footer-logo-beta-gouv-fr{ role: 'img', 'aria-label': 'Logo beta.gouv.fr' }

10
config/env.example.optional
View file

@ -89,3 +89,13 @@ DS_ENV="staging"
# Admins and instructeurs can freely change their email to these domains # Admins and instructeurs can freely change their email to these domains
# LEGIT_ADMIN_DOMAINS = "domaine_1.com;domaine_2.com" # LEGIT_ADMIN_DOMAINS = "domaine_1.com;domaine_2.com"
# Instance provider
# PROVIDED_BY="la DINUM"
# PROVIDER_NAME="DINUM"
# PROVIDER_TITLE="Direction Interministérielle au Numérique"
# PROVIDER_URL="https://numerique.gouv.fr/"
# PROVIDER_LOGO_SRC="footer/logo-dinum.png"
# PROVIDER_LOGO_ALT="Logo DINUM"
# PROVIDER_LOGO_HEIGHT="161"
# PROVIDER_LOGO_WIDTH="138"

10
config/initializers/provider.rb Normal file
View file

@ -0,0 +1,10 @@
# Instance provider
PROVIDED_BY = ENV.fetch("PROVIDED_BY", "la DINUM")
PROVIDER_NAME = ENV.fetch("PROVIDER_NAME", "DINUM")
PROVIDER_TITLE = ENV.fetch("PROVIDER_TITLE", "Direction Interministérielle au Numérique")
PROVIDER_URL = ENV.fetch("PROVIDER_URL", "https://numerique.gouv.fr/")
PROVIDER_LOGO_SRC = ENV.fetch("PROVIDER_LOGO_SRC", "footer/logo-dinum.png")
PROVIDER_LOGO_ALT = ENV.fetch("PROVIDER_LOGO_ALT", "Logo DINUM")
PROVIDER_LOGO_HEIGHT = ENV.fetch("PROVIDER_LOGO_HEIGHT", "161")
PROVIDER_LOGO_WIDTH = ENV.fetch("PROVIDER_LOGO_WIDTH", "138")