diff --git a/website/api/controllers/view-transparency.js b/website/api/controllers/view-transparency.js index 7267792026..4aa3a2b69f 100644 --- a/website/api/controllers/view-transparency.js +++ b/website/api/controllers/view-transparency.js @@ -16,8 +16,17 @@ module.exports = { fn: async function () { + + let showSwagForm = false; + // Due to shipping costs, we'll check the requesting user's cf-ipcountry to see if they're in the US, and their cf-iplongitude header to see if they're in the contiguous US. + if(this.req.get('cf-ipcountry') === 'US' && this.req.get('cf-iplongitude') > -125) { + showSwagForm = true; + } // Respond with view. - return {showSecureframeBanner: this.req.param('utm_content') === 'secureframe'}; + return { + showSecureframeBanner: this.req.param('utm_content') === 'secureframe', + showSwagForm, + }; } diff --git a/website/assets/images/icon-fleet-tumbler-55x51@2x.png b/website/assets/images/icon-fleet-tumbler-55x51@2x.png new file mode 100644 index 0000000000..d027315cc6 Binary files /dev/null and b/website/assets/images/icon-fleet-tumbler-55x51@2x.png differ diff --git a/website/assets/styles/pages/transparency.less b/website/assets/styles/pages/transparency.less index 89283f74b1..68d561ac88 100644 --- a/website/assets/styles/pages/transparency.less +++ b/website/assets/styles/pages/transparency.less @@ -83,6 +83,30 @@ line-height: @text-lineheight; } } + [purpose='swag-cta'] { + display: flex; + width: 263px; + // padding: 16px 24px; + align-items: center; + text-decoration: none; + border-radius: 6px; + border: 1px solid var(--UI-Gray, #E3E3E3); + background: #FFF; + box-shadow: 1px 2px 2px 0px rgba(197, 199, 209, 0.20); + font-size: 14px; + [purpose='swag-link'] { + padding: 16px 24px; + display: block; + } + strong { + font-weight: 800; + } + img { + width: 55px; + height: 51px; + margin-right: 24px; + } + } [purpose='feature'] { padding-top: 64px; padding-bottom: 64px; diff --git a/website/views/pages/transparency.ejs b/website/views/pages/transparency.ejs index 44f9b2854e..1a85af36ca 100644 --- a/website/views/pages/transparency.ejs +++ b/website/views/pages/transparency.ejs @@ -9,7 +9,18 @@

How does it affect me?

Your IT team has to maintain your computer and keep it compliant with with a bunch of security requirements. But they also realize you have a job to do. So they want to be as un-intrusive as possible.

-

That’s why they chose Fleet. It’s compatible with everything, including Linux, so it doesn’t limit what operating system you use. And it’s open source, meaning if you want to, you can take it apart and see what it’s doing to your computer.

+

That’s why they chose Fleet. It’s compatible with everything, including Linux, so it doesn’t limit what operating system you use. And it’s open source, meaning if you want to, you can take it apart and see what it’s doing to your computer.

+
+ +
+
A tumbler with a Fleet logo
+
+ Get a Fleet tumbler + It's free +
+
+
+
Information about a users device in Fleet.