From c71a3ba4732f58d740a84d18e2a41c148bd1d75f Mon Sep 17 00:00:00 2001
From: robocoder <anthon.pang@gmail.com>
Date: Sun, 5 Sep 2010 19:03:28 +0000
Subject: [PATCH] fixes #1315
git-svn-id: http://dev.piwik.org/svn/trunk@3063 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
config/global.ini.php | 3 +++
plugins/MultiSites/Controller.php | 3 ++-
plugins/MultiSites/templates/index.tpl | 2 +-
plugins/MultiSites/templates/row.tpl | 2 ++
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/config/global.ini.php b/config/global.ini.php
index ce1de0e578..7b93deccd2 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -70,6 +70,9 @@ autocomplete_min_sites = 5
; maximum number of websites showed in search results in autocompleter
site_selector_max_sites = 10
+; if set to 1, shows sparklines (evolution graph) in multisites reports
+show_multisites_sparklines = 1
+
; this action name is used when the URL ends with a slash /
; it is useful to have an actual string to write in the UI
action_default_name = index
diff --git a/plugins/MultiSites/Controller.php b/plugins/MultiSites/Controller.php
index 3836929fe0..b221401345 100644
--- a/plugins/MultiSites/Controller.php
+++ b/plugins/MultiSites/Controller.php
@@ -109,7 +109,8 @@ class Piwik_MultiSites_Controller extends Piwik_Controller
}
$this->setGeneralVariablesView($view);
$this->setMinMaxDateAcrossWebsites($mySites, $view);
-
+ $view->show_sparklines = Zend_Registry::get('config')->General->show_multisites_sparklines;
+
echo $view->render();
}
diff --git a/plugins/MultiSites/templates/index.tpl b/plugins/MultiSites/templates/index.tpl
index c5ed71f1d3..017a06fac2 100644
--- a/plugins/MultiSites/templates/index.tpl
+++ b/plugins/MultiSites/templates/index.tpl
@@ -53,7 +53,7 @@
<span>{'General_ColumnNbUniqVisitors'|translate}</span>
<span class="arrow"></span>
</th>
- <th id="evolution" style=" width:350px" colspan="2">
+ <th id="evolution" style=" width:350px" colspan="{if $show_sparklines}2{else}1{/if}">
<span class="arrow "></span>
<span class="evolution" style="cursor:pointer;" onClick="params = setOrderBy(this,allSites, params, $('#evolution_selector').val() + 'Summary');"> {'MultiSites_Evolution'|translate}</span>
<select class="selector" id="evolution_selector" onchange="params['evolutionBy'] = $('#evolution_selector').val(); switchEvolution(params);">
diff --git a/plugins/MultiSites/templates/row.tpl b/plugins/MultiSites/templates/row.tpl
index fdde2a7600..0e37a787fa 100644
--- a/plugins/MultiSites/templates/row.tpl
+++ b/plugins/MultiSites/templates/row.tpl
@@ -19,8 +19,10 @@
<div class="actions"style="display:none">%actionsSummary%</div>
<div class="unique" >%uniqueSummary%</div>
</td>
+{if $show_sparklines}
<td style="width:180px">
<div id="sparkline_%idsite%" style="width: 100px; margin: auto">
%sparkline%
</div>
</td>
+{/if}
--
GitLab