# HG changeset patch
# User gibus
# Date 1392116699 -3600
# Node ID 0a19e3214687019e203b26de3e3454c9f973e188
# Parent  a6b0dcb13eb05415da068120cd00ea26547d9f8a
CNIL/EU privacy directive compliance for piwik cookies.

diff -r a6b0dcb13eb0 -r 0a19e3214687 src/cm/locale/bg/LC_MESSAGES/django.mo
Binary file src/cm/locale/bg/LC_MESSAGES/django.mo has changed
diff -r a6b0dcb13eb0 -r 0a19e3214687 src/cm/locale/bg/LC_MESSAGES/django.po
--- a/src/cm/locale/bg/LC_MESSAGES/django.po	Mon Feb 10 15:56:24 2014 +0100
+++ b/src/cm/locale/bg/LC_MESSAGES/django.po	Tue Feb 11 12:04:59 2014 +0100
@@ -2209,3 +2209,8 @@
 #, fuzzy
 msgid "To disable this category for this text whatever the configuration for the workspace, enter: "
 msgstr "За да деактивирате тази категория за този текст, независимо от конфигурацията на работната област, въведете: "
+
+#: /header.html:8
+#, fuzzy
+msgid "Privacy policy"
+msgstr "политика за поверителност"
diff -r a6b0dcb13eb0 -r 0a19e3214687 src/cm/locale/en/LC_MESSAGES/django.po
--- a/src/cm/locale/en/LC_MESSAGES/django.po	Mon Feb 10 15:56:24 2014 +0100
+++ b/src/cm/locale/en/LC_MESSAGES/django.po	Tue Feb 11 12:04:59 2014 +0100
@@ -2078,3 +2078,8 @@
 #: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270
 msgid "To disable this category for this text whatever the configuration for the workspace, enter: "
 msgstr ""
+
+#: /header.html:8
+#, fuzzy
+msgid "Privacy policy"
+msgstr ""
diff -r a6b0dcb13eb0 -r 0a19e3214687 src/cm/locale/es/LC_MESSAGES/django.mo
Binary file src/cm/locale/es/LC_MESSAGES/django.mo has changed
diff -r a6b0dcb13eb0 -r 0a19e3214687 src/cm/locale/es/LC_MESSAGES/django.po
--- a/src/cm/locale/es/LC_MESSAGES/django.po	Mon Feb 10 15:56:24 2014 +0100
+++ b/src/cm/locale/es/LC_MESSAGES/django.po	Tue Feb 11 12:04:59 2014 +0100
@@ -2374,3 +2374,8 @@
 #, fuzzy
 msgid "To disable this category for this text whatever the configuration for the workspace, enter: "
 msgstr "Para desactivar esta categoría para este texto sea cual sea la configuración del espacio de trabajo, escriba: "
+
+#: /header.html:8
+#, fuzzy
+msgid "Privacy policy"
+msgstr "Política de confidencialidad"
diff -r a6b0dcb13eb0 -r 0a19e3214687 src/cm/locale/fr/LC_MESSAGES/django.mo
Binary file src/cm/locale/fr/LC_MESSAGES/django.mo has changed
diff -r a6b0dcb13eb0 -r 0a19e3214687 src/cm/locale/fr/LC_MESSAGES/django.po
--- a/src/cm/locale/fr/LC_MESSAGES/django.po	Mon Feb 10 15:56:24 2014 +0100
+++ b/src/cm/locale/fr/LC_MESSAGES/django.po	Tue Feb 11 12:04:59 2014 +0100
@@ -2299,3 +2299,8 @@
 #: models.py:266 models.py:267 models.py:268 models.py:269 models.py:270
 msgid "To disable this category for this text whatever the configuration for the workspace, enter: "
 msgstr "Pour désactiver cette catégorie pour ce texte quelle que soit la configuration de l'espace de travail, entrez : "
+
+#: /header.html:8
+#, fuzzy
+msgid "Privacy policy"
+msgstr "Vie privée"
diff -r a6b0dcb13eb0 -r 0a19e3214687 src/cm/locale/it/LC_MESSAGES/django.mo
Binary file src/cm/locale/it/LC_MESSAGES/django.mo has changed
diff -r a6b0dcb13eb0 -r 0a19e3214687 src/cm/locale/it/LC_MESSAGES/django.po
--- a/src/cm/locale/it/LC_MESSAGES/django.po	Mon Feb 10 15:56:24 2014 +0100
+++ b/src/cm/locale/it/LC_MESSAGES/django.po	Tue Feb 11 12:04:59 2014 +0100
@@ -2327,3 +2327,8 @@
 #, fuzzy
 msgid "To disable this category for this text whatever the configuration for the workspace, enter: "
 msgstr "Per disabilitare questa categoria per questo testo qualunque sia la configurazione per l'area di lavoro, digitare: "
+
+#: /header.html:8
+#, fuzzy
+msgid "Privacy policy"
+msgstr "Politica della privacy"
diff -r a6b0dcb13eb0 -r 0a19e3214687 src/cm/locale/no/LC_MESSAGES/django.mo
Binary file src/cm/locale/no/LC_MESSAGES/django.mo has changed
diff -r a6b0dcb13eb0 -r 0a19e3214687 src/cm/locale/no/LC_MESSAGES/django.po
--- a/src/cm/locale/no/LC_MESSAGES/django.po	Mon Feb 10 15:56:24 2014 +0100
+++ b/src/cm/locale/no/LC_MESSAGES/django.po	Tue Feb 11 12:04:59 2014 +0100
@@ -2188,3 +2188,8 @@
 #, fuzzy
 msgid "To disable this category for this text whatever the configuration for the workspace, enter: "
 msgstr "For å deaktivere denne kategorien for denne teksten uansett konfigurasjon for arbeidsområdet, skriver du: "
+
+#: /header.html:8
+#, fuzzy
+msgid "Privacy policy"
+msgstr "Personvern"
diff -r a6b0dcb13eb0 -r 0a19e3214687 src/cm/locale/pt_BR/LC_MESSAGES/django.mo
Binary file src/cm/locale/pt_BR/LC_MESSAGES/django.mo has changed
diff -r a6b0dcb13eb0 -r 0a19e3214687 src/cm/locale/pt_BR/LC_MESSAGES/django.po
--- a/src/cm/locale/pt_BR/LC_MESSAGES/django.po	Mon Feb 10 15:56:24 2014 +0100
+++ b/src/cm/locale/pt_BR/LC_MESSAGES/django.po	Tue Feb 11 12:04:59 2014 +0100
@@ -2213,3 +2213,8 @@
 #, fuzzy
 msgid "To disable this category for this text whatever the configuration for the workspace, enter: "
 msgstr "Para desativar esta categoria para este texto seja qual for a configuração do espaço de trabalho, digite: "
+
+#: /header.html:8
+#, fuzzy
+msgid "Privacy policy"
+msgstr "Política de privacidade"
diff -r a6b0dcb13eb0 -r 0a19e3214687 src/cm/media/css/base.css
--- a/src/cm/media/css/base.css	Mon Feb 10 15:56:24 2014 +0100
+++ b/src/cm/media/css/base.css	Tue Feb 11 12:04:59 2014 +0100
@@ -863,4 +863,16 @@
   font: 16px "Droid Sans", Verdana, sans-serif;
 }
 
+#piwik-cookies-optout {
+  position: fixed;
+  left: 25%;
+  top: 3%;
+  width: 900px;
+  background-color: #ddd;
+  opacity:0.4;
+  filter:alpha(opacity=40); /* For IE8 and earlier */
+}
 
+#piwik-cookies-optout iframe {
+  display: none;
+}
diff -r a6b0dcb13eb0 -r 0a19e3214687 src/cm/templates/site/layout/header.html
--- a/src/cm/templates/site/layout/header.html	Mon Feb 10 15:56:24 2014 +0100
+++ b/src/cm/templates/site/layout/header.html	Tue Feb 11 12:04:59 2014 +0100
@@ -4,6 +4,9 @@
 
 <div id="header_controls">
 
+{% if not DISABLE_TRACKING %}
+   <a id="hide-piwik-cookies-optout">{% blocktrans %}Privacy policy{% endblocktrans %} ▼ </a> ·
+{% endif %}
 {% if user.is_authenticated %}<b>{{ user.username }}</b> ·{% endif %} 
    <a title="{% blocktrans %}Home{% endblocktrans %}" href="{% url index %}">{% blocktrans %}Home{% endblocktrans %}</a>
    {% if can_create_text %}    
diff -r a6b0dcb13eb0 -r 0a19e3214687 src/cm/templates/site/tracking.html
--- a/src/cm/templates/site/tracking.html	Mon Feb 10 15:56:24 2014 +0100
+++ b/src/cm/templates/site/tracking.html	Tue Feb 11 12:04:59 2014 +0100
@@ -6,21 +6,22 @@
 
 <!-- Piwik -->
 <script type="text/javascript">
+<!--
   var _paq = _paq || [];
   _paq.push(["trackPageView"]);
   _paq.push(["enableLinkTracking"]);
 
   _paq.push([function() {
-    function getOriginalVisitorCookieTimeout() {
+    function getOriginalVisitorCookieTimeout(obj) {
       var now = new Date(),
-        nowts = Math.round(now.getTime() / 1000),
-        visitorInfo = this.getVisitorInfo();
+        nowTs = Math.round(now.getTime() / 1000),
+        visitorInfo = obj.getVisitorInfo();
       var createTs = parseInt(visitorInfo[2]);
       var cookieTimeout = 33696000; // 13 mois en secondes
       var originalTimeout = createTs + cookieTimeout - nowTs;
       return originalTimeout;
     }
-    this.setVisitorCookieTimeout(getOriginalVisitorCookieTimeout());
+    this.setVisitorCookieTimeout(getOriginalVisitorCookieTimeout(this));
   }]);
 
   (function() {
@@ -30,6 +31,13 @@
     var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
     g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
   })();
+<!-- End Piwik Code -->
+$(document).ready(function() {
+  $('#hide-piwik-cookies-optout').click(function() {
+    $('#piwik-cookies-optout iframe').slideToggle("fast");
+  });
+});
+-->
 </script>
-<!-- End Piwik Code -->
+<div id="piwik-cookies-optout"><iframe frameborder="no" width="900px" height="120px" src="http://piwik.sopinspace.net/index.php?module=CoreAdminHome&action=optOut&language={{ LANGUAGE_CODE }}"></iframe></div>
 {% endif %}