Skip to content

Commit 64752f3

Browse files
olivierlemaslemarcusolsson
olivierlemasle
authored and
marcusolsson
committed
Emails: Update notification templates (grafana#19662)
- Update copyright year - Remove duplicated xmlns
1 parent f6bdcb2 commit 64752f3

8 files changed

+23
-25
lines changed

‎emails/package.json

+8-10
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,14 @@
1313
"start": "grunt watch"
1414
},
1515
"devDependencies": {
16-
"grunt": "^0.4.5",
17-
"grunt-premailer": "^1.1.10",
16+
"grunt": "1.0.1",
17+
"grunt-premailer": "1.1.0",
1818
"grunt-processhtml": "^0.4.2",
19-
"grunt-uncss": "^0.3.7",
20-
"load-grunt-config": "^0.14.0",
21-
"grunt-contrib-watch": "^0.6.1",
22-
"grunt-text-replace": "^0.3.12"
23-
},
24-
"dependencies": {
25-
"grunt-assemble": "^0.4.0",
26-
"grunt-contrib-clean": "^0.6.0"
19+
"grunt-uncss": "0.9.0",
20+
"load-grunt-config": "3.0.1",
21+
"grunt-contrib-watch": "1.1.0",
22+
"grunt-text-replace": "0.4.0",
23+
"grunt-assemble": "0.6.3",
24+
"grunt-contrib-clean": "2.0.0"
2725
}
2826
}

‎emails/templates/layouts/default.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2-
<html xmlns="http://www.w3.org/1999/xhtml">
2+
<html>
33
<head>
44
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
55
<meta name="viewport" content="width=device-width"/>
@@ -143,7 +143,7 @@
143143
<center>
144144
<p style="text-align: center; font-size: 12px; color: #999999;">
145145
Sent by <a href="[[.AppUrl]]">Grafana v[[.BuildVersion]]</a>
146-
<br />&copy; 2018 Grafana Labs
146+
<br />&copy; 2019 Grafana Labs
147147
</p>
148148
</center>
149149
</td>

‎public/emails/alert_notification.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2-
<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml">
2+
<html xmlns="http://www.w3.org/1999/xhtml">
33
<head>
44
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
55
<meta name="viewport" content="width=device-width" />
6-
6+
77
<style>body {
88
width: 100% !important; min-width: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; margin: 0; padding: 0;
99
}
@@ -339,11 +339,11 @@ <h5 class="data" style="color: #222222; font-family: 'Open Sans', 'Helvetica Neu
339339

340340

341341

342-
342+
343343
</td>
344344
</tr>
345345
</table>
346-
346+
347347
<table class="footer center" style="border-spacing: 0; border-collapse: collapse; vertical-align: top; text-align: center; color: #999999; margin-top: 20px; padding: 0;" bgcolor="#2e2e2e">
348348
<tr style="vertical-align: top; padding: 0;" align="left">
349349
<td class="wrapper last" style="word-break: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; border-collapse: collapse !important; position: relative; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0; padding: 10px 20px 0px 0px;" align="left" valign="top">
@@ -353,7 +353,7 @@ <h5 class="data" style="color: #222222; font-family: 'Open Sans', 'Helvetica Neu
353353
<center style="width: 100%; min-width: 580px;">
354354
<p style="font-size: 12px; color: #999999; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="center">
355355
Sent by <a href="{{.AppUrl}}" style="color: #E67612; text-decoration: none;">Grafana v{{.BuildVersion}}</a>
356-
<br />© 2016 Grafana and raintank
356+
<br />© 2019 Grafana Labs
357357
</p>
358358
</center>
359359
</td>

‎public/emails/invited_to_org.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ <h4 class="center" style="color: #222222; font-family: 'Open Sans', 'Helvetica N
266266
<center style="width: 100%; min-width: 580px;">
267267
<p style="font-size: 12px; color: #999999; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="center">
268268
Sent by <a href="{{.AppUrl}}" style="color: #E67612; text-decoration: none;">Grafana v{{.BuildVersion}}</a>
269-
<br />© 2016 Grafana and raintank
269+
<br />© 2019 Grafana Labs
270270
</p>
271271
</center>
272272
</td>

‎public/emails/new_user_invite.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ <h4 class="center" style="color: #222222; font-family: 'Open Sans', 'Helvetica N
267267
<center style="width: 100%; min-width: 580px;">
268268
<p style="font-size: 12px; color: #999999; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="center">
269269
Sent by <a href="{{.AppUrl}}" style="color: #E67612; text-decoration: none;">Grafana v{{.BuildVersion}}</a>
270-
<br />© 2016 Grafana and raintank
270+
<br />© 2019 Grafana Labs
271271
</p>
272272
</center>
273273
</td>

‎public/emails/reset_password.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2-
<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml">
2+
<html xmlns="http://www.w3.org/1999/xhtml">
33
<head>
44
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
55
<meta name="viewport" content="width=device-width" />
@@ -261,7 +261,7 @@ <h4 style="color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetic
261261
<center style="width: 100%; min-width: 580px;">
262262
<p style="font-size: 12px; color: #999999; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="center">
263263
Sent by <a href="{{.AppUrl}}" style="color: #E67612; text-decoration: none;">Grafana v{{.BuildVersion}}</a>
264-
<br />© 2016 Grafana and raintank
264+
<br />© 2019 Grafana Labs
265265
</p>
266266
</center>
267267
</td>

‎public/emails/signup_started.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2-
<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml">
2+
<html xmlns="http://www.w3.org/1999/xhtml">
33
<head>
44
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
55
<meta name="viewport" content="width=device-width" />
@@ -265,7 +265,7 @@ <h4 class="center" style="color: #222222; font-family: 'Open Sans', 'Helvetica N
265265
<center style="width: 100%; min-width: 580px;">
266266
<p style="font-size: 12px; color: #999999; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="center">
267267
Sent by <a href="{{.AppUrl}}" style="color: #E67612; text-decoration: none;">Grafana v{{.BuildVersion}}</a>
268-
<br />© 2016 Grafana and raintank
268+
<br />© 2019 Grafana Labs
269269
</p>
270270
</center>
271271
</td>

‎public/emails/welcome_on_signup.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2-
<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml">
2+
<html xmlns="http://www.w3.org/1999/xhtml">
33
<head>
44
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
55
<meta name="viewport" content="width=device-width" />
@@ -268,7 +268,7 @@ <h4 style="color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetic
268268
<center style="width: 100%; min-width: 580px;">
269269
<p style="font-size: 12px; color: #999999; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-weight: normal; line-height: 19px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; margin: 0 0 10px; padding: 0;" align="center">
270270
Sent by <a href="{{.AppUrl}}" style="color: #E67612; text-decoration: none;">Grafana v{{.BuildVersion}}</a>
271-
<br />© 2016 Grafana and raintank
271+
<br />© 2019 Grafana Labs
272272
</p>
273273
</center>
274274
</td>

0 commit comments

Comments
 (0)