[mauser]- refs #62 commited huge work by Maciej Zawadziński: thanks! still some work to do + QA but looks really good :)

[mauser]- refs #116 commited partial fix
[mauser]- refs #65 commited partial fix
- fixed broken tests

4 files changed, 178 insertions, 152 deletions

diff --git a/plugins/VisitsSummary/VisitsSummary.php b/plugins/VisitsSummary/VisitsSummary.php
index 7470636e2e..a9e88e6777 100644
--- a/plugins/VisitsSummary/VisitsSummary.php
+++ b/plugins/VisitsSummary/VisitsSummary.php
@@ -1,132 +1,135 @@
-<?php
-/**
- * Piwik - Open source web analytics
- * 
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- * 
- * @package Piwik_VisitsSummary
- */
-	
-/**
- * 
- * @package Piwik_VisitsSummary
- */
-class Piwik_VisitsSummary extends Piwik_Plugin
-{
-	public function getInformation()
-	{
-		$info = array(
-			// name must be the className prefix!
-			'name' => 'Piwik_VisitsSummary',
-			'description' => 'Description',
-			'author' => 'Piwik',
-			'homepage' => 'http://piwik.org/',
-			'version' => '0.1',
-			'translationAvailable' => false,
-		);
-		
-		return $info;
-	}
-	
-}
-
-require_once "ViewDataTable.php";
-class Piwik_VisitsSummary_Controller extends Piwik_Controller 
-{
-	function index()
-	{
-		$view = new Piwik_View('VisitsSummary/index.tpl');
-		// period
-		$currentPeriod = Piwik_Common::getRequestVar('period');
-		$view->period = $currentPeriod;
-		
-		$view->graphEvolutionVisitsSummary = $this->getLastVisitsGraph( true );
-		
-		$this->setSparklinesAndNumbers($view);		
-		echo $view->render();
-	}
-	
-	protected function setSparklinesAndNumbers($view)
-	{
-		$view->urlSparklineNbVisits 		= $this->getUrlSparkline( 'getLastVisitsGraph');
-		$view->urlSparklineNbUniqVisitors 	= $this->getUrlSparkline( 'getLastUniqueVisitorsGraph');
-		$view->urlSparklineNbActions 		= $this->getUrlSparkline( 'getLastActionsGraph');
-		$view->urlSparklineSumVisitLength 	= $this->getUrlSparkline( 'getLastSumVisitsLengthGraph');
-		$view->urlSparklineMaxActions 		= $this->getUrlSparkline( 'getLastMaxActionsGraph');
-		$view->urlSparklineBounceCount 		= $this->getUrlSparkline( 'getLastBounceCountGraph');
-		
-		$dataTableVisit = self::getVisitsSummary();
-		$view->nbUniqVisitors = $dataTableVisit->getColumn('nb_uniq_visitors');
-		$view->nbVisits = $dataTableVisit->getColumn('nb_visits');
-		$view->nbActions = $dataTableVisit->getColumn('nb_actions');
-		$view->sumVisitLength = $dataTableVisit->getColumn('sum_visit_length');
-		$view->bounceCount = $dataTableVisit->getColumn('bounce_count');
-		$view->maxActions = $dataTableVisit->getColumn('max_actions');
-		
-	}
-	
-	function getSparklines()
-	{
-		$view = new Piwik_View('VisitsSummary/sparklines.tpl');
-		$this->setSparklinesAndNumbers($view);		
-		echo $view->render();
-	}
-	/**
-	 * General visit
-	 */
-	static public function getVisitsSummary()
-	{
-		$requestString = 'method=' . "VisitsSummary.get" . '&format=original'.
-			// we disable filters for example "search for pattern", in the case this method is called 
-			// by a method that already calls the API with some generic filters applied 
-			'&disable_generic_filters=true'; 
-		$request = new Piwik_API_Request($requestString);
-		return $request->process();
-	}
-
-	function getLastVisitsGraph( $fetch = false )
-	{
-		$view = $this->getLastUnitGraph('VisitsSummary', __FUNCTION__, "VisitsSummary.getVisits");
-		return $this->renderView($view, $fetch);
-	}
-	
-	function getLastUniqueVisitorsGraph( $fetch = false )
-	{
-		$view = $this->getLastUnitGraph('VisitsSummary', __FUNCTION__, "VisitsSummary.getUniqueVisitors");
-		return $this->renderView($view, $fetch);
-	}
-	
-	function getLastActionsGraph( $fetch = false )
-	{
-		$view = $this->getLastUnitGraph('VisitsSummary', __FUNCTION__, "VisitsSummary.getActions");
-		return $this->renderView($view, $fetch);
-	}
-	
-	function getLastSumVisitsLengthGraph( $fetch = false )
-	{
-		$view = $this->getLastUnitGraph('VisitsSummary', __FUNCTION__, "VisitsSummary.getSumVisitsLength");
-		return $this->renderView($view, $fetch);
-	}
-	
-	function getLastMaxActionsGraph( $fetch = false )
-	{
-		$view = $this->getLastUnitGraph('VisitsSummary', __FUNCTION__, "VisitsSummary.getMaxActions");
-		return $this->renderView($view, $fetch);
-	}
-	
-	function getLastBounceCountGraph( $fetch = false )
-	{
-		$view = $this->getLastUnitGraph('VisitsSummary', __FUNCTION__, "VisitsSummary.getBounceCount");
-		return $this->renderView($view, $fetch);
-	}
-	
-}		
-
-Piwik_AddWidget( 'VisitsSummary', 'getLastVisitsGraph', 'Last visits graph');
-Piwik_AddWidget( 'VisitsSummary', 'getSparklines', 'Visits overview');
-Piwik_AddWidget( 'VisitsSummary', 'getLastUniqueVisitorsGraph', 'Last unique visitors graph');
-Piwik_AddWidget( 'VisitsSummary', 'index', 'Overview with graph');
-
-Piwik_AddMenu('Visitors', 'Overview', array('module' => 'VisitsSummary'), true);
\ No newline at end of file
+<?php

