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

Merge pull request #1365 from betagouv/fix-1291

Browse source 
Fix 1291
This commit is contained in:
Mathieu Magnin 2018-01-29 11:15:01 +01:00 committed by GitHub
commit 31aabcd6b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/administration_mailer/invite_admin.html.haml
View file

@ -14,3 +14,7 @@ Bonne journée,
%br %br
%br %br
L'équipe Téléprocédures Simplifiées L'équipe Téléprocédures Simplifiées
%br
%br
Nous vous rappelons qu'en utilisant notre service, vous vous engagez à respecter nos
= link_to "conditions générales d'utilisation", CGU_URL

3
app/views/dossiers/etapes/etape_2/_individual.html.haml
View file

@ -36,7 +36,8 @@
%p %p
%label{ style: 'font-weight: normal;' } %label{ style: 'font-weight: normal;' }
= f.check_box :autorisation_donnees = f.check_box :autorisation_donnees
 J'accepte <a href="https://tps.gitbooks.io/tps-documentation/content/conditions-generales-dutilisation.html" target="_blank">les CGU</a>.  J'accepte
= link_to "les CGU", CGU_URL, target: :blank
.row .row
.col-xs-5.col-xs-5 .col-xs-5.col-xs-5
.col-xs-2.col-xs-2 .col-xs-2.col-xs-2

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

@ -7,6 +7,6 @@
\- \-
= link_to 'Statistiques', stats_path = link_to 'Statistiques', stats_path
\- \-
= link_to 'CGU / Mentions légales', "https://tps.gitbooks.io/tps-documentation/content/conditions-generales-dutilisation.html" = link_to 'CGU / Mentions légales', CGU_URL
\- \-
= link_to 'Contact', "mailto:"+t('dynamics.contact_email') = link_to 'Contact', "mailto:"+t('dynamics.contact_email')

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

@ -21,7 +21,7 @@
%li.footer-link %li.footer-link
= link_to "Statistiques", stats_path, :class => "footer-link" = link_to "Statistiques", stats_path, :class => "footer-link"
%li.footer-link %li.footer-link
= link_to "CGU", "https://tps.gitbooks.io/tps-documentation/content/conditions-generales-dutilisation.html", :class => "footer-link", :target => "_blank" = link_to "CGU", CGU_URL, :class => "footer-link", :target => "_blank"
%li.footer-column %li.footer-column
%ul.footer-links %ul.footer-links

2
config/initializers/urls.rb
View file

@ -3,3 +3,5 @@ if Rails.env.production?
else else
SIADEURL = 'https://staging.entreprise.api.gouv.fr' SIADEURL = 'https://staging.entreprise.api.gouv.fr'
end end
CGU_URL = "https://tps.gitbooks.io/tps-documentation/content/conditions-generales-dutilisation.html"

4
spec/mailers/previews/administration_mailer_preview.rb
View file

@ -6,4 +6,8 @@ class AdministrationMailerPreview < ActionMailer::Preview
] ]
AdministrationMailer.dubious_procedures(procedures_and_champs) AdministrationMailer.dubious_procedures(procedures_and_champs)
end end
def invite_admin
AdministrationMailer.invite_admin(Administrateur.last, "12345678")
end
end end