From 8d8c2efa23a0c3dc55f398bf763afabb90cddeda Mon Sep 17 00:00:00 2001 From: Erica Wright Date: Thu, 27 Jul 2017 14:24:49 -0400 Subject: [PATCH] create /unsupported/outdated version of the /unsupported page --- frontend/src/common.js | 4 ++-- public/locales/en-US/send.ftl | 2 ++ public/main.css | 11 ++++++----- server/server.js | 7 +++++-- views/unsupported.handlebars | 22 +++++++++++++++------- 5 files changed, 30 insertions(+), 16 deletions(-) diff --git a/frontend/src/common.js b/frontend/src/common.js index 26ecff1a..ecee7102 100644 --- a/frontend/src/common.js +++ b/frontend/src/common.js @@ -16,7 +16,7 @@ gcmCompliant().catch(err => { sendEvent(isSender ? 'sender' : 'recipient', 'unsupported', { cd6: err }).then(() => { - location.replace('/unsupported'); + location.replace('/unsupported/gcm'); }); }); @@ -25,6 +25,6 @@ if (navigator.userAgent.toLowerCase().indexOf('firefox') > -1 && sendEvent(isSender ? 'sender' : 'recipient', 'unsupported', { cd6: new Error('Firefox is outdated.') }).then(() => { - location.replace('/unsupported'); + location.replace('/unsupported/outdated'); }); } \ No newline at end of file diff --git a/public/locales/en-US/send.ftl b/public/locales/en-US/send.ftl index f9ddf900..8f3b18bc 100644 --- a/public/locales/en-US/send.ftl +++ b/public/locales/en-US/send.ftl @@ -67,6 +67,8 @@ expiredPageHeader = This link has expired or never existed in the first place! notSupportedHeader = Your browser is not supported. // Firefox Send is a brand name and should not be localized. notSupportedDetail = Unfortunately this browser does not support the web technology that powers Firefox Send. You’ll need to try another browser. We recommend Firefox! +notSupportedOutdatedDetail = Unfortunately this version of Firefox does not support the web technology that powers Firefox Send. You’ll need to update your browser. +updateFirefox = Update Firefox downloadFirefoxButtonSub = Free Download uploadedFile = File copyFileList = Copy URL diff --git a/public/main.css b/public/main.css index 5be705a2..8f51109f 100644 --- a/public/main.css +++ b/public/main.css @@ -517,13 +517,13 @@ tbody { margin: 0 auto 23px; } -#firefox-logo { +.firefox-logo { width: 70px; } -#dl-firefox { +#dl-firefox, +#update-firefox { margin-bottom: 181px; - width: 260px; height: 80px; background: #12bc00; border-radius: 3px; @@ -538,14 +538,15 @@ tbody { justify-content: center; align-items: center; line-height: 1; + padding: 0 25px; } -#dl-firefox-text { +.unsupported-button-text { text-align: left; margin-left: 20.4px; } -#dl-firefox-text > span { +.unsupported-button-text > span { font-family: 'Fira Sans'; font-weight: 300; font-size: 18px; diff --git a/server/server.js b/server/server.js index b12f3f57..1daf549e 100644 --- a/server/server.js +++ b/server/server.js @@ -96,8 +96,11 @@ app.get('/', (req, res) => { res.render('index'); }); -app.get('/unsupported', (req, res) => { - res.render('unsupported'); +app.get('/unsupported/:reason', (req, res) => { + const outdated = req.params.reason === 'outdated'? true : false; + res.render('unsupported', { + outdated: outdated + }); }); app.get('/legal', (req, res) => { diff --git a/views/unsupported.handlebars b/views/unsupported.handlebars index 62814e57..358bab65 100644 --- a/views/unsupported.handlebars +++ b/views/unsupported.handlebars @@ -1,11 +1,19 @@
-
- - -
Firefox
- -
-
+ {{#if outdated}} +
+ + +
+
+ {{else}} +
+ + +
Firefox
+ +
+
+ {{/if}}