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

Update email contents and subjects (#2023)

Browse Source 
- Refer to "Kolide" as "Fleet"
- Fix link to documentation
- Remove suggestion to email support@kolide.co
This commit is contained in:
Zachary Wasserman
2019-04-04 18:56:15 -04:00
committed by Jason Meller
parent eb4770f730
commit 7153e0043c
5 changed files with 16 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/mail/templates/change_email_confirmation.html
+2 -11
View File
@@ -66,19 +66,10 @@
</tr>
<tr bgcolor="#9ca3ac">
<td valign="middle" align="left" style="padding:10px 20px; font-family: 'Oxygen', Arial, sans-serif; color: #fff;">
<a href="https://docs.kolide.co" style="color: #fff; text-decoration: none;">Help</a>
<a href="https://github.com/kolide/fleet/tree/master/docs" style="color: #fff; text-decoration: none;">Fleet Documentation</a>
</td>
<td valign="middle" align="right" style="padding:10px 20px; font-family: 'Oxygen', Arial, sans-serif;">
<a href="https://kolide.co" style="text-decoration: none;"><img src="{{.KolideServerURL}}/assets/images/kolide-white@2x.png" width="122" height="33" /></a>
</td>
</tr>
<tr bgcolor="#f4f6fb">
<td colspan="2" style="padding:20px; font-family: 'Oxygen', Arial, sans-serif; color: '#66696f'; font-size: 13px;">
Please do not reply directly to this email. We are unable to respond
to inquires sent to this address. For support, contact
<a href="mailto:support@kolide.co">support@kolide.co</a>.
<br>
<br>
<a href="https://kolide.com" style="text-decoration: none;"><img src="{{.KolideServerURL}}/assets/images/kolide-white@2x.png" width="122" height="33" /></a>
</td>
</tr>
</table>
server/mail/templates/invite_token.html
+3 -12
View File
@@ -52,7 +52,7 @@
</tr>
<tr>
<td colspan="2" style="padding:60px; font-family: 'Oxygen', Arial, sans-serif;">
<h1>You Have Been Invited To Kolide!</h1>
<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>
<table bgcolor="#f4f6fb" height="100px" cellpadding="20px">
@@ -70,19 +70,10 @@
</tr>
<tr bgcolor="#9ca3ac">
<td valign="middle" align="left" style="padding:10px 20px; font-family: 'Oxygen', Arial, sans-serif; color: #fff;">
<a href="https://docs.kolide.co" style="color: #fff; text-decoration: none;">Help</a>
<a href="https://github.com/kolide/fleet/tree/master/docs" style="color: #fff; text-decoration: none;">Fleet Documentation</a>
</td>
<td valign="middle" align="right" style="padding:10px 20px; font-family: 'Oxygen', Arial, sans-serif;">
<a href="https://kolide.co" style="text-decoration: none;"><img src="{{.KolideServerURL}}/assets/images/kolide-white@2x.png" width="122" height="33" /></a>
</td>
</tr>
<tr bgcolor="#f4f6fb">
<td colspan="2" style="padding:20px; font-family: 'Oxygen', Arial, sans-serif; color: '#66696f'; font-size: 13px;">
Please do not reply directly to this email. We are unable to respond
to inquires sent to this address. For support, contact
<a href="mailto:support@kolide.co">support@kolide.co</a>.
<br>
<br>
<a href="https://kolide.com" style="text-decoration: none;"><img src="{{.KolideServerURL}}/assets/images/kolide-white@2x.png" width="122" height="33" /></a>
</td>
</tr>
</table>
server/mail/templates/password_reset.html
+2 -11
View File
@@ -60,19 +60,10 @@
</tr>
<tr bgcolor="#9ca3ac">
<td valign="middle" align="left" style="padding:10px 20px; font-family: 'Oxygen', Arial, sans-serif; color: #fff;">
<a href="https://docs.kolide.co" style="color: #fff; text-decoration: none;">Help</a>
<a href="https://github.com/kolide/fleet/tree/master/docs" style="color: #fff; text-decoration: none;">Fleet Documentation</a>
</td>
<td valign="middle" align="right" style="padding:10px 20px; font-family: 'Oxygen', Arial, sans-serif;">
<a href="https://kolide.co" style="text-decoration: none;"><img src="{{.KolideServerURL}}/assets/images/kolide-white@2x.png" width="122" height="33" /></a>
</td>
</tr>
<tr bgcolor="#f4f6fb">
<td colspan="2" style="padding:20px; font-family: 'Oxygen', Arial, sans-serif; color: '#66696f'; font-size: 13px;">
Please do not reply directly to this email. We are unable to respond
to inquires sent to this address. For support, contact
<a href="mailto:support@kolide.co">support@kolide.co</a>.
<br>
<br>
<a href="https://kolide.com" style="text-decoration: none;"><img src="{{.KolideServerURL}}/assets/images/kolide-white@2x.png" width="122" height="33" /></a>
</td>
</tr>
</table>
server/mail/templates/smtp_setup.html
+8 -9
View File
@@ -52,17 +52,16 @@
</tr>
<tr>
<td colspan="2" style="padding:60px; font-family: 'Oxygen', Arial, sans-serif;">
<h1 style="font-weight:300">Confirmed Kolide SMTP Setup</h1>
<p>Looks like you've got SMTP setup properly on your <a href="{{.KolideServerURL}}">Fleet instance</a> or else you wouldn't be reading this!</p>
<h1 style="font-weight:300">Confirmed Fleet SMTP Setup</h1>
<p>This message confirms that SMTP is set up properly on your <a href="{{.KolideServerURL}}">Fleet instance</a>.</p>
</td>
</tr>
<tr bgcolor="#f4f6fb">
<td colspan="2" style="padding:20px; font-family: 'Oxygen', Arial, sans-serif; color: '#66696f'; font-size: 13px;">
Please do not reply directly to this email. We are unable to respond
to inquires sent to this address. For support, contact
<a href="mailto:support@kolide.co">support@kolide.co</a>.
<br>
<br>
<tr bgcolor="#9ca3ac">
<td valign="middle" align="left" style="padding:10px 20px; font-family: 'Oxygen', Arial, sans-serif; color: #fff;">
<a href="https://github.com/kolide/fleet/tree/master/docs" style="color: #fff; text-decoration: none;">Fleet Documentation</a>
</td>
<td valign="middle" align="right" style="padding:10px 20px; font-family: 'Oxygen', Arial, sans-serif;">
<a href="https://kolide.com" style="text-decoration: none;"><img src="{{.KolideServerURL}}/assets/images/kolide-white@2x.png" width="122" height="33" /></a>
</td>
</tr>
</table>
server/service/service_invites.go
+1 -1
View File
@@ -62,7 +62,7 @@ func (svc service) InviteNewUser(ctx context.Context, payload kolide.InvitePaylo
invitedBy = inviter.Username
}
inviteEmail := kolide.Email{
Subject: "You're Invited to Kolide",
Subject: "You are Invited to Fleet",
To: []string{invite.Email},
Config: config,
Mailer: &kolide.InviteMailer{