empayre/fleet
14
0
Fork 0
mirror of https://github.com/empayre/fleet.git synced 2024-11-06 08:55:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update email template image links (#1938)

Browse Source 
* Update email image links; move pngs to fleetdm.com
This commit is contained in:
gillespi314 2021-09-03 17:00:30 -05:00 committed by GitHub
parent bf8f5e932e
commit 4a307f1274
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/1927-email-template-images Normal file
View File

@ -0,0 +1 @@
* Move email template images from github to fleetdm.com; update links

8
server/mail/templates/change_email_confirmation.html
View File

@ -93,7 +93,7 @@
<a href="https://fleetdm.com" target="_blank">
<img
alt="Fleet logo"
src="{{.AssetURL}}/assets/images/fleet-logo-blue-118x41@2x.png?raw=true"
src="{{.AssetURL}}/fleet-logo-blue-118x41@2x.png"
style="height: 41px; width: 118px"
/>
</a>
@ -140,14 +140,14 @@
<img
alt="Fleet logo"
style="height: 20px; width: 20px; padding-right: 20px"
src="{{.AssetURL}}/assets/images/fleet-mark-color-40x40@2x.png?raw=true"
src="{{.AssetURL}}/fleet-mark-color-40x40@2x.png"
/>
</a>
<a href="https://twitter.com/fleetctl" target="_blank">
<img
alt="Twitter logo"
style="height: 20px; width: 25px; padding-right: 20px"
src="{{.AssetURL}}/assets/images/twitter-logo-50x40@2x.png?raw=true"
src="{{.AssetURL}}/twitter-logo-50x40@2x.png"
/>
</a>
<a
@ -157,7 +157,7 @@
<img
alt="Slack logo"
style="height: 20px; width: 20.5px; padding-right: 20px"
src="{{.AssetURL}}/assets/images/slack-logo-41x40@2x.png?raw=true"
src="{{.AssetURL}}/slack-logo-41x40@2x.png"
/>
</a>
</div>

8
server/mail/templates/invite_token.html
View File

@ -93,7 +93,7 @@
<a href="https://fleetdm.com" target="_blank">
<img
alt="Fleet logo"
src="{{.AssetURL}}/assets/images/fleet-logo-blue-118x41@2x.png?raw=true"
src="{{.AssetURL}}/fleet-logo-blue-118x41@2x.png"
style="height: 41px; width: 118px"
/>
</a>
@ -170,14 +170,14 @@
<img
alt="Fleet logo"
style="height: 20px; width: 20px; padding-right: 20px"
src="{{.AssetURL}}/assets/images/fleet-mark-color-40x40@2x.png?raw=true"
src="{{.AssetURL}}/fleet-mark-color-40x40@2x.png"
/>
</a>
<a href="https://twitter.com/fleetctl" target="_blank">
<img
alt="Twitter logo"
style="height: 20px; width: 25px; padding-right: 20px"
src="{{.AssetURL}}/assets/images/twitter-logo-50x40@2x.png?raw=true"
src="{{.AssetURL}}/twitter-logo-50x40@2x.png"
/>
</a>
<a
@ -187,7 +187,7 @@
<img
alt="Slack logo"
style="height: 20px; width: 20.5px; padding-right: 20px"
src="{{.AssetURL}}/assets/images/slack-logo-41x40@2x.png?raw=true"
src="{{.AssetURL}}/slack-logo-41x40@2x.png"
/>
</a>
</div>

8
server/mail/templates/password_reset.html
View File

