Merge branch 'master' into feature/service-faciliti

This commit is contained in:
Amauri CHAMPEAUX 2020-04-18 15:25:30 +02:00 committed by GitHub
commit 3ffca69d83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 5 deletions

View File

@ -21,7 +21,7 @@ Bonus:
# Installation guide # Installation guide
[Visit opt-out.ferank.eu](https://opt-out.ferank.eu/) [Visit tarteaucitron.io](https://tarteaucitron.io/)
# How to use # How to use
@ -51,7 +51,7 @@ tarteaucitron.init({
//"cookieDomain": ".my-multisite-domaine.fr", /* Shared cookie for subdomain website */ //"cookieDomain": ".my-multisite-domaine.fr", /* Shared cookie for subdomain website */
"readmoreLink": "/cookiespolicy" /* Change the default readmore link pointing to opt-out.ferank.eu */ "readmoreLink": "/cookiespolicy" /* Change the default readmore link pointing to tarteaucitron.io */
}); });
</script> </script>
``` ```

View File

@ -343,7 +343,7 @@ var tarteaucitron = {
html += ' </ul>'; html += ' </ul>';
html += ' <div class="tarteaucitronHidden" id="tarteaucitronScrollbarChild" style="height:20px;display:block"></div>'; html += ' <div class="tarteaucitronHidden" id="tarteaucitronScrollbarChild" style="height:20px;display:block"></div>';
if (tarteaucitron.parameters.removeCredit === false) { if (tarteaucitron.parameters.removeCredit === false) {
html += ' <a class="tarteaucitronSelfLink" href="https://opt-out.ferank.eu/" rel="nofollow noreferrer noopener" target="_blank" title="tarteaucitron ' + tarteaucitron.lang.newWindow + '">🍋 ' + tarteaucitron.lang.credit + '</a>'; html += ' <a class="tarteaucitronSelfLink" href="https://tarteaucitron.io/" rel="nofollow noreferrer noopener" target="_blank" title="tarteaucitron ' + tarteaucitron.lang.newWindow + '">🍋 ' + tarteaucitron.lang.credit + '</a>';
} }
html += ' </div>'; html += ' </div>';
html += ' </div>'; html += ' </div>';
@ -582,7 +582,7 @@ var tarteaucitron = {
if (tarteaucitron.parameters.moreInfoLink == true) { if (tarteaucitron.parameters.moreInfoLink == true) {
var link = 'https://opt-out.ferank.eu/service/' + service.key + '/'; var link = 'https://tarteaucitron.io/service/' + service.key + '/';
if (service.readmoreLink !== undefined && service.readmoreLink !== '') { if (service.readmoreLink !== undefined && service.readmoreLink !== '') {
link = service.readmoreLink; link = service.readmoreLink;
} }
@ -1604,7 +1604,7 @@ var tarteaucitron = {
if (tarteaucitron.uuid !== '' && tarteaucitron.uuid !== undefined && tarteaucitron.proTemp !== '') { if (tarteaucitron.uuid !== '' && tarteaucitron.uuid !== undefined && tarteaucitron.proTemp !== '') {
var div = document.getElementById('tarteaucitronPremium'), var div = document.getElementById('tarteaucitronPremium'),
timestamp = new Date().getTime(), timestamp = new Date().getTime(),
url = 'https://opt-out.ferank.eu/log/?'; url = 'https://tarteaucitron.io/log/?';
if (div === null) { if (div === null) {
return; return;

View File

@ -3028,3 +3028,20 @@ tarteaucitron.services.faciliti = {
} }
}; };
// userlike
tarteaucitron.services.userlike = {
"key": "userlike",
"type": "support",
"name": "Userlike",
"uri": "https://www.userlike.com/en/terms#privacy-policy",
"needConsent": true,
"cookies": ['uslk_s', 'uslk_e'],
"js": function () {
"use strict";
if (tarteaucitron.user.userlikeKey === undefined) {
return;
}
tarteaucitron.addScript('//userlike-cdn-widgets.s3-eu-west-1.amazonaws.com/' + tarteaucitron.user.userlikeKey);
}
};