Merge branch 'master' into issuu

2018-06-15 15:02:02 +02:00 · 2018-06-15 15:02:02 +02:00 · 7411369f79
parent 7143dc9258 c7af71d4f7
commit 7411369f79
5 changed files with 148 additions and 14 deletions
--- a/README.md
+++ b/README.md
@ -56,7 +56,11 @@ Bonus:
 * Comment
  * Disqus
  * Facebook (commentaire)
-
+  
+* Marketing Automation & CRM
+  * Mautic
+  * Webmecanik Automation
+  
 * Social network
  * AddThis
  * AddToAny (feed)
@ -100,3 +104,23 @@ In PHP for example, you can bypass all the script by setting this var `tarteauci

 # Installation guide
 [Visit opt-out.ferank.eu](https://opt-out.ferank.eu/)
+
+
+# How to use
+
+```html
+<script type="text/javascript" src="/tarteaucitron/tarteaucitron.js"></script>
+
+<script type="text/javascript">
+tarteaucitron.init({
+    "hashtag": "#tarteaucitron", /* Ouverture automatique du panel avec le hashtag */
+    "highPrivacy": false, /* désactiver le consentement implicite (en naviguant) ? */
+    "orientation": "top", /* le bandeau doit être en haut (top) ou en bas (bottom) ? */
+    "adblocker": false, /* Afficher un message si un adblocker est détecté */
+    "showAlertSmall": true, /* afficher le petit bandeau en bas à droite ? */
+    "cookieslist": true, /* Afficher la liste des cookies installés ? */
+    "removeCredit": false, /* supprimer le lien vers la source ? */
+    "cookieDomain": ".my-multisite-domaine.fr" /* Nom de domaine sur lequel sera posé le cookie - pour les multisites / sous-domaines - Facultatif */
+});
+</script>
+```
--- a/lang/tarteaucitron.es.js
+++ b/lang/tarteaucitron.es.js
@ -1,7 +1,7 @@
 /*global tarteaucitron */
 tarteaucitron.lang = {
    "adblock": "Hola! Este sitio web es transparente y le da la opción de activar los servicios de terceros.",
-    "adblock_call": "Por favor deshabilite su AdBlocker para comenzar a personalizar.",
+    "adblock_call": "Por favor deshabilite su AdBlocker para empezar a personalizar los servicios.",
    "reload": "Actualizar esta página",
    
    "alertBigScroll": "Al continuar para desplazarse,",
@ -14,7 +14,7 @@ tarteaucitron.lang = {
    "acceptAll": "OK, aceptar todas",
    "close": "Cerrar",
    
-    "all": "Preference for all services",
+    "all": "Ajustes para todos los servicios",

    "info": "Protegiendo tu privacidad",
    "disclaimer": "Aceptando estos servicios terceros, estas aceptando sus cookies y el uso de tecnologías de rastreo necesarias para su correcto funcionamiento.",
@ -28,7 +28,7 @@ tarteaucitron.lang = {
    "source": "Ver sitio web oficial",
    "credit": "Gestor de cookies realizada por tarteaucitron.js",
    
-    "fallback": "esta deshabilitado.",
+    "fallback": "está deshabilitado.",

    "ads": {
        "title": "Red de publicidad",
--- a/lang/tarteaucitron.nl.js
+++ b/lang/tarteaucitron.nl.js
@ -0,0 +1,65 @@
+/*global tarteaucitron */
+tarteaucitron.lang = {
+    "adblock": "Hallo! Deze site is transparant en laat u de services van derden kiezen die u wilt toestaan.",
+    "adblock_call": "Schakel uw adblocker uit om te beginnen met aanpassen.",
+    "reload": "Ververs de pagina",
+    
+    "alertBigScroll": "Door te blijven scrollen,",
+    "alertBigClick": "Als je doorgaat met het surfen op deze website,",
+    "alertBig": "sta je alle diensten van derden toe",
+    
+    "alertBigPrivacy": "Deze site maakt gebruik van cookies en geeft u controle over wat u wilt activeren",
+    "alertSmall": "Beheer instellingen",
+    "personalize": "Personaliseer",
+    "acceptAll": "OK, accepteer alle",
+    "close": "Sluit",
+    
+    "all": "Voorkeur voor alle diensten",
+
+    "info": "Bescherming van uw privacy",
+    "disclaimer": "Door deze services van derden toe te staan, accepteert u hun cookies en het gebruik van trackingtechnologieën die nodig zijn voor hun goede werking.",
+    "allow": "Toestaan",
+    "deny": "Weigeren",
+    "noCookie": "Deze service gebruikt geen cookie",
+    "useCookie": "Deze service kan worden geïnstalleerd",
+    "useCookieCurrent": "Deze service is geïnstalleerd",
+    "useNoCookie": "Deze service heeft geen cookies geïnstalleerd.",
+    "more": "Lees meer",
+    "source": "Bekijk de officiële website",
+    "credit": "Cookie manager mogelijk gemaakt door tarteaucitron.js",
+    
+    "fallback": "is uitgeschakeld.",
+
+    "ads": {
+        "title": "Advertentienetwerk",
+        "details": "Advertentienetwerken kunnen inkomsten genereren door advertentieruimte op de site te verkopen."
+    },
+    "analytic": {
+        "title": "Bezoekers meting",
+        "details": "De bezoekersdiensten voor het publiek worden gebruikt om nuttige statistieken te genereren om de site te verbeteren."
+    },
+    "social": {
+        "title": "Sociale netwerken",
+        "details": "Sociale netwerken kunnen de bruikbaarheid van de site verbeteren en helpen deze via de shares te promoten."
+    },
+    "video": {
+        "title": "Videos",
+        "details": "Video sharing-services helpen om rich media op de site toe te voegen en de zichtbaarheid ervan te vergroten."
+    },
+    "comment": {
+        "title": "Comments",
+        "details": "Commentsmanagers faciliteren het indienen van opmerkingen en het bestrijden van spam."
+    },
+    "support": {
+        "title": "Support",
+        "details": "Support diensten stellen u in staat contact op te nemen met het team van de site en helpen het te verbeteren."
+    },
+    "api": {
+        "title": "APIs",
+        "details": "APIs worden gebruikt om scripts te laden: geolocatie, zoekmachines, vertalingen, ..."
+    },
+    "other": {
+        "title": "Overig",
+        "details": "Diensten om webinhoud weer te geven."
+    }
+};
--- a/tarteaucitron.js
+++ b/tarteaucitron.js
@ -865,14 +865,15 @@ var tarteaucitron = {
                expireTime = time + 31536000000, // 365 days
                regex = new RegExp("!" + key + "=(wait|true|false)", "g"),
                cookie = tarteaucitron.cookie.read().replace(regex, ""),
-                value = 'tarteaucitron=' + cookie + '!' + key + '=' + status;
-            
-            if (tarteaucitron.cookie.read().indexOf(key + '=' + status) === -1) {
+                value = 'tarteaucitron=' + cookie + '!' + key + '=' + status,
+                domain = (tarteaucitron.parameters.cookieDomain !== undefined && tarteaucitron.parameters.cookieDomain !== '') ? 'domain=' + tarteaucitron.parameters.cookieDomain + ';' : '';
+
+          if (tarteaucitron.cookie.read().indexOf(key + '=' + status) === -1) {
                tarteaucitron.pro('!' + key + '=' + status);
            }

            d.setTime(expireTime);
-            document.cookie = value + '; expires=' + d.toGMTString() + '; path=/;';
+            document.cookie = value + '; expires=' + d.toGMTString() + '; path=/;' + domain;
        },
        "read": function () {
            "use strict";
@ -1040,7 +1041,7 @@ var tarteaucitron = {
        "use strict";
        if (!navigator) { return 'en'; }
        
-        var availableLanguages = 'cs,en,fr,es,it,de,pt,pl,ru',
+        var availableLanguages = 'cs,en,fr,es,it,de,nl,pt,pl,ru',
            defaultLanguage = 'en',
            lang = navigator.language || navigator.browserLanguage ||
                navigator.systemLanguage || navigator.userLang || null,
@ -1077,6 +1078,8 @@ var tarteaucitron = {
            return 'it_IT';
        } else if (userLanguage === 'pt') {
            return 'pt_PT';
+        } else if (userLanguage === 'nl') {
+            return 'nl_NL';
        } else {
            return 'en_US';
        }
--- a/tarteaucitron.services.js
+++ b/tarteaucitron.services.js
@ -853,8 +853,7 @@ tarteaucitron.services.analytics = {
            window.ga.q.push(arguments);
        };
        window.ga.l = new Date();
-
-        tarteaucitron.addScript('//www.google-analytics.com/analytics.js', '', function () {
+        tarteaucitron.addScript('https://www.google-analytics.com/analytics.js', '', function () {
            ga('create', tarteaucitron.user.analyticsUa, {'cookieExpires': 34128000});
            ga('send', 'pageview');
            if (typeof tarteaucitron.user.analyticsMore === 'function') {
@ -871,12 +870,16 @@ tarteaucitron.services.gtag = {
    "name": "Google Analytics (gtag.js)",
    "uri": "https://support.google.com/analytics/answer/6004245",
    "needConsent": true,
-    "cookies": ['_ga', '_gat', '_gid', '__utma', '__utmb', '__utmc', '__utmt', '__utmz'],
+    "cookies": (function () {
+        // Add _gat_gtag_UA_XXXXXXX_XX cookie to cookies array
+        var gatGtagUaCookie = '_gat_gtag_' + tarteaucitron.user.gtagUa;
+        gatGtagUaCookie = gatGtagUaCookie.replace(/-/g, '_');
+        return ['_ga', '_gat', '_gid', '__utma', '__utmb', '__utmc', '__utmt', '__utmz', gatGtagUaCookie];
+    })(),
    "js": function () {
        "use strict";
        window.dataLayer = window.dataLayer || [];
-
-        tarteaucitron.addScript('//www.googletagmanager.com/gtag/js?id=' + tarteaucitron.user.gtagUa, '', function () {
+        tarteaucitron.addScript('https://www.googletagmanager.com/gtag/js?id=' + tarteaucitron.user.gtagUa, '', function () {
            function gtag(){dataLayer.push(arguments);}
            gtag('js', new Date());
            gtag('config', tarteaucitron.user.gtagUa);
@ -968,6 +971,20 @@ tarteaucitron.services.jsapi = {
    }
 };

+// recaptcha
+tarteaucitron.services.recaptcha = {
+    "key": "recaptcha",
+    "type": "api",
+    "name": "reCAPTCHA",
+    "uri": "http://www.google.com/policies/privacy/",
+    "needConsent": true,
+    "cookies": ['nid'],
+    "js": function () {
+        "use strict";
+        tarteaucitron.addScript('https://www.google.com/recaptcha/api.js');
+    }
+};
+
 // linkedin
 tarteaucitron.services.linkedin = {
    "key": "linkedin",
@ -1893,3 +1910,28 @@ tarteaucitron.services.issuu = {
        });
    }
 };
+
+// webmecanik
+tarteaucitron.services.webmecanik = {
+    "key": "webmecanik",
+    "type": "analytic",
+    "name": "Webmecanik",
+    "uri": "https://webmecanik.com/tos",
+    "needConsent": true,
+    "cookies": ['mtc_id', 'mtc_sid'],
+    "js": function () {
+        "use strict";
+        if (tarteaucitron.user.webmecanikurl === undefined) {
+            return;
+        }
+        window['WebmecanikTrackingObject'] = 'mt';
+        window['mt'] = window['mt'] || function() {
+            (window['mt'].q = window['mt'].q || []).push(arguments);
+        };
+
+        tarteaucitron.addScript(tarteaucitron.user.webmecanikurl, '', function() {
+            mt('send', 'pageview');
+        });
+    }
+};
+