Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 11:35:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #7659 add option to change cookie link url

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2019-06-13 11:54:39 -04:00
parent d939614782
commit 25ea634787
4 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/language/en-GB/admin/settings/cookies.json
View File

@@ -4,6 +4,7 @@
"consent.message": "Notification message", "consent.message": "Notification message",
"consent.acceptance": "Acceptance message", "consent.acceptance": "Acceptance message",
"consent.link-text": "Policy Link Text", "consent.link-text": "Policy Link Text",
"consent.link-url": "Policy Link URL",
"consent.blank-localised-default": "Leave blank to use NodeBB localised defaults", "consent.blank-localised-default": "Leave blank to use NodeBB localised defaults",
"settings": "Settings", "settings": "Settings",
"cookie-domain": "Session cookie domain", "cookie-domain": "Session cookie domain",

1
public/src/app.js
View File

@@ -811,6 +811,7 @@ app.cacheBuster = null;
config.cookies.message = translator.unescape(config.cookies.message); config.cookies.message = translator.unescape(config.cookies.message);
config.cookies.dismiss = translator.unescape(config.cookies.dismiss); config.cookies.dismiss = translator.unescape(config.cookies.dismiss);
config.cookies.link = translator.unescape(config.cookies.link); 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) { app.parseAndTranslate('partials/cookie-consent', config.cookies, function (html) {
$(document.body).append(html); $(document.body).append(html);

1
src/controllers/api.js
View File

@@ -77,6 +77,7 @@ apiController.loadConfig = function (req, callback) {
message: translator.escape(validator.escape(meta.config.cookieConsentMessage || '[[global:cookies.message]]')).replace(/\\/g, '\\\\'), 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, '\\\\'), 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: 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([ async.waterfall([

4
src/views/admin/settings/cookies.tpl
View File

@@ -33,6 +33,10 @@
[[admin/settings/cookies:consent.blank-localised-default]] [[admin/settings/cookies:consent.blank-localised-default]]
</p> </p>
</div> </div>
<div class="form-group">
<label for="cookieConsentLink">[[admin/settings/cookies:consent.link-url]]</label>
<input class="form-control" id="cookieConsentLink" type="text" data-field="cookieConsentLinkUrl" />
</div>
</form> </form>
</div> </div>
</div> </div>