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

Merge branch 'dev'

Browse source
This commit is contained in:
gregoirenovel 2018-03-14 15:27:27 +01:00
commit 73b0328c22
7 changed files with 36 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/assets/stylesheets/new_design/accompagnateur.scss
View file

@ -30,16 +30,20 @@
}
}
.mixed-buttons-bar .button {
// Needed so that buttons without text
// are ligned with those that have text
vertical-align: top;
}
.mixed-buttons-bar {
flex-shrink: 0;
.mixed-buttons-bar .label {
padding: $default-spacer $default-padding;
font-size: 14px;
line-height: 20px;
.button {
// Needed so that buttons without text
// are ligned with those that have text
vertical-align: top;
}
.label {
padding: $default-spacer $default-padding;
font-size: 14px;
line-height: 20px;
}
}
.print-menu-opener {

2
app/controllers/root_controller.rb
View file

@ -13,7 +13,7 @@ class RootController < ApplicationController
end
if Date.today < Date.new(2018, 03, 31)
flash.now.notice = ["Téléprocédures Simplifiées change de nom et devient demarches-simplifiees.fr, <a href='https://tps.gitbooks.io/tps-documentation/content/changement-de-nom.html' target='_blank'>en savoir plus</a>."]
flash.now.notice = ["Téléprocédures Simplifiées change de nom et devient demarches-simplifiees.fr, <a href='https://demarches-simplifiees.gitbooks.io/demarches-simplifiees/content/changement-de-nom.html' target='_blank' rel='noopener noreferrer'>en savoir plus</a>."]
end
render 'landing'

2
app/mailers/administration_mailer.rb
View file

@ -13,7 +13,7 @@ class AdministrationMailer < ApplicationMailer
@reset_password_token = reset_password_token
mail(to: admin.email,
subject: "demarches-simplifiees.fr - Activez votre compte administrateur",
reply_to: "equipe@demarches-simplifiees.fr")
reply_to: "contact@demarches-simplifiees.fr")
end
def dubious_procedures(procedures_and_type_de_champs)

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

@ -22,9 +22,9 @@
%li.footer-link
= link_to "Statistiques", stats_path, :class => "footer-link"
%li.footer-link
= link_to "CGU", CGU_URL, :class => "footer-link", :target => "_blank"
= link_to "CGU", CGU_URL, :class => "footer-link", :target => "_blank", rel: "noopener noreferrer"
%li.footer-link
= link_to "Mentions légales", "https://tps.gitbooks.io/tps-documentation/content/conditions-generales-dutilisation.html#4-mentions-l%C3%A9gales", :class => "footer-link", :target => "_blank"
= link_to "Mentions légales", "https://demarches-simplifiees.gitbooks.io/demarches-simplifiees/content/conditions-generales-dutilisation.html#4-mentions-l%C3%A9gales", :class => "footer-link", :target => "_blank", rel: "noopener noreferrer"
%li.footer-column
%ul.footer-links
@ -33,10 +33,10 @@
"mailto:#{t('dynamics.contact_email')}",
:class => "footer-link"
%li.footer-link
= link_to "Documentation", "https://tps.gitbooks.io/tps-documentation/content/", :class => "footer-link", :target => "_blank"
= link_to "Documentation", "https://demarches-simplifiees.gitbooks.io/demarches-simplifiees/content/", :class => "footer-link", :target => "_blank", rel: "noopener noreferrer"
%li.footer-link
= link_to "Documentation de l'API", "/docs", :class => "footer-link", :target => "_blank"
= link_to "Documentation de l'API", "/docs", :class => "footer-link", :target => "_blank", rel: "noopener noreferrer"
%li.footer-link
= link_to "FAQ", "http://demarches-simplifiees.helpscoutdocs.com/", :class => "footer-link", :target => "_blank"
= link_to "FAQ", "http://demarches-simplifiees.helpscoutdocs.com/", :class => "footer-link", :target => "_blank", rel: "noopener noreferrer"
%li.footer-link
= link_to "Accessibilité", accessibilite_index_path, :class => "footer-link"

27
app/views/root/landing.html.haml
View file

@ -50,11 +50,13 @@
"mailto:#{t("dynamics.contact_email")}?subject=Demande%20de%20compte%20administrateur%20demarches-simplifiees.fr",
class: "role-panel-button-primary",
target: "_blank",
rel: "noopener noreferrer",
onclick: "javascript: ga('send', 'pageview', '/demander-une-demo')"
= link_to "Voir la documentation",
"https://tps.gitbooks.io/tps-documentation/content/",
"https://demarches-simplifiees.gitbooks.io/demarches-simplifiees/content/",
target: "_blank",
rel: "noopener noreferrer",
class: "role-panel-button-secondary"
.landing-panel.admins-panel
@ -156,36 +158,36 @@
%ul.users
%li.user
= link_to "https://www.ecologique-solidaire.gouv.fr/", target: :blank do
= link_to "https://www.ecologique-solidaire.gouv.fr/", target: :blank, rel: "noopener noreferrer" do
%img.user-image{ :src => image_url("landing/users/mtes.jpg"), alt: "Ministère de la Transition Écologique et Solidaire" }
%li.user
= link_to "https://www.iledefrance.fr/", target: :blank do
= link_to "https://www.iledefrance.fr/", target: :blank, rel: "noopener noreferrer" do
%img.user-image{ :src => image_url("landing/users/region-idf.jpg"), alt: "Région Île-de-France" }
%li.user
= link_to "http://www.artisanat.fr/", target: :blank do
= link_to "http://www.artisanat.fr/", target: :blank, rel: "noopener noreferrer" do
%img.user-image{ :src => image_url("landing/users/chambres-de-metiers.jpg"), alt: "Chambres des Métiers et de l'Artisanat" }
%li.user
= link_to "http://www.cci.fr/", target: :blank do
= link_to "http://www.cci.fr/", target: :blank, rel: "noopener noreferrer" do
%img.user-image{ :src => image_url("landing/users/cci.jpg"), alt: "CCI de France" }
%li.user
= link_to "http://www.driea.ile-de-france.developpement-durable.gouv.fr/", target: :blank do
= link_to "http://www.driea.ile-de-france.developpement-durable.gouv.fr/", target: :blank, rel: "noopener noreferrer" do
%img.user-image{ :src => image_url("landing/users/driea-idf.jpg"), alt: "Direction Régionale et Interdépartementale de l'Équipement et de l'Aménagement" }
%ul.users
%li.user
= link_to "https://www.debatpublic.fr/", target: :blank do
= link_to "https://www.debatpublic.fr/", target: :blank, rel: "noopener noreferrer" do
%img.user-image{ :src => image_url("landing/users/cndp.jpg"), alt: "Commission Nationale du Débat Public" }
%li.user
= link_to "https://www.iledefrance.ars.sante.fr/", target: :blank do
= link_to "https://www.iledefrance.ars.sante.fr/", target: :blank, rel: "noopener noreferrer" do
%img.user-image{ :src => image_url("landing/users/ars-idf.jpg"), alt: "Agence Régionale de Santé d'Île-de-France" }
%li.user
= link_to "http://www.franceagrimer.fr/", target: :blank do
= link_to "http://www.franceagrimer.fr/", target: :blank, rel: "noopener noreferrer" do
%img.user-image{ :src => image_url("landing/users/france-agrimer.jpg"), alt: "FranceAgrimer" }
%li.user
= link_to "http://www.rhone.gouv.fr/", target: :blank do
= link_to "http://www.rhone.gouv.fr/", target: :blank, rel: "noopener noreferrer" do
%img.user-image{ :src => image_url("landing/users/prefecture-rhone.jpg"), alt: "Préfecture de la région Rhône-Alpes" }
%li.user
= link_to "http://www.lillemetropole.fr/", target: :blank do
= link_to "http://www.lillemetropole.fr/", target: :blank, rel: "noopener noreferrer" do
%img.user-image{ :src => image_url("landing/users/mel.jpg"), alt: "Métropole Européenne de Lille" }
.landing-panel.cta-panel
@ -198,4 +200,5 @@
= link_to "Contactez-nous",
"mailto:#{t("dynamics.contact_email")}?subject=Question%20à%20propos%20de%20demarches-simplifiees.fr",
class: "cta-panel-button-white",
target: "_blank"
target: "_blank",
rel: "noopener noreferrer"

1
config/initializers/constants.rb Normal file
View file

@ -0,0 +1 @@
CGU_URL = "https://demarches-simplifiees.gitbooks.io/demarches-simplifiees/content/conditions-generales-dutilisation.html"

2
config/initializers/urls.rb
View file

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