diff --git a/emails/templates/layouts/default.html b/emails/templates/layouts/default.html index f6d729054cd..07eb32874c7 100644 --- a/emails/templates/layouts/default.html +++ b/emails/templates/layouts/default.html @@ -94,8 +94,7 @@ td[class="stack-column-center"] {
-
- +
diff --git a/public/emails/alert_notification.html b/public/emails/alert_notification.html index 15668c1924c..ce8354cdff5 100644 --- a/public/emails/alert_notification.html +++ b/public/emails/alert_notification.html @@ -4,9 +4,7 @@ - - + + -
@@ -107,11 +106,11 @@ td[class="stack-column-center"] { - - - + + +
- -
+ +
- -
-
+ + +
+
+ + +
+
- - -
-
+ + +
- - - @@ -200,21 +198,21 @@ text-decoration: underline;
- - - - - - +
- -
+ + + +
+ +
- - - +
+ + - - +
+
{{Subject .Subject "{{.Title}}"}} - - -
- - -
-

{{.Title}}

+ + +
+ + +
+

{{.Title}}
@@ -222,13 +220,13 @@ text-decoration: underline;
- - -
- - -
-

{{.Message}}

+ + +
+ + +
+

{{.Message}}
@@ -237,26 +235,26 @@ text-decoration: underline;
{{if ne .State "ok" }} - - -
-
- - -
-
Metric name
+ + +
+
+ + + - {{range .EvalMatches}} - - + - {{end}} @@ -267,17 +265,17 @@ text-decoration: underline;
+
Metric name
 -
Value
+ 		+
Value
-
{{.Metric}}
+
+
{{.Metric}}
 -
{{.Value}}
+ 		+
{{.Value}}
{{end}} - - -
- - -
+ + +
+ + + @@ -287,25 +285,25 @@ text-decoration: underline;
{{if ne .ImageLink "" }} - Alerting Panel + Alerting Panel {{end}} {{if ne .EmbededImage "" }} - Alerting Panel + Alerting Panel {{end}}
- - -
- - -
- - -
- View your Alert rule + + +
+ + + -
+ + +
+ View your Alert rule
- - -
- Go to the Alerts page + + + +
+ Go to the Alerts page
@@ -323,20 +321,20 @@ text-decoration: underline;
- - -
- - -
-
-

+ + + diff --git a/public/emails/invited_to_org.html b/public/emails/invited_to_org.html index cd81f603eef..30f2b34ee9a 100644 --- a/public/emails/invited_to_org.html +++ b/public/emails/invited_to_org.html @@ -4,9 +4,7 @@ - - + + -
+ + + - +
+
+

Sent by Grafana v{{.BuildVersion}}
© 2016 Grafana and raintank

- -
-
+ + +
+
+ + +
+
- - -
-
+ + +
- - - @@ -200,26 +198,26 @@ text-decoration: underline;
- - - - - - +
- -
+ + + +
+ +
- - - +
+ + - - +
+
{{Subject .Subject "{{.InvitedBy}} has added you to the {{.OrgName}} organization"}} - - -
+ + +
- - -
-

You have been added to {{.OrgName}}

+ + + - +
+

You have been added to {{.OrgName}}
@@ -227,22 +225,22 @@ text-decoration: underline;
- - -
- - -
-

{{.InvitedBy}} has added you to the {{.OrgName}} organization in Grafana. -

Once logged in, {{.OrgName}} will be available in the left side menu, in the dropdown below your username.

+ + +
+ + + - + - -
+

{{.InvitedBy}} has added you to the {{.OrgName}} organization in Grafana. +

Once logged in, {{.OrgName}} will be available in the left side menu, in the dropdown below your username.
- - - + + @@ -259,20 +257,20 @@ text-decoration: underline;
Log in now
+ + +
Log in now
- - -
- - -
-
-

+ + + diff --git a/public/emails/new_user_invite.html b/public/emails/new_user_invite.html index 65b6bfc2602..b925ced7267 100644 --- a/public/emails/new_user_invite.html +++ b/public/emails/new_user_invite.html @@ -4,9 +4,7 @@ - - + + -
+ + + - +
+
+

Sent by Grafana v{{.BuildVersion}}
© 2016 Grafana and raintank

- -
-
+ + +
+
+ + +
+
- - -
-
+ + +
- - - @@ -200,26 +198,26 @@ text-decoration: underline;
- - - - - - +
- -
+ + + +
+ +
- - - +
+ + - - +
+
{{Subject .Subject "{{.InvitedBy}} has invited you to join Grafana"}} - - -
+ + +
- - -
-

You're invited to join {{.OrgName}}

+ + + - +
+

You're invited to join {{.OrgName}}
@@ -227,29 +225,29 @@ text-decoration: underline;
- - -
- - -
-

You've been invited to join the {{.OrgName}} organization by {{.InvitedBy}}. To accept your invitation and join the team, please click the link below:

+ + +
+ + + - - @@ -260,20 +258,20 @@ text-decoration: underline;
+

You've been invited to join the {{.OrgName}} organization by {{.InvitedBy}}. To accept your invitation and join the team, please click the link below:
- - - + + - - + - +
Accept Invitation
+ + +
Accept Invitation
-

You can also copy/paste this link into your browser directly: {{.LinkUrl}}

+
+

You can also copy/paste this link into your browser directly: {{.LinkUrl}}
- - -
- - -
-
-

+ + + diff --git a/public/emails/reset_password.html b/public/emails/reset_password.html index aca5c7e60a2..3dd678f01d7 100644 --- a/public/emails/reset_password.html +++ b/public/emails/reset_password.html @@ -4,9 +4,7 @@ - - + + -
+ + + - +
+
+

Sent by Grafana v{{.BuildVersion}}
© 2016 Grafana and raintank

- -
-
+ + +
+
+ + +
+
- - -
-
+ + +
- - - @@ -200,24 +198,24 @@ text-decoration: underline;
- - - - - - +
- -
+ + + +
+ +
- - - +
+ + - - +
+
{{Subject .Subject "Reset your Grafana password - {{.Name}}"}} - - -
+ + +
- - -
-

Hi {{.Name}},

+ + + - +
+

Hi {{.Name}},
@@ -225,21 +223,21 @@ text-decoration: underline;
- - -
- - -
-

+ + +
+ + + - +
+

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.

+

Not working? Try copying and pasting it to your browser.
@@ -254,20 +252,20 @@ text-decoration: underline;
- - -
- - -
-
-

+ + + diff --git a/public/emails/signup_started.html b/public/emails/signup_started.html index c9e24bf575e..37457f9745e 100644 --- a/public/emails/signup_started.html +++ b/public/emails/signup_started.html @@ -4,9 +4,7 @@ - - + + -
+ + + - +
+
+

Sent by Grafana v{{.BuildVersion}}
© 2016 Grafana and raintank

- -
-
+ + +
+
+ + +
+
- - -
-
+ + +
- - - @@ -200,24 +198,24 @@ text-decoration: underline;
- - - - - - +
- -
+ + + +
+ +
- - - +
+ + - - +
+
{{Subject .Subject "Welcome to Grafana, please complete your sign up!"}} - - -
+ + +
- - -
-

Complete the signup

+ + + - +
+

Complete the signup
@@ -225,23 +223,23 @@ text-decoration: underline;
- - -
- - -
+ + +
+ + + - + - -
Copy and past the email verification code:
- {{.Code}}
in + {{.Code}}
in the sign up form or use the link below.
- - - + + @@ -258,20 +256,20 @@ text-decoration: underline;
Complete Sign Up
+ + +
Complete Sign Up
- - -
- - -
-
-

+ + + diff --git a/public/emails/welcome_on_signup.html b/public/emails/welcome_on_signup.html index 3048a9dbf42..f6a04977be7 100644 --- a/public/emails/welcome_on_signup.html +++ b/public/emails/welcome_on_signup.html @@ -4,9 +4,7 @@ - - + + -
+ + + - +
+
+

Sent by Grafana v{{.BuildVersion}}
© 2016 Grafana and raintank

- -
-
+ + +
+
+ + +
+
- - -
-
+ + +
- - - @@ -200,27 +198,27 @@ text-decoration: underline;
- - - - - - +
- -
+ + + +
+ +
- - - +
+ + - - +
+
{{Subject .Subject "Welcome to Grafana"}} - - -
+ + +
- - -
-

Hi {{.Name}},

+ + + - + - - + @@ -230,23 +228,23 @@ text-decoration: underline;
+

Hi {{.Name}},
+
Welcome! Ready to start building some beautiful metric and analytic dashboards?
- - -
- - -
-

+ + +
+ + + - + - - +
+

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

+
Thank you for joining our community.
-

The Grafana Team

+

The Grafana Team
@@ -261,20 +259,20 @@ text-decoration: underline;
- - -
- - -
-
-

+ + +
+ + + - +
+
+

Sent by Grafana v{{.BuildVersion}}
© 2016 Grafana and raintank