+/**

+ * Piwik - Open source web analytics

+ * 

+ * @link http://piwik.org

+ * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later

+ * @version $Id$

+ * 

+ * @package Piwik_VisitsSummary

+ */

+	

+/**

+ * 

+ * @package Piwik_VisitsSummary

+ */

+class Piwik_VisitsSummary extends Piwik_Plugin

+{

+	public function getInformation()

+	{

+		$info = array(

+			// name must be the className prefix!

+			'name' => 'VisitsSummary',

+			'description' => 'Description',

+			'author' => 'Piwik',

+			'homepage' => 'http://piwik.org/',

+			'version' => '0.1',

+			'translationAvailable' => true,

+		);

+		

+		return $info;

+	}

+	

+	function postLoad()

+	{

+		Piwik_AddWidget( 'VisitsSummary', 'getLastVisitsGraph', Piwik_Translate('VisitsSummary_WidgetLastVisits'));

+		Piwik_AddWidget( 'VisitsSummary', 'getSparklines', Piwik_Translate('VisitsSummary_WidgetVisits'));

+		Piwik_AddWidget( 'VisitsSummary', 'getLastUniqueVisitorsGraph', Piwik_Translate('VisitsSummary_WidgetLastVisitors'));

+		Piwik_AddWidget( 'VisitsSummary', 'index', Piwik_Translate('VisitsSummary_WidgetOverviewGraph'));

+

+		Piwik_AddMenu('Visitors', Piwik_Translate('VisitsSummary_SubmenuOverview'), array('module' => 'VisitsSummary'), true);

+	}

+}

+

+require_once "ViewDataTable.php";

+class Piwik_VisitsSummary_Controller extends Piwik_Controller 

