diff options
| author | BeezyT <timo@ezdesign.de> | 2011-10-31 11:48:15 +0400 |
|---|---|---|
| committer | BeezyT <timo@ezdesign.de> | 2011-10-31 11:48:15 +0400 |
| commit | 1f0f21992dd09b02e90e25de18e87959c0826791 (patch) | |
| tree | be71d3c4bf901043c42137864979ea9dd810dd32 /plugins/VisitsSummary | |
| parent | f82388f491d893532a72a174e579a53154915c2c (diff) | |
refs #1454 backward compatibility: show nb_actions if finer metrics are not available, german translation
git-svn-id: http://dev.piwik.org/svn/trunk@5394 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins/VisitsSummary')
| -rw-r--r-- | plugins/VisitsSummary/Controller.php | 11 | ||||
| -rw-r--r-- | plugins/VisitsSummary/templates/sparklines.tpl | 7 |
2 files changed, 18 insertions, 0 deletions
diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php index e49dd1dfc4..0e89147ed9 100644 --- a/plugins/VisitsSummary/Controller.php +++ b/plugins/VisitsSummary/Controller.php @@ -113,5 +113,16 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller $view->bounceRate = Piwik::getPercentageSafe($nbBouncedVisits, $nbVisits); $view->maxActions = $dataRow->getColumn('max_actions'); $view->nbActionsPerVisit = $dataRow->getColumn('nb_actions_per_visit'); + + // backward compatibility: + // show actions if the finer metrics are not archived + $view->showOnlyActions = false; + if ($dataRow->getColumn('nb_pageviews') + $dataRow->getColumn('nb_downloads') + + $dataRow->getColumn('nb_outlinks') == 0 && $dataRow->getColumn('nb_actions') > 0) + { + $view->showOnlyActions = true; + $view->nbActions = $dataRow->getColumn('nb_actions'); + $view->urlSparklineNbActions = $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('nb_actions'))); + } } } diff --git a/plugins/VisitsSummary/templates/sparklines.tpl b/plugins/VisitsSummary/templates/sparklines.tpl index fecad25b82..fd50969ab4 100644 --- a/plugins/VisitsSummary/templates/sparklines.tpl +++ b/plugins/VisitsSummary/templates/sparklines.tpl @@ -20,6 +20,12 @@ </div> <div id='rightcolumn'> + {if $showOnlyActions} + <div class="sparkline"> + {sparkline src=$urlSparklineNbActions} + {'VisitsSummary_NbActionsDescription'|translate:"<strong>$nbActions</strong>"} + </div> + {else} <div class="sparkline"> {sparkline src=$urlSparklineNbPageviews} {'VisitsSummary_NbPageviewsDescription'|translate:"<strong>$nbPageviews</strong>"|trim}, @@ -35,6 +41,7 @@ {'VisitsSummary_NbOutlinksDescription'|translate:"<strong>$nbOutlinks</strong>"|trim}, {'VisitsSummary_NbUniqueOutlinksDescription'|translate:"<strong>$nbUniqueOutlinks</strong>"} </div> + {/if} <div class="sparkline"> {sparkline src=$urlSparklineMaxActions} {'VisitsSummary_MaxNbActions'|translate:"<strong>$maxActions</strong>"} |