update Piwik to version 2.16 (fixes #91)

2016-04-10 18:55:57 +02:00 · 2016-04-10 18:55:57 +02:00 · 47263617c5
commit 47263617c5
parent 9abe039dc8
5833 changed files with 418860 additions and 226988 deletions
--- a/www/analytics/plugins/Overlay/API.php
+++ b/www/analytics/plugins/Overlay/API.php
@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
 *
 * @link http://piwik.org
 * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@ -11,6 +11,7 @@ namespace Piwik\Plugins\Overlay;
 use Exception;
 use Piwik\Access;
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
 use Piwik\DataTable;
 use Piwik\Piwik;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
@ -105,26 +106,26 @@ class API extends \Piwik\Plugin\API
    {
        /**
         * Triggered immediately before the user is authenticated.
-         * 
+         *
         * This event can be used by plugins that provide their own authentication mechanism
-         * to make that mechanism available. Subscribers should set the `'auth'` object in
-         * the {@link Piwik\Registry} to an object that implements the {@link Piwik\Auth} interface.
-         * 
+         * to make that mechanism available. Subscribers should set the `'Piwik\Auth'` object in
+         * the container to an object that implements the {@link Piwik\Auth} interface.
+         *
         * **Example**
-         * 
-         *     use Piwik\Registry;
-         * 
+         *
+         *     use Piwik\Container\StaticContainer;
+         *
         *     public function initAuthenticationObject($activateCookieAuth)
         *     {
-         *         Registry::set('auth', new LDAPAuth($activateCookieAuth));
+         *         StaticContainer::getContainer()->set('Piwik\Auth', new LDAPAuth($activateCookieAuth));
         *     }
-         * 
+         *
         * @param bool $activateCookieAuth Whether authentication based on `$_COOKIE` values should
         *                                        be allowed.
         */
        Piwik::postEvent('Request.initAuthenticationObject', array($activateCookieAuth = true));

-        $auth = \Piwik\Registry::get('auth');
+        $auth = StaticContainer::get('Piwik\Auth');
        $success = Access::getInstance()->reloadAccess($auth);

        if (!$success) {
--- a/www/analytics/plugins/Overlay/Controller.php
+++ b/www/analytics/plugins/Overlay/Controller.php
@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
 *
 * @link http://piwik.org
 * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@ -8,21 +8,34 @@
 */
 namespace Piwik\Plugins\Overlay;

+use Piwik\API\CORSHandler;
 use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\Metrics;
-use Piwik\MetricsFormatter;
 use Piwik\Piwik;
+use Piwik\Plugin\Report;
 use Piwik\Plugins\Actions\ArchivingHelper;
+use Piwik\Plugins\SegmentEditor\SegmentFormatter;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\ProxyHttp;
+use Piwik\Segment;
 use Piwik\Tracker\Action;
 use Piwik\Tracker\PageUrl;
 use Piwik\View;

 class Controller extends \Piwik\Plugin\Controller
 {
+    /**
+     * @var SegmentFormatter
+     */
+    private $segmentFormatter;
+
+    public function __construct(SegmentFormatter $segmentFormatter)
+    {
+        $this->segmentFormatter = $segmentFormatter;
+        parent::__construct();
+    }

    /** The index of the plugin */
    public function index()
@ -37,13 +50,11 @@ class Controller extends \Piwik\Plugin\Controller
        $view = new View($template);

        $this->setGeneralVariablesView($view);
-
-        $view->idSite = $this->idSite;
-        $view->date = Common::getRequestVar('date', 'today');
-        $view->period = Common::getRequestVar('period', 'day');
+        $view->segment = Request::getRawSegmentFromRequest();

        $view->ssl = ProxyHttp::isHttps();

+        $this->outputCORSHeaders();
        return $view->render();
    }

@ -54,7 +65,9 @@ class Controller extends \Piwik\Plugin\Controller
        $period = Common::getRequestVar('period');
        $date = Common::getRequestVar('date');
        $currentUrl = Common::getRequestVar('currentUrl');
+        $segment = Request::getRawSegmentFromRequest();
        $currentUrl = Common::unsanitizeInputValue($currentUrl);
+        $segmentSidebar = '';

        $normalizedCurrentUrl = PageUrl::excludeQueryParametersFromUrl($currentUrl, $idSite);
        $normalizedCurrentUrl = Common::unsanitizeInputValue($normalizedCurrentUrl);
@ -64,33 +77,52 @@ class Controller extends \Piwik\Plugin\Controller
        $path = ArchivingHelper::getActionExplodedNames($normalizedCurrentUrl, Action::TYPE_PAGE_URL);
        $path = array_map('urlencode', $path);
        $label = implode('>', $path);
-        $request = new Request(
-            'method=Actions.getPageUrls'
-            . '&idSite=' . urlencode($idSite)
-            . '&date=' . urlencode($date)
-            . '&period=' . urlencode($period)
-            . '&label=' . urlencode($label)
-            . '&format=original'
+
+        $params = array(
+            'idSite' => $idSite,
+            'date' => $date,
+            'period' => $period,
+            'label' => $label,
+            'format' => 'original',
+            'format_metrics' => 0,
        );
-        $dataTable = $request->process();
+
+        if (!empty($segment)) {
+            $params['segment'] = $segment;
+        }
+
+        $dataTable = Request::processRequest('Actions.getPageUrls', $params);
+
+        $formatter = new Metrics\Formatter\Html();

        $data = array();
        if ($dataTable->getRowsCount() > 0) {
            $row = $dataTable->getFirstRow();

            $translations = Metrics::getDefaultMetricTranslations();
-            $showMetrics = array('nb_hits', 'nb_visits', 'nb_uniq_visitors',
+            $showMetrics = array('nb_hits', 'nb_visits', 'nb_users', 'nb_uniq_visitors',
                                 'bounce_rate', 'exit_rate', 'avg_time_on_page');

+            $segmentSidebar = $row->getMetadata('segment');
+            if (!empty($segmentSidebar) && !empty($segment)) {
+                $segmentSidebar = $segment . ';' . $segmentSidebar;
+            }
+
            foreach ($showMetrics as $metric) {
                $value = $row->getColumn($metric);
                if ($value === false) {
                    // skip unique visitors for period != day
                    continue;
                }
-                if ($metric == 'avg_time_on_page') {
-                    $value = MetricsFormatter::getPrettyTimeFromSeconds($value);
+
+                if ($metric == 'bounce_rate'
+                    || $metric == 'exit_rate'
+                ) {
+                    $value = $formatter->getPrettyPercentFromQuotient($value);
+                } else if ($metric == 'avg_time_on_page') {
+                    $value = $formatter->getPrettyTimeFromSeconds($value, $displayAsSentence = true);
                }
+
                $data[] = array(
                    'name'  => $translations[$metric],
                    'value' => $value
@ -117,6 +149,10 @@ class Controller extends \Piwik\Plugin\Controller
        $view->idSite = $idSite;
        $view->period = $period;
        $view->date = $date;
+        $view->segment = $segmentSidebar;
+        $view->segmentDescription = $this->segmentFormatter->getHumanReadable($segment, $idSite);
+
+        $this->outputCORSHeaders();
        return $view->render();
    }

@ -129,63 +165,20 @@ class Controller extends \Piwik\Plugin\Controller
        $idSite = Common::getRequestVar('idSite', 0, 'int');
        Piwik::checkUserHasViewAccess($idSite);

+        $view = new View('@Overlay/startOverlaySession');
+
        $sitesManager = APISitesManager::getInstance();
        $site = $sitesManager->getSiteFromId($idSite);
        $urls = $sitesManager->getSiteUrlsFromId($idSite);

-        @header('Content-Type: text/html; charset=UTF-8');
-        return '
-			<html><head><title></title></head><body>
-			<script type="text/javascript">
-				function handleProtocol(url) {
-					if (' . (ProxyHttp::isHttps() ? 'true' : 'false') . ') {
-						return url.replace(/http:\/\//i, "https://");
-					} else {
-						return url.replace(/https:\/\//i, "http://");
-					}
-				}
+        $view->isHttps   = ProxyHttp::isHttps();
+        $view->knownUrls = json_encode($urls);
+        $view->mainUrl   = $site['main_url'];

-				function removeUrlPrefix(url) {
-					return url.replace(/http(s)?:\/\/(www\.)?/i, "");
-				}
+        $this->outputCORSHeaders();
+        Common::sendHeader('Content-Type: text/html; charset=UTF-8');

-				if (window.location.hash) {
-					var match = false;
-
-					var urlToRedirect = window.location.hash.substr(1);
-					var urlToRedirectWithoutPrefix = removeUrlPrefix(urlToRedirect);
-
-					var knownUrls = ' . Common::json_encode($urls) . ';
-					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("' . $site['main_url'] . '");
-				};
-			</script>
-			</body></html>
-		';
+        return $view->render();
    }

    /**
@ -204,6 +197,7 @@ class Controller extends \Piwik\Plugin\Controller
        $message = nl2br(htmlentities($message));

        $view = new View('@Overlay/showErrorWrongDomain');
+        $this->addCustomLogoInfo($view);
        $view->message = $message;

        if (Piwik::isUserHasAdminAccess($idSite)) {
@ -217,6 +211,7 @@ class Controller extends \Piwik\Plugin\Controller
            $view->troubleshoot = htmlentities(Piwik::translate('Overlay_RedirectUrlErrorUser'));
        }

+        $this->outputCORSHeaders();
        return $view->render();
    }

@ -231,6 +226,13 @@ class Controller extends \Piwik\Plugin\Controller
    public function notifyParentIframe()
    {
        $view = new View('@Overlay/notifyParentIframe');
+        $this->outputCORSHeaders();
        return $view->render();
    }
+
+    protected function outputCORSHeaders()
+    {
+        $corsHandler = new CORSHandler();
+        $corsHandler->handle();
+    }
 }
--- a/www/analytics/plugins/Overlay/Overlay.php
+++ b/www/analytics/plugins/Overlay/Overlay.php
@ -1,6 +1,6 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
 *
 * @link http://piwik.org
 * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@ -9,21 +9,12 @@

 namespace Piwik\Plugins\Overlay;

-
 class Overlay extends \Piwik\Plugin
 {
-    public function getInformation()
-    {
-        $suffix = ' Note: Requires the Transitions plugin enabled.';
-        $info = parent::getInformation();
-        $info['description'] .= ' ' . $suffix;
-        return $info;
-    }
-
    /**
-     * @see Piwik\Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::registerEvents
     */
-    function getListHooksRegistered()
+    function registerEvents()
    {
        return array(
            'AssetManager.getJavaScriptFiles'        => 'getJsFiles',
--- a/www/analytics/plugins/Overlay/client/client.js
+++ b/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;
            }
--- a/www/analytics/plugins/Overlay/client/followingpages.js
+++ b/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 {

        /**
--- a/www/analytics/plugins/Overlay/client/linktags.eps
+++ b/www/analytics/plugins/Overlay/client/linktags.eps
--- a/www/analytics/plugins/Overlay/client/linktags.psd
+++ b/www/analytics/plugins/Overlay/client/linktags.psd
--- a/www/analytics/plugins/Overlay/client/urlnormalizer.js
+++ b/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;
        }
--- a/www/analytics/plugins/Overlay/config/ui-test.php
+++ b/www/analytics/plugins/Overlay/config/ui-test.php
@ -0,0 +1,14 @@
+<?php
+
+return array(
+
+    // Overlay needs the full URLs in order to find the links in the embedded page (otherwise the %
+    // tooltips don't show up)
+    'tests.ui.url_normalizer_blacklist.api' => DI\add(array(
+        'Overlay.getFollowingPages',
+    )),
+    'tests.ui.url_normalizer_blacklist.controller' => DI\add(array(
+        'Overlay.renderSidebar',
+    )),
+
+);
--- a/www/analytics/plugins/Overlay/images/info.png
+++ b/www/analytics/plugins/Overlay/images/info.png
--- a/www/analytics/plugins/Overlay/javascripts/Overlay_Helper.js
+++ b/www/analytics/plugins/Overlay/javascripts/Overlay_Helper.js
@ -1,5 +1,5 @@
 /*!
- * Piwik - Web Analytics
+ * Piwik - free/libre analytics platform
 *
 * @link http://piwik.org
 * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@ -20,11 +20,17 @@ var Overlay_Helper = {
    },

    /** Get the url to launch overlay */
-    getOverlayLink: function (idSite, period, date, link) {
-        var url = 'index.php?module=Overlay&period=' + period + '&date=' + date + '&idSite=' + idSite;
-        if (link) {
-            url += '#l=' + Overlay_Helper.encodeFrameUrl(link);
+    getOverlayLink: function (idSite, period, date, segment, link) {
+        var url = 'index.php?module=Overlay&period=' + encodeURIComponent(period) + '&date=' + encodeURIComponent(date) + '&idSite=' + encodeURIComponent(idSite);
+
+        if (segment) {
+            url += '&segment=' + encodeURIComponent(segment);
        }
+
+        if (link) {
+            url += '#?l=' + Overlay_Helper.encodeFrameUrl(link);
+        }
+
        return url;
    }

--- a/www/analytics/plugins/Overlay/javascripts/Piwik_Overlay.js
+++ b/www/analytics/plugins/Overlay/javascripts/Piwik_Overlay.js
@ -1,5 +1,5 @@
 /*!
- * Piwik - Web Analytics
+ * Piwik - free/libre analytics platform
 *
 * @link http://piwik.org
 * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@ -8,9 +8,9 @@
 var Piwik_Overlay = (function () {

    var $body, $iframe, $sidebar, $main, $location, $loading, $errorNotLoading;
-    var $rowEvolutionLink, $transitionsLink, $fullScreenLink;
+    var $rowEvolutionLink, $transitionsLink, $fullScreenLink, $visitorLogLink;

-    var idSite, period, date;
+    var idSite, period, date, segment;

    var iframeSrcBase;
    var iframeDomain = '';
@ -19,7 +19,6 @@ var Piwik_Overlay = (function () {
    var iframeCurrentActionLabel = '';
    var updateComesFromInsideFrame = false;

-
    /** Load the sidebar for a url */
    function loadSidebar(currentUrl) {
        showLoading();
@ -29,20 +28,26 @@ var Piwik_Overlay = (function () {
        iframeCurrentPage = currentUrl;
        iframeDomain = currentUrl.match(/http(s)?:\/\/(www\.)?([^\/]*)/i)[3];

-        globalAjaxQueue.abort();
-        var ajaxRequest = new ajaxHelper();
-        ajaxRequest.addParams({
+        var params = {
            module: 'Overlay',
            action: 'renderSidebar',
            currentUrl: currentUrl
-        }, 'get');
+        };
+
+        if (segment) {
+            params.segment = segment;
+        }
+
+        globalAjaxQueue.abort();
+        var ajaxRequest = new ajaxHelper();
+        ajaxRequest.addParams(params, 'get');
        ajaxRequest.setCallback(
            function (response) {
                hideLoading();

                var $response = $(response);

-                var $responseLocation = $response.find('.Overlay_Location');
+                var $responseLocation = $response.find('.overlayLocation');
                var $url = $responseLocation.find('span');
                iframeCurrentPageNormalized = $url.data('normalizedUrl');
                iframeCurrentActionLabel = $url.data('label');
@ -57,7 +62,7 @@ var Piwik_Overlay = (function () {
                    $locationSpan.tooltip({
                        track: true,
                        items: '*',
-                        tooltipClass: 'Overlay_Tooltip',
+                        tooltipClass: 'overlayTooltip',
                        content: '<strong>' + Piwik_Overlay_Translations.domain + ':</strong> ' +
                                  piwikHelper.addBreakpointsToUrl(iframeDomain),
                        show: false,
@ -67,10 +72,14 @@ var Piwik_Overlay = (function () {

                $sidebar.empty().append($response).show();

-                if ($sidebar.find('.Overlay_NoData').size() == 0) {
+                if ($sidebar.find('.overlayNoData').size() == 0) {
                    $rowEvolutionLink.show();
-                    $transitionsLink.show()
+                    $transitionsLink.show();
+                    if ($('#segment').val()) {
+                        $visitorLogLink.show();
+                    }
                }
+
            }
        );
        ajaxRequest.setErrorCallback(function () {
@ -97,6 +106,7 @@ var Piwik_Overlay = (function () {
        $fullScreenLink.hide();
        $rowEvolutionLink.hide();
        $transitionsLink.hide();
+        $visitorLogLink.hide();

        $errorNotLoading.hide();
    }
@ -107,9 +117,29 @@ var Piwik_Overlay = (function () {
        $fullScreenLink.show();
    }

+    function getOverlaySegment(url) {
+        var location = broadcast.getParamValue('segment', url);
+
+        // angular will encode the value again since it is added as the fragment path, not the fragment query parameter,
+        // so we have to decode it again after getParamValue
+        location = decodeURIComponent(location);
+
+        return location;
+    }
+
+    function getOverlayLocationFromHash(urlHash) {
+        var location = broadcast.getParamValue('l', urlHash);
+
+        // angular will encode the value again since it is added as the fragment path, not the fragment query parameter,
+        // so we have to decode it again after getParamValue
+        location = decodeURIComponent(location);
+
+        return location;
+    }
+
    /** $.history callback for hash change */
    function hashChangeCallback(urlHash) {
-        var location = broadcast.getParamValue('l', urlHash);
+        var location = getOverlayLocationFromHash(urlHash);
        location = Overlay_Helper.decodeFrameUrl(location);

        if (!updateComesFromInsideFrame) {
@ -129,23 +159,25 @@ var Piwik_Overlay = (function () {
    return {

        /** This method is called when Overlay loads  */
-        init: function (iframeSrc, pIdSite, pPeriod, pDate) {
+        init: function (iframeSrc, pIdSite, pPeriod, pDate, pSegment) {
            iframeSrcBase = iframeSrc;
            idSite = pIdSite;
            period = pPeriod;
            date = pDate;
+            segment = pSegment;

            $body = $('body');
-            $iframe = $('#Overlay_Iframe');
-            $sidebar = $('#Overlay_Sidebar');
-            $location = $('#Overlay_Location');
-            $main = $('#Overlay_Main');
-            $loading = $('#Overlay_Loading');
-            $errorNotLoading = $('#Overlay_Error_NotLoading');
+            $iframe = $('#overlayIframe');
+            $sidebar = $('#overlaySidebar');
+            $location = $('#overlayLocation');
+            $main = $('#overlayMain');
+            $loading = $('#overlayLoading');
+            $errorNotLoading = $('#overlayErrorNotLoading');

-            $rowEvolutionLink = $('#Overlay_RowEvolution');
-            $transitionsLink = $('#Overlay_Transitions');
-            $fullScreenLink = $('#Overlay_FullScreen');
+            $rowEvolutionLink = $('#overlayRowEvolution');
+            $transitionsLink = $('#overlayTransitions');
+            $fullScreenLink = $('#overlayFullScreen');
+            $visitorLogLink = $('#overlaySegmentedVisitorLog');

            adjustDimensions();

@ -171,6 +203,8 @@ var Piwik_Overlay = (function () {

            // handle hash change
            broadcast.loadAjaxContent = hashChangeCallback;
+
+            broadcast._isInit = false;
            broadcast.init();

            if (window.location.href.split('#').length == 1) {
@ -179,12 +213,12 @@ var Piwik_Overlay = (function () {
            }

            // handle date selection
-            var $select = $('select#Overlay_DateRangeSelect').change(function () {
+            var $select = $('select#overlayDateRangeSelect').change(function () {
                var parts = $(this).val().split(';');
                if (parts.length == 2) {
                    period = parts[0];
                    date = parts[1];
-                    window.location.href = Overlay_Helper.getOverlayLink(idSite, period, date, iframeCurrentPage);
+                    window.location.href = Overlay_Helper.getOverlayLink(idSite, period, date, segment, iframeCurrentPage);
                }
            });

@ -202,7 +236,11 @@ var Piwik_Overlay = (function () {

            // handle transitions link
            $transitionsLink.click(function () {
-                DataTable_RowActions_Transitions.launchForUrl(iframeCurrentPageNormalized);
+                var unescapedSegment = null;
+                if (segment) {
+                    unescapedSegment = unescape(segment);
+                }
+                DataTable_RowActions_Transitions.launchForUrl(iframeCurrentPageNormalized, unescapedSegment);
                return false;
            });

@ -212,6 +250,12 @@ var Piwik_Overlay = (function () {
                return false;
            });

+            // handle segmented visitor log link
+            $visitorLogLink.click(function () {
+                SegmentedVisitorLog.show('Actions.getPageUrls', $('#segment').val(), {});
+                return false;
+            });
+
            // handle full screen link
            $fullScreenLink.click(function () {
                var href = iframeSrcBase;
@ -230,7 +274,7 @@ var Piwik_Overlay = (function () {
            var locationParts = location.href.split('#');
            var currentLocation = '';
            if (locationParts.length > 1) {
-                currentLocation = broadcast.getParamValue('l', locationParts[1]);
+                currentLocation = getOverlayLocationFromHash(locationParts[1]);
            }

            var newLocation = Overlay_Helper.encodeFrameUrl(currentUrl);
--- a/www/analytics/plugins/Overlay/javascripts/rowaction.js
+++ b/www/analytics/plugins/Overlay/javascripts/rowaction.js
@ -1,5 +1,5 @@
 /*!
- * Piwik - Web Analytics
+ * Piwik - free/libre analytics platform
 *
 * @link http://piwik.org
 * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@ -15,17 +15,47 @@ function DataTable_RowActions_Overlay(dataTable) {

 DataTable_RowActions_Overlay.prototype = new DataTable_RowAction;

+DataTable_RowActions_Overlay.registeredReports = [];
+DataTable_RowActions_Overlay.registerReport = function (handler) {
+    DataTable_RowActions_Overlay.registeredReports.push(handler);
+}
+
+
 DataTable_RowActions_Overlay.prototype.onClick = function (actionA, tr, e) {
    if (!actionA.data('overlay-manipulated')) {
        actionA.data('overlay-manipulated', 1);

-        var link = tr.find('> td:first > a').attr('href');
-        link = $('<textarea>').html(link).val(); // remove html entities
+        var segment, link;

-        actionA.attr({
-            target: '_blank',
-            href: Overlay_Helper.getOverlayLink(this.dataTable.param.idSite, 'month', 'today', link)
-        });
+        var i = 0;
+        for (i; i < DataTable_RowActions_Overlay.registeredReports.length; i++) {
+            var report = DataTable_RowActions_Overlay.registeredReports[i];
+            if (report
+                && report.onClick
+                && report.isAvailableOnReport
+                && report.isAvailableOnReport(this.dataTable.param)) {
+                var result = report.onClick.apply(this, arguments);
+
+                if (!result || !result.link) {
+                    return;
+                }
+
+                link = result.link;
+                if (result.segment) {
+                    segment = result.segment;
+                }
+                break;
+            }
+        }
+
+        if (link) {
+            var href = Overlay_Helper.getOverlayLink(this.dataTable.param.idSite, 'month', 'today', segment, link);
+
+            actionA.attr({
+                target: '_blank',
+                href: href
+            });
+        }
    }

    return true;
@ -54,7 +84,18 @@ DataTable_RowActions_Registry.register({
        if (!window.DataTable_RowActions_Transitions) {
            return false;
        }
-        return DataTable_RowActions_Transitions.isPageUrlReport(dataTableParams.module, dataTableParams.action);
+
+        var i = 0;
+        for (i; i < DataTable_RowActions_Overlay.registeredReports.length; i++) {
+            var report = DataTable_RowActions_Overlay.registeredReports[i];
+            if (report
+                && report.isAvailableOnReport
+                && report.isAvailableOnReport(dataTableParams)) {
+                return true;
+            }
+        }
+
+        return false;
    },

    isAvailableOnRow: function (dataTableParams, tr) {
--- a/www/analytics/plugins/Overlay/lang/ar.json
+++ b/www/analytics/plugins/Overlay/lang/ar.json
@ -0,0 +1,5 @@
+{
+    "Overlay": {
+        "Location": "المكان"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/be.json
+++ b/www/analytics/plugins/Overlay/lang/be.json
@ -0,0 +1,5 @@
+{
+    "Overlay": {
+        "Location": "Лакаця"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/bg.json
+++ b/www/analytics/plugins/Overlay/lang/bg.json
@ -0,0 +1,16 @@
+{
+    "Overlay": {
+        "Clicks": "%s клика",
+        "ClicksFromXLinks": "%1$s щраквания от една от %2$s връзките",
+        "Domain": "Домейн",
+        "ErrorNotLoadingDetails": "Възможно е заредената страница вдясно да няма последяващия Piwik код. В този случай опитайте да стартирате нова връзка за различна страница от доклада на страници.",
+        "ErrorNotLoadingLink": "Щраквайки тук, ще получите повече съвети за отстраняване на проблеми",
+        "Link": "Връзка",
+        "Location": "Местоположение",
+        "NoData": "Няма данни за тази страница по време на избрания период.",
+        "OneClick": "1 клик",
+        "OpenFullScreen": "Цял екран (без странична лента)",
+        "RedirectUrlErrorAdmin": "Може да добавите домейнът като допълнителен адрес %1$sв настройките%2$s.",
+        "RedirectUrlErrorUser": "Попитайте вашият администратор да добави домейна, като допълнителен URL."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/ca.json
+++ b/www/analytics/plugins/Overlay/lang/ca.json
@ -0,0 +1,20 @@
+{
+    "Overlay": {
+        "Clicks": "%s clicks",
+        "ClicksFromXLinks": "%1$s clicks de un de %2$s enllaços",
+        "Domain": "Domini",
+        "ErrorNotLoading": "No es pot iniciar la sessió de pàgines Overlay",
+        "ErrorNotLoadingDetails": "Potser la pàgina carregada a la dreta no te el codi de rastreig de Piwik. En aquest cas, proveu de llençar el Overlay d'un altra pàgina del informe de pàgines.",
+        "ErrorNotLoadingDetailsSSL": "Com esteu fent servir Piwik a través de https, es possible que el vostre lloc web no suporti el SSL. Proveu utilitzant el Piwik sobre http.",
+        "ErrorNotLoadingLink": "Feu click aquí per obtenir més informació sobre com solucionar el problema.",
+        "Link": "Enllaç",
+        "Location": "Ubicació",
+        "NoData": "No hi ha informació per aquesta pàgina en el període seleccionat.",
+        "OneClick": "1 click",
+        "OpenFullScreen": "Mostra a pantalla complerta (sense barra lateral)",
+        "Overlay": "Overlay de pàgina",
+        "RedirectUrlError": "Esteu intentant obrir un pàgina Overlay per la URL \"%1$s\". %2$s Cap dels dominis configurats al Piwik concòrda amb l'enllaç.",
+        "RedirectUrlErrorAdmin": "Podeu afegir una URL addicional per un domini a %1$s les preferències%2$s.",
+        "RedirectUrlErrorUser": "Contacteu amb el vostre administrador per afegir el domini com una URL adicional."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/cs.json
+++ b/www/analytics/plugins/Overlay/lang/cs.json
@ -0,0 +1,21 @@
+{
+    "Overlay": {
+        "Clicks": "%s kliknutí",
+        "ClicksFromXLinks": "%1$s kliknutí z některého z %2$s odkazů",
+        "Domain": "Doména",
+        "ErrorNotLoading": "Sezení překryvu stránky nemohlo být zatím spuštěno.",
+        "ErrorNotLoadingDetails": "Možná nemá načtená stránka na pravé straně sledovací kód. V tomto případě zkuste spustit překryv pro jinou stránku z hlášení stránek.",
+        "ErrorNotLoadingDetailsSSL": "Protože používáte Piwik přes HTTPS, nejpravděpodobnější je, že stránky nepodporují SSL. Zkuste přistoupit k Piwiku přes HTTP.",
+        "ErrorNotLoadingLink": "Klikněte zde pro více tipů k řešení problémů",
+        "Link": "Odkaz",
+        "Location": "Umístění",
+        "NoData": "V daném období nejsou pro vybranou stránku k dispozici žádná data.",
+        "OneClick": "1 kliknutí",
+        "OpenFullScreen": "Přejít na celou obrazovku (bez postranní lišty)",
+        "Overlay": "Překryv stránky",
+        "PluginDescription": "Podívejte se na vaše analytická data jako na překryv na vašich stránkách. Zjistěte, kolik uživatelů kliklo na kterýkoliv odkaz. Poznámka: vyžaduje povolený zásuvný modul přechodů.",
+        "RedirectUrlError": "Pokoušíte se spustit překryv pro stránku s url \"%1$s\". %2$s Žádná doména z nastavení Piwiku ale neodpovídá odkazu.",
+        "RedirectUrlErrorAdmin": "Doménu můžete jako další URL přidat v %1$snastavení%2$s.",
+        "RedirectUrlErrorUser": "Požádejte svého administrátora o přidání stránky jako další URL:."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/da.json
+++ b/www/analytics/plugins/Overlay/lang/da.json
@ -0,0 +1,20 @@
+{
+    "Overlay": {
+        "Clicks": "%s klik",
+        "ClicksFromXLinks": "%1$s klik fra et af %2$s link",
+        "Domain": "Domæne",
+        "ErrorNotLoading": "Sideoverlay session kunne ikke startes endnu.",
+        "ErrorNotLoadingDetails": "Måske den indlæste side til højre ikke har Piwik sporingskode. I så tilfælde, kan du prøve at starte overlejring for en anden side fra siderapporter.",
+        "ErrorNotLoadingDetailsSSL": "Da du bruger Piwik over HTTPS, er den mest sandsynlige årsag, at hjemmesiden ikke understøtter SSL. Prøv at bruge Piwik over HTTP.",
+        "ErrorNotLoadingLink": "Klik her for at få flere tips til fejlfinding",
+        "Link": "Link",
+        "Location": "Lokation",
+        "NoData": "Der er ingen data for denne side i den valgte periode.",
+        "OneClick": "1 klik",
+        "OpenFullScreen": "Vis fuldskærm (ingen sidebjælke)",
+        "Overlay": "Side overlejring",
+        "RedirectUrlError": "Du forsøger at åbne sideoverlejring for URL \"%1$s\". %2$s Ingen af domæner fra Piwiks indstillinger matcher linket.",
+        "RedirectUrlErrorAdmin": "Du kan tilføje domænet som en yderligere URL %1$si indstillingerne%2$s.",
+        "RedirectUrlErrorUser": "Spørg administratoren om at tilføje domænet som en yderligere URL."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/de.json
+++ b/www/analytics/plugins/Overlay/lang/de.json
@ -0,0 +1,21 @@
+{
+    "Overlay": {
+        "Clicks": "%s Klicks",
+        "ClicksFromXLinks": "%1$s klicks von einem von %2$s Verweisen",
+        "Domain": "Domain",
+        "ErrorNotLoading": "Die Seiten Overlay Sitzung kann gerade nicht aufgerufen werden.",
+        "ErrorNotLoadingDetails": "Möglicherweise hat die rechte Seite keinen Piwik Tracking Code. In diesem Fall bitte versuchen das Overlay für eine andere Seite aus dem Seitenbericht zu benutzen.",
+        "ErrorNotLoadingDetailsSSL": "Da Sie Piwik über https nutzen, ist es wahrscheinlich dass Ihre Website kein SSL unterstützt. Bitte benutzen Sie Piwik über http.",
+        "ErrorNotLoadingLink": "Klicken Sie hier für weitere Tipps zur Fehlerbehebung",
+        "Link": "Link",
+        "Location": "Seite",
+        "NoData": "Für den gewählten Zeitraum gibt es keine Daten für diese Seite.",
+        "OneClick": "1-click",
+        "OpenFullScreen": "Vollbildmodus starten (keine Sidebar)",
+        "Overlay": "Seiten Overlay",
+        "PluginDescription": "Sehen Sie Ihre Analysedaten als ein Overlay auf Ihrer aktuellen Website an. Lassen Sie sich anzeigen wie oft Ihre Benutzer auf welchen Link geklickt haben. Hinweis: Benötigt das Transitions-Plugin.",
+        "RedirectUrlError": "Sie versuchen, eine Seiten Overlay Sitzung für die URL \"%1$s\" zu starten. %2$s Keine der in den Piwik Einstellungen hinterlegten Domains passt zu diesem Link.",
+        "RedirectUrlErrorAdmin": "Sie können diese Domain %1$sin den Einstellungen%2$s als zusätzliche URL hinzufügen.",
+        "RedirectUrlErrorUser": "Bitten Sie Ihren Administrator diese Domain als zusätzliche URL hinzuzufügen."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/el.json
+++ b/www/analytics/plugins/Overlay/lang/el.json
@ -0,0 +1,21 @@
+{
+    "Overlay": {
+        "Clicks": "%s πατήματα",
+        "ClicksFromXLinks": "%1$s πατήματα από ένα από τους %2$s συνδέσμους",
+        "Domain": "Τομέας",
+        "ErrorNotLoading": "Η συνεδρία Υπερκάλυψης Σελίδας δεν προσπελάστηκε ακόμα.",
+        "ErrorNotLoadingDetails": "Ίσως η ιστοσελίδα που φορτώνει στα δεξιά δεν έχει τον κώδικα ιχνηλάτη του Piwik. Σε αυτή την περίπτωση, προσπαθήστε να εκκινήσετε την Επικάλυψη για μια διαφορετική σελίδα από τη σελίδα αναφορών.",
+        "ErrorNotLoadingDetailsSSL": "Δεδομένου ότι χρησιμοποιείτε το Piwik σε https, η πιο πιθανή αιτία είναι ότι η ιστοσελίδα σας δεν υποστηρίζει SSL. Δοκιμάστε να χρησιμοποιήσετε το Piwik σε http.",
+        "ErrorNotLoadingLink": "Πατήστε εδώ για να λάβετε περισσότερες οδηγίες για την αντιμετώπιση προβλημάτων",
+        "Link": "Σύνδεσμος",
+        "Location": "Τοποθεσία",
+        "NoData": "Δεν υπάρχουν δεδομένα για αυτή τη σελίδα κατά τη διάρκεια της επιλεγμένης περιόδου.",
+        "OneClick": "1 πάτημα",
+        "OpenFullScreen": "Μετάβαση σε πλήρη οθόνη (χωρίς πλευρική γραμμή)",
+        "Overlay": "Υπερκάλυψη Σελίδας",
+        "PluginDescription": "Δείτε τα δεδομένα αναλυτικών σας ως Υπέρθεση στον ιστοτόπο σας. Δείτε πόσες φορές οι χρήστες σας κάνανε κλικ σε κάθε σύνδεσμο. Σημείωση: Απαιτείται να είναι ενεργοποιημένο το πρόσθετο Transitions.",
+        "RedirectUrlError": "Προσπαθείτε να ανοίξετε τη Σελίδα Υπέρθεσης για το URL \"%1$s\". %2$s Κανένα από τα ονόματα στις ρυθμίσεις του Piwik συμφωνεί με το σύνδεσμο.",
+        "RedirectUrlErrorAdmin": "Μπορείτε να προσθέσετε το όνομα ως επιπρόσθετο URL %1$sστις ρυθμίσεις%2$s.",
+        "RedirectUrlErrorUser": "Ζητήστε από το διαχειριστή σας για να προσθέσετε το όνομα χώρου ως μια επιπλέον διεύθυνση URL."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/en.json
+++ b/www/analytics/plugins/Overlay/lang/en.json
@ -0,0 +1,21 @@
+{
+    "Overlay": {
+        "Clicks": "%s clicks",
+        "ClicksFromXLinks": "%1$s clicks from one of %2$s links",
+        "Domain": "Domain",
+        "ErrorNotLoading": "The Page Overlay session couldn't be launched yet.",
+        "ErrorNotLoadingDetails": "Maybe the page loaded on the right doesn't have the Piwik tracker code. In this case, try launching Overlay for a different page from the pages report.",
+        "ErrorNotLoadingDetailsSSL": "Since you're using Piwik over https, the most likely cause is that your website doesn't support SSL. Try using Piwik over http.",
+        "ErrorNotLoadingLink": "Click here to get more tips for troubleshooting",
+        "Link": "Link",
+        "Location": "Location",
+        "NoData": "There is no data for this page during the selected period.",
+        "OneClick": "1 click",
+        "OpenFullScreen": "Go full screen (no sidebar)",
+        "Overlay": "Page Overlay",
+        "PluginDescription": "See your analytics data as an Overlay on your actual website. View how many times your users have clicked on each link. Note: Requires the Transitions plugin enabled.",
+        "RedirectUrlError": "You are attempting to open Page Overlay for the URL \"%1$s\". %2$s None of the domains from the Piwik settings matches the link.",
+        "RedirectUrlErrorAdmin": "You can add the domain as an additional URL %1$sin the settings%2$s.",
+        "RedirectUrlErrorUser": "Ask your administrator to add the domain as an additional URL."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/es.json
+++ b/www/analytics/plugins/Overlay/lang/es.json
@ -0,0 +1,21 @@
+{
+    "Overlay": {
+        "Clicks": "%s clics",
+        "ClicksFromXLinks": "%1$s clics desde uno de %2$s enlaces",
+        "Domain": "Dominio",
+        "ErrorNotLoading": "La sesión de superposición de página no puede ser aun iniciada.",
+        "ErrorNotLoadingDetails": "Tal vez la página cargada a su derecha no posee el código de rastreo Piwik. En este caso, trate de lanzar Overlay para una página diferente desde las páginas de informe.",
+        "ErrorNotLoadingDetailsSSL": "Ya que está utilizando Piwik sobre https, la causa más probable es que su sitio de internet no provea soporte SSL. Intente utilizar Piwik sobre http.",
+        "ErrorNotLoadingLink": "Clic aquí para obtener más ayuda acerca de soluciones de problemas",
+        "Link": "Enlace",
+        "Location": "Ubicación",
+        "NoData": "No hay información para esta página en el período seleccionado.",
+        "OneClick": "1 clic",
+        "OpenFullScreen": "Ir a pantalla completa (sin barras laterales)",
+        "Overlay": "Superposición de página",
+        "PluginDescription": "Vea su información analítica como una superposición en su actual sitio de internet. Vea cuántas veces sus usuarios han hecho clic en cada enlace. Nota: Requiere el complemento Transitions habilitado.",
+        "RedirectUrlError": "Está intentando abrir Superposición de página de la dirección de internet \"%1$s\"- %2$s Ninguno de los dominios de su configuración Piwik coincide con el enlace.",
+        "RedirectUrlErrorAdmin": "Puede agregar el dominio como una dirección de internet %1$sen la configuración%2$s.",
+        "RedirectUrlErrorUser": "Pregunte a su administrador para agregar el dominio como una dirección de internet adicional."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/et.json
+++ b/www/analytics/plugins/Overlay/lang/et.json
@ -0,0 +1,12 @@
+{
+    "Overlay": {
+        "Clicks": "%s klikki",
+        "ClicksFromXLinks": "%1$s klikki %2$s lingilt",
+        "Domain": "Domeen",
+        "Link": "Link",
+        "Location": "Asukoht",
+        "OneClick": "1 klikk",
+        "OpenFullScreen": "Ava täisekraani vaade (ilma külgribata)",
+        "Overlay": "Lehe statistika kiht"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/fa.json
+++ b/www/analytics/plugins/Overlay/lang/fa.json
@ -0,0 +1,17 @@
+{
+    "Overlay": {
+        "Clicks": "%s کلیک",
+        "ClicksFromXLinks": "%1$s کلیک از یکی از %2$s لینک",
+        "Domain": "دامنه",
+        "ErrorNotLoading": "صفحه از دسترس خارج شد و نمی تواند راه اندازی می شود.",
+        "ErrorNotLoadingLink": "اینجا کلیک کنید تا نکات بیشتری درباره عیب یابی بدانید",
+        "Link": "لینک",
+        "Location": "موقعیت",
+        "NoData": "داده ای برای این صفحه در طی بازه ی انتخاب شده وجود ندارد.",
+        "OneClick": "1 کلیک",
+        "OpenFullScreen": "به حالت تمام صفحه برو (بدون ستون کناری)",
+        "Overlay": "صفحه از دسترس خارج شد",
+        "RedirectUrlErrorAdmin": "شما توانید آدرس های جدیدی را اضافه نمایید URL %1$sin the settings%2$s.",
+        "RedirectUrlErrorUser": "از مدیریت بخواهید که این دامنه را به عنوان دامنه اضافی بیافزاید."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/fi.json
+++ b/www/analytics/plugins/Overlay/lang/fi.json
@ -0,0 +1,20 @@
+{
+    "Overlay": {
+        "Clicks": "%s klikkausta",
+        "ClicksFromXLinks": "%1$s klikkaukset yhdestä %2$s:n linkeistä",
+        "Domain": "Verkkotunnus",
+        "ErrorNotLoading": "Sivun leijuke sessiota ei voitu käynnistää vielä.",
+        "ErrorNotLoadingDetails": "On mahdollista, ettei ladatulla sivulla ole Piwik seurantakoodia. Yritä käynnistää leijuke toiselle sivulle sivuraportista.",
+        "ErrorNotLoadingDetailsSSL": "Koska käytät Piwikiä https:llä, todennäköisin syy on, ettei verkkosivusi tue SSL:ää. Kokeile käyttää Piwikiä http:llä.",
+        "ErrorNotLoadingLink": "Klikkaa tästä saadaksesi lisää vinkkejä vianetsintään",
+        "Link": "Linkki",
+        "Location": "Sijainti",
+        "NoData": "Tällä sivulla ei ole tietoja valitulla ajalla.",
+        "OneClick": "1 klikkaus",
+        "OpenFullScreen": "Siirry koko näytön tilaan (ei sivupalkkia)",
+        "Overlay": "Sivun leijuke",
+        "RedirectUrlError": "Yrität avata sivun leijuketta URL:lle \"%1$s\". %2$s mikän Piwikin asetuksien domain ei vastaa linkkiä.",
+        "RedirectUrlErrorAdmin": "Voit lisätä domainin ylimääräisenä URL:nä %1$sasetuksissa%2$s.",
+        "RedirectUrlErrorUser": "Pyydä ylläpitää lisäämään domain ylimääräisenä verkkosivuna."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/fr.json
+++ b/www/analytics/plugins/Overlay/lang/fr.json
@ -0,0 +1,21 @@
+{
+    "Overlay": {
+        "Clicks": "%s clics",
+        "ClicksFromXLinks": "%1$s clics depuis un des %2$s liens",
+        "Domain": "Domaine",
+        "ErrorNotLoading": "L'analyse des pages web n'a pas pu être lancée pour le moment.",
+        "ErrorNotLoadingDetails": "Peut être que la page chargée sur la droite n'a pas de code de suivi Piwik. Dans ce cas, essayez de lancer la navigation superposée depuis une autre page que le rapport de pages.",
+        "ErrorNotLoadingDetailsSSL": "Etant donné que vous utilisez Piwik en https, la cause la plus probable est que votre site web ne supporte pas le SSL. Essayez d'utiliser Piwik en http.",
+        "ErrorNotLoadingLink": "Cliquez ici pour obtenir plus d'informations de dépannage.",
+        "Link": "Lien",
+        "Location": "Localisation",
+        "NoData": "Il n'y a aucune données durant cette période",
+        "OneClick": "1 clic",
+        "OpenFullScreen": "Ouvrir en plein écran",
+        "Overlay": "Analyse des pages web",
+        "PluginDescription": "Visualisez vos données d'analyse comme une Superposition de votre site web. Voyez combien de fois vos utilisateurs ont cliqué sur chaque lien. Remarque : Nécessite que le composant Transitions soit activé.",
+        "RedirectUrlError": "Vous tentez d'ouvrir l'analyse des pages web pour l'URL \"%1$s\". %2$s Aucun des domaines configurés dans Piwik ne correspond à cette URL.",
+        "RedirectUrlErrorAdmin": "Vous pouvez ajouter le domaine en tant qu'URL additionnelle %1$sdans les paramètres%2$s.",
+        "RedirectUrlErrorUser": "Demandez à votre administrateur d'ajouter le domaine en tant qu'URL additionnelle."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/he.json
+++ b/www/analytics/plugins/Overlay/lang/he.json
@ -0,0 +1,7 @@
+{
+    "Overlay": {
+        "Clicks": "%s לחיצות",
+        "Location": "מיקום",
+        "OneClick": "לחיצה 1"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/hi.json
+++ b/www/analytics/plugins/Overlay/lang/hi.json
@ -0,0 +1,21 @@
+{
+    "Overlay": {
+        "Clicks": "%s क्लिक करता है",
+        "ClicksFromXLinks": "%1$s एक %2$sलिंक से क्लिक करता है",
+        "Domain": "डोमेन",
+        "ErrorNotLoading": "पृष्ठ आवरण सत्र अभी तक शुरू नहीं किया जा सका.",
+        "ErrorNotLoadingDetails": "शायद दाएँ तरफ लोड किया पृष्ठ पर Piwik ट्रैकर कोड नहीं है. इस मामले में, पृष्ठों की रिपोर्ट से एक अलग पेज के लिए आवरण शुरू करने का प्रयास करें.",
+        "ErrorNotLoadingDetailsSSL": "आप https के ऊपर Piwik का उपयोग कर रहे हैं, सबसे संभावित कारण आपकी वेबसाइट एसएसएल समर्थन नहीं करती है. Http पर Piwik का उपयोग करने का प्रयास करें.",
+        "ErrorNotLoadingLink": "समस्या निवारण के लिए और अधिक सुझाव प्राप्त के लिए यहां क्लिक करें",
+        "Link": "लिंक",
+        "Location": "स्थान",
+        "NoData": "चयनित अवधि के दौरान इस पृष्ठ के लिए कोई डाटा नहीं है.",
+        "OneClick": "1 क्लिक करें",
+        "OpenFullScreen": "पूर्ण स्क्रीन (कोई साइडबार नहीं ) के लिए जाओ",
+        "Overlay": "पृष्ठ आवरण",
+        "PluginDescription": "अपने वास्तविक वेबसाइट पर ओवरले के रूप में अपने Analytics डेटा देखें। अपने उपयोगकर्ताओं को एक लिंक पर क्लिक किया है कि कैसे कई बार देखें। नोट: सक्षम बदलाव प्लगइन की आवश्यकता है।",
+        "RedirectUrlError": "आप यूआरएल \"%1$s\" के लिए पृष्ठ आवरण खोलने के लिए प्रयास कर रहे हैं. Piwik सेटिंग से डोमेन में से कोई%2$s भी लिंक से मेल नहीं खाता है.",
+        "RedirectUrlErrorAdmin": "आप सेटिंग्स%1$s से एक अतिरिक्त URL%2$s के रूप में डोमेन जोड़ सकते हैं",
+        "RedirectUrlErrorUser": "एक अतिरिक्त URL के रूप में डोमेन को जोड़ने के लिए अपने व्यवस्थापक से पूछें."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/hr.json
+++ b/www/analytics/plugins/Overlay/lang/hr.json
@ -0,0 +1,5 @@
+{
+    "Overlay": {
+        "Location": "Lokacija"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/hu.json
+++ b/www/analytics/plugins/Overlay/lang/hu.json
@ -0,0 +1,5 @@
+{
+    "Overlay": {
+        "Location": "Hely"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/id.json
+++ b/www/analytics/plugins/Overlay/lang/id.json
@ -0,0 +1,20 @@
+{
+    "Overlay": {
+        "Clicks": "%s klik",
+        "ClicksFromXLinks": "%1$s klik dari salah satu %2$s tautan",
+        "Domain": "Ranah",
+        "ErrorNotLoading": "Sesi Penghampar Halaman belum dapat diluncurkan.",
+        "ErrorNotLoadingDetails": "Kemungkinan yang dimuat di kanan tidak memiliki kode pelcakan Piwik. Dalam hal ini, silakan mencoba meluncurkan Penghampar untuk halaman yang berbeda dari laporan halaman.",
+        "ErrorNotLoadingDetailsSSL": "Sejak Anda menggunakan Piwik melalui https, kemungkinan besar penyebabnya adalah situs Anda tidak mendukung SSL. Silakan menggunakan Piwik melalui http.",
+        "ErrorNotLoadingLink": "Klik di sini untuk memperoleh kiat-kiat pemecahan masalah",
+        "Link": "Tautan",
+        "Location": "Lokasi",
+        "NoData": "Tidak ada data untuk halaman ini selama periode terpilih.",
+        "OneClick": "1 kilik",
+        "OpenFullScreen": "Menuju halaman penuh (tanpa batang sisi)",
+        "Overlay": "Penghampar Halaman",
+        "RedirectUrlError": "Anda mencoba membuka Penghampar Halaman dari URL \"%1$s\". %2$s Tidak ada ranah dari pengaturan Piwik sesuai dengan tautan.",
+        "RedirectUrlErrorAdmin": "Anda dapat menambah ranah sebagai URL tambahan di %1$spengaturan%2$s.",
+        "RedirectUrlErrorUser": "Silakan bertanya kepada pengelola Anda untuk menambah ranah sebagai URL tambahan."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/is.json
+++ b/www/analytics/plugins/Overlay/lang/is.json
@ -0,0 +1,5 @@
+{
+    "Overlay": {
+        "Location": "Staðsetning"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/it.json
+++ b/www/analytics/plugins/Overlay/lang/it.json
@ -0,0 +1,21 @@
+{
+    "Overlay": {
+        "Clicks": "%s clicks",
+        "ClicksFromXLinks": "%1$s clicks per uno di %2$s links",
+        "Domain": "Dominio",
+        "ErrorNotLoading": "La sessione di Overlay Pagina non può ancora essere lanciata.",
+        "ErrorNotLoadingDetails": "Forse la pagina caricata sulla destra non ha il codice tracking di Piwik. In questo caso prova ad avviare Overlay per una pagina diversa.",
+        "ErrorNotLoadingDetailsSSL": "Dal momento che si sta utilizzando Piwik su HTTPS, la causa più probabile è che il vostro sito web non supporti SSL. Prova a utilizzare Piwik su HTTP.",
+        "ErrorNotLoadingLink": "Ottieni altri suggerimenti sui problemi",
+        "Link": "Link",
+        "Location": "Posizione",
+        "NoData": "Non vi sono dati per questa pagina nel periodo selezionato",
+        "OneClick": "1 click",
+        "OpenFullScreen": "Vai a schermo intero (niente barra laterale)",
+        "Overlay": "Overlay di Pagina",
+        "PluginDescription": "Vedi i tuoi dati statistici in sovrapposizione al tuo sito web. Guarda quante volte i tuoi utenti hanno cliccato su ciascun link. Nota: Richiede che sia abilitato il plugin Transitions.",
+        "RedirectUrlError": "Si sta tentando di aprire la Pagina Overlay per l'URL \"%1$s\". %2$s Nessuno dei domini dalle impostazioni di Piwik corrisponde al link.",
+        "RedirectUrlErrorAdmin": "È possibile aggiungere il dominio come un ulteriore URL %1$snelle impostazioni%2$s.",
+        "RedirectUrlErrorUser": "Chiedi all'amministratore di aggiungere il dominio come un URL aggiuntivo."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/ja.json
+++ b/www/analytics/plugins/Overlay/lang/ja.json
@ -0,0 +1,21 @@
+{
+    "Overlay": {
+        "Clicks": "%s クリック",
+        "ClicksFromXLinks": "%2$s リンクの 1 つからの%1$s クリック",
+        "Domain": "ドメイン",
+        "ErrorNotLoading": "ページオーバーレイ・セッションがまだ開始されていません。",
+        "ErrorNotLoadingDetails": "右側にロードされたページには、Piwik 追跡コードがありません。ページレポートとは異なるページで、オーバーレイの起動をお試しください。",
+        "ErrorNotLoadingDetailsSSL": "Piwik を https 経由で利用していますが、お使いのパソコンが SSL をサポートしていないことが原因として考えられます。http 経由でのご利用をお試しください。",
+        "ErrorNotLoadingLink": "トラブルシューティングのためのヒントは、こちらをクリック",
+        "Link": "リンク",
+        "Location": "位置情報",
+        "NoData": "このページに対する選択された期間のデータは存在しません。",
+        "OneClick": "1 クリック",
+        "OpenFullScreen": "フルスクリーンへ (サイドバーなし)",
+        "Overlay": "ページオーバーレイ",
+        "PluginDescription": "実際の web サイト上のオーバーレイ分析データを参照してください。ユーザーが各リンクをクリックした回数が表示されます。注: 有効なトランジションプラグインが必要です。",
+        "RedirectUrlError": "URL \"%1$s\" に対するページオーバーレイを開こうとしています。%2$s Piwik 設定のドメインが、すべてリンクに一致しません。",
+        "RedirectUrlErrorAdmin": "%1$s 設定で %2$s 追加の URL としてドメインを追加できます。",
+        "RedirectUrlErrorUser": "管理者に、任意のドメインを追加 URL として追加するよう管理者に依頼してください。"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/ka.json
+++ b/www/analytics/plugins/Overlay/lang/ka.json
@ -0,0 +1,5 @@
+{
+    "Overlay": {
+        "Location": "მდებარეობა"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/ko.json
+++ b/www/analytics/plugins/Overlay/lang/ko.json
@ -0,0 +1,21 @@
+{
+    "Overlay": {
+        "Clicks": "%s회 클릭",
+        "ClicksFromXLinks": "%2$s개의 링크 중 하나를 %1$s회 클릭",
+        "Domain": "도메인",
+        "ErrorNotLoading": "페이지 오버레이 세션을 아직 실행할 수 없습니다.",
+        "ErrorNotLoadingDetails": "오른쪽에 로드된 페이지는 Piwik의 추적 코드가 누락되었을 수 있습니다. 이 경우, 페이지 보고서에서 다른 페이지에서 오버레이를 실행해보세요.",
+        "ErrorNotLoadingDetailsSSL": "Piwik에서 HTTPS를 사용하도록 설정되었지만, 당신의 웹사이트는 SSL을 지원하지 않습니다. Piwik에 HTTP를 사용해 보세요.",
+        "ErrorNotLoadingLink": "이 곳을 클릭하여 더 많은 문제 해결에 대한 팁 보기",
+        "Link": "링크",
+        "Location": "위치",
+        "NoData": "선택한 기간 동안이 페이지에 대한 데이터가 없습니다.",
+        "OneClick": "1회 클릭",
+        "OpenFullScreen": "전체 화면 (사이드바 아님)으로 이동",
+        "Overlay": "페이지 오버레이",
+        "PluginDescription": "당신의 웹사이트 분석 데이터를 오버레이 형식으로 볼 수 있습니다. 사용자가 얼마나 각 링크를 클릭했는지 확인해보세요. 참고: Transitions 플러그인이 활성화 되어 있어야 합니다.",
+        "RedirectUrlError": "URL \"%1$s\"에 대한 페이지 오버레이를 열려고 시도합니다. %2$s은 Piwik 설정한 도메인과 어떤 링크도 일치하지 않습니다.",
+        "RedirectUrlErrorAdmin": "당신은 %1$s설정%2$s에서 추가적인 URL로 도메인을 추가할 수 있습니다.",
+        "RedirectUrlErrorUser": "도메인에 추가적인 URL을 추가하려면 관리자에게 문의하세요."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/lt.json
+++ b/www/analytics/plugins/Overlay/lang/lt.json
@ -0,0 +1,6 @@
+{
+    "Overlay": {
+        "Clicks": "%s spustelėjimų",
+        "Location": "Vietovė"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/lv.json
+++ b/www/analytics/plugins/Overlay/lang/lv.json
@ -0,0 +1,5 @@
+{
+    "Overlay": {
+        "Location": "Lokācijas"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/nb.json
+++ b/www/analytics/plugins/Overlay/lang/nb.json
@ -0,0 +1,10 @@
+{
+    "Overlay": {
+        "Clicks": "%s klikk",
+        "Domain": "Domene",
+        "ErrorNotLoadingLink": "Klikk her for å få flere tips for feilsøking",
+        "Link": "Lenke",
+        "Location": "Sted",
+        "OneClick": "1 klikk"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/nl.json
+++ b/www/analytics/plugins/Overlay/lang/nl.json
@ -0,0 +1,21 @@
+{
+    "Overlay": {
+        "Clicks": "%s klikken",
+        "ClicksFromXLinks": "%1$s Kliks van één van %2$s links",
+        "Domain": "Domein",
+        "ErrorNotLoading": "De Pagina Overlay sessie kon nog niet gestart worden.",
+        "ErrorNotLoadingDetails": "De aan de rechter kant geladen pagina heeft wellicht niet de Piwik tracker code. Probeer in dat geval een andere pagina van het rapport 'Pagina's' als overlay.",
+        "ErrorNotLoadingDetailsSSL": "Omdat u Piwik via https gebruikt is het waarschijnlijk dat uw website geen SSL ondersteunt. Probeer Piwik via http te gebruiken.",
+        "ErrorNotLoadingLink": "Klik hier voor meer tips tijdens het troubleshooten.",
+        "Link": "Link",
+        "Location": "Locatie",
+        "NoData": "Er is geen data voor deze pagina gedurende de geselecteerde periode.",
+        "OneClick": "1 klik",
+        "OpenFullScreen": "Toon volledig scherm (geen zijbalk)",
+        "Overlay": "Pagina Overlay",
+        "PluginDescription": "Zie je analyse data als een transparant op je eigenlijke website. Zie hoeveel keer je bezoekers hebben geklik op elke link. Opmerking: Vereist dat de Transitions plugin is ingeschakeld.",
+        "RedirectUrlError": "Je probeert Pagina overlay te openen voor de URL \"%1$s\". %2$s Geen enkel domain van de Piwik instellingen komt overeen met de link.",
+        "RedirectUrlErrorAdmin": "Je kunt het domein toevoegen als extra URL %1$sin de instellingen%2$s.",
+        "RedirectUrlErrorUser": "Vraag je beheerder om het domein toe te voegen als additionele URL."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/nn.json
+++ b/www/analytics/plugins/Overlay/lang/nn.json
@ -0,0 +1,5 @@
+{
+    "Overlay": {
+        "Location": "Plass"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/pl.json
+++ b/www/analytics/plugins/Overlay/lang/pl.json
@ -0,0 +1,10 @@
+{
+    "Overlay": {
+        "Clicks": "%s kliknięć",
+        "Domain": "Domena",
+        "Link": "Link",
+        "Location": "Położenie",
+        "OneClick": "1 kliknięcie",
+        "RedirectUrlErrorUser": "Zwrócić się do administratora, aby dodać domenę jako dodatkowy URL."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/pt-br.json
+++ b/www/analytics/plugins/Overlay/lang/pt-br.json
@ -0,0 +1,21 @@
+{
+    "Overlay": {
+        "Clicks": "%s cliques",
+        "ClicksFromXLinks": "%1$s cliques de um dos %2$s links",
+        "Domain": "Domínio",
+        "ErrorNotLoading": "A sessão de sobreposição de página (Page Overlay) ainda não pode ser exibida.",
+        "ErrorNotLoadingDetails": "Talvez a página carregada no lado direito não tem o código JS de rastreamento. Neste caso, tente iniciar sobreposição para uma página diferente das páginas do relatório.",
+        "ErrorNotLoadingDetailsSSL": "Desde que você está usando Piwik sobre https, a causa mais provável é que o seu site não suporta SSL. Tente usar Piwik sobre http.",
+        "ErrorNotLoadingLink": "Clique aqui para obter mais dicas para solução de problemas",
+        "Link": "Link",
+        "Location": "Localização",
+        "NoData": "Não há dados para esta página durante o período selecionado.",
+        "OneClick": "1 clique",
+        "OpenFullScreen": "Ir para tela cheia (sem barra lateral)",
+        "Overlay": "Sobreposição de Página",
+        "PluginDescription": "Veja os dados das suas análises como uma sobreposição em seu site real. Veja quantas vezes os usuários clicaram em cada link. Nota: Requer o plugin Transições ativado.",
+        "RedirectUrlError": "Você está tentando abrir sobreposição de página para a URL \"%1$s\". %2$s Nenhum dos domínios configurados no Piwik corresponde ao link.",
+        "RedirectUrlErrorAdmin": "Você pode adicionar um domínio como uma URL adicional %1$sem definições%2$s.",
+        "RedirectUrlErrorUser": "Solicite ao seu administrador para adicionar o domínio como uma URL adicional."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/pt.json
+++ b/www/analytics/plugins/Overlay/lang/pt.json
@ -0,0 +1,5 @@
+{
+    "Overlay": {
+        "Location": "Localização"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/ro.json
+++ b/www/analytics/plugins/Overlay/lang/ro.json
@ -0,0 +1,20 @@
+{
+    "Overlay": {
+        "Clicks": "%s click-uri",
+        "ClicksFromXLinks": "%1$s click-uri de la unul dintre %2$s link-uri",
+        "Domain": "Domeniu",
+        "ErrorNotLoading": "Sesiunea de acoperire pagina nu a putut fi lansata încă.",
+        "ErrorNotLoadingDetails": "Poate pagina încărcată din dreapta nu are codul de urmărire Piwik. În acest caz, încercați lansarea Overlay pentru o altă pagină din raportul de pagini.",
+        "ErrorNotLoadingDetailsSSL": "Din moment ce utilizați Piwik peste https, cauza cea mai probabilă este că site-ul dvs. nu suporta SSL. Încercați să folosiți Piwik peste http.",
+        "ErrorNotLoadingLink": "Click aici pentru a obține mai multe sfaturi pentru depanare",
+        "Link": "Legătură",
+        "Location": "Localitate",
+        "NoData": "Nu există date pentru această pagină în perioada selectată.",
+        "OneClick": "1 click",
+        "OpenFullScreen": "Tot ecranul (fără bara laterală)",
+        "Overlay": "Acoperire Pagina",
+        "RedirectUrlError": "Încercați să deschideți Acoperire Pagina pentru URL-ul \"%1$s\". %2$s Niciunul dintre domeniile de setările Piwik nu se potrivește lcu acest link.",
+        "RedirectUrlErrorAdmin": "Puteți adăuga domeniul ca o suplimentare de URL-ul %1$s in setarile%2$s.",
+        "RedirectUrlErrorUser": "Adresați-vă administratorului pentru a adăuga un domeniu ca un URL suplimentar."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/ru.json
+++ b/www/analytics/plugins/Overlay/lang/ru.json
@ -0,0 +1,15 @@
+{
+    "Overlay": {
+        "Clicks": "%s кликов",
+        "Domain": "Домен",
+        "ErrorNotLoadingLink": "Получить дополнительные советы по устранению неполадок",
+        "Link": "Ссылка",
+        "Location": "Местоположение",
+        "NoData": "Нет данных по этой странице за выбранный период.",
+        "OneClick": "1 клик",
+        "OpenFullScreen": "Перейти к полному экрану",
+        "Overlay": "Глубина проникновения",
+        "RedirectUrlErrorAdmin": "Можете добавить домен как дополнительный URL %1$sв настройках%2$s.",
+        "RedirectUrlErrorUser": "Попросите администратора добавить домен как дополнительный URL."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/sk.json
+++ b/www/analytics/plugins/Overlay/lang/sk.json
@ -0,0 +1,8 @@
+{
+    "Overlay": {
+        "Clicks": "%s kliknutia",
+        "Location": "Miesto",
+        "OpenFullScreen": "Prejsť na celú obrazovku (bez bočnej lišty)",
+        "Overlay": "Prekrytie stránky"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/sl.json
+++ b/www/analytics/plugins/Overlay/lang/sl.json
@ -0,0 +1,5 @@
+{
+    "Overlay": {
+        "Location": "Lokacija"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/sq.json
+++ b/www/analytics/plugins/Overlay/lang/sq.json
@ -0,0 +1,5 @@
+{
+    "Overlay": {
+        "Location": "Vend"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/sr.json
+++ b/www/analytics/plugins/Overlay/lang/sr.json
@ -0,0 +1,21 @@
+{
+    "Overlay": {
+        "Clicks": "%s klikova",
+        "ClicksFromXLinks": "%1$s klikova sa jednog od %2$s linkova",
+        "Domain": "Domen",
+        "ErrorNotLoading": "Nije moguće pokrenuti sesiju za ovaj prikaz.",
+        "ErrorNotLoadingDetails": "Možda stranica koja se učitala sa desne strane nema Piwik kod za praćenje. U tom slučaju, pokušajte da otvorite prikaz neke druge stranice sa izveštajem.",
+        "ErrorNotLoadingDetailsSSL": "S obzirom na to da koristite Piwik preko HTTPS-a, najverovatnije je da vaš sajt ne podržava SSL. Pokušajte da koristite Piwik preko HTTP-a.",
+        "ErrorNotLoadingLink": "Kliknite ovde za više saveta za rešavanje problema",
+        "Link": "Link",
+        "Location": "Lokacija",
+        "NoData": "Nema podataka o ovoj stranici za dati period.",
+        "OneClick": "1 klik",
+        "OpenFullScreen": "Prikaži preko celog ekrana",
+        "Overlay": "Prikaz preko (overlay)",
+        "PluginDescription": "Prikažite analitičke podatke preko vašeg sajta. Pogledajte koliko puta su korisnici kliknuli na svaki od linkova. Morate imati uključen Transitions dodatak.",
+        "RedirectUrlError": "Pokušali ste da otvorite stranicu za URL \"%1$s\". %2$s Nijedan od domena iz Piwik podešavanja ne odgovara ovom linku.",
+        "RedirectUrlErrorAdmin": "Možete dodati domen kao dodatni URL %1$su podešavanjima%2$s.",
+        "RedirectUrlErrorUser": "Zamolite administratora da doda domen kao dodatni URL."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/sv.json
+++ b/www/analytics/plugins/Overlay/lang/sv.json
@ -0,0 +1,20 @@
+{
+    "Overlay": {
+        "Clicks": "%s klick",
+        "ClicksFromXLinks": "%1$s klick från en av %2$s länkar",
+        "Domain": "Domän",
+        "ErrorNotLoading": "Sessionen för sidöverlägg kunde inte startas.",
+        "ErrorNotLoadingDetails": "Möjligtvis så har inte sidan som laddats till höger Piwik's spårningskod. I det här falletkan du prova att starta Sidöverlägg för en annan sida från rapporten \"Sidor\".",
+        "ErrorNotLoadingDetailsSSL": "Eftersom du använder Piwik över https, så är den mest troliga orsaken att din webbläsare inte stödjer SSL. Försök att använda Piwik över http.",
+        "ErrorNotLoadingLink": "Klicka här för att få fler tips för felsökning",
+        "Link": "Länk",
+        "Location": "Plats",
+        "NoData": "Det finns inga data för denna sida under den valda perioden.",
+        "OneClick": "1 klick",
+        "OpenFullScreen": "Gå till helskärmsläge (ingen sidolist)",
+        "Overlay": "Sidöverlägg",
+        "RedirectUrlError": "Du försöker öppna ett överliggande lager för URL \"%1$s\". %2$s Ingen av domänerna från Piwik's inställningar matchar länken.",
+        "RedirectUrlErrorAdmin": "Du kan lägga till domänen som en extra URL %1$si inställningarna%2$s.",
+        "RedirectUrlErrorUser": "Be administratören att lägga till domänen som en extra webbadress"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/ta.json
+++ b/www/analytics/plugins/Overlay/lang/ta.json
@ -0,0 +1,8 @@
+{
+    "Overlay": {
+        "Domain": "புலம்",
+        "Link": "இணைப்பு",
+        "Location": "இடம்",
+        "OneClick": "1 சொடுக்கு"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/te.json
+++ b/www/analytics/plugins/Overlay/lang/te.json
@ -0,0 +1,7 @@
+{
+    "Overlay": {
+        "Clicks": "%s నొక్కులు",
+        "Link": "లంకె",
+        "Location": "ప్రాంతం"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/th.json
+++ b/www/analytics/plugins/Overlay/lang/th.json
@ -0,0 +1,9 @@
+{
+    "Overlay": {
+        "Clicks": "%s คลิก",
+        "Domain": "โดเมน",
+        "Link": "ลิงก์",
+        "Location": "ตำแหน่งที่ตั้ง",
+        "OneClick": "1 คลิก"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/tl.json
+++ b/www/analytics/plugins/Overlay/lang/tl.json
@ -0,0 +1,19 @@
+{
+    "Overlay": {
+        "Clicks": "%s na mga click",
+        "ClicksFromXLinks": "%1$s i-click mula sa isa sa %2$s links.",
+        "Domain": "Domain",
+        "ErrorNotLoading": "Ang sesyon ng Page Overlay ay hindi pa mailunsad.",
+        "ErrorNotLoadingDetails": "Marahil ang pahina na naload sa kanan ay walang Piwik tracker code. Sa ganitong sitwasyon subukan mong e-launch ang overlay sa ibat-ibang pahina na nang-galing sa ulat ng mga pahina.",
+        "ErrorNotLoadingDetailsSSL": "Dahil ginagamit mo ang https sa Piwik ang pinakapang-karaniwang dahilan ay ang iyong website ay hindi suportado ang SSL. Subukang gamitin ang http sa Piwik.",
+        "ErrorNotLoadingLink": "I-click dito upang makakuha ng maraming tip sa pag-totroubleshoot.",
+        "Link": "Link",
+        "Location": "Lokasyon",
+        "NoData": "Walang datos para sa pahinang ito sa napiling panahon.",
+        "OpenFullScreen": "Mag full screen (walang sidebar)",
+        "Overlay": "Page Overlay",
+        "RedirectUrlError": "Sinusubukan mo upang buksan ang Overlay ng Pahina para sa URL na \"%1$s\". %2$s Wala sa mga domains ng Piwik settings ang tugma sa link",
+        "RedirectUrlErrorAdmin": "Maaari mong idagdag ang domain na karagdagang URL %1$s sa mga setting ng %2$s.",
+        "RedirectUrlErrorUser": "Tanungin ang iyong administrator upang idagdag ang domain bilang isang karagdagang URL."
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/tr.json
+++ b/www/analytics/plugins/Overlay/lang/tr.json
@ -0,0 +1,5 @@
+{
+    "Overlay": {
+        "Location": "Konum"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/uk.json
+++ b/www/analytics/plugins/Overlay/lang/uk.json
@ -0,0 +1,5 @@
+{
+    "Overlay": {
+        "Location": "Місцезнаходження"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/vi.json
+++ b/www/analytics/plugins/Overlay/lang/vi.json
@ -0,0 +1,20 @@
+{
+    "Overlay": {
+        "Clicks": "%s click",
+        "ClicksFromXLinks": "%1$s click từ một trong %2$s link",
+        "Domain": "Tên miền",
+        "ErrorNotLoading": "Một phiên trang Overlay chưa thể đưa ra.",
+        "ErrorNotLoadingDetails": "Có thể các trang được tải về bên phải không có mã theo dõi Piwik. Trong trường hợp này, hãy thử đưa ra Overlay cho một trang khác nhau từ báo cáo trang.",
+        "ErrorNotLoadingDetailsSSL": "Kể từ khi bạn đang sử dụng Piwik qua HTTPS, nguyên nhân có thể nhất là trang web của bạn không hỗ trợ SSL. Hãy thử sử dụng Piwik qua http.",
+        "ErrorNotLoadingLink": "Click vào đây để có thêm các lời khuyên cho việc xử lý sự cố",
+        "Link": "Link",
+        "Location": "Vị trí",
+        "NoData": "Không có dữ liệu cho trang này trong khoảng thời gian đã chọn.",
+        "OneClick": "1 click",
+        "OpenFullScreen": "Toàn màn hình (không có sidebar)",
+        "Overlay": "Trang Overlay",
+        "RedirectUrlError": "Bạn đang cố mở trang Overlay cho URL \"%1$s\". Không có %2$s của các tên miền từ các thiết lập Piwik phù hợp với liên kết này.",
+        "RedirectUrlErrorAdmin": "Bạn có thể thêm các tên miền như một URL bổ sung %1$s trong cài đặt %2$s.",
+        "RedirectUrlErrorUser": "Yêu cầu quản trị của bạn thêm các tên miền như một URL bổ sung"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/zh-cn.json
+++ b/www/analytics/plugins/Overlay/lang/zh-cn.json
@ -0,0 +1,21 @@
+{
+    "Overlay": {
+        "Clicks": "%s 次点击",
+        "ClicksFromXLinks": "%1$s 次点击来自 %2$s 中的链接",
+        "Domain": "域名",
+        "ErrorNotLoading": "还无法运行页面叠加会话。",
+        "ErrorNotLoadingDetails": "也许右边加载的页面没有 Piwik 跟踪代码。如果是这样，试试在另外一个页面运行叠加。",
+        "ErrorNotLoadingDetailsSSL": "因为你通过 https 访问 Piwik，最可能的原因是您的网站不支持 SSL，试试用 http 访问 Piwik。",
+        "ErrorNotLoadingLink": "点这里了解更多排错的方法",
+        "Link": "链接",
+        "Location": "位置",
+        "NoData": "所选时间段内没有本页面的数据。",
+        "OneClick": "1 次点击",
+        "OpenFullScreen": "全屏(无边框)",
+        "Overlay": "页面叠加",
+        "PluginDescription": "请参阅您的分析数据为您的实际网站的叠加。查看有多少次你的用户点击每一个环节上。注：需要在转换插件启用。",
+        "RedirectUrlError": "您正在打开网址 \"%1$s\" 的页面叠加。%2$s 没有 Piwik 设置的域名匹配这个链接。",
+        "RedirectUrlErrorAdmin": "您可以在 %1$s管理设置%2$s 中以附加网址添加域名。",
+        "RedirectUrlErrorUser": "请管理员以附加网址来添加域名。"
+    }
+}
--- a/www/analytics/plugins/Overlay/lang/zh-tw.json
+++ b/www/analytics/plugins/Overlay/lang/zh-tw.json
@ -0,0 +1,5 @@
+{
+    "Overlay": {
+        "Location": "位置"
+    }
+}
--- a/www/analytics/plugins/Overlay/stylesheets/overlay.css
+++ b/www/analytics/plugins/Overlay/stylesheets/overlay.css
@ -19,36 +19,38 @@ body #logo {
    margin-top: 5px;
 }

-a#Overlay_Title {
-    font-size: 15px;
-    font-weight: normal;
-    color: #7e7363;
+a#overlayTitle {
+    font-size: 12px;
    text-decoration: none;
-    margin: -3px 0 0 0;
-    padding: 0 0 0 5px;
-    vertical-align: text-bottom;
+    color: #4d4d4d;
+    margin-left: 10px;
 }
-
-#Overlay_Title img {
-    vertical-align: text-bottom;
+a#overlayTitle .icon-help {
    margin-left: 4px;
 }

-#Overlay_DateRangeSelection {
-    padding: 30px 0 20px 23px;
-    background: url(../../Zeitgeist/images/icon-calendar.gif) 2px 33px no-repeat;
-    margin-left: 5px;
+#overlayDateRangeSelection {
+    padding: 0 0 0 25px;
+    background: url(../../Morpheus/images/icon-calendar.gif) 2px center no-repeat;
+    margin: 20px 10px;
 }

-#Overlay_Location {
+#overlayLocation, .overlaySegment {
    width: 200px;
-    padding: 0 0 30px 0;
-    margin-left: 5px;
    font-size: 12px;
 }

-#Overlay_Loading {
-    background: url(../../Zeitgeist/images/loading-blue.gif) no-repeat center 10px;
+#overlayLocation {
+    margin: 0 0 10px 10px;
+}
+
+.overlaySegment {
+    margin: 0 0 30px 0;
+    word-break: break-all;
+}
+
+#overlayLoading {
+    background: url(../../Morpheus/images/loading-blue.gif) no-repeat center 10px;
    width: 190px;
    padding-top: 30px;
    margin-top: 30px;
@ -56,104 +58,112 @@ a#Overlay_Title {
    display: none;
 }

-#Overlay_Sidebar {
+#overlaySidebar {
    width: 200px;
-    margin-left: 5px;
+    margin-left: 10px;
 }

-#Overlay_Sidebar h2 {
+#overlaySidebar h2 {
    font-size: 15px;
-    margin: 0;
-    padding: 0 0 8px 23px;
+    margin: 0 0 8px 0;
    color: #255792;
 }

-a#Overlay_FullScreen,
-a#Overlay_RowEvolution,
-a#Overlay_Transitions {
+a#overlaySegmentedVisitorLog,
+a#overlayFullScreen,
+a#overlayRowEvolution,
+a#overlayTransitions {
    display: block;
    color: #255792;
    font-size: 13px;
    line-height: 15px;
-    margin: 0 0 0 5px;
-    padding: 8px 0 3px 25px;
+    margin: 0 0 0 10px;
+    padding: 8px 10px 3px 25px;
    text-decoration: none;
 }

-a#Overlay_RowEvolution {
+a#overlayRowEvolution {
    margin-top: 20px;
-    background: url(../../Zeitgeist/images/row_evolution_hover.png) no-repeat 0 7px;
+    background: url(../../Morpheus/images/row_evolution_hover.png) no-repeat 0 7px;
 }

-a#Overlay_Transitions {
+a#overlayTransitions {
    background: url(../../Transitions/images/transitions_icon_hover.png) no-repeat 0 6px;
 }

-a#Overlay_FullScreen {
-    margin-top: 20px;
-    background: url(../../Zeitgeist/images/fullscreen.png) no-repeat 3px 8px;
+a#overlaySegmentedVisitorLog {
+    background: url(../../Live/images/visitorlog-hover.png) no-repeat 0 8px;
 }

-a#Overlay_FullScreen:hover,
-a#Overlay_RowEvolution:hover,
-a#Overlay_Transitions:hover {
+a#overlayFullScreen {
+    margin-top: 20px;
+    background: url(../../Morpheus/images/fullscreen.png) no-repeat 3px 8px;
+}
+
+a#overlaySegmentedVisitorLog:hover,
+a#overlayFullScreen:hover,
+a#overlayRowEvolution:hover,
+a#overlayTransitions:hover {
    color: #E87500;
 }

-#Overlay_Main {
+#overlayMain {
    margin-left: 220px;
    position: absolute;
    top: 0;
 }

-#Overlay_Iframe {
+#overlayIframe {
    border-left: 2px solid #ddd;
 }

-.Overlay_Metric {
+.overlayMetric {
    font-size: 12px;
-    padding-bottom: 4px;
+    line-height: 14px;
+    padding: 5px 0;
 }

-.Overlay_MetricValue {
+.overlayMetricValue {
    font-size: 14px;
    font-weight: bold;
 }

-.Overlay_NoData {
+.overlayNoData {
    font-size: 12px;
    color: #7E7363;
 }

-h2.Overlay_MainMetrics {
-    background: url(../images/info.png) 0 1px no-repeat;
-}
-
-body .ui-tooltip.Overlay_Tooltip {
+body .ui-tooltip.overlayTooltip {
    font-size: 11px;
    padding: 3px 5px 3px 6px;
 }

-#Overlay_NoFrame {
+#overlayNoFrame {
    padding: 20px 0 40px 2px;
 }

-#Overlay_Error_NotLoading {
+#overlayErrorNotLoading {
    width: 190px;
    display: none;
    margin: 20px 0 0 5px;
    font-size: 14px;
 }

-#Overlay_Error_NotLoading span {
+#overlayErrorNotLoading span {
    color: #E87500;
    font-weight: bold;
 }

-#topBars {
+.navbar .navbar-right {
+    display: none;
+}
+
+.top_controls {
    display: none;
 }

 .overlay-sidebar-container {
    width: 220px;
-}
+    margin-left: -16px;
+    margin-top: 10px;
+}
--- a/www/analytics/plugins/Overlay/templates/index.twig
+++ b/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 %}
--- a/www/analytics/plugins/Overlay/templates/index_noframe.twig
+++ b/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) {
--- a/www/analytics/plugins/Overlay/templates/notifyParentIframe.twig
+++ b/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">
--- a/www/analytics/plugins/Overlay/templates/renderSidebar.twig
+++ b/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>
--- a/www/analytics/plugins/Overlay/templates/showErrorWrongDomain.twig
+++ b/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>
--- a/www/analytics/plugins/Overlay/templates/startOverlaySession.twig
+++ b/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>