Discharge7443/fleet
1
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity

Update links to main branch in email templates (#1086)

Browse Source 
- Update links to documentation
- Update link to assets by editing `getAssetURL()`
- Prettier did some reformatting of the email template code which is resulting in a larger amount of lines changed
This commit is contained in:
noahtalerman
2021-06-15 14:29:20 -04:00
committed by GitHub
parent 3e15a163ef
commit 3fe13be701
5 changed files with 337 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/mail/templates/change_email_confirmation.html
+82 -18
View File
@@ -1,11 +1,14 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Nunito+Sans:wght@400;600;700&display=swap" rel="stylesheet">
<link rel="preconnect" href="https://fonts.gstatic.com" />
<link
href="https://fonts.googleapis.com/css2?family=Nunito+Sans:wght@400;600;700&display=swap"
rel="stylesheet"
/>
<style>
body {
font-family: 'Nunito Sans', sans-serif;
font-family: "Nunito Sans", sans-serif;
}
h1 {
@@ -14,7 +17,7 @@
}
p {
line-height: 2.0;
line-height: 2;
}
a {
@@ -38,43 +41,104 @@
padding: 20px !important;
}
}
</style>
</head>
<body>
<table align="center" border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" bgcolor="#F9FAFC" style="background: #F9FAFC; font-family: 'Nunito Sans', sans-serif; color: #66696f; border-collapse:collapse;">
<table
align="center"
border="0"
cellpadding="0"
cellspacing="0"
height="100%"
width="100%"
bgcolor="#F9FAFC"
style="
background: #f9fafc;
font-family: 'Nunito Sans', sans-serif;
color: #66696f;
border-collapse: collapse;
"
>
<tr>
<td valign="top" align="center">
<table width="580" align="center" cellpadding="0" cellspacing="0" bgcolor="#ffffff" style="margin: 20px 10px;">
<table
width="580"
align="center"
cellpadding="0"
cellspacing="0"
bgcolor="#ffffff"
style="margin: 20px 10px"
>
<tr>
<td colspan="2" bgcolor="#ffffff" style="padding:20px; font-family: 'Nunito Sans', sans-serif;">
<img src="{{.AssetURL}}/assets/images/fleet-logo-color@2x.png?raw=true" width="174" height="48" />
<td
colspan="2"
bgcolor="#ffffff"
style="padding: 20px; font-family: 'Nunito Sans', sans-serif"
>
<img
src="{{.AssetURL}}/assets/images/fleet-logo-color@2x.png?raw=true"
width="174"
height="48"
/>
</td>
</tr>
<tr>
<td colspan="2" style="padding:60px; font-family: 'Nunito Sans', sans-serif;">
<td
colspan="2"
style="padding: 60px; font-family: 'Nunito Sans', sans-serif"
>
<h1>Change Confirmation</h1>
<p><strong>Hello,</strong></p>
<p>This message is to confirm that the email address you recently changed actually works. Please click the link below to confirm that you want to change your email address in Kolide.</p>
<p>
This message is to confirm that the email address you recently
changed actually works. Please click the link below to confirm
that you want to change your email address in Kolide.
</p>
<table bgcolor="#F9FAFC" height="100px" cellpadding="20px">
<tr>
<td style="font-family: 'Nunito Sans', sans-serif;">
<a href="{{.BaseURL}}/email/change/{{.Token}}">{{.BaseURL}}/email/change/{{.Token}}</a>
<td style="font-family: 'Nunito Sans', sans-serif">
<a href="{{.BaseURL}}/email/change/{{.Token}}"
>{{.BaseURL}}/email/change/{{.Token}}</a
>
</td>
</tr>
</table>
</td>
</tr>
<tr bgcolor="#9ca3ac">
<td valign="middle" align="left" style="padding:10px 20px; font-family: 'Nunito Sans', sans-serif; color: #fff;">
<a href="https://github.com/fleetdm/fleet/tree/master/docs" style="color: #fff; text-decoration: none;">Fleet Documentation</a>
<td
valign="middle"
align="left"
style="
padding: 10px 20px;
font-family: 'Nunito Sans', sans-serif;
color: #fff;
"
>
<a
href="https://github.com/fleetdm/fleet/tree/main/docs"
style="color: #fff; text-decoration: none"
>Fleet Documentation</a
>
</td>
<td valign="middle" align="right" style="padding:10px 20px; font-family: 'Nunito Sans', sans-serif;">
<a href="https://fleetdm.com" style="text-decoration: none;"><img src="{{.AssetURL}}/assets/images/fleet-logo-text-all-white@2x.png?raw=true" width="122" height="33" /></a>
<td
valign="middle"
align="right"
style="
padding: 10px 20px;
font-family: 'Nunito Sans', sans-serif;
"
>
<a href="https://fleetdm.com" style="text-decoration: none"
><img
src="{{.AssetURL}}/assets/images/fleet-logo-text-all-white@2x.png?raw=true"
width="122"
height="33"
/></a>
</td>
</tr>
</table>
<br>
<br />
</td>
</tr>
</table>
server/mail/templates/invite_token.html
+87 -19
View File
@@ -1,11 +1,14 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Nunito+Sans:wght@400;600;700&display=swap" rel="stylesheet">
<link rel="preconnect" href="https://fonts.gstatic.com" />
<link
href="https://fonts.googleapis.com/css2?family=Nunito+Sans:wght@400;600;700&display=swap"
rel="stylesheet"
/>
<style>
body {
font-family: 'Nunito Sans', sans-serif;
font-family: "Nunito Sans", sans-serif;
}
h1 {
@@ -14,7 +17,7 @@
}
p {
line-height: 2.0;
line-height: 2;
}
a {
@@ -38,31 +41,72 @@
padding: 20px !important;
}
}
</style>
</head>
<body>
<table align="center" border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" bgcolor="#F9FAFC" style="background: #F9FAFC; font-family: 'Nunito Sans', sans-serif; color: #66696f; border-collapse:collapse;">
<table
align="center"
border="0"
cellpadding="0"
cellspacing="0"
height="100%"
width="100%"
bgcolor="#F9FAFC"
style="
background: #f9fafc;
font-family: 'Nunito Sans', sans-serif;
color: #66696f;
border-collapse: collapse;
"
>
<tr>
<td valign="top" align="center">
<table width="580" align="center" cellpadding="0" cellspacing="0" bgcolor="#ffffff" style="margin: 20px 10px;">
<table
width="580"
align="center"
cellpadding="0"
cellspacing="0"
bgcolor="#ffffff"
style="margin: 20px 10px"
>
<tr>
<td colspan="2" bgcolor="#ffffff" style="padding:20px; font-family: 'Nunito Sans', sans-serif;">
<img src="{{.AssetURL}}/assets/images/fleet-logo-color@2x.png?raw=true" width="174" height="48" />
<td
colspan="2"
bgcolor="#ffffff"
style="padding: 20px; font-family: 'Nunito Sans', sans-serif"
>
<img
src="{{.AssetURL}}/assets/images/fleet-logo-color@2x.png?raw=true"
width="174"
height="48"
/>
</td>
</tr>
<tr>
<td colspan="2" style="padding:60px; font-family: 'Nunito Sans', sans-serif;">
<td
colspan="2"
style="padding: 60px; font-family: 'Nunito Sans', sans-serif"
>
<h1>You Have Been Invited To Fleet!</h1>
<p><strong>Hello,</strong></p>
<p>{{.InvitedByUsername}} has invited you to join <strong>{{.OrgName}}</strong>. Please click the link below to accept the invitation and setup your account.</p>
<p>
{{.InvitedByUsername}} has invited you to join
<strong>{{.OrgName}}</strong>. Please click the link below to
accept the invitation and setup your account.
</p>
<table bgcolor="#F9FAFC" height="100px" cellpadding="20px">
<tr>
<td style="font-family: 'Nunito Sans', sans-serif;">
<td style="font-family: 'Nunito Sans', sans-serif">
{{if .SSOEnabled}}
<a href="{{.BaseURL}}/login/ssoinvites/{{.Token}}?name={{.Name}}&email={{.Email}}">{{.BaseURL}}/login/ssoinvites/{{.Token}}?name={{.Name}}&email={{.Email}}</a>
<a
href="{{.BaseURL}}/login/ssoinvites/{{.Token}}?name={{.Name}}&email={{.Email}}"
>{{.BaseURL}}/login/ssoinvites/{{.Token}}?name={{.Name}}&email={{.Email}}</a
>
{{else}}
<a href="{{.BaseURL}}/login/invites/{{.Token}}?name={{.Name}}&email={{.Email}}">{{.BaseURL}}/login/invites/{{.Token}}?name={{.Name}}&email={{.Email}}</a>
<a
href="{{.BaseURL}}/login/invites/{{.Token}}?name={{.Name}}&email={{.Email}}"
>{{.BaseURL}}/login/invites/{{.Token}}?name={{.Name}}&email={{.Email}}</a
>
{{end}}
</td>
</tr>
@@ -70,15 +114,39 @@
</td>
</tr>
<tr bgcolor="#9ca3ac">
<td valign="middle" align="left" style="padding:10px 20px; font-family: 'Nunito Sans', sans-serif; color: #fff;">
<a href="https://github.com/fleetdm/fleet/tree/master/docs" style="color: #fff; text-decoration: none;">Fleet Documentation</a>
<td
valign="middle"
align="left"
style="
padding: 10px 20px;
font-family: 'Nunito Sans', sans-serif;
color: #fff;
"
>
<a
href="https://github.com/fleetdm/fleet/tree/main/docs"
style="color: #fff; text-decoration: none"
>Fleet Documentation</a
>
</td>
<td valign="middle" align="right" style="padding:10px 20px; font-family: 'Nunito Sans', sans-serif;">
<a href="https://fleetdm.com" style="text-decoration: none;"><img src="{{.AssetURL}}/assets/images/fleet-logo-text-all-white@2x.png?raw=true" width="122" height="33" /></a>
<td
valign="middle"
align="right"
style="
padding: 10px 20px;
font-family: 'Nunito Sans', sans-serif;
"
>
<a href="https://fleetdm.com" style="text-decoration: none"
><img
src="{{.AssetURL}}/assets/images/fleet-logo-text-all-white@2x.png?raw=true"
width="122"
height="33"
/></a>
</td>
</tr>
</table>
<br>
<br />
</td>
</tr>
</table>
server/mail/templates/password_reset.html
+89 -19
View File
@@ -1,11 +1,14 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Nunito+Sans:wght@400;600;700&display=swap" rel="stylesheet">
<link rel="preconnect" href="https://fonts.gstatic.com" />
<link
href="https://fonts.googleapis.com/css2?family=Nunito+Sans:wght@400;600;700&display=swap"
rel="stylesheet"
/>
<style>
body {
font-family: 'Nunito Sans', sans-serif;
font-family: "Nunito Sans", sans-serif;
}
h1 {
@@ -14,7 +17,7 @@
}
p {
line-height: 2.0;
line-height: 2;
}
a {
@@ -38,37 +41,104 @@
padding: 20px !important;
}
}
</style>
</head>
<body>
<table align="center" border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" bgcolor="#F9FAFC" style="background: #F9FAFC; font-family: 'Nunito Sans', sans-serif; color: #66696f; border-collapse:collapse;">
<table
align="center"
border="0"
cellpadding="0"
cellspacing="0"
height="100%"
width="100%"
bgcolor="#F9FAFC"
style="
background: #f9fafc;
font-family: 'Nunito Sans', sans-serif;
color: #66696f;
border-collapse: collapse;
"
>
<tr>
<td valign="top" align="center">
<table width="580" align="center" cellpadding="0" cellspacing="0" bgcolor="#ffffff" style="margin: 20px 10px;">
<table
width="580"
align="center"
cellpadding="0"
cellspacing="0"
bgcolor="#ffffff"
style="margin: 20px 10px"
>
<tr>
<td colspan="2" bgcolor="#ffffff" style="padding:20px; font-family: 'Nunito Sans', sans-serif;">
<img src="{{.AssetURL}}/assets/images/fleet-logo-color@2x.png?raw=true" width="174" height="48" />
<td
colspan="2"
bgcolor="#ffffff"
style="padding: 20px; font-family: 'Nunito Sans', sans-serif"
>
<img
src="{{.AssetURL}}/assets/images/fleet-logo-color@2x.png?raw=true"
width="174"
height="48"
/>
</td>
</tr>
<tr>
<td colspan="2" style="padding:60px; font-family: 'Nunito Sans', sans-serif;">
<h1 style="font-weight:300">Reset Your Fleet Password...</h1>
<p>Someone requested a password reset on your Fleet account. Follow the link below to reset your password:</p>
<p><a href="{{.BaseURL}}/login/reset?token={{.Token}}">Reset Password</a></p>
<p style="color:#9ca3ac"><em>If you did not make the request, you may ignore this email as no changes have been made.</em></p>
<td
colspan="2"
style="padding: 60px; font-family: 'Nunito Sans', sans-serif"
>
<h1 style="font-weight: 300">Reset Your Fleet Password...</h1>
<p>
Someone requested a password reset on your Fleet account.
Follow the link below to reset your password:
</p>
<p>
<a href="{{.BaseURL}}/login/reset?token={{.Token}}"
>Reset Password</a
>
</p>
<p style="color: #9ca3ac">
<em
>If you did not make the request, you may ignore this email
as no changes have been made.</em
>
</p>
</td>
</tr>
<tr bgcolor="#9ca3ac">
<td valign="middle" align="left" style="padding:10px 20px; font-family: 'Nunito Sans', sans-serif; color: #fff;">
<a href="https://github.com/fleetdm/fleet/tree/master/docs" style="color: #fff; text-decoration: none;">Fleet Documentation</a>
<td
valign="middle"
align="left"
style="
padding: 10px 20px;
font-family: 'Nunito Sans', sans-serif;
color: #fff;
"
>
<a
href="https://github.com/fleetdm/fleet/tree/main/docs"
style="color: #fff; text-decoration: none"
>Fleet Documentation</a
>
</td>
<td valign="middle" align="right" style="padding:10px 20px; font-family: 'Nunito Sans', sans-serif;">
<a href="https://fleetdm.com" style="text-decoration: none;"><img src="{{.AssetURL}}/assets/images/fleet-logo-text-all-white@2x.png?raw=true" width="122" height="33" /></a>
<td
valign="middle"
align="right"
style="
padding: 10px 20px;
font-family: 'Nunito Sans', sans-serif;
"
>
<a href="https://fleetdm.com" style="text-decoration: none"
><img
src="{{.AssetURL}}/assets/images/fleet-logo-text-all-white@2x.png?raw=true"
width="122"
height="33"
/></a>
</td>
</tr>
</table>
<br>
<br />
</td>
</tr>
</table>
server/mail/templates/smtp_setup.html
+78 -17
View File
@@ -1,11 +1,14 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Nunito+Sans:wght@400;600;700&display=swap" rel="stylesheet">
<link rel="preconnect" href="https://fonts.gstatic.com" />
<link
href="https://fonts.googleapis.com/css2?family=Nunito+Sans:wght@400;600;700&display=swap"
rel="stylesheet"
/>
<style>
body {
font-family: 'Nunito Sans', sans-serif;
font-family: "Nunito Sans", sans-serif;
}
h1 {
@@ -14,7 +17,7 @@
}
p {
line-height: 2.0;
line-height: 2;
}
a {
@@ -38,35 +41,93 @@
padding: 20px !important;
}
}
</style>
</head>
<body>
<table align="center" border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" bgcolor="#F9FAFC" style="background: #F9FAFC; font-family: 'Nunito Sans', sans-serif; color: #66696f; border-collapse:collapse;">
<table
align="center"
border="0"
cellpadding="0"
cellspacing="0"
height="100%"
width="100%"
bgcolor="#F9FAFC"
style="
background: #f9fafc;
font-family: 'Nunito Sans', sans-serif;
color: #66696f;
border-collapse: collapse;
"
>
<tr>
<td valign="top" align="center">
<table width="580" align="center" cellpadding="0" cellspacing="0" bgcolor="#ffffff" style="margin: 20px 10px;">
<table
width="580"
align="center"
cellpadding="0"
cellspacing="0"
bgcolor="#ffffff"
style="margin: 20px 10px"
>
<tr>
<td colspan="2" bgcolor="#ffffff" style="padding:20px; font-family: 'Nunito Sans', sans-serif;">
<img src="{{.AssetURL}}/assets/images/fleet-logo-color@2x.png?raw=true" width="174" height="48" />
<td
colspan="2"
bgcolor="#ffffff"
style="padding: 20px; font-family: 'Nunito Sans', sans-serif"
>
<img
src="{{.AssetURL}}/assets/images/fleet-logo-color@2x.png?raw=true"
width="174"
height="48"
/>
</td>
</tr>
<tr>
<td colspan="2" style="padding:60px; font-family: 'Nunito Sans', sans-serif;">
<h1 style="font-weight:300">Confirmed Fleet SMTP Setup</h1>
<p>This message confirms that SMTP is set up properly on your <a href="{{.BaseURL}}">Fleet instance</a>.</p>
<td
colspan="2"
style="padding: 60px; font-family: 'Nunito Sans', sans-serif"
>
<h1 style="font-weight: 300">Confirmed Fleet SMTP Setup</h1>
<p>
This message confirms that SMTP is set up properly on your
<a href="{{.BaseURL}}">Fleet instance</a>.
</p>
</td>
</tr>
<tr bgcolor="#9ca3ac">
<td valign="middle" align="left" style="padding:10px 20px; font-family: 'Nunito Sans', sans-serif; color: #fff;">
<a href="https://github.com/fleetdm/fleet/tree/master/docs" style="color: #fff; text-decoration: none;">Fleet Documentation</a>
<td
valign="middle"
align="left"
style="
padding: 10px 20px;
font-family: 'Nunito Sans', sans-serif;
color: #fff;
"
>
<a
href="https://github.com/fleetdm/fleet/tree/main/docs"
style="color: #fff; text-decoration: none"
>Fleet Documentation</a
>
</td>
<td valign="middle" align="right" style="padding:10px 20px; font-family: 'Nunito Sans', sans-serif;">
<a href="https://fleetdm.com" style="text-decoration: none;"><img src="{{.AssetURL}}/assets/images/fleet-logo-text-all-white@2x.png?raw=true" width="122" height="33" /></a>
<td
valign="middle"
align="right"
style="
padding: 10px 20px;
font-family: 'Nunito Sans', sans-serif;
"
>
<a href="https://fleetdm.com" style="text-decoration: none"
><img
src="{{.AssetURL}}/assets/images/fleet-logo-text-all-white@2x.png?raw=true"
width="122"
height="33"
/></a>
</td>
</tr>
</table>
<br>
<br />
</td>
</tr>
</table>
server/service/service.go
+1 -1
View File
@@ -89,7 +89,7 @@ func getAssetURL() template.URL {
v := version.Version().Version
tag := strings.Split(v, "-")[0]
if tag == "unknown" {
tag = "master"
tag = "main"
}
return template.URL("https://github.com/fleetdm/fleet/blob/" + tag)