From a3bd6ce8a3b7b6d2d12107c4124346105d52bcce Mon Sep 17 00:00:00 2001
From: Alexis Reigel <mail@koffeinfrei.org>
Date: Wed, 10 May 2017 17:37:47 +0200
Subject: use common devise layout and use heading style

---
 .../mailer/confirmation_instructions.html.haml     | 31 +++++++++++-----------
 app/views/devise/mailer/password_change.html.haml  | 17 ++++++------
 .../mailer/reset_password_instructions.html.haml   | 21 +++++++--------
 .../devise/mailer/unlock_instructions.html.haml    | 17 ++++++------
 4 files changed, 41 insertions(+), 45 deletions(-)

(limited to 'app/views/devise')

diff --git a/app/views/devise/mailer/confirmation_instructions.html.haml b/app/views/devise/mailer/confirmation_instructions.html.haml
index 086bb8e083d..a508b7537a2 100644
--- a/app/views/devise/mailer/confirmation_instructions.html.haml
+++ b/app/views/devise/mailer/confirmation_instructions.html.haml
@@ -1,16 +1,15 @@
-.center
-  - if @resource.unconfirmed_email.present?
-    #content
-      %h2= @resource.unconfirmed_email
-      %p Click the link below to confirm your email address.
-    #cta
-      = link_to 'Confirm your email address', confirmation_url(@resource, confirmation_token: @token)
-  - else
-    #content
-      - if Gitlab.com?
-        %h2 Thanks for signing up to GitLab!
-      - else
-        %h2 Welcome, #{@resource.name}!
-      %p To get started, click the link below to confirm your account.
-    #cta
-      = link_to 'Confirm your account', confirmation_url(@resource, confirmation_token: @token)
+- if @resource.unconfirmed_email.present?
+  #content
+    = email_default_heading(@resource.unconfirmed_email)
+    %p Click the link below to confirm your email address.
+  #cta
+    = link_to 'Confirm your email address', confirmation_url(@resource, confirmation_token: @token)
+- else
+  #content
+    - if Gitlab.com?
+      = email_default_heading('Thanks for signing up to GitLab!')
+    - else
+      = email_default_heading("Welcome, #{@resource.name}!")
+    %p To get started, click the link below to confirm your account.
+  #cta
+    = link_to 'Confirm your account', confirmation_url(@resource, confirmation_token: @token)
diff --git a/app/views/devise/mailer/password_change.html.haml b/app/views/devise/mailer/password_change.html.haml
index b378540e03c..5ec515285f2 100644
--- a/app/views/devise/mailer/password_change.html.haml
+++ b/app/views/devise/mailer/password_change.html.haml
@@ -1,9 +1,8 @@
-= render layout: 'layouts/mailer/default_content' do
-  Hello, #{@resource.name}!
-  %p
-    The password for your GitLab account on
-    #{link_to(Gitlab.config.gitlab.url, Gitlab.config.gitlab.url)}
-    has successfully been changed.
-  %p
-    If you did not initiate this change, please contact your administrator
-    immediately.
+= email_default_heading("Hello, #{@resource.name}!")
+%p
+  The password for your GitLab account on
+  #{link_to(Gitlab.config.gitlab.url, Gitlab.config.gitlab.url)}
+  has successfully been changed.
+%p
+  If you did not initiate this change, please contact your administrator
+  immediately.
diff --git a/app/views/devise/mailer/reset_password_instructions.html.haml b/app/views/devise/mailer/reset_password_instructions.html.haml
index 9ae240ba309..47e192afa52 100644
--- a/app/views/devise/mailer/reset_password_instructions.html.haml
+++ b/app/views/devise/mailer/reset_password_instructions.html.haml
@@ -1,11 +1,10 @@
-= render layout: 'layouts/mailer/default_content' do
-  Hello, #{@resource.name}!
-  %p
-    Someone, hopefully you, has requested to reset the password for your
-    GitLab account on #{link_to(Gitlab.config.gitlab.url, Gitlab.config.gitlab.url)}.
-  %p
-    If you did not perform this request, you can safely ignore this email.
-  %p
-    Otherwise, click the link below to complete the process.
-  #cta
-    = link_to('Reset password', edit_password_url(@resource, reset_password_token: @token))
+= email_default_heading("Hello, #{@resource.name}!")
+%p
+  Someone, hopefully you, has requested to reset the password for your
+  GitLab account on #{link_to(Gitlab.config.gitlab.url, Gitlab.config.gitlab.url)}.
+%p
+  If you did not perform this request, you can safely ignore this email.
+%p
+  Otherwise, click the link below to complete the process.
+#cta
+  = link_to('Reset password', edit_password_url(@resource, reset_password_token: @token))
diff --git a/app/views/devise/mailer/unlock_instructions.html.haml b/app/views/devise/mailer/unlock_instructions.html.haml
index 9990d1ccac6..79e3a35cc9a 100644
--- a/app/views/devise/mailer/unlock_instructions.html.haml
+++ b/app/views/devise/mailer/unlock_instructions.html.haml
@@ -1,9 +1,8 @@
-.center
-  #content
-    %h2 Hello, #{@resource.name}!
-    %p
-      Your GitLab account has been locked due to an excessive amount of unsuccessful
-      sign in attempts. Your account will automatically unlock in #{time_ago_in_words(Devise.unlock_in.from_now)}
-      or you may click the link below to unlock now.
-    #cta
-      = link_to('Unlock account', unlock_url(@resource, unlock_token: @token))
+#content
+  = email_default_heading("Hello, #{@resource.name}!")
+  %p
+    Your GitLab account has been locked due to an excessive amount of unsuccessful
+    sign in attempts. Your account will automatically unlock in #{time_ago_in_words(Devise.unlock_in.from_now)}
+    or you may click the link below to unlock now.
+  #cta
+    = link_to('Unlock account', unlock_url(@resource, unlock_token: @token))
-- 
cgit v1.2.3