@ -93,7 +93,7 @@
<a href="https://fleetdm.com" target="_blank">
<img
alt="Fleet logo"
src="{{.AssetURL}}/assets/images/fleet-logo-blue-118x41@2x.png?raw=true"
src="{{.AssetURL}}/fleet-logo-blue-118x41@2x.png"
style="height: 41px; width: 118px"
/>
</a>
@ -145,14 +145,14 @@
<img
alt="Fleet logo"
style="height: 20px; width: 20px; padding-right: 20px"
src="{{.AssetURL}}/assets/images/fleet-mark-color-40x40@2x.png?raw=true"
src="{{.AssetURL}}/fleet-mark-color-40x40@2x.png"
/>
</a>
<a href="https://twitter.com/fleetctl" target="_blank">
<img
alt="Twitter logo"
style="height: 20px; width: 25px; padding-right: 20px"
src="{{.AssetURL}}/assets/images/twitter-logo-50x40@2x.png?raw=true"
src="{{.AssetURL}}/twitter-logo-50x40@2x.png"
/>
</a>
<a
@ -162,7 +162,7 @@
<img
alt="Slack logo"
style="height: 20px; width: 20.5px; padding-right: 20px"
src="{{.AssetURL}}/assets/images/slack-logo-41x40@2x.png?raw=true"
src="{{.AssetURL}}/slack-logo-41x40@2x.png"
/>
</a>
</div>

8
server/mail/templates/smtp_setup.html
View File

@ -89,7 +89,7 @@
<a href="https://fleetdm.com" target="_blank">
<img
alt="Fleet logo"
src="{{.AssetURL}}/assets/images/fleet-logo-blue-118x41@2x.png?raw=true"
src="{{.AssetURL}}/fleet-logo-blue-118x41@2x.png"
style="height: 41px; width: 118px"
/>
</a>
@ -119,14 +119,14 @@
<img
alt="Fleet logo"
style="height: 20px; width: 20px; padding-right: 20px"
src="{{.AssetURL}}/assets/images/fleet-mark-color-40x40@2x.png?raw=true"
src="{{.AssetURL}}/fleet-mark-color-40x40@2x.png"
/>
</a>
<a href="https://twitter.com/fleetctl" target="_blank">
<img
alt="Twitter logo"
style="height: 20px; width: 25px; padding-right: 20px"
src="{{.AssetURL}}/assets/images/twitter-logo-50x40@2x.png?raw=true"
src="{{.AssetURL}}/twitter-logo-50x40@2x.png"
/>
</a>
<a
@ -136,7 +136,7 @@
<img
alt="Slack logo"
style="height: 20px; width: 20.5px; padding-right: 20px"
src="{{.AssetURL}}/assets/images/slack-logo-41x40@2x.png?raw=true"
src="{{.AssetURL}}/slack-logo-41x40@2x.png"
/>
</a>
</div>

14
server/service/service.go
View File

@ -4,7 +4,6 @@ package service
import (
"html/template"
"strings"
"sync"
"github.com/WatchBeam/clock"
@ -14,7 +13,6 @@ import (
"github.com/fleetdm/fleet/v4/server/logging"
"github.com/fleetdm/fleet/v4/server/sso"
kitlog "github.com/go-kit/kit/log"
"github.com/kolide/kit/version"
"github.com/pkg/errors"
)
@ -80,17 +78,9 @@ type validationMiddleware struct {
ssoSessionStore sso.SessionStore
}
// getAssetURL gets the URL prefix used for retrieving assets from Github. This
// function will determine the appropriate version to use, and create a URL
// prefix for retrieving assets from that tag.
// getAssetURL simply returns the base url used for retrieving image assets from fleetdm.com.
func getAssetURL() template.URL {
v := version.Version().Version
tag := strings.Split(v, "-")[0]
if tag == "unknown" {
tag = "main"
}
return template.URL("https://github.com/fleetdm/fleet/blob/" + tag)
return template.URL("https://fleetdm.com/images/permanent")
}
// seenHostSet implements synchronized storage for the set of seen hosts.

BIN
website/assets/images/permanent/fleet-logo-blue-118x41@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
website/assets/images/permanent/fleet-mark-color-40x40@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 895 B

BIN
website/assets/images/permanent/slack-logo-41x40@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
website/assets/images/permanent/twitter-logo-50x40@2x.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB