From 6f0d3830b0a4a4474b43e869e974bd7244e0fd4f Mon Sep 17 00:00:00 2001 From: Gilles De Mey Date: Wed, 16 Aug 2023 16:24:49 +0200 Subject: [PATCH] Email: Light theme email templates (#72398) --- emails/templates/invited_to_org.mjml | 6 +- emails/templates/new_user_invite.mjml | 6 +- emails/templates/ng_alert_notification.mjml | 10 +- emails/templates/partials/_globals.mjml | 2 + .../partials/alerting/firing_instance.mjml | 4 +- .../partials/alerting/instance_details.mjml | 14 +- .../partials/alerting/resolved_instance.mjml | 4 +- emails/templates/partials/layout/head.mjml | 10 +- emails/templates/partials/layout/header.mjml | 2 +- emails/templates/partials/layout/theme.css | 36 ++ emails/templates/reset_password.mjml | 6 +- emails/templates/signup_started.mjml | 58 +-- emails/templates/welcome_on_signup.mjml | 6 +- public/emails/invited_to_org.html | 46 +-- public/emails/new_user_invite.html | 42 +- public/emails/ng_alert_notification.html | 368 +++++++++--------- public/emails/reset_password.html | 42 +- public/emails/signup_started.html | 162 +++++--- public/emails/welcome_on_signup.html | 46 +-- 19 files changed, 494 insertions(+), 376 deletions(-) create mode 100644 emails/templates/partials/_globals.mjml create mode 100644 emails/templates/partials/layout/theme.css diff --git a/emails/templates/invited_to_org.mjml b/emails/templates/invited_to_org.mjml index f1f8a0c8273..8444cae1887 100644 --- a/emails/templates/invited_to_org.mjml +++ b/emails/templates/invited_to_org.mjml @@ -1,4 +1,8 @@ + + + + @@ -10,7 +14,7 @@ - +

You have been added to {{ .OrgName }}

diff --git a/emails/templates/new_user_invite.mjml b/emails/templates/new_user_invite.mjml index d965d329ce9..4f94d0f879a 100644 --- a/emails/templates/new_user_invite.mjml +++ b/emails/templates/new_user_invite.mjml @@ -1,4 +1,8 @@ + + + + @@ -10,7 +14,7 @@ - +

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

diff --git a/emails/templates/ng_alert_notification.mjml b/emails/templates/ng_alert_notification.mjml index 4e919458666..2a75a010535 100644 --- a/emails/templates/ng_alert_notification.mjml +++ b/emails/templates/ng_alert_notification.mjml @@ -1,4 +1,8 @@ + + + + @@ -20,7 +24,7 @@ {{ if .Message }} - + @@ -61,7 +65,7 @@ {{ range .Alerts.Firing }} - + @@ -94,7 +98,7 @@ {{ range .Alerts.Resolved }} - + diff --git a/emails/templates/partials/_globals.mjml b/emails/templates/partials/_globals.mjml new file mode 100644 index 00000000000..34163541b5b --- /dev/null +++ b/emails/templates/partials/_globals.mjml @@ -0,0 +1,2 @@ + + diff --git a/emails/templates/partials/alerting/firing_instance.mjml b/emails/templates/partials/alerting/firing_instance.mjml index 9f392b5e788..443f5223d2e 100644 --- a/emails/templates/partials/alerting/firing_instance.mjml +++ b/emails/templates/partials/alerting/firing_instance.mjml @@ -1,6 +1,6 @@ - + - + Firing diff --git a/emails/templates/partials/alerting/instance_details.mjml b/emails/templates/partials/alerting/instance_details.mjml index 458124dd974..f479a193430 100644 --- a/emails/templates/partials/alerting/instance_details.mjml +++ b/emails/templates/partials/alerting/instance_details.mjml @@ -1,7 +1,7 @@ {{ if .ImageURL }} - + @@ -10,7 +10,7 @@ {{ if .EmbeddedImage }} - + @@ -50,7 +50,7 @@ - + {{ range $refID, $value := .Values }} {{ $refID }}={{ $value }}  @@ -69,7 +69,7 @@ Labels - + {{ range .Labels.SortedPairs }} @@ -88,7 +88,7 @@ Annotations
- + {{ range .Annotations.SortedPairs }} {{ if and (ne .Name "description") (ne .Name "summary") }} @@ -106,7 +106,7 @@
- + {{ if .SilenceURL }} @@ -136,7 +136,7 @@ - + Observed {{ ago .StartsAt }} before this notification was delivered, at diff --git a/emails/templates/partials/alerting/resolved_instance.mjml b/emails/templates/partials/alerting/resolved_instance.mjml index 5b9060f5922..344c92be3de 100644 --- a/emails/templates/partials/alerting/resolved_instance.mjml +++ b/emails/templates/partials/alerting/resolved_instance.mjml @@ -1,6 +1,6 @@ - + - + Resolved diff --git a/emails/templates/partials/layout/head.mjml b/emails/templates/partials/layout/head.mjml index 83c9269b784..9dbaf0f7b52 100644 --- a/emails/templates/partials/layout/head.mjml +++ b/emails/templates/partials/layout/head.mjml @@ -1,8 +1,14 @@ + + + - + + - + + + a { color: #6E9FFF; diff --git a/emails/templates/partials/layout/header.mjml b/emails/templates/partials/layout/header.mjml index 15d50e0024b..37e078838eb 100644 --- a/emails/templates/partials/layout/header.mjml +++ b/emails/templates/partials/layout/header.mjml @@ -1,3 +1,3 @@ - + diff --git a/emails/templates/partials/layout/theme.css b/emails/templates/partials/layout/theme.css new file mode 100644 index 00000000000..c90933f6056 --- /dev/null +++ b/emails/templates/partials/layout/theme.css @@ -0,0 +1,36 @@ +.canvas { + background-color: #fff; +} + +.background { + background-color: #FFF; + border: 1px solid #e4e5e6; +} + +.border-bottom { + border-bottom: 1px solid #e4e5e6; +} + +.border-top { + border-top: 1px solid #e4e5e6; +} + +.well { + background-color: #F4F5F5; + border: 1px solid #e4e5e6; +} + +.txt div, .token div { + color: #24292e; +} + +.txt tbody tr td { + color: #24292e; +} + +.token { + background-color: #F4F5F5; + border: 1px solid #e4e5e6; + + padding: 10px 25px; +} diff --git a/emails/templates/reset_password.mjml b/emails/templates/reset_password.mjml index c3e8713a865..8a0161f4533 100644 --- a/emails/templates/reset_password.mjml +++ b/emails/templates/reset_password.mjml @@ -1,4 +1,8 @@ + + + + @@ -10,7 +14,7 @@ - +

Hi {{ .Name }},

diff --git a/emails/templates/signup_started.mjml b/emails/templates/signup_started.mjml index 21ba7299b85..ff211fbd95c 100644 --- a/emails/templates/signup_started.mjml +++ b/emails/templates/signup_started.mjml @@ -1,4 +1,8 @@ + + + + @@ -10,28 +14,38 @@ - - - -

Complete the signup

-
- - Copy and paste the email verification code in the sign up form or use the link below. - - - {{ .Code }} - - - Complete Sign Up - - - You can also copy and paste this link into your browser directly: - - - {{ .SignUpUrl }} - -
-
+ + + + +

Complete the signup

+
+ + Copy and paste the email verification code in the sign up form or use the link below. + +
+
+ + + + {{ .Code }} + + + + + + + Complete Sign Up + + + You can also copy and paste this link into your browser directly: + + + {{ .SignUpUrl }} + + + +
diff --git a/emails/templates/welcome_on_signup.mjml b/emails/templates/welcome_on_signup.mjml index e54fdd798c4..686842eb8ce 100644 --- a/emails/templates/welcome_on_signup.mjml +++ b/emails/templates/welcome_on_signup.mjml @@ -1,4 +1,8 @@ + + + + @@ -10,7 +14,7 @@ - +

Hi {{ .Name }},

diff --git a/public/emails/invited_to_org.html b/public/emails/invited_to_org.html index 57f4b635068..504a5c84ea8 100644 --- a/public/emails/invited_to_org.html +++ b/public/emails/invited_to_org.html @@ -60,9 +60,9 @@ ` }} {{ __dangerouslyInjectHTML `` }} - + {{ __dangerouslyInjectHTML `` }} @@ -98,8 +98,8 @@ - -
+ +
{{ __dangerouslyInjectHTML `` }}
@@ -116,7 +116,7 @@ @@ -132,32 +132,32 @@
- +
- {{ __dangerouslyInjectHTML `` }} -
- + {{ __dangerouslyInjectHTML `` }} +
+
-
- {{ __dangerouslyInjectHTML `` }} + + {{ __dangerouslyInjectHTML `` }}
- - - @@ -166,7 +166,7 @@ @@ -174,13 +174,13 @@ - - @@ -203,8 +203,8 @@
-
+
+

You have been added to {{ .OrgName }}

{{ .InvitedBy }} has added you to the {{ .OrgName }} organization in Grafana.
-
Once logged in, {{ .OrgName }} will be available to switch to in the user interface.
+
+
Once logged in, {{ .OrgName }} will be available to switch to in the user interface.
-
Log in now by clicking the link below:
+
+
Log in now by clicking the link below:
- Login to Grafana + Login to Grafana
-
You can also copy and paste this link into your browser directly:
+
+
You can also copy and paste this link into your browser directly:
- + +
- diff --git a/public/emails/new_user_invite.html b/public/emails/new_user_invite.html index 38fb422bc04..c43ade4bf98 100644 --- a/public/emails/new_user_invite.html +++ b/public/emails/new_user_invite.html @@ -60,9 +60,9 @@ ` }} {{ __dangerouslyInjectHTML `` }} - + {{ __dangerouslyInjectHTML `` }} @@ -98,8 +98,8 @@ - -
+ +
{{ __dangerouslyInjectHTML `` }}
-
© {{ now | date "2006" }} Grafana Labs. Sent by Grafana v{{ .BuildVersion }}.
+
+
© {{ now | date "2006" }} Grafana Labs. Sent by Grafana v{{ .BuildVersion }}.
@@ -116,7 +116,7 @@ @@ -132,26 +132,26 @@
- +
- {{ __dangerouslyInjectHTML `` }} -
- + {{ __dangerouslyInjectHTML `` }} +
+
-
- {{ __dangerouslyInjectHTML `` }} + + {{ __dangerouslyInjectHTML `` }}
- - @@ -160,7 +160,7 @@ @@ -168,13 +168,13 @@ - - @@ -197,8 +197,8 @@
-
+
+

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

