From b0b96aa41044e90f430647658442beec718d62f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 11 Aug 2015 10:01:30 +0200 Subject: [PATCH] Moved reset password and welcome on sign up email to new email build template system --- emails/reset_password.html | 34 ---- emails/templates/reset_password.html | 42 +++++ emails/templates/welcome_on_signup.html | 37 ++++ emails/welcome_on_signup.html | 30 ---- public/emails/reset_password.html | 229 +++++++++++++++++++++--- public/emails/welcome_on_signup.html | 220 ++++++++++++++++++++--- 6 files changed, 474 insertions(+), 118 deletions(-) delete mode 100644 emails/reset_password.html create mode 100644 emails/templates/reset_password.html create mode 100644 emails/templates/welcome_on_signup.html delete mode 100644 emails/welcome_on_signup.html diff --git a/emails/reset_password.html b/emails/reset_password.html deleted file mode 100644 index 970d5da6ca0..00000000000 --- a/emails/reset_password.html +++ /dev/null @@ -1,34 +0,0 @@ -{{Subject .Subject "Reset your Grafana password - {{.Name}}"}} - - - - - -{{.Name}}, please reset your password - - -
-
-
-
-
-
- Hi {{.Name}}, -
-
-

Please click the following link to reset your password within {{.EmailCodeValidHours}} hours.

-

- {{.AppUrl}}user/password/reset?code={{.Code}} -

-

Not working? Try copying and pasting it to your browser.

-
-
-
-
-
- © 2014 Grafana -
-
-
- - diff --git a/emails/templates/reset_password.html b/emails/templates/reset_password.html new file mode 100644 index 00000000000..f3aca5da95e --- /dev/null +++ b/emails/templates/reset_password.html @@ -0,0 +1,42 @@ +[[Subject .Subject "Reset your Grafana password - [[.Name]]"]] + + + + + +
+ + + + + + +
+

Hi [[.Name]]

+
+ +
+ + + + + +
+ + + + + +
+

+ Please click the following link to reset your password within [[.EmailCodeValidHours]] hours. +

+

+ [[.AppUrl]]user/password/reset?code=[[.Code]] +

+

Not working? Try copying and pasting it to your browser.

+
+ +
+ + diff --git a/emails/templates/welcome_on_signup.html b/emails/templates/welcome_on_signup.html new file mode 100644 index 00000000000..b93c56b77b1 --- /dev/null +++ b/emails/templates/welcome_on_signup.html @@ -0,0 +1,37 @@ +[[Subject .Subject "Welcome to Grafana"]] + + + + + +
+ + + + + + +
+

Hi [[.Name]]

+
+ +
+ + + + + +
+ + + + + +
+

+ If you are new to Grafana please read the Getting Started guide. +

+
+
+ + diff --git a/emails/welcome_on_signup.html b/emails/welcome_on_signup.html deleted file mode 100644 index 5018930da57..00000000000 --- a/emails/welcome_on_signup.html +++ /dev/null @@ -1,30 +0,0 @@ -{{Subject .Subject "Welcome to Grafana"}} - - - - - -{{.Name}} Welcome to Grafana - - -
-
-
-
-
-
- Hi {{.Name}}, -
-
- -
-
-
-
-
- © 2014 Grafana -
-
-
- - diff --git a/public/emails/reset_password.html b/public/emails/reset_password.html index 970d5da6ca0..ef1c98d9107 100644 --- a/public/emails/reset_password.html +++ b/public/emails/reset_password.html @@ -1,34 +1,205 @@ -{{Subject .Subject "Reset your Grafana password - {{.Name}}"}} - - - + + - -{{.Name}}, please reset your password + + + - -
-
-
-
-
-
- Hi {{.Name}}, -
-
-

Please click the following link to reset your password within {{.EmailCodeValidHours}} hours.

-

- {{.AppUrl}}user/password/reset?code={{.Code}} + + + + + + +
+
+ + + + + +
+
+ + + + + +
+ + + + + + +
+ +
+ +
+ +
+
+ + + + + + +
+ + + {{Subject .Subject "Reset your Grafana password - {{.Name}}"}} + + + + + +
+ + + + + + +
+

Hi {{.Name}}

+
+ +
+ + + + + +
+ + + + + +
+

+ Please click the following link to reset your password within {{.EmailCodeValidHours}} hours.

-

Not working? Try copying and pasting it to your browser.

- - - - -
- © 2014 Grafana -
- - +

+ {{.AppUrl}}user/password/reset?code={{.Code}} +

+

Not working? Try copying and pasting it to your browser.

+
+ +
+ + + + + + + + + +
+ + + + + +
+
+

+ Sent by Grafana v{{.BuildVersion}} +

+
+
+
+ + +
+
+
diff --git a/public/emails/welcome_on_signup.html b/public/emails/welcome_on_signup.html index 5018930da57..b311bfca11c 100644 --- a/public/emails/welcome_on_signup.html +++ b/public/emails/welcome_on_signup.html @@ -1,30 +1,200 @@ -{{Subject .Subject "Welcome to Grafana"}} - - - + + - -{{.Name}} Welcome to Grafana + + + - -

-
-
-
-
-
- Hi {{.Name}}, -
-
+ + + + + + +
+
- - - - -
- © 2014 Grafana -
- - + + + + +
+
+ + + + + +
+ + + + + + +
+ +
+ +
+ +
+
+ + + + + + +
+ + + {{Subject .Subject "Welcome to Grafana"}} + + + + + +
+ + + + + + +
+

Hi {{.Name}}

+
+ +
+ + + + + +
+ + + + + +
+

+ If you are new to Grafana please read the Getting Started guide. +

+
+
+ + + + + + + + + +
+ + + + + +
+
+

+ Sent by Grafana v{{.BuildVersion}} +

+
+
+
+ + +
+
+