From a31264e13d96bb66a0d4e48efbe6d97bdc13b487 Mon Sep 17 00:00:00 2001 From: Amauri CHAMPEAUX Date: Wed, 29 Aug 2018 11:12:57 +0200 Subject: [PATCH] Add an option to display a link to the privacy url "privacyUrl": "https://example.com/privacy-policy", --- README.md | 87 +--------------------------------------- css/tarteaucitron.css | 4 +- lang/tarteaucitron.cs.js | 2 + lang/tarteaucitron.de.js | 2 + lang/tarteaucitron.en.js | 2 + lang/tarteaucitron.es.js | 2 + lang/tarteaucitron.fr.js | 2 + lang/tarteaucitron.it.js | 2 + lang/tarteaucitron.nl.js | 4 +- lang/tarteaucitron.pl.js | 2 + lang/tarteaucitron.pt.js | 3 ++ lang/tarteaucitron.ru.js | 2 + tarteaucitron.js | 21 ++++++++-- 13 files changed, 43 insertions(+), 92 deletions(-) diff --git a/README.md b/README.md index 85c33d1..36f03f1 100644 --- a/README.md +++ b/README.md @@ -20,92 +20,6 @@ Bonus: - Load service when user click on Allow (without reload of the page), - Incorporate a fallback system (display a link instead of social button and a static banner instead of advertising). -## Supported services -* Advertising network - * Ad Up Technology (ads) - * Ad Up Technology (conversion) - * Ad Up Technology (retargeting) - * Amazon - * Clicmanager - * Criteo - * FERank (pub) - * Google Adsense - * Google Adsense Search (form) - * Google Adsense Search (result) - * Google Adwords (conversion) - * Google Adwords (remarketing) - * Pubdirecte - * Twenga - * vShop - -* APIs - * Google jsapi - * Google Maps - * Google Tag Manager - * Timeline JS - * Typekit (adobe) - -* Audience measurement - * Alexa - * Clicky - * Crazyegg - * FERank - * Get+ - * Google Analytics (ga.js) - * Google Analytics (universal) - * StatCounter - * VisualRevenue - * Xiti - -* Comment - * Disqus - * Facebook (commentaire) - -* Marketing Automation & CRM - * Mautic - * Webmecanik Automation - * Koban - -* Social network - * AddThis - * AddToAny (feed) - * AddToAny (share) - * eKomi - * Facebook - * Facebook (like box) - * Google+ - * Google+ (badge) - * Linkedin - * Pinterest - * Shareaholic - * ShareThis - * Twitter - * Twitter (cards) - * Twitter (timelines) - -* Support - * UserVoice - * Zopim - -* Video - * Calameo - * Dailymotion - * Prezi - * SlideShare - * Vimeo - * YouTube - * Issuu - - -## Visitors outside the EU -In PHP for example, you can bypass all the script by setting this var `tarteaucitron.user.bypass = true;` if the visitor is not in the EU. - -## Tested on -- IE 6+ -- FF 3+ -- Safari 4+ -- Chrome 14+ -- Opera 10+ # Installation guide [Visit opt-out.ferank.eu](https://opt-out.ferank.eu/) @@ -129,6 +43,7 @@ tarteaucitron.init({ "removeCredit": false, /* supprimer le lien vers la source ? */ "handleBrowserDNTRequest": false, /* Répondre au DoNotTrack du navigateur ?*/ "moreInfoLink": true, + "privacyUrl": "", //"cookieDomain": ".my-multisite-domaine.fr" /* Nom de domaine sur lequel sera posé le cookie - pour les multisites / sous-domaines - Facultatif */ }); diff --git a/css/tarteaucitron.css b/css/tarteaucitron.css index 03a39c3..c35742a 100644 --- a/css/tarteaucitron.css +++ b/css/tarteaucitron.css @@ -448,7 +448,7 @@ h2#tarteaucitronCookiesNumberBis { font-weight: 700; } -#tarteaucitronAlertBig #tarteaucitronCloseAlert, #tarteaucitronAlertBig #tarteaucitronPersonalize { +#tarteaucitronAlertBig #tarteaucitronCloseAlert, #tarteaucitronAlertBig #tarteaucitronPersonalize, #tarteaucitronAlertBig #tarteaucitronPrivacyUrl { background: #008300; color: #fff; cursor: pointer; @@ -459,7 +459,7 @@ h2#tarteaucitronCookiesNumberBis { margin-left: 7px; } -#tarteaucitronAlertBig #tarteaucitronCloseAlert { +#tarteaucitronAlertBig #tarteaucitronCloseAlert, #tarteaucitronAlertBig #tarteaucitronPrivacyUrl { background: #fff; color: #333; font-size: 13px; diff --git a/lang/tarteaucitron.cs.js b/lang/tarteaucitron.cs.js index 915d950..1120254 100644 --- a/lang/tarteaucitron.cs.js +++ b/lang/tarteaucitron.cs.js @@ -13,6 +13,8 @@ tarteaucitron.lang = { "personalize": "Přizpůsobit", "acceptAll": "OK, přijmout vše", "close": "Zavřít", + + "privacyUrl": "Zásady ochrany osobních údajů", "all": "Nastavení všech služeb", diff --git a/lang/tarteaucitron.de.js b/lang/tarteaucitron.de.js index 939149d..c39a1bd 100644 --- a/lang/tarteaucitron.de.js +++ b/lang/tarteaucitron.de.js @@ -13,6 +13,8 @@ tarteaucitron.lang = { "personalize": "Personalisieren", "acceptAll": "OK, akzeptiere alles", "close": "Beenden", + + "privacyUrl": "Datenschutz-Bestimmungen", "all": "Präferenz für alle Dienste", diff --git a/lang/tarteaucitron.en.js b/lang/tarteaucitron.en.js index 8441457..0d4bc0b 100644 --- a/lang/tarteaucitron.en.js +++ b/lang/tarteaucitron.en.js @@ -13,6 +13,8 @@ tarteaucitron.lang = { "personalize": "Personalize", "acceptAll": "OK, accept all", "close": "Close", + + "privacyUrl": "Privacy policy", "all": "Preference for all services", diff --git a/lang/tarteaucitron.es.js b/lang/tarteaucitron.es.js index 986ef67..7b2232a 100644 --- a/lang/tarteaucitron.es.js +++ b/lang/tarteaucitron.es.js @@ -13,6 +13,8 @@ tarteaucitron.lang = { "personalize": "Personalizar", "acceptAll": "OK, aceptar todas", "close": "Cerrar", + + "privacyUrl": "Política de privacidad", "all": "Ajustes para todos los servicios", diff --git a/lang/tarteaucitron.fr.js b/lang/tarteaucitron.fr.js index 09fd7e1..882e312 100644 --- a/lang/tarteaucitron.fr.js +++ b/lang/tarteaucitron.fr.js @@ -14,6 +14,8 @@ tarteaucitron.lang = { "personalize": "Personnaliser", "close": "Fermer", + "privacyUrl": "Politique de confidentialité", + "all": "Préférence pour tous les services", "info": "Protection de votre vie privée", diff --git a/lang/tarteaucitron.it.js b/lang/tarteaucitron.it.js index 89f8393..e369860 100644 --- a/lang/tarteaucitron.it.js +++ b/lang/tarteaucitron.it.js @@ -13,6 +13,8 @@ tarteaucitron.lang = { "acceptAll": "Ok, accetta tutto", "personalize": "Personalizza", "close": "Chiudi", + + "privacyUrl": "Politica sulla riservatezza", "all": "Preferenze per tutti i servizi", diff --git a/lang/tarteaucitron.nl.js b/lang/tarteaucitron.nl.js index 2b7a1a5..d2917a2 100644 --- a/lang/tarteaucitron.nl.js +++ b/lang/tarteaucitron.nl.js @@ -13,7 +13,9 @@ tarteaucitron.lang = { "personalize": "Personaliseer", "acceptAll": "OK, accepteer alle", "close": "Sluit", - + + "privacyUrl": "Privacybeleid", + "all": "Voorkeur voor alle diensten", "info": "Bescherming van uw privacy", diff --git a/lang/tarteaucitron.pl.js b/lang/tarteaucitron.pl.js index fdbcc95..3da7f46 100644 --- a/lang/tarteaucitron.pl.js +++ b/lang/tarteaucitron.pl.js @@ -13,6 +13,8 @@ tarteaucitron.lang = { "personalize": "Personalizacja", "acceptAll": "OK, akceptuję wszystko", "close": "zamknij", + + "privacyUrl": "Polityka prywatności", "all": "Preferencja dla wszystkich usług", diff --git a/lang/tarteaucitron.pt.js b/lang/tarteaucitron.pt.js index 303893b..6c564e3 100644 --- a/lang/tarteaucitron.pt.js +++ b/lang/tarteaucitron.pt.js @@ -13,6 +13,9 @@ tarteaucitron.lang = { "personalize": "Personalizar", "acceptAll": "OK, aceitar tudo", "close": "Fechar", + + "privacyUrl": "Política de Privacidade", + "all": "Definições dos serviços", "info": "Proteger sua privacidade", "disclaimer": "Ao aceitar os serviços terceiros, você aceita o uso de cookies em conjunto de tecnologias de rastreamento que lhe são necessárias para funcionar", diff --git a/lang/tarteaucitron.ru.js b/lang/tarteaucitron.ru.js index 995c8c8..7be324d 100644 --- a/lang/tarteaucitron.ru.js +++ b/lang/tarteaucitron.ru.js @@ -13,6 +13,8 @@ tarteaucitron.lang = { "personalize": "Персонализировать", "acceptAll": "Ок, все активировать", "close": "Закрыть", + + "privacyUrl": "Политика конфиденциальности", "all": "Преференция всем сервисам", diff --git a/tarteaucitron.js b/tarteaucitron.js index 4de776e..40db353 100644 --- a/tarteaucitron.js +++ b/tarteaucitron.js @@ -16,7 +16,7 @@ var scripts = document.getElementsByTagName('script'), var tarteaucitron = { - "version": 20180828003, + "version": 20180829, "cdn": cdn, "user": {}, "lang": {}, @@ -209,7 +209,8 @@ var tarteaucitron = { "cookieslist": true, "handleBrowserDNTRequest": false, "AcceptAllCta" : false, - "moreInfoLink": true + "moreInfoLink": true, + "privacyUrl": "" }, params = tarteaucitron.parameters; @@ -314,6 +315,13 @@ var tarteaucitron = { html += ' '; + + if (tarteaucitron.parameters.privacyUrl !== "") { + html += ' '; + } + html += ''; } else { html += '
'; @@ -326,6 +334,13 @@ var tarteaucitron = { html += ' '; + + if (tarteaucitron.parameters.privacyUrl !== "") { + html += ' '; + } + html += '
'; html += '
'; } @@ -462,7 +477,7 @@ var tarteaucitron = { cookie = tarteaucitron.cookie.read(), hostname = document.location.hostname, hostRef = document.referrer.split('/')[2], - isNavigating = (hostRef === hostname) ? true : false, + isNavigating = (hostRef === hostname && window.location.href !== tarteaucitron.parameters.privacyUrl) ? true : false, isAutostart = (!service.needConsent) ? true : false, isWaiting = (cookie.indexOf(service.key + '=wait') >= 0) ? true : false, isDenied = (cookie.indexOf(service.key + '=false') >= 0) ? true : false,