+{

+	function index()

+	{

+		$view = new Piwik_View('VisitsSummary/index.tpl');

+		// period

+		$currentPeriod = Piwik_Common::getRequestVar('period');

+		$view->period = $currentPeriod;

+		

+		$view->graphEvolutionVisitsSummary = $this->getLastVisitsGraph( true );

+		

+		$this->setSparklinesAndNumbers($view);		

+		echo $view->render();

+	}

+	

+	protected function setSparklinesAndNumbers($view)

+	{

+		$view->urlSparklineNbVisits 		= $this->getUrlSparkline( 'getLastVisitsGraph');

+		$view->urlSparklineNbUniqVisitors 	= $this->getUrlSparkline( 'getLastUniqueVisitorsGraph');

+		$view->urlSparklineNbActions 		= $this->getUrlSparkline( 'getLastActionsGraph');

+		$view->urlSparklineSumVisitLength 	= $this->getUrlSparkline( 'getLastSumVisitsLengthGraph');

+		$view->urlSparklineMaxActions 		= $this->getUrlSparkline( 'getLastMaxActionsGraph');

+		$view->urlSparklineBounceCount 		= $this->getUrlSparkline( 'getLastBounceCountGraph');

+		

+		$dataTableVisit = self::getVisitsSummary();

+		$view->nbUniqVisitors = $dataTableVisit->getColumn('nb_uniq_visitors');

+		$view->nbVisits = $dataTableVisit->getColumn('nb_visits');

+		$view->nbActions = $dataTableVisit->getColumn('nb_actions');

+		$view->sumVisitLength = $dataTableVisit->getColumn('sum_visit_length');

+		$view->bounceCount = $dataTableVisit->getColumn('bounce_count');

+		$view->maxActions = $dataTableVisit->getColumn('max_actions');

+		

+	}

+	

+	function getSparklines()

+	{

+		$view = new Piwik_View('VisitsSummary/sparklines.tpl');

+		$this->setSparklinesAndNumbers($view);		

+		echo $view->render();

+	}

+	/**

+	 * General visit

+	 */

+	static public function getVisitsSummary()

+	{

+		$requestString = 'method=' . "VisitsSummary.get" . '&format=original'.

+			// we disable filters for example "search for pattern", in the case this method is called 

+			// by a method that already calls the API with some generic filters applied 

+			'&disable_generic_filters=true'; 

+		$request = new Piwik_API_Request($requestString);

+		return $request->process();

+	}

+

+	function getLastVisitsGraph( $fetch = false )

+	{

+		$view = $this->getLastUnitGraph('VisitsSummary', __FUNCTION__, "VisitsSummary.getVisits");

+		return $this->renderView($view, $fetch);

+	}

+	

+	function getLastUniqueVisitorsGraph( $fetch = false )

+	{

+		$view = $this->getLastUnitGraph('VisitsSummary', __FUNCTION__, "VisitsSummary.getUniqueVisitors");

+		return $this->renderView($view, $fetch);

+	}

+	

+	function getLastActionsGraph( $fetch = false )

+	{

+		$view = $this->getLastUnitGraph('VisitsSummary', __FUNCTION__, "VisitsSummary.getActions");

+		return $this->renderView($view, $fetch);

+	}

+	

+	function getLastSumVisitsLengthGraph( $fetch = false )

+	{

+		$view = $this->getLastUnitGraph('VisitsSummary', __FUNCTION__, "VisitsSummary.getSumVisitsLength");

+		return $this->renderView($view, $fetch);

+	}

+	

+	function getLastMaxActionsGraph( $fetch = false )

+	{

+		$view = $this->getLastUnitGraph('VisitsSummary', __FUNCTION__, "VisitsSummary.getMaxActions");

+		return $this->renderView($view, $fetch);

+	}

+	

+	function getLastBounceCountGraph( $fetch = false )

+	{

+		$view = $this->getLastUnitGraph('VisitsSummary', __FUNCTION__, "VisitsSummary.getBounceCount");

+		return $this->renderView($view, $fetch);

+	}

+	

+}

+

diff --git a/plugins/VisitsSummary/index.tpl b/plugins/VisitsSummary/index.tpl
index 94171b08b6..279f9a86ab 100644
--- a/plugins/VisitsSummary/index.tpl
+++ b/plugins/VisitsSummary/index.tpl
@@ -1,12 +1,15 @@
-<script type="text/javascript" src="plugins/Home/templates/sparkline.js"></script>
-
-<a name="evolutionGraph" graphId="VisitsSummarygetLastVisitsGraph"></a>
-<h2>Evolution on the last 30 {$period}s</h2>
-{$graphEvolutionVisitsSummary}
-
-<h2>Report</h2>
-{include file=VisitsSummary/sparklines.tpl}
-
-
-<br><br><br>
-<p style='color:lightgrey; size:0.8em;'>{$totalTimeGeneration} seconds {if $totalNumberOfQueries != 0}/ {$totalNumberOfQueries}  queries{/if} to generate the page</p>
+<script type="text/javascript" src="plugins/Home/templates/sparkline.js"></script>

+

+<a name="evolutionGraph" graphId="VisitsSummarygetLastVisitsGraph"></a>

+<h2>{'VisitsSummary_Evolution'|translate:$period}</h2>

+{$graphEvolutionVisitsSummary}

+

+<h2>{'VisitsSummary_Report'|translate}</h2>

+{include file=VisitsSummary/sparklines.tpl}

+

+

+<br><br><br>

+<p style='color:lightgrey; size:0.8em;'>