-
You've been invited to join the {{ .OrgName }} organization by {{ .InvitedBy }}. To accept your invitation and join the team, please click the link below:
+
+
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 and paste this link into your browser directly:
+
+
You can also copy and paste this link into your browser directly:
- + +
- diff --git a/public/emails/ng_alert_notification.html b/public/emails/ng_alert_notification.html index 3dcf73630d8..6945666e5eb 100644 --- a/public/emails/ng_alert_notification.html +++ b/public/emails/ng_alert_notification.html @@ -60,9 +60,9 @@ ` }} {{ __dangerouslyInjectHTML `` }} - + {{ __dangerouslyInjectHTML `` }} @@ -120,7 +120,7 @@ {{ $numberOfResolvedAlerts := (len .Alerts.Resolved) }} - +
{{ if $numberOfFiringInstance }} @@ -142,7 +142,7 @@ {{ end }}
-
+
{{ __dangerouslyInjectHTML `` }}
-
© {{ now | date "2006" }} Grafana Labs. Sent by Grafana v{{ .BuildVersion }}.
+
+
© {{ now | date "2006" }} Grafana Labs. Sent by Grafana v{{ .BuildVersion }}.
@@ -159,7 +159,7 @@ @@ -187,16 +187,16 @@ {{ if eq (.GroupLabels.SortedPairs.Names | join ",") "alertname,grafana_folder" }} - {{ else }} -
- +
-
+
+

📁 {{ .GroupLabels.grafana_folder }} › {{ .GroupLabels.alertname }}

-
+
+

📁 Grouped by 

{{ range .GroupLabels.SortedPairs }} @@ -220,25 +220,25 @@
{{ __dangerouslyInjectHTML `` }} {{ if .Message }} - {{ __dangerouslyInjectHTML `` }} -
- + {{ __dangerouslyInjectHTML `` }} +
+
-
- {{ __dangerouslyInjectHTML `` }} -
+
+ {{ __dangerouslyInjectHTML `` }} +
- {{ __dangerouslyInjectHTML `` }} + {{ __dangerouslyInjectHTML `` }}
-
-
+
+
{{ range $line := (splitList "\n" .Message) }} @@ -277,8 +277,8 @@ - @@ -294,19 +294,19 @@ {{ __dangerouslyInjectHTML `` }} {{ range .Alerts.Firing }} - {{ __dangerouslyInjectHTML `` }} -
-
-
+
+

🔥 {{ .Alerts.Firing | len }} firing instances

+ {{ __dangerouslyInjectHTML `` }} +
+
-
- {{ __dangerouslyInjectHTML `` }} -
+
+ {{ __dangerouslyInjectHTML `` }} +
-
- {{ __dangerouslyInjectHTML `` }} + + {{ __dangerouslyInjectHTML `` }}
@@ -315,8 +315,8 @@
- @@ -326,13 +326,13 @@
- Firing + + Firing
- {{ __dangerouslyInjectHTML `` }} + {{ __dangerouslyInjectHTML `` }}
- @@ -340,7 +340,7 @@ {{ __dangerouslyInjectHTML `` }} {{ if gt (len .GeneratorURL) 0 }} - {{ __dangerouslyInjectHTML `` }} + {{ __dangerouslyInjectHTML `` }}
-
{{ .Labels.alertname }}
+
+
{{ .Labels.alertname }}
@@ -350,7 +350,7 @@ @@ -370,24 +370,24 @@ {{ __dangerouslyInjectHTML `` }} {{ if .ImageURL }} - {{ __dangerouslyInjectHTML `` }} -
+ {{ __dangerouslyInjectHTML `` }} +
- View alert + View alert
- {{ __dangerouslyInjectHTML `` }} -
- + {{ __dangerouslyInjectHTML `` }} +
+
- @@ -406,23 +406,23 @@ {{ __dangerouslyInjectHTML `` }} {{ end }}{{ if .EmbeddedImage }} - {{ __dangerouslyInjectHTML `` }} -
+ {{ __dangerouslyInjectHTML `` }} +
+ - +
- {{ __dangerouslyInjectHTML `` }} -
- + {{ __dangerouslyInjectHTML `` }} +
+
- @@ -440,36 +440,36 @@ {{ __dangerouslyInjectHTML `` }} {{ end }} - {{ __dangerouslyInjectHTML `` }} -
+ {{ __dangerouslyInjectHTML `` }} +
- + +
- {{ __dangerouslyInjectHTML `` }} + {{ __dangerouslyInjectHTML `` }}
{{ if .Annotations.summary }} - - {{ end }}{{ if .Annotations.description }} - -
-
Summary
+
+
Summary
-
{{- .Annotations.summary -}}
+
+
{{- .Annotations.summary -}}
-
Description
+
+
Description
-
+
+
{{ range $line := (splitList "\n" .Annotations.description) }} {{ $line }}
{{ end }} @@ -488,19 +488,19 @@
{{ __dangerouslyInjectHTML `` }} {{ if .Values }} - {{ __dangerouslyInjectHTML `` }} -
+ {{ __dangerouslyInjectHTML `` }} +
- {{ __dangerouslyInjectHTML `` }} + {{ __dangerouslyInjectHTML `` }}
- @@ -512,23 +512,23 @@
-
Values
+
+
Values
- {{ __dangerouslyInjectHTML `` }} -
+ {{ __dangerouslyInjectHTML `` }} +
- {{ __dangerouslyInjectHTML `` }} -
+ {{ __dangerouslyInjectHTML `` }} +
-
+ -
-
+
+
{{ range $refID, $value := .Values }} {{ $refID }}={{ $value }}  {{ end }}
@@ -549,25 +549,25 @@ {{ __dangerouslyInjectHTML `` }} {{ end }} - {{ __dangerouslyInjectHTML `` }} -
+ {{ __dangerouslyInjectHTML `` }} +
- {{ __dangerouslyInjectHTML `` }} + {{ __dangerouslyInjectHTML `` }}
{{ if .Labels.SortedPairs }} - -
-
Labels
+
+
Labels
- +
+ {{ range .Labels.SortedPairs }} {{ end }}{{ if (without .Annotations.SortedPairs.Names "description" "summary") }} - -
@@ -581,13 +581,13 @@
-
Annotations
+
+
Annotations
- +
+ {{ range .Annotations.SortedPairs }}{{ if and (ne .Name "description") (ne .Name "summary") }} @@ -611,15 +611,15 @@
- {{ __dangerouslyInjectHTML `` }} -
+ {{ __dangerouslyInjectHTML `` }} +
-
+ {{ __dangerouslyInjectHTML `` }} {{ if .SilenceURL }} - {{ __dangerouslyInjectHTML `` }} + {{ __dangerouslyInjectHTML `` }}
@@ -629,7 +629,7 @@ @@ -641,7 +641,7 @@ {{ __dangerouslyInjectHTML `` }} {{ end }}{{ if .Annotations.runbook_url }} - {{ __dangerouslyInjectHTML `` }} + {{ __dangerouslyInjectHTML `` }}
- Silence + Silence
@@ -651,7 +651,7 @@ @@ -663,7 +663,7 @@ {{ __dangerouslyInjectHTML `` }} {{ end }}{{ if .DashboardURL }} - {{ __dangerouslyInjectHTML `` }} + {{ __dangerouslyInjectHTML `` }}
- View runbook + View runbook
@@ -673,7 +673,7 @@ @@ -685,7 +685,7 @@ {{ __dangerouslyInjectHTML `` }} {{ end }}{{ if .PanelURL }} - {{ __dangerouslyInjectHTML `` }} + {{ __dangerouslyInjectHTML `` }}
- View dashboard + View dashboard
@@ -695,7 +695,7 @@ @@ -713,19 +713,19 @@
- View panel + View panel
- {{ __dangerouslyInjectHTML `` }} -
+ {{ __dangerouslyInjectHTML `` }} +
-
- {{ __dangerouslyInjectHTML `` }} + + {{ __dangerouslyInjectHTML `` }}
- @@ -768,8 +768,8 @@
-
Observed {{ ago .StartsAt }} before this notification was delivered, at {{ .StartsAt }}
+
+
Observed {{ ago .StartsAt }} before this notification was delivered, at {{ .StartsAt }}
- @@ -785,19 +785,19 @@ {{ __dangerouslyInjectHTML `` }} {{ range .Alerts.Resolved }} - {{ __dangerouslyInjectHTML `` }} -
-
-
+
+

✅ {{ .Alerts.Resolved | len }} resolved instances

+ {{ __dangerouslyInjectHTML `` }} +
+
-
- {{ __dangerouslyInjectHTML `` }} -
+
+ {{ __dangerouslyInjectHTML `` }} +
-
- {{ __dangerouslyInjectHTML `` }} + + {{ __dangerouslyInjectHTML `` }}
@@ -806,8 +806,8 @@
- @@ -817,13 +817,13 @@
-

Resolved

+
+

Resolved

- {{ __dangerouslyInjectHTML `` }} + {{ __dangerouslyInjectHTML `` }}
- @@ -831,7 +831,7 @@ {{ __dangerouslyInjectHTML `` }} {{ if gt (len .GeneratorURL) 0 }} - {{ __dangerouslyInjectHTML `` }} + {{ __dangerouslyInjectHTML `` }}
-
{{ .Labels.alertname }}
+
+
{{ .Labels.alertname }}
@@ -841,7 +841,7 @@ @@ -861,24 +861,24 @@ {{ __dangerouslyInjectHTML `` }} {{ if .ImageURL }} - {{ __dangerouslyInjectHTML `` }} -
+ {{ __dangerouslyInjectHTML `` }} +
- View alert + View alert
- {{ __dangerouslyInjectHTML `` }} -
- + {{ __dangerouslyInjectHTML `` }} +
+
- @@ -897,23 +897,23 @@ {{ __dangerouslyInjectHTML `` }} {{ end }}{{ if .EmbeddedImage }} - {{ __dangerouslyInjectHTML `` }} -
+ {{ __dangerouslyInjectHTML `` }} +
+ - +
- {{ __dangerouslyInjectHTML `` }} -
- + {{ __dangerouslyInjectHTML `` }} +
+
- @@ -931,36 +931,36 @@ {{ __dangerouslyInjectHTML `` }} {{ end }} - {{ __dangerouslyInjectHTML `` }} -
+ {{ __dangerouslyInjectHTML `` }} +
- + +
- {{ __dangerouslyInjectHTML `` }} + {{ __dangerouslyInjectHTML `` }}
{{ if .Annotations.summary }} - - {{ end }}{{ if .Annotations.description }} - -
-
Summary
+
+
Summary
-
{{- .Annotations.summary -}}
+
+
{{- .Annotations.summary -}}
-
Description
+
+
Description
-
+
+
{{ range $line := (splitList "\n" .Annotations.description) }} {{ $line }}
{{ end }} @@ -979,19 +979,19 @@
{{ __dangerouslyInjectHTML `` }} {{ if .Values }} - {{ __dangerouslyInjectHTML `` }} -
+ {{ __dangerouslyInjectHTML `` }} +
- {{ __dangerouslyInjectHTML `` }} + {{ __dangerouslyInjectHTML `` }}
- @@ -1003,23 +1003,23 @@
-
Values
+
+
Values
- {{ __dangerouslyInjectHTML `` }} -
+ {{ __dangerouslyInjectHTML `` }} +
- {{ __dangerouslyInjectHTML `` }} -
+ {{ __dangerouslyInjectHTML `` }} +
-
+ -
-
+
+
{{ range $refID, $value := .Values }} {{ $refID }}={{ $value }}  {{ end }}
@@ -1040,25 +1040,25 @@ {{ __dangerouslyInjectHTML `` }} {{ end }} - {{ __dangerouslyInjectHTML `` }} -
+ {{ __dangerouslyInjectHTML `` }} +
- {{ __dangerouslyInjectHTML `` }} + {{ __dangerouslyInjectHTML `` }}
{{ if .Labels.SortedPairs }} - -
-
Labels
+
+
Labels
- +
+ {{ range .Labels.SortedPairs }} {{ end }}{{ if (without .Annotations.SortedPairs.Names "description" "summary") }} - -
@@ -1072,13 +1072,13 @@
-
Annotations
+
+
Annotations
- +
+ {{ range .Annotations.SortedPairs }}{{ if and (ne .Name "description") (ne .Name "summary") }} @@ -1102,15 +1102,15 @@
- {{ __dangerouslyInjectHTML `` }} -
+ {{ __dangerouslyInjectHTML `` }} +
-
+ {{ __dangerouslyInjectHTML `` }} {{ if .SilenceURL }} - {{ __dangerouslyInjectHTML `` }} + {{ __dangerouslyInjectHTML `` }}
@@ -1120,7 +1120,7 @@ @@ -1132,7 +1132,7 @@ {{ __dangerouslyInjectHTML `` }} {{ end }}{{ if .Annotations.runbook_url }} - {{ __dangerouslyInjectHTML `` }} + {{ __dangerouslyInjectHTML `` }}
- Silence + Silence
@@ -1142,7 +1142,7 @@ @@ -1154,7 +1154,7 @@ {{ __dangerouslyInjectHTML `` }} {{ end }}{{ if .DashboardURL }} - {{ __dangerouslyInjectHTML `` }} + {{ __dangerouslyInjectHTML `` }}
- View runbook + View runbook
@@ -1164,7 +1164,7 @@ @@ -1176,7 +1176,7 @@ {{ __dangerouslyInjectHTML `` }} {{ end }}{{ if .PanelURL }} - {{ __dangerouslyInjectHTML `` }} + {{ __dangerouslyInjectHTML `` }}
- View dashboard + View dashboard
@@ -1186,7 +1186,7 @@ @@ -1204,19 +1204,19 @@
- View panel + View panel
- {{ __dangerouslyInjectHTML `` }} -
+ {{ __dangerouslyInjectHTML `` }} +
-
- {{ __dangerouslyInjectHTML `` }} + + {{ __dangerouslyInjectHTML `` }}
- @@ -1259,8 +1259,8 @@
-
Observed {{ ago .StartsAt }} before this notification was delivered, at {{ .StartsAt }}
+
+
Observed {{ ago .StartsAt }} before this notification was delivered, at {{ .StartsAt }}
- diff --git a/public/emails/reset_password.html b/public/emails/reset_password.html index a09859c8f43..6133b5c59fa 100644 --- a/public/emails/reset_password.html +++ b/public/emails/reset_password.html @@ -60,9 +60,9 @@ ` }} {{ __dangerouslyInjectHTML `` }} - + {{ __dangerouslyInjectHTML `` }} @@ -98,8 +98,8 @@ - -
+ +
{{ __dangerouslyInjectHTML `` }}
-
© {{ now | date "2006" }} Grafana Labs. Sent by Grafana v{{ .BuildVersion }}.
+
+
© {{ now | date "2006" }} Grafana Labs. Sent by Grafana v{{ .BuildVersion }}.
@@ -116,7 +116,7 @@ @@ -132,26 +132,26 @@
- +
- {{ __dangerouslyInjectHTML `` }} -
- + {{ __dangerouslyInjectHTML `` }} +
+
-
- {{ __dangerouslyInjectHTML `` }} + + {{ __dangerouslyInjectHTML `` }}
- - @@ -160,7 +160,7 @@ @@ -168,13 +168,13 @@ - - @@ -197,8 +197,8 @@
-
+
+

