Merge remote-tracking branch 'origin/master' into plugin_namespaces

Conflicts:
	core/Tracker/Request.php
	core/ViewDataTable.php
	core/ViewDataTable/HtmlTable/Goals.php
	plugins/Actions/Actions.php
	plugins/Annotations/API.php
	plugins/CoreHome/CoreHome.php
	plugins/DBStats/DBStats.php
	plugins/DevicesDetection/DevicesDetection.php
	plugins/Goals/Goals.php
	plugins/Live/Live.php
	plugins/Referers/Referers.php
	plugins/UserSettings/UserSettings.php
	plugins/UsersManager/API.php
	plugins/VisitTime/VisitTime.php
	plugins/VisitorInterest/VisitorInterest.php

4 files changed, 9 insertions, 9 deletions

diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php
index dec284cd3c..6b2381c0d5 100755
--- a/plugins/MultiSites/API.php
+++ b/plugins/MultiSites/API.php
@@ -402,8 +402,8 @@ class API
      * Sets the total evolution metadata for a datatable returned by $this->buildDataTable
      * given data for the last period.
      *
-     * @param DataTable $dataTable
-     * @param DataTable $pastData
+     * @param DataTable|DataTable\Map $dataTable
+     * @param DataTable|DataTable\Map $pastData
      * @param array $apiMetrics Metrics info.
      */
     private function setPastDataMetadata($dataTable, $pastData, $apiMetrics)
diff --git a/plugins/MultiSites/javascripts/multiSites.js b/plugins/MultiSites/javascripts/multiSites.js
index 15c8aade97..8b004fb769 100644
--- a/plugins/MultiSites/javascripts/multiSites.js
+++ b/plugins/MultiSites/javascripts/multiSites.js
@@ -174,7 +174,7 @@ function getSparklineImg(id, column, params) {
     if (token_auth.length) {
         append = '&token_auth=' + token_auth;
     }
-    return '<img class="sparkline" alt="" src="?module=MultiSites&action=getEvolutionGraph&period=' + params['period'] + '&date=' + params['dateSparkline'] + '&evolutionBy=' + params['evolutionBy'] + '&columns=' + column + '&idSite=' + id + '&idsite=' + id + '&viewDataTable=sparkline' + append + '" width="100" height="25" />';
+    return '<img alt="" src="?module=MultiSites&action=getEvolutionGraph&period=' + params['period'] + '&date=' + params['dateSparkline'] + '&evolutionBy=' + params['evolutionBy'] + '&columns=' + column + '&idSite=' + id + '&idsite=' + id + '&viewDataTable=sparkline' + append + '&colors=' + encodeURIComponent(JSON.stringify(piwik.getSparklineColors())) + '" width="100" height="25" />';
 }
 
 function showPagination(allSites, params) {
diff --git a/plugins/MultiSites/stylesheets/multiSites.less b/plugins/MultiSites/stylesheets/multiSites.less
index 155af00a5c..ffacd8e3ae 100644
--- a/plugins/MultiSites/stylesheets/multiSites.less
+++ b/plugins/MultiSites/stylesheets/multiSites.less
@@ -13,7 +13,7 @@
 }
 
 .indicator {
-    background: url(../images/loading-blue.gif) no-repeat center;
+    background: url(plugins/MultiSites/images/loading-blue.gif) no-repeat center;
     height: 20px;
     width: 60px;
     margin: auto;
@@ -58,24 +58,24 @@
     width: 16px;
     height: 13px;
     display: inline-block;
-    background-image: url(../../Zeitgeist/images/sortdesc.png);
+    background-image: url(plugins/Zeitgeist/images/sortdesc.png);
 }
 
 .multisites_asc {
     width: 16px;
     height: 13px;
     display: inline-block;
-    background-image: url(../../Zeitgeist/images/sortasc.png);
+    background-image: url(plugins/Zeitgeist/images/sortasc.png);
 }
 
 #mt thead {
     line-height: 2.5em;
 }
 
-#mt thead :first-child {
+#mt thead *:first-child {
     border-top-left-radius: 7px
 }
 
-#mt thead :last-child {
+#mt thead *:last-child {
     border-top-right-radius: 7px;
 }
\ No newline at end of file
diff --git a/plugins/MultiSites/templates/_siteRow.twig b/plugins/MultiSites/templates/_siteRow.twig
index 437db12226..bd4ea54276 100644
--- a/plugins/MultiSites/templates/_siteRow.twig
+++ b/plugins/MultiSites/templates/_siteRow.twig
@@ -26,7 +26,7 @@
     {% endif %}
     {% if show_sparklines %}
     <td style="width:180px">
-        <div id="sparkline_%idsite%" style="width: 100px; margin: auto">
+        <div id="sparkline_%idsite%" class="sparkline" style="width: 100px; margin: auto">
             <a target="_blank" href="index.php?module=CoreHome&action=index&date=%date%&period=%period%&idSite=%idsite%"
                title="{% set dashboardName %}{{ 'Dashboard_DashboardOf'|translate('%name%') }}{% endset %} {{ 'General_GoTo'|translate(dashboardName) }}">%sparkline%</a>
         </div>