+{'VisitsSummary_GenerateTime'|translate:$totalTimeGeneration:$totalNumberOfQueries}

+{if $totalNumberOfQueries != 0}, {'VisitsSummary_GenerateQueries'|translate:$totalNumberOfQueries}{/if}

+</p>

diff --git a/plugins/VisitsSummary/lang/en.php b/plugins/VisitsSummary/lang/en.php
new file mode 100644
index 0000000000..24b0d4bc40
--- /dev/null
+++ b/plugins/VisitsSummary/lang/en.php
@@ -0,0 +1,21 @@
+<?php

+$translations = array(

+	'VisitsSummary_NbVisits' => '%s visits',

+	'VisitsSummary_NbUniqueVisitors' => '%s unique visitors',

+	'VisitsSummary_NbActions' => '%s actions (page views)',

+	'VisitsSummary_TotalTime' => '%s total time spent by the visitors',

+	'VisitsSummary_MaxNbActions' => '%s max actions in one visit',

+	'VisitsSummary_NbBounced' => '%s visitors have bounced (left the site after one page)',

+	'VisitsSummary_Evolution' => 'Evolution on the last 30 %ss',

+	'VisitsSummary_Report' => 'Report',

+	'VisitsSummary_GenerateTime' => '%s seconds to generate the page',

+	'VisitsSummary_GenerateQueries' => '%s queries executed',

+

+	'VisitsSummary_WidgetLastVisits' => 'Last visits graph',

+	'VisitsSummary_WidgetVisits' => 'Visits overview',

+	'VisitsSummary_WidgetLastVisitors' => 'Last unique visitors graph',

+	'VisitsSummary_WidgetOverviewGraph' => 'Overview with graph',

+

+	'VisitsSummary_SubmenuOverview' => 'Overview',

+

+);

diff --git a/plugins/VisitsSummary/sparklines.tpl b/plugins/VisitsSummary/sparklines.tpl
index 12a802fbbd..1894348e9e 100644
--- a/plugins/VisitsSummary/sparklines.tpl
+++ b/plugins/VisitsSummary/sparklines.tpl
@@ -1,9 +1,8 @@
-<div id="to remove this div" class="parentDiv">
-<p><img class="sparkline" src="{$urlSparklineNbVisits}" /> <span><strong>{$nbVisits} </strong>visits</span></p>
-<p><img class="sparkline" src="{$urlSparklineNbUniqVisitors}" /> <span><strong>{$nbUniqVisitors}</strong> unique visitors</span></p>
-<p><img class="sparkline" src="{$urlSparklineNbActions}" /> <span><strong>{$nbActions}</strong> actions (page views)</span></p>
-<p><img class="sparkline" src="{$urlSparklineSumVisitLength}" /> <span><strong>{$sumVisitLength|sumtime}</strong> total time spent by the visitors</span></p>
-<p><img class="sparkline" src="{$urlSparklineMaxActions}" /> <span><strong>{$maxActions}</strong> max actions in one visit</span></p>
-<p><img class="sparkline" src="{$urlSparklineBounceCount}" /> <span><strong>{$bounceCount} </strong>visitors have bounced (left the site after one page)</span></p>
-
+<div id="to remove this div" class="parentDiv">

+<img class="sparkline" src="{$urlSparklineNbVisits}" /> <span>{'VisitsSummary_NbVisits'|translate:"<strong>$nbVisits</strong>"}</span></p>

+<img class="sparkline" src="{$urlSparklineNbUniqVisitors}" /> <span>{'VisitsSummary_NbUniqueVisitors'|translate:"<strong>$nbUniqVisitors</strong>"}</span></p>

+<img class="sparkline" src="{$urlSparklineNbActions}" /> <span>{'VisitsSummary_NbActions'|translate:"<strong>$nbActions</strong>"}</span></p>

+<img class="sparkline" src="{$urlSparklineSumVisitLength}" /> <span>{assign var=sumtimeVisitLength value=$sumVisitLength|sumtime} {'VisitsSummary_TotalTime'|translate:"<strong>$sumtimeVisitLength</strong>"}</span></p>

+<img class="sparkline" src="{$urlSparklineMaxActions}" /> <span>{'VisitsSummary_MaxNbActions'|translate:"<strong>$maxActions</strong>"}</span></p>

+<img class="sparkline" src="{$urlSparklineBounceCount}" /> <span>{'VisitsSummary_NbBounced'|translate:"<strong>$bounceCount</strong>"}</span></p>

 </div>
\ No newline at end of file