Hi {{ .Name }},

-
Please click the following link to reset your password within {{ .EmailCodeValidHours }} hours.
+
+
Please click the following link to reset your password within {{ .EmailCodeValidHours }} hours.
- Reset Password + Reset Password
-
You can also copy and paste this link into your browser directly:
+
+
You can also copy and paste this link into your browser directly:
- + +
- diff --git a/public/emails/signup_started.html b/public/emails/signup_started.html index f1bbc1c21d3..47363a9f5c5 100644 --- a/public/emails/signup_started.html +++ b/public/emails/signup_started.html @@ -60,9 +60,9 @@ ` }} {{ __dangerouslyInjectHTML `` }} - + {{ __dangerouslyInjectHTML `` }} @@ -98,8 +98,8 @@ - -
+ +
{{ __dangerouslyInjectHTML `` }}
-
© {{ now | date "2006" }} Grafana Labs. Sent by Grafana v{{ .BuildVersion }}.
+
+
© {{ now | date "2006" }} Grafana Labs. Sent by Grafana v{{ .BuildVersion }}.
@@ -116,7 +116,7 @@ @@ -132,70 +132,110 @@
- +
- {{ __dangerouslyInjectHTML `` }} -
- + {{ __dangerouslyInjectHTML `` }} +
+
-
- {{ __dangerouslyInjectHTML `` }} -
- + @@ -212,8 +252,8 @@
+ {{ __dangerouslyInjectHTML `` }} +
+ - - - - - - - - - - - - - - - -
-
-

Complete the signup

+
+ {{ __dangerouslyInjectHTML `` }} +
+ + + + + + + + + +
+
+

Complete the signup

+
+
+
Copy and paste the email verification code in the sign up form or use the link below.
+
-
-
Copy and paste the email verification code in the sign up form or use the link below.
-
- - - - - - -
-

- {{ .Code }} -

-
-
- - - - - - -
- Complete Sign Up -
-
-
You can also copy and paste this link into your browser directly:
-
- + {{ __dangerouslyInjectHTML `` }}
- {{ __dangerouslyInjectHTML `` }} + {{ __dangerouslyInjectHTML `` }} +
+ + + + + + +
+ {{ __dangerouslyInjectHTML `` }} +
+ + + + + + +
+
{{ .Code }}
+
+
+ {{ __dangerouslyInjectHTML `` }} +
+
+ {{ __dangerouslyInjectHTML `` }} +
+ + + + + + +
+ {{ __dangerouslyInjectHTML `` }} +
+ + + + + + + + + + + + +
+ + + + + + +
+ Complete Sign Up +
+
+
You can also copy and paste this link into your browser directly:
+
+ +
+
+ {{ __dangerouslyInjectHTML `` }} +
+
+ {{ __dangerouslyInjectHTML `` }}
- diff --git a/public/emails/welcome_on_signup.html b/public/emails/welcome_on_signup.html index 7766e84f8f7..34620adaa3d 100644 --- a/public/emails/welcome_on_signup.html +++ b/public/emails/welcome_on_signup.html @@ -60,9 +60,9 @@ ` }} {{ __dangerouslyInjectHTML `` }} - + {{ __dangerouslyInjectHTML `` }} @@ -98,8 +98,8 @@ - -
+ +
{{ __dangerouslyInjectHTML `` }}
-
© {{ now | date "2006" }} Grafana Labs. Sent by Grafana v{{ .BuildVersion }}.
+
+
© {{ now | date "2006" }} Grafana Labs. Sent by Grafana v{{ .BuildVersion }}.
@@ -116,7 +116,7 @@ @@ -132,31 +132,31 @@
- +
- {{ __dangerouslyInjectHTML `` }} -
- + {{ __dangerouslyInjectHTML `` }} +
+
-
- {{ __dangerouslyInjectHTML `` }} + + {{ __dangerouslyInjectHTML `` }}
- - - @@ -165,7 +165,7 @@ @@ -173,13 +173,13 @@ - - @@ -202,8 +202,8 @@
-
+
+

Hi {{ .Name }},

-
Welcome! Ready to start building some beautiful metric and analytic dashboards?
+
+
Welcome! Ready to start building some beautiful metric and analytic dashboards?
-
If you are new to Grafana, refer to the Getting started with Grafana guide.
+
+
If you are new to Grafana, refer to the Getting started with Grafana guide.
- Check out our getting started guide + Check out our getting started guide
-
Thank you for joining our community.
+
+
Thank you for joining our community.
-
The Grafana Team
+
+
The Grafana Team
-
-
© {{ now | date "2006" }} Grafana Labs. Sent by Grafana v{{ .BuildVersion }}.
+
+
© {{ now | date "2006" }} Grafana Labs. Sent by Grafana v{{ .BuildVersion }}.