From 25ea634787d0d16513b3d455c43c7d901a10bcaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 13 Jun 2019 11:54:39 -0400 Subject: [PATCH] fix: #7659 add option to change cookie link url --- public/language/en-GB/admin/settings/cookies.json | 1 + public/src/app.js | 1 + src/controllers/api.js | 1 + src/views/admin/settings/cookies.tpl | 4 ++++ 4 files changed, 7 insertions(+) diff --git a/public/language/en-GB/admin/settings/cookies.json b/public/language/en-GB/admin/settings/cookies.json index f8b0f0538b..a6244febdd 100644 --- a/public/language/en-GB/admin/settings/cookies.json +++ b/public/language/en-GB/admin/settings/cookies.json @@ -4,6 +4,7 @@ "consent.message": "Notification message", "consent.acceptance": "Acceptance message", "consent.link-text": "Policy Link Text", + "consent.link-url": "Policy Link URL", "consent.blank-localised-default": "Leave blank to use NodeBB localised defaults", "settings": "Settings", "cookie-domain": "Session cookie domain", diff --git a/public/src/app.js b/public/src/app.js index 364a57d9eb..5c83eebfdf 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -811,6 +811,7 @@ app.cacheBuster = null; config.cookies.message = translator.unescape(config.cookies.message); config.cookies.dismiss = translator.unescape(config.cookies.dismiss); config.cookies.link = translator.unescape(config.cookies.link); + config.cookies.link_url = translator.unescape(config.cookies.link_url); app.parseAndTranslate('partials/cookie-consent', config.cookies, function (html) { $(document.body).append(html); diff --git a/src/controllers/api.js b/src/controllers/api.js index 8649259b2b..d87cf6d10f 100644 --- a/src/controllers/api.js +++ b/src/controllers/api.js @@ -77,6 +77,7 @@ apiController.loadConfig = function (req, callback) { message: translator.escape(validator.escape(meta.config.cookieConsentMessage || '[[global:cookies.message]]')).replace(/\\/g, '\\\\'), dismiss: translator.escape(validator.escape(meta.config.cookieConsentDismiss || '[[global:cookies.accept]]')).replace(/\\/g, '\\\\'), link: translator.escape(validator.escape(meta.config.cookieConsentLink || '[[global:cookies.learn_more]]')).replace(/\\/g, '\\\\'), + link_url: translator.escape(validator.escape(meta.config.cookieConsentLinkUrl || 'https://www.cookiesandyou.com')).replace(/\\/g, '\\\\'), }; async.waterfall([ diff --git a/src/views/admin/settings/cookies.tpl b/src/views/admin/settings/cookies.tpl index 77edaefc34..2ff2a47900 100644 --- a/src/views/admin/settings/cookies.tpl +++ b/src/views/admin/settings/cookies.tpl @@ -33,6 +33,10 @@ [[admin/settings/cookies:consent.blank-localised-default]]

+
+ + +