update Piwik to version 2.16 (fixes #91)

www/analytics/plugins/Overlay/client/client.js

@@ -10,7 +10,7 @@ var Piwik_Overlay_Client = (function () {
     var idSite;
 
     /** The current period and date */
-    var period, date;
+    var period, date, segment;
 
     /** Reference to the status bar DOM element */
     var statusBar;
@@ -35,7 +35,7 @@ var Piwik_Overlay_Client = (function () {
             callback();
         }
         else {
-            Piwik_Overlay_Client.loadScript('libs/jquery/jquery.js', function () {
+            Piwik_Overlay_Client.loadScript('libs/bower_components/jquery/dist/jquery.min.js', function () {
                 $ = jQuery;
                 jQuery.noConflict();
                 callback();
@@ -131,11 +131,12 @@ var Piwik_Overlay_Client = (function () {
     return {
 
         /** Initialize in-site analytics */
-        initialize: function (pPiwikRoot, pIdSite, pPeriod, pDate) {
+        initialize: function (pPiwikRoot, pIdSite, pPeriod, pDate, pSegment) {
             piwikRoot = pPiwikRoot;
             idSite = pIdSite;
             period = pPeriod;
             date = pDate;
+            segment = pSegment;
 
             var load = this.loadScript;
             var loading = this.loadingNotification;
@@ -193,6 +194,10 @@ var Piwik_Overlay_Client = (function () {
             var url = piwikRoot + 'index.php?module=API&method=Overlay.' + method
                 + '&idSite=' + idSite + '&period=' + period + '&date=' + date + '&format=JSON&filter_limit=-1';
 
+            if (segment) {
+                url += '&segment=' + segment;
+            }
+
             if (additionalParams) {
                 url += '&' + additionalParams;
             }

www/analytics/plugins/Overlay/client/followingpages.js

@@ -164,7 +164,12 @@ var Piwik_Overlay_FollowingPages = (function () {
         linkTag[0].piwikTagElement = true;
 
         var rate = data.clickRate;
-        if (rate < 10) {
+
+        if( rate < 0.001 ) {
+            rate = '<0.001';
+        } else if (rate < 1) {
+            rate = Math.round( rate * 1000 ) / 1000;
+        } else if (rate < 10) {
             rate = Math.round(rate * 10) / 10;
         } else {
             rate = Math.round(rate);
@@ -387,11 +392,11 @@ var Piwik_Overlay_FollowingPages = (function () {
             offset = linkTag.offset();
             height = linkTag.outerHeight();
         }
-        
+
         var numLinks = linksOnPage[linkUrl].length;
 
         putBoxAroundLink(offset, width, height, numLinks, data.referrals);
-        
+
         // highlight tags
         for (var j = 0; j < numLinks; j++) {
             var tag = linksOnPage[linkUrl][j][0].piwikTagElement;
@@ -407,11 +412,11 @@ var Piwik_Overlay_FollowingPages = (function () {
         linkTag[0].piwikHideNotification = Piwik_Overlay_Client.notification(
             Piwik_Overlay_Translations.get('link') + ': ' + linkUrl, 'LinkLocation');
     }
-    
+
     function putBoxAroundLink(offset, width, height, numLinks, numReferrals) {
         var borderWidth = 2;
         var padding = 4; // the distance between the link and the border
-        
+
         // top border
         highlightElements[0]
             .width(width + 2 * padding)
@@ -419,7 +424,7 @@ var Piwik_Overlay_FollowingPages = (function () {
                 top: offset.top - borderWidth - padding,
                 left: offset.left - padding
             }).show();
-        
+
         // right border
         highlightElements[1]
             .height(height + 2 * borderWidth + 2 * padding)
@@ -427,7 +432,7 @@ var Piwik_Overlay_FollowingPages = (function () {
                 top: offset.top - borderWidth - padding,
                 left: offset.left + width + padding
             }).show();
-        
+
         // left border
         highlightElements[2]
             .height(height + 2 * borderWidth + 2 * padding)
@@ -456,7 +461,7 @@ var Piwik_Overlay_FollowingPages = (function () {
             top: offset.top + height + padding,
             left: offset.left - borderWidth - padding
         }).show();
-        
+
         var minBoxWidth = width + 2 * borderWidth + 2 * padding;
         if (highlightElements[3].width() < minBoxWidth) {
             // we cannot use minWidth because of IE7
@@ -485,7 +490,6 @@ var Piwik_Overlay_FollowingPages = (function () {
         }
     }
 
-
     return {
 
         /**

www/analytics/plugins/Overlay/client/urlnormalizer.js

@@ -189,6 +189,8 @@ var Piwik_Overlay_UrlNormalizer = (function () {
             url = url.replace(/\?&/, '?');
             url = url.replace(/\?#/, '#');
             url = url.replace(/\?$/, '');
+            url = url.replace(/%5B/gi, '[');
+            url = url.replace(/%5D/gi, ']');
 
             return url;
         }