aboutsummaryrefslogtreecommitdiffstats
path: root/app/views/devise
diff options
context:
space:
mode:
authorAlban Peignier2017-12-14 12:04:19 +0100
committerAlban Peignier2017-12-14 12:04:19 +0100
commit1eacdd594ec0079372c7e8d0c32d283e2a20a05c (patch)
treecc9894f01798b73a588d3a3b2dc22ea720bf9048 /app/views/devise
parent0d6dd2459c805558a6b941c8311a990be76a67e7 (diff)
downloadchouette-core-1eacdd594ec0079372c7e8d0c32d283e2a20a05c.tar.bz2
Refactor mailer layout. Refs #5303
Diffstat (limited to 'app/views/devise')
-rw-r--r--app/views/devise/mailer/invitation_instructions.fr.html.slim4
-rw-r--r--app/views/devise/passwords/new.html.slim24
2 files changed, 16 insertions, 12 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'