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

Merge pull request #3547 from betagouv/dev

Browse source 
MEP 2019-03-05-01
This commit is contained in:
Mathieu Magnin 2019-03-05 18:10:23 +01:00 committed by GitHub
commit 614ec77acf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,3 +43,5 @@
= link_to "FAQ", FAQ_URL, :class => "footer-link", :target => "_blank", rel: "noopener noreferrer" = link_to "FAQ", FAQ_URL, :class => "footer-link", :target => "_blank", rel: "noopener noreferrer"
%li.footer-link %li.footer-link
= link_to "Accessibilité", accessibilite_path, :class => "footer-link" = link_to "Accessibilité", accessibilite_path, :class => "footer-link"
%li.footer-link
= link_to "Disponibilité", STATUS_PAGE_URL, :class => "footer-link", :target => "_blank", rel: "noopener noreferrer"

8
app/views/shared/dossiers/_demande.html.haml
View file

@ -10,9 +10,17 @@
- if dossier.etablissement.present? - if dossier.etablissement.present?
= render partial: "shared/dossiers/identite_entreprise", locals: { etablissement: dossier.etablissement, profile: profile } = render partial: "shared/dossiers/identite_entreprise", locals: { etablissement: dossier.etablissement, profile: profile }
- if profile == 'usager' && !dossier.read_only?
.flex.row-reverse
= link_to "Modifier le SIRET", siret_dossier_path(dossier), class: 'button'
- if dossier.individual.present? - if dossier.individual.present?
= render partial: "shared/dossiers/identite_individual", locals: { individual: dossier.individual } = render partial: "shared/dossiers/identite_individual", locals: { individual: dossier.individual }
- if profile == 'usager' && !dossier.read_only?
.flex.row-reverse
= link_to "Modifier l'identité", identite_dossier_path(dossier), class: 'button'
.tab-title Formulaire .tab-title Formulaire
- champs = dossier.champs.includes(:type_de_champ) - champs = dossier.champs.includes(:type_de_champ)
- if champs.any? - if champs.any?

1
app/views/shared/dossiers/editable_champs/_pays.html.haml
View file

@ -1,3 +1,4 @@
= form.select :value, = form.select :value,
Champs::PaysChamp.pays, Champs::PaysChamp.pays,
include_blank: true,
required: champ.mandatory? required: champ.mandatory?

1
app/views/shared/dossiers/editable_champs/_regions.html.haml
View file

@ -1,3 +1,4 @@
= form.select :value, = form.select :value,
Champs::RegionChamp.regions, Champs::RegionChamp.regions,
include_blank: true,
required: champ.mandatory? required: champ.mandatory?

1
config/initializers/urls.rb
View file

@ -22,4 +22,5 @@ MENTIONS_LEGALES_URL = [CGU_URL, "4-mentions-legales"].join("#")
API_DOC_URL = [DOC_URL, "pour-aller-plus-loin", "api"].join("/") API_DOC_URL = [DOC_URL, "pour-aller-plus-loin", "api"].join("/")
WEBHOOK_DOC_URL = [DOC_URL, "pour-aller-plus-loin", "webhook"].join("/") WEBHOOK_DOC_URL = [DOC_URL, "pour-aller-plus-loin", "webhook"].join("/")
FAQ_URL = "https://faq.demarches-simplifiees.fr" FAQ_URL = "https://faq.demarches-simplifiees.fr"
STATUS_PAGE_URL = "https://status.demarches-simplifiees.fr"
MATOMO_IFRAME_URL = "https://stats.data.gouv.fr/index.php?module=CoreAdminHome&action=optOut&language=fr&&fontColor=333333&fontSize=16px&fontFamily=Muli" MATOMO_IFRAME_URL = "https://stats.data.gouv.fr/index.php?module=CoreAdminHome&action=optOut&language=fr&&fontColor=333333&fontSize=16px&fontFamily=Muli"