Converted VisitsSummary plugin to Twig

3 files changed, 44 insertions, 44 deletions

diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php
index 5857a7a34d..dccdc214cb 100644
--- a/plugins/VisitsSummary/Controller.php
+++ b/plugins/VisitsSummary/Controller.php
@@ -17,7 +17,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller
 {
     public function index()
     {
-        $view = Piwik_View::factory('index');
+        $view = new Piwik_View('@VisitsSummary/index');
         $this->setPeriodVariablesView($view);
         $view->graphEvolutionVisitsSummary = $this->getEvolutionGraph(true, array('nb_visits'));
         $this->setSparklinesAndNumbers($view);
@@ -26,7 +26,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller
 
     public function getSparklines()
     {
-        $view = Piwik_View::factory('sparklines');
+        $view = new Piwik_View('@VisitsSummary/sparklines');
         $this->setPeriodVariablesView($view);
         $this->setSparklinesAndNumbers($view);
         echo $view->render();
diff --git a/plugins/VisitsSummary/templates/index.twig b/plugins/VisitsSummary/templates/index.twig
index 43c7097911..1dd7a49689 100644
--- a/plugins/VisitsSummary/templates/index.twig
+++ b/plugins/VisitsSummary/templates/index.twig
@@ -1,16 +1,16 @@
-{* This graphId must be unique for this report *}
+{# This graphId must be unique for this report #}
 <a name="evolutionGraph" graphId="VisitsSummarygetEvolutionGraph"></a>
 
-<h2>{'Referers_Evolution'|translate}</h2>
+<h2>{{ 'Referers_Evolution'|translate }}</h2>
 
-{$graphEvolutionVisitsSummary}
+{{ graphEvolutionVisitsSummary|raw }}
 
-<h2>{'General_Report'|translate}</h2>
-{include file="VisitsSummary/templates/sparklines.tpl"}
-{*
+<h2>{{ 'General_Report'|translate }}</h2>
+{% include "@VisitsSummary/sparklines.twig" %}
+{#
 Time page generation
 	<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/templates/sparklines.twig b/plugins/VisitsSummary/templates/sparklines.twig
index f57aa9ee94..ca405b5799 100644
--- a/plugins/VisitsSummary/templates/sparklines.twig
+++ b/plugins/VisitsSummary/templates/sparklines.twig
@@ -1,65 +1,65 @@
 <div id='leftcolumn'>
     <div class="sparkline">
-        {sparkline src=$urlSparklineNbVisits}
-        {'VisitsSummary_NbVisits'|translate:"<strong>$nbVisits</strong>"}{if $displayUniqueVisitors},
-            {'VisitsSummary_NbUniqueVisitors'|translate:"<strong>$nbUniqVisitors</strong>"}{/if}
+        {{ sparkline(urlSparklineNbVisits)|raw }}
+        {{ 'VisitsSummary_NbVisits'|translate("<strong>"+nbVisits+"</strong>") }}{% if displayUniqueVisitors %},
+            {{ 'VisitsSummary_NbUniqueVisitors'|translate("<strong>"+nbUniqVisitors+"</strong>") }}{% endif %}
     </div>
     <div class="sparkline">
-        {sparkline src=$urlSparklineAvgVisitDuration}
-        {assign var=averageVisitDuration value=$averageVisitDuration|sumtime}
-        {'VisitsSummary_AverageVisitDuration'|translate:"<strong>$averageVisitDuration</strong>"}
+        {{ sparkline(urlSparklineAvgVisitDuration)|raw }}
+        {% set averageVisitDuration=averageVisitDuration|sumtime %}
+        {{ 'VisitsSummary_AverageVisitDuration'|translate("<strong>"+averageVisitDuration+"</strong>") }}
     </div>
     <div class="sparkline">
-        {sparkline src=$urlSparklineBounceRate}
-        {'VisitsSummary_NbVisitsBounced'|translate:"<strong>$bounceRate%</strong>"}
+        {{ sparkline(urlSparklineBounceRate)|raw }}
+        {{ 'VisitsSummary_NbVisitsBounced'|translate("<strong>"+bounceRate+"%</strong>") }}
     </div>
     <div class="sparkline">
-        {sparkline src=$urlSparklineActionsPerVisit}
-        {'VisitsSummary_NbActionsPerVisit'|translate:"<strong>$nbActionsPerVisit</strong>"}
+        {{ sparkline(urlSparklineActionsPerVisit)|raw }}
+        {{ 'VisitsSummary_NbActionsPerVisit'|translate("<strong>"+nbActionsPerVisit+"</strong>") }}
     </div>
 	<div class="sparkline">
-		{sparkline src=$urlSparklineAvgGenerationTime}
-		{assign var=averageGenerationTime value=$averageGenerationTime|sumtime}
-		{'VisitsSummary_AverageGenerationTime'|translate:"<strong>$averageGenerationTime</strong>"}
+        {{ sparkline(urlSparklineAvgGenerationTime)|raw }}
+		{% set averageGenerationTime=averageGenerationTime|sumtime %}
+		{{ 'VisitsSummary_AverageGenerationTime'|translate("<strong>"+averageGenerationTime+"</strong>") }}
 	</div>
 </div>
 
 <div id='rightcolumn'>
-    {if $showOnlyActions}
+    {% if showOnlyActions %}
         <div class="sparkline">
-            {sparkline src=$urlSparklineNbActions}
-            {'VisitsSummary_NbActionsDescription'|translate:"<strong>$nbActions</strong>"}
+            {{ sparkline(urlSparklineNbActions)|raw }}
+            {{ 'VisitsSummary_NbActionsDescription'|translate("<strong>"+nbActions+"</strong>") }}
         </div>
-    {else}
+    {% else %}
         <div class="sparkline">
-            {sparkline src=$urlSparklineNbPageviews}
-            {'VisitsSummary_NbPageviewsDescription'|translate:"<strong>$nbPageviews</strong>"|trim},
-            {'VisitsSummary_NbUniquePageviewsDescription'|translate:"<strong>$nbUniquePageviews</strong>"}
+            {{ sparkline(urlSparklineNbPageviews)|raw }}
+            {{ 'VisitsSummary_NbPageviewsDescription'|translate("<strong>"+nbPageviews+"</strong>")|trim }},
+            {{ 'VisitsSummary_NbUniquePageviewsDescription'|translate("<strong>"+nbUniquePageviews+"</strong>") }}
         </div>
-        {if $displaySiteSearch}
+        {% if displaySiteSearch %}
             <div class="sparkline">
-                {sparkline src=$urlSparklineNbSearches}
-                {'VisitsSummary_NbSearchesDescription'|translate:"<strong>$nbSearches</strong>"|trim},
-                {'VisitsSummary_NbKeywordsDescription'|translate:"<strong>$nbKeywords</strong>"}
+                {{ sparkline(urlSparklineNbSearches)|raw }}
+                {{ 'VisitsSummary_NbSearchesDescription'|translate("<strong>"+nbSearches+"</strong>")|trim }},
+                {{ 'VisitsSummary_NbKeywordsDescription'|translate("<strong>"+nbKeywords+"</strong>") }}
             </div>
-        {/if}
+        {% endif %}
         <div class="sparkline">
-            {sparkline src=$urlSparklineNbDownloads}
-            {'VisitsSummary_NbDownloadsDescription'|translate:"<strong>$nbDownloads</strong>"|trim},
-            {'VisitsSummary_NbUniqueDownloadsDescription'|translate:"<strong>$nbUniqueDownloads</strong>"}
+                {{ sparkline(urlSparklineNbDownloads)|raw }}
+                {{ 'VisitsSummary_NbDownloadsDescription'|translate("<strong>"+nbDownloads+"</strong>")|trim }},
+                {{ 'VisitsSummary_NbUniqueDownloadsDescription'|translate("<strong>"+nbUniqueDownloads+"</strong>") }}
         </div>
         <div class="sparkline">
-            {sparkline src=$urlSparklineNbOutlinks}
-            {'VisitsSummary_NbOutlinksDescription'|translate:"<strong>$nbOutlinks</strong>"|trim},
-            {'VisitsSummary_NbUniqueOutlinksDescription'|translate:"<strong>$nbUniqueOutlinks</strong>"}
+                {{ sparkline(urlSparklineNbOutlinks)|raw }}
+                {{ 'VisitsSummary_NbOutlinksDescription'|translate("<strong>"+nbOutlinks+"</strong>")|trim }},
+                {{ 'VisitsSummary_NbUniqueOutlinksDescription'|translate("<strong>"+nbUniqueOutlinks+"</strong>") }}
         </div>
-    {/if}
+    {% endif %}
     <div class="sparkline">
-        {sparkline src=$urlSparklineMaxActions}
-        {'VisitsSummary_MaxNbActions'|translate:"<strong>$maxActions</strong>"}
+            {{ sparkline(urlSparklineMaxActions)|raw }}
+            {{ 'VisitsSummary_MaxNbActions'|translate("<strong>"+maxActions+"</strong>") }}
     </div>
 </div>
 <div style="clear:both;"></div>
 
-{include file="CoreHome/templates/sparkline_footer.tpl"}
+{% include "@CoreHome/sparkline_footer.twig" %}