refs #1454 adding pageviews, downloads and outlinks to the ui

git-svn-id: http://dev.piwik.org/svn/trunk@5388 59fd770c-687e-43c8-a1e3-f5a4ff64c105

lang/en.php

@@ -1421,10 +1421,12 @@ Note: this token will expire in 24 hrs.",
 	'VisitsSummary_NbVisits' => '%s visits',
 	'VisitsSummary_NbUniqueVisitors' => '%s unique visitors',
 	'VisitsSummary_NbActions' => '%s actions',
-	'VisitsSummary_NbActionsDescription' => '%s actions (page views, downloads and outlinks)',
+	'VisitsSummary_NbPageviewsDescription' => '%s pageviews ',
+	'VisitsSummary_NbDownloadsDescription' => '%s downloads ',
+	'VisitsSummary_NbOutlinksDescription' => '%s outlinks ',
 	'VisitsSummary_AverageVisitDuration' => '%s average visit duration',
 	'VisitsSummary_MaxNbActions' => '%s max actions in one visit',
-	'VisitsSummary_NbActionsPerVisit' => '%s actions per visit',
+	'VisitsSummary_NbActionsPerVisit' => '%s actions (page views, downloads and outlinks) per visit',
 	'VisitsSummary_NbVisitsBounced' => '%s visits have bounced (left the website after one page)',
 	'VisitsSummary_EvolutionOverLastPeriods' => 'Evolution over the last %s',
 	'VisitsSummary_GenerateTime' => '%s seconds to generate the page',

plugins/VisitsSummary/Controller.php

@@ -42,6 +42,9 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller
 		}
 		$view->setColumnsToDisplay($columns);
 		
+		$meta = Piwik_API_API::getInstance()->getMetadata(false, 'VisitsSummary', 'get');
+		$view->setColumnsTranslations($meta[0]['metrics']);
+		
 		$doc = Piwik_Translate('VisitsSummary_VisitsSummaryDocumentation').'<br />'
 		     . Piwik_Translate('General_BrokenDownReportDocumentation').'<br /><br />'
 		     
@@ -85,7 +88,9 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller
 	protected function setSparklinesAndNumbers($view)
 	{
 		$view->urlSparklineNbVisits 		= $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('nb_visits')));
-		$view->urlSparklineNbActions 		= $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('nb_actions')));
+		$view->urlSparklineNbPageviews 		= $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('nb_pageviews', 'nb_uniq_pageviews')));
+		$view->urlSparklineNbDownloads 		= $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('nb_downloads', 'nb_uniq_downloads')));
+		$view->urlSparklineNbOutlinks 		= $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('nb_outlinks', 'nb_uniq_outlinks')));
 		$view->urlSparklineAvgVisitDuration = $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('avg_time_on_site')));
 		$view->urlSparklineMaxActions 		= $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('max_actions')));
 		$view->urlSparklineActionsPerVisit 	= $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('nb_actions_per_visit')));
@@ -97,7 +102,9 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller
 		$view->nbUniqVisitors = $dataRow->getColumn('nb_uniq_visitors');
 		$nbVisits = $dataRow->getColumn('nb_visits');
 		$view->nbVisits = $nbVisits;
-		$view->nbActions = $dataRow->getColumn('nb_actions');
+		$view->nbPageviews = $dataRow->getColumn('nb_pageviews');
+		$view->nbDownloads = $dataRow->getColumn('nb_downloads');
+		$view->nbOutlinks = $dataRow->getColumn('nb_outlinks');
 		$view->averageVisitDuration = $dataRow->getColumn('avg_time_on_site');
 		$nbBouncedVisits = $dataRow->getColumn('bounce_count');
 		$view->bounceRate = Piwik::getPercentageSafe($nbBouncedVisits, $nbVisits);

plugins/VisitsSummary/templates/sparklines.tpl

@@ -3,7 +3,9 @@
 {if $displayUniqueVisitors}
 	<div class="sparkline">{sparkline src=$urlSparklineNbUniqVisitors} {'VisitsSummary_NbUniqueVisitors'|translate:"<strong>$nbUniqVisitors</strong>"}</div>
 {/if}
-	<div class="sparkline">{sparkline src=$urlSparklineNbActions} {'VisitsSummary_NbActionsDescription'|translate:"<strong>$nbActions</strong>"}</div>
+	<div class="sparkline">{sparkline src=$urlSparklineNbPageviews} {'VisitsSummary_NbPageviewsDescription'|translate:"<strong>$nbPageviews</strong>"}</div>
+	<div class="sparkline">{sparkline src=$urlSparklineNbDownloads} {'VisitsSummary_NbDownloadsDescription'|translate:"<strong>$nbDownloads</strong>"}</div>
+	<div class="sparkline">{sparkline src=$urlSparklineNbOutlinks} {'VisitsSummary_NbOutlinksDescription'|translate:"<strong>$nbOutlinks</strong>"}</div>
 	<div class="sparkline">{sparkline src=$urlSparklineActionsPerVisit} {'VisitsSummary_NbActionsPerVisit'|translate:"<strong>$nbActionsPerVisit</strong>"}</div>
 </div>
 <div id='rightcolumn'>