diff options
| -rw-r--r-- | app/views/devise/mailer/invitation_instructions.fr.html.slim | 4 | ||||
| -rw-r--r-- | app/views/devise/passwords/new.html.slim | 24 | ||||
| -rw-r--r-- | app/views/layouts/mailer.html.erb | 22 | ||||
| -rw-r--r-- | app/views/layouts/mailer.html.slim | 7 | ||||
| -rw-r--r-- | config/environments/development.rb | 3 | ||||
| -rw-r--r-- | config/locales/devise.fr.yml | 2 |
6 files changed, 41 insertions, 21 deletions
diff --git a/app/views/devise/mailer/invitation_instructions.fr.html.slim b/app/views/devise/mailer/invitation_instructions.fr.html.slim index 484e0d68d..e263e188a 100644 --- a/app/views/devise/mailer/invitation_instructions.fr.html.slim +++ b/app/views/devise/mailer/invitation_instructions.fr.html.slim @@ -1,7 +1,7 @@ -p = t("devise.mailer.invitation_instructions.hello", email: @resource.email) +p = t("devise.mailer.invitation_instructions.hello", email: @resource.name) p = t("devise.mailer.invitation_instructions.someone_invited_you", url: unauthenticated_root_url) p = link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, :invitation_token => @token) -p = t("devise.mailer.invitation_instructions.ignore").html_safe
\ No newline at end of file +p = t("devise.mailer.invitation_instructions.ignore").html_safe diff --git a/app/views/devise/passwords/new.html.slim b/app/views/devise/passwords/new.html.slim index 8a739ecc1..6e03595fc 100644 --- a/app/views/devise/passwords/new.html.slim +++ b/app/views/devise/passwords/new.html.slim @@ -1,11 +1,15 @@ -.col-md-offset-2.col-md-8 - .panel.panel-default - .panel-heading = t('.title') - - .panel-body - = simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), html: {class: 'form-horizontal' } ) do |form| - = form.input :email, :as => :email, placeholder: 'user@domain.com' +/ PageHeader - .form-actions - = link_to t("cancel"), unauthenticated_root_path, class: 'btn btn-default' - = form.button :submit, :value => t("devise.passwords.new.commit"), class: 'btn-info'
\ No newline at end of file += pageheader '', t('.title') + +/ PageContent +.page_content + .container-fluid + .row + .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-10.col-sm-offset-1 + = simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), html: {class: 'form-horizontal', id: 'password_form' } ) do |form| + .row + .col-lg-12 + = form.input :email, :as => :email, placeholder: 'user@domain.com' + + = form.button :submit, :value => t("devise.passwords.new.commit"), class: 'btn btn-default formSubmitr', form: 'invitation_form' diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..977cbfe5b --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,22 @@ +<!DOCTYPE html> +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <style> + /* Email styles need to be inline */ + body { + font-family: "Open Sans", sans-serif; + font-size: 14px; + line-height: 1.4; + color: #4b4b4b; + width: 800px; + } + </style> + </head> + + <body> + <%= image_tag 'mail-header.png' %> + + <%= yield %> + </body> +</html> diff --git a/app/views/layouts/mailer.html.slim b/app/views/layouts/mailer.html.slim deleted file mode 100644 index 5db6917b3..000000000 --- a/app/views/layouts/mailer.html.slim +++ /dev/null @@ -1,7 +0,0 @@ -doctype html -html - head - meta charset="utf-8" - /!* Email styles need to be inline */ - body - = yield diff --git a/config/environments/development.rb b/config/environments/development.rb index 56773d81e..e9cd16c34 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -36,9 +36,10 @@ Rails.application.configure do # config.action_view.raise_on_missing_translations = true #config.active_record.auto_explain_threshold_in_seconds = (RUBY_PLATFORM == "java" ? nil : 0.5) - config.action_mailer.default_url_options = { :host => 'localhost:3000' } + config.action_mailer.default_url_options = { :host => ENV.fetch('RAILS_HOST', 'http://localhost:3000') } config.action_mailer.default_options = { from: 'Stif BOIV <stif-boiv@af83.com>' } config.action_mailer.delivery_method = :letter_opener + config.action_mailer.asset_host = ENV.fetch('RAILS_HOST', 'http://localhost:3000') # change to true to allow email to be sent during development config.action_mailer.perform_deliveries = true diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml index d3fd6d03e..42a568fec 100644 --- a/config/locales/devise.fr.yml +++ b/config/locales/devise.fr.yml @@ -31,7 +31,7 @@ norme Neptune (NFP 99 506)" passwords: new: title: Mot de passe oublié - commit: Envoyer les instructions pour un nouveau mot de passe + commit: Envoyer les instructions edit: title: Changer de mot de passe new_password: Nouveau mot de passe |