Merge branch 'master' into php-5.3-namespaces

Conflicts:
	core/Access.php
	core/Config.php
	core/EventDispatcher.php
	core/JqplotDataGenerator/Evolution.php
	core/Piwik.php
	core/Plugin/MetadataLoader.php
	core/ViewDataTable.php
	core/ViewDataTable/Cloud.php
	core/ViewDataTable/GenerateGraphHTML.php
	core/ViewDataTable/HtmlTable.php
	core/ViewDataTable/HtmlTable/AllColumns.php
	core/ViewDataTable/HtmlTable/Goals.php
	plugins/Actions/Controller.php
	plugins/CoreHome/Controller.php
	plugins/CoreHome/DataTableRowAction/RowEvolution.php
	plugins/CoreHome/templates/_dataTable.twig
	plugins/CustomVariables/Controller.php
	plugins/DBStats/Controller.php
	plugins/DevicesDetection/Controller.php
	plugins/ExampleUI/Controller.php
	plugins/Goals/Controller.php
	plugins/Live/Controller.php
	plugins/Provider/Controller.php
	plugins/Referers/Controller.php
	plugins/UserCountry/Controller.php
	plugins/UserCountryMap/Controller.php
	plugins/UserSettings/Archiver.php
	plugins/UserSettings/Controller.php
	plugins/VisitTime/Controller.php
	plugins/VisitTime/VisitTime.php
	plugins/VisitorInterest/Controller.php
	plugins/VisitsSummary/Controller.php
	tests/PHPUnit/proxy/index.php

1 files changed, 6 insertions, 4 deletions

diff --git a/core/Twig.php b/core/Twig.php
index ea5e23d9f5..c00fc2a23d 100644
--- a/core/Twig.php
+++ b/core/Twig.php
@@ -32,6 +32,9 @@ use Twig_SimpleFunction;
  */
 class Twig
 {
+    const SPARKLINE_TEMPLATE = '<img class="sparkline" alt="" data-src="%s" width="%d" height="%d" />
+    <script type="text/javascript">$(document).ready(function () { piwik.initSparklines(); });</script>';
+    
     /**
      * @var Twig_Environment
      */
@@ -104,10 +107,9 @@ class Twig
     protected function addFunction_sparkline()
     {
         $sparklineFunction = new Twig_SimpleFunction('sparkline', function ($src) {
-            $graph = new Piwik_Visualization_Sparkline();
-            $width = $graph->getWidth();
-            $height = $graph->getHeight();
-            return sprintf('<img class="sparkline" alt="" src="%s" width="%d" height="%d" />', $src, $width, $height);
+            $width = Piwik_Visualization_Sparkline::DEFAULT_WIDTH;
+            $height = Piwik_Visualization_Sparkline::DEFAULT_HEIGHT;
+            return sprintf(Piwik_Twig::SPARKLINE_TEMPLATE, $src, $width, $height);
         }, array('is_safe' => array('html')));
         $this->twig->addFunction($sparklineFunction);
     }