diff options
author | Thomas ZILLIOX <thomas@zilliox.me> | 2013-08-09 22:23:06 +0400 |
---|---|---|
committer | Thomas ZILLIOX <thomas@zilliox.me> | 2013-08-09 22:23:06 +0400 |
commit | 7d670462a05ea6f66f0305614cf7177539188381 (patch) | |
tree | 8e6016d7ed5b1c13ae0ff0892b5637a79eaedcc8 | |
parent | 5fe3c0d20b6d0dc0b082302d0a89cee924fa3224 (diff) |
Activate sparklines colors to the MultiSites plugin
-rw-r--r-- | core/Twig.php | 2 | ||||
-rw-r--r-- | plugins/MultiSites/javascripts/multiSites.js | 2 | ||||
-rw-r--r-- | plugins/MultiSites/templates/_siteRow.twig | 2 | ||||
-rw-r--r-- | plugins/Zeitgeist/templates/_sparklineFooter.twig | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/core/Twig.php b/core/Twig.php index 4b32e4931c..a5a9cea40e 100644 --- a/core/Twig.php +++ b/core/Twig.php @@ -34,7 +34,7 @@ use Twig_SimpleFunction; class Twig { const SPARKLINE_TEMPLATE = '<img alt="" data-src="%s" width="%d" height="%d" /> - <script type="text/javascript">$(document).ready(function () { piwik.initSparklines(); });</script>'; + <script type="text/javascript">$(function() { piwik.initSparklines(); });</script>'; /** * @var Twig_Environment diff --git a/plugins/MultiSites/javascripts/multiSites.js b/plugins/MultiSites/javascripts/multiSites.js index d9d14e6df5..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 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/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> diff --git a/plugins/Zeitgeist/templates/_sparklineFooter.twig b/plugins/Zeitgeist/templates/_sparklineFooter.twig index b8b864d75c..60664aa216 100644 --- a/plugins/Zeitgeist/templates/_sparklineFooter.twig +++ b/plugins/Zeitgeist/templates/_sparklineFooter.twig @@ -1,5 +1,5 @@ <script type="text/javascript"> - $(document).ready(function () { + $(function () { initializeSparklines(); }); </script> |