update Piwik to version 2.16 (fixes #91)

www/analytics/plugins/Overlay/templates/index.twig

@@ -8,22 +8,22 @@
 
 {% block content %}
     <div class="overlay-sidebar-container">
-        <a id="Overlay_Title" href="http://piwik.org/docs/page-overlay/" target="_blank">
+        <a id="overlayTitle" href="http://piwik.org/docs/page-overlay/" rel="noreferrer" target="_blank">
             {{ 'Overlay_Overlay'|translate }}
-            <img src="plugins/Zeitgeist/images/help.png" alt="Documentation"/>
+            <span class="icon-help"></span>
         </a>
 
-        <div id="Overlay_DateRangeSelection">
-            <select id="Overlay_DateRangeSelect" name="Overlay_DateRangeSelect">
-                <option value="day;today">{{ 'General_Today'|translate }}</option>
-                <option value="day;yesterday">{{ 'General_Yesterday'|translate }}</option>
+        <div id="overlayDateRangeSelection">
+            <select id="overlayDateRangeSelect" name="overlayDateRangeSelect">
+                <option value="day;today">{{ 'Intl_Today'|translate }}</option>
+                <option value="day;yesterday">{{ 'Intl_Yesterday'|translate }}</option>
                 <option value="week;today">{{ 'General_CurrentWeek'|translate }}</option>
                 <option value="month;today">{{ 'General_CurrentMonth'|translate }}</option>
                 <option value="year;today">{{ 'General_CurrentYear'|translate }}</option>
             </select>
         </div>
 
-        <div id="Overlay_Error_NotLoading">
+        <div id="overlayErrorNotLoading">
             <p>
                 <span>{{ 'Overlay_ErrorNotLoading'|translate }}</span>
             </p>
@@ -37,38 +37,36 @@
             </p>
 
             <p>
-                <a href="http://piwik.org/docs/page-overlay/#toc-page-overlay-troubleshooting" target="_blank">
+                <a href="http://piwik.org/docs/page-overlay/#toc-page-overlay-troubleshooting" rel="noreferrer"  target="_blank">
                     {{ 'Overlay_ErrorNotLoadingLink'|translate }}
                 </a>
             </p>
         </div>
 
-        <div id="Overlay_Location">&nbsp;</div>
+        <div id="overlayLocation">&nbsp;</div>
 
-        <div id="Overlay_Loading">{{ 'General_Loading'|translate }}</div>
+        <div id="overlayLoading">{{ 'General_Loading'|translate }}</div>
 
-        <div id="Overlay_Sidebar"></div>
+        <div id="overlaySidebar"></div>
 
-        <a id="Overlay_RowEvolution">{{ 'General_RowEvolutionRowActionTooltipTitle'|translate }}</a>
-        <a id="Overlay_Transitions">{{ 'General_TransitionsRowActionTooltipTitle'|translate }}</a>
+        <a id="overlayRowEvolution">{{ 'General_RowEvolutionRowActionTooltipTitle'|translate }}</a>
+        <a id="overlayTransitions">{{ 'General_TransitionsRowActionTooltipTitle'|translate }}</a>
+        <a id="overlaySegmentedVisitorLog">{{ 'Live_RowActionTooltipTitle'|translate }}</a>
     </div>
 
-    <!-- TODO: rethink the way the sidebar works -->
-    <!-- <a id="Overlay_FullScreen" href="#">
-        {'Overlay_OpenFullScreen'|translate|escape:'html'}
-    </a> -->
-
-
-    <div id="Overlay_Main">
-        <iframe id="Overlay_Iframe" src="" frameborder="0"></iframe>
+    <div id="overlayMain">
+        <iframe id="overlayIframe" src="" frameborder="0"></iframe>
     </div>
 
     <script type="text/javascript">
-        var iframeSrc = 'index.php?module=Overlay&action=startOverlaySession&idSite={{ idSite }}&period={{ period }}&date={{ date }}';
-        Piwik_Overlay.init(iframeSrc, '{{ idSite }}', '{{ period }}', '{{ date }}');
+        broadcast._isInit = true;
+        $(function () {
+            var iframeSrc = 'index.php?module=Overlay&action=startOverlaySession&idSite={{ idSite }}&period={{ period }}&date={{ rawDate }}&segment={{ segment }}';
+            Piwik_Overlay.init(iframeSrc, '{{ idSite }}', '{{ period }}', '{{ rawDate }}', '{{ segment }}');
 
-        Piwik_Overlay_Translations = {
-            domain: "{{ 'Overlay_Domain'|translate }}"
-        };
+            window.Piwik_Overlay_Translations = {
+                domain: "{{ 'Overlay_Domain'|translate }}"
+            };
+        });
     </script>
 {% endblock %}

www/analytics/plugins/Overlay/templates/index_noframe.twig

@@ -3,10 +3,10 @@
 {% block content %}
 <h1>{{ 'Overlay_Overlay'|translate }}</h1>
 
-<div id="Overlay_NoFrame">
+<div id="overlayNoFrame">
 
     <script type="text/javascript">
-        var newLocation = 'index.php?module=Overlay&action=startOverlaySession&idSite={{ idSite }}&period={{ period }}&date={{ date }}';
+        var newLocation = 'index.php?module=Overlay&action=startOverlaySession&idSite={{ idSite }}&period={{ period }}&date={{ date }}&segment={{ segment }}';
 
         var locationParts = window.location.href.split('#');
         if (locationParts.length > 1) {

www/analytics/plugins/Overlay/templates/notifyParentIframe.twig

@@ -1,6 +1,7 @@
 <html>
 <head>
     <title></title>
+    <meta name="robots" content="noindex,nofollow">
 </head>
 <body>
 <script type="text/javascript">

www/analytics/plugins/Overlay/templates/renderSidebar.twig

@@ -1,22 +1,30 @@
 <div> <!-- Wrapper is needed that the html can be jqueryfied -->
 
     <!-- This div is removed by JS and the content is put in the location div -->
-    <div class="Overlay_Location">
+    <div class="overlayLocation">
         <strong>{{ 'Overlay_Location'|translate }}:</strong>
 		<span data-normalized-url="{{ normalizedUrl }}" data-label="{{ label }}">
 			{{ location }}
 		</span>
     </div>
 
+    <div class="overlaySegment">
+        <strong>{{ 'General_Segment'|translate }}:</strong>
+        <span>{{ segmentDescription }}</span>
+    </div>
+
     {% if data|length > 0 %}
-        <h2 class="Overlay_MainMetrics">{{ 'General_MainMetrics'|translate }}</h2>
+        <h2 class="overlayMainMetrics">{{ 'General_MainMetrics'|translate }}</h2>
+        <ul class="overlayMetrics">
         {% for metric in data %}
-            <div class="Overlay_Metric">
-                <span class="Overlay_MetricValue">{{ metric.value|raw }}</span> {{ metric.name }}
-            </div>
+            <li class="overlayMetric">
+                <span class="overlayMetricValue">{{ metric.value|raw }}</span> {{ metric.name }}
+            </li>
         {% endfor %}
+        </ul>
+        <input type="hidden" value="{{ segment }}" id="segment" />
     {% else %}
-        <!-- note: the class Overlay_NoData is used in Piwik_Overlay.js -->
-        <div class="Overlay_NoData">{{ 'Overlay_NoData'|translate }}</div>
+        <!-- note: the class overlayNoData is used in Piwik_Overlay.js -->
+        <div class="overlayNoData">{{ 'Overlay_NoData'|translate }}</div>
     {% endif %}
 </div>

www/analytics/plugins/Overlay/templates/showErrorWrongDomain.twig

@@ -2,9 +2,10 @@
 <html>
 <head>
     <meta charset="utf-8">
+    <meta name="robots" content="noindex,nofollow">
     <title></title>
-    <meta name="generator" content="Piwik - Open Source Web Analytics"/>
-    <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
+    <meta name="generator" content="Piwik - free/libre analytics platform"/>
+    {% include "@CoreHome/_favicon.twig" %}
     <link rel="stylesheet" type="text/css" href="plugins/Overlay/stylesheets/showErrorWrongDomain.css" />
 </head>
 <body>

www/analytics/plugins/Overlay/templates/startOverlaySession.twig

@@ -0,0 +1,50 @@
+<html><head><title></title></head><body>
+<script type="text/javascript">
+    function handleProtocol(url) {
+        if ({% if isHttps %}true{% else %}false{% endif %}) {
+            return url.replace(/http:\/\//i, "https://");
+        } else {
+            return url.replace(/https:\/\//i, "http://");
+        }
+    }
+
+    function removeUrlPrefix(url) {
+        return url.replace(/http(s)?:\/\/(www\.)?/i, "");
+    }
+
+    if (window.location.hash) {
+        var match = false;
+
+        var urlToRedirect = window.location.hash.substr(1);
+        var urlToRedirectWithoutPrefix = removeUrlPrefix(urlToRedirect);
+
+        var knownUrls = {{ knownUrls|raw }};
+        for (var i = 0; i < knownUrls.length; i++) {
+            var testUrl = removeUrlPrefix(knownUrls[i]);
+            if (urlToRedirectWithoutPrefix.substr(0, testUrl.length) == testUrl) {
+                match = true;
+                if (navigator.appName == "Microsoft Internet Explorer") {
+                    // internet explorer loses the referrer if we use window.location.href=X
+                    var referLink = document.createElement("a");
+                    referLink.href = handleProtocol(urlToRedirect);
+                    document.body.appendChild(referLink);
+                    referLink.click();
+                } else {
+                    window.location.href = handleProtocol(urlToRedirect);
+                }
+                break;
+            }
+        }
+
+        if (!match) {
+            var idSite = window.location.href.match(/idSite=([0-9]+)/i)[1];
+            window.location.href = "index.php?module=Overlay&action=showErrorWrongDomain"
+                    + "&idSite=" + idSite
+                    + "&url=" + encodeURIComponent(urlToRedirect);
+        }
+    }
+    else {
+        window.location.href = handleProtocol("{{ mainUrl|e('js') }}");
+    };
+</script>
+</body></html>