Converted Multisites plugin to Twig

3 files changed, 76 insertions, 70 deletions

diff --git a/plugins/MultiSites/Controller.php b/plugins/MultiSites/Controller.php
index cb63dc5746..151b080ac3 100644
--- a/plugins/MultiSites/Controller.php
+++ b/plugins/MultiSites/Controller.php
@@ -116,7 +116,7 @@ class Piwik_MultiSites_Controller extends Piwik_Controller
 
         $this->applyPrettyMoney($digestableData);
 
-        $view = new Piwik_View("MultiSites/templates/index.tpl");
+        $view = new Piwik_View("@MultiSites/index");
         $view->isWidgetized = $isWidgetized;
         $view->sitesData = array_values($digestableData);
         $view->evolutionBy = $this->evolutionBy;
diff --git a/plugins/MultiSites/templates/index.twig b/plugins/MultiSites/templates/index.twig
index f130594d6e..c46fa2f78a 100644
--- a/plugins/MultiSites/templates/index.twig
+++ b/plugins/MultiSites/templates/index.twig
@@ -1,81 +1,89 @@
-{assign var=showSitesSelection value=false}
-{if !$isWidgetized}
-    {include file="CoreHome/templates/header.tpl"}
-{/if}
+{% set showSitesSelection=false %}
 
+    {% extends 'dashboard.twig' %}
+{% if not isWidgetized %}{% endif %}
+
+{% block content %}
 <div id="multisites">
     <div id="main">
-        {include file="MultiSites/templates/row.tpl" assign="row"}
+        {% include "@MultiSites/row.twig" with row %}
         <script type="text/javascript">
             var allSites = new Array();
             var params = new Array();
-            {foreach from=$sitesData key=i item=site}
-            allSites[{$i}] = new setRowData({$site.idsite}, {$site.visits}, {$site.pageviews}, {if empty($site.revenue)}0{else}{$site.revenue}{/if}, '{$site.name|escape:"javascript"}', '{$site.main_url|escape:"javascript"}', '{if isset($site.visits_evolution)}{$site.visits_evolution|replace:",":"."}{/if}', '{if isset($site.pageviews_evolution)}{$site.pageviews_evolution|replace:",":"."}{/if}', '{if isset($site.revenue_evolution)}{$site.revenue_evolution|replace:",":"."}{/if}');
-            {/foreach}
-            params['period'] = '{$period}';
-            params['date'] = '{$date}';
-            params['evolutionBy'] = '{$evolutionBy}';
-            params['mOrderBy'] = '{$orderBy}';
-            params['order'] = '{$order}';
-            params['limit'] = '{$limit}';
+            {% for i,site in sitesData %}
+            allSites[{{ i }}] = new setRowData({{ site.idsite }},
+                {{ site.visits }},
+                {{ site.pageviews }},
+                {% if site.revenue is empty %}0{% else %}{{ site.revenue|raw }}{% endif %},
+                '{{ site.name|e("js") }}',
+                '{{ site.main_url|e("js") }}',
+                '{% if site.visits_evolution is defined %}{{ site.visits_evolution|replace({",":"."}) }}{% endif %}',
+                '{% if site.pageviews_evolution is defined %}{{ site.pageviews_evolution|replace({",":"."}) }}{% endif %}',
+                '{% if site.revenue_evolution is defined %}{{ site.revenue_evolution|replace({",":"."})|raw }}{% endif %}'
+            );
+            {% endfor %}
+            params['period'] = '{{ period }}';
+            params['date'] = '{{ date }}';
+            params['evolutionBy'] = '{{ evolutionBy }}';
+            params['mOrderBy'] = '{{ orderBy }}';
+            params['order'] = '{{ order }}';
+            params['limit'] = '{{ limit }}';
             params['page'] = 1;
-            params['prev'] = "{'General_Previous'|translate|escape:"javascript"}";
-            params['next'] = "{'General_Next'|translate|escape:"javascript"}";
-            params['row'] = '{$row|escape:"javascript"}';
-            params['dateSparkline'] = '{$dateSparkline}';
+            params['prev'] = "{{ 'General_Previous'|translate|e("js") }}";
+            params['next'] = "{{ 'General_Next'|translate|e("js") }}";
+            params['row'] = '{{ row|e("js") }}';
+            params['dateSparkline'] = '{{ dateSparkline }}';
         </script>
 
-        {postEvent name="template_headerMultiSites"}
-
-        {if !$isWidgetized}
+        {% if not isWidgetized %}
             <div class="top_controls_inner">
-                {include file="CoreHome/templates/period_select.tpl"}
-                {include file="CoreHome/templates/header_message.tpl"}
+                {% include "@CoreHome/period_select.twig" %}
+                {% include "@CoreHome/header_message.twig" %}
             </div>
-        {/if}
+        {% endif %}
 
         <div class="centerLargeDiv">
-
-            <h2>{'General_AllWebsitesDashboard'|translate}
-                {capture assign=nVisits}{'General_NVisits'|translate:$totalVisits}{/capture}
-                {capture assign=nVisitsLast}{'General_NVisits'|translate:$pastTotalVisits}{/capture}
+            <h2>{{ 'General_AllWebsitesDashboard'|translate }}
+                {% set nVisits %}{{ 'General_NVisits'|translate(totalVisits) }}{% endset %}
+                {% set nVisitsLast %}{{ 'General_NVisits'|translate(pastTotalVisits) }}{% endset %}
                 <span class='smallTitle'
-                      {if $totalVisitsEvolution}title="{'General_EvolutionSummaryGeneric'|translate:$nVisits:$prettyDate:$nVisitsLast:$pastPeriodPretty:$totalVisitsEvolution}"{/if}>
-		{'General_TotalVisitsPageviewsRevenue'|translate:"<strong>$totalVisits</strong>":"<strong>$totalPageviews</strong>":"<strong>$totalRevenue</strong>"}
-	</span>
+                {% if totalVisitsEvolution %}title="{{ 'General_EvolutionSummaryGeneric'|translate(nVisits,prettyDate,nVisitsLast,pastPeriodPretty,totalVisitsEvolution) }}"{% endif %}>
+                    {{ 'General_TotalVisitsPageviewsRevenue'|translate("<strong>"+totalVisits+"</strong>","<strong>"+totalPageviews+"</strong>","<strong>"+totalRevenue+"</strong>")|raw }}
+	            </span>
             </h2>
 
             <table id="mt" class="dataTable" cellspacing="0">
                 <thead>
                 <tr>
                     <th id="names" class="label" onClick="params = setOrderBy(this,allSites, params, 'names');">
-                        <span>{'General_Website'|translate}</span>
+                        <span>{{ 'General_Website'|translate }}</span>
                         <span class="arrow {if $evolutionBy=='names'}multisites_{$order}{/if}"></span>
                     </th>
                     <th id="visits" class="multisites-column" style="width: 100px" onClick="params = setOrderBy(this,allSites, params, 'visits');">
-                        <span>{'General_ColumnNbVisits'|translate}</span>
+                        <span>{{ 'General_ColumnNbVisits'|translate }}</span>
                         <span class="arrow {if $evolutionBy=='visits'}multisites_{$order}{/if}"></span>
                     </th>
                     <th id="pageviews" class="multisites-column" style="width: 110px" onClick="params = setOrderBy(this,allSites, params, 'pageviews');">
-                        <span>{'General_ColumnPageviews'|translate}</span>
+                        <span>{{ 'General_ColumnPageviews'|translate }}</span>
                         <span class="arrow {if $evolutionBy=='pageviews'}multisites_{$order}{/if}"></span>
                     </th>
-                    {if $displayRevenueColumn}
+                    {% if displayRevenueColumn %}
                         <th id="revenue" class="multisites-column" style="width: 110px" onClick="params = setOrderBy(this,allSites, params, 'revenue');">
-                            <span>{'Goals_ColumnRevenue'|translate}</span>
-                            <span class="arrow {if $evolutionBy=='revenue'}multisites_{$order}{/if}"></span>
+                            <span>{{ 'Goals_ColumnRevenue'|translate }}</span>
+                            <span class="arrow {% if evolutionBy=='revenue' %}multisites_{{ order }}{% endif %}"></span>
                         </th>
-                    {/if}
+                    {% endif %}
                     <th id="evolution" style=" width:350px" colspan="{if $show_sparklines}2{else}1{/if}">
                         <span class="arrow "></span>
                         <span class="evolution" style="cursor:pointer;"
-                              onClick="params = setOrderBy(this,allSites, params, $('#evolution_selector').val() + 'Summary');"> {'MultiSites_Evolution'|translate}</span>
+                              onClick="params = setOrderBy(this,allSites, params, $('#evolution_selector').val() + 'Summary');"> {{ 'MultiSites_Evolution'|translate }}</span>
                         <select class="selector" id="evolution_selector"
                                 onchange="params['evolutionBy'] = $('#evolution_selector').val(); switchEvolution(params);">
-                            <option value="visits" {if $evolutionBy eq 'visits'} selected {/if}>{'General_ColumnNbVisits'|translate}</option>
-                            <option value="pageviews" {if $evolutionBy eq 'pageviews'} selected {/if}>{'General_ColumnPageviews'|translate}</option>
-                            {if $displayRevenueColumn}
-                                <option value="revenue" {if $evolutionBy eq 'revenue'} selected {/if}>{'Goals_ColumnRevenue'|translate}</option>{/if}
+                            <option value="visits" {% if evolutionBy == 'visits' %} selected {% endif %}>{{ 'General_ColumnNbVisits'|translate }}</option>
+                            <option value="pageviews" {% if evolutionBy == 'pageviews' %} selected {% endif %}}>{{ 'General_ColumnPageviews'|translate }}</option>
+                            {% if displayRevenueColumn %}
+                                <option value="revenue" {% if evolutionBy == 'revenue' %} selected {% endif %}>{{ 'Goals_ColumnRevenue'|translate }}</option>
+                            {% endif %}
                         </select>
                     </th>
                 </tr>
@@ -85,21 +93,22 @@
                 </tbody>
 
                 <tfoot>
-                {if $isSuperUser}
+                {% if isSuperUser %}
                     <tr>
                         <td colspan="8" class="clean" style="text-align: right; padding-top: 15px;padding-right:10px">
-                            <a href="{url}&module=SitesManager&action=index&showaddsite=1"><img src='plugins/UsersManager/images/add.png' alt=""
-                                                                                                style="margin: 0;"/> {'SitesManager_AddSite'|translate}</a>
+                            <a href="{{ url }}&module=SitesManager&action=index&showaddsite=1">
+                                <img src='plugins/UsersManager/images/add.png' alt="" style="margin: 0;"/> {{ 'SitesManager_AddSite'|translate }}
+                            </a>
                         </td>
                     </tr>
-                {/if}
+                {% endif %}
                 <tr row_id="last">
                     <td colspan="8" class="clean" style="padding: 20px">
                         <span id="prev" class="pager" style="padding-right: 20px;"></span>
-		<span class="dataTablePages">
-			<span id="counter">
-		</span>
-		</span>
+                        <span class="dataTablePages">
+                            <span id="counter">
+                            </span>
+                        </span>
                         <span id="next" class="clean" style="padding-left: 20px;"></span>
                     </td>
                 </tr>
@@ -107,15 +116,12 @@
             </table>
         </div>
         <script type="text/javascript">
-            prepareRows(allSites, params, '{$orderBy}');
+            prepareRows(allSites, params, '{{ orderBy }}');
 
-            {if $autoRefreshTodayReport}
-            piwikHelper.refreshAfter({$autoRefreshTodayReport} * 1000
-            )
-            ;
-            {/if}
+            {% if autoRefreshTodayReport %}
+            piwikHelper.refreshAfter({{ autoRefreshTodayReport }} * 1000);
+            {% endif %}
         </script>
     </div>
 </div>
-
-{include file="CoreHome/templates/footer.tpl"}
+{% endblock %}
\ No newline at end of file
diff --git a/plugins/MultiSites/templates/row.twig b/plugins/MultiSites/templates/row.twig
index b49457a5f7..23169836e2 100644
--- a/plugins/MultiSites/templates/row.twig
+++ b/plugins/MultiSites/templates/row.twig
@@ -2,7 +2,7 @@
     <a title="View reports" href="index.php?module=CoreHome&action=index&date=%date%&period=%period%&idSite=%idsite%">%name%</a>
     
     <span style="width: 10px; margin-left:3px"> 
-	<a target="_blank" title="{'General_GoTo'|translate:"%main_url%"}" href="%main_url%"><img src="plugins/MultiSites/images/link.gif"/></a>
+	<a target="_blank" title="{{ 'General_GoTo'|translate("%main_url%") }}" href="%main_url%"><img src="plugins/MultiSites/images/link.gif"/></a>
     </span>
 </td>
 <td class="multisites-column">
@@ -11,24 +11,24 @@
 <td class="multisites-column">
     %pageviews%
 </td>
-{if $displayRevenueColumn}
+{% if displayRevenueColumn %}
     <td class="multisites-column">
         %revenue%
     </td>
-{/if}
-{if $period!='range'}
+{% endif %}
+{% if period!='range' %}
 <td style="width:170px">
     <div class="visits" style="display:none">%visitsSummary%</div>
     <div class="pageviews" style="display:none">%pageviewsSummary%</div>
-    {if $displayRevenueColumn}
+    {% if displayRevenueColumn %}
         <div class="revenue" style="display:none">%revenueSummary%</div>
-    {/if}
-    {/if}
-    {if $show_sparklines}
+    {% endif %}
+{% endif %}
+{% if show_sparklines %}
     <td style="width:180px">
         <div id="sparkline_%idsite%" style="width: 100px; margin: auto">
             <a target="_blank" href="index.php?module=CoreHome&action=index&date=%date%&period=%period%&idSite=%idsite%"
-               title="{capture assign=dashboardName}{'Dashboard_DashboardOf'|translate:'%name%'}{/capture} {'General_GoTo'|translate:$dashboardName}">%sparkline%</a>
+               title="{% set dashboardName %}{{ 'Dashboard_DashboardOf'|translate('%name%') }}{% endset %} {{ 'General_GoTo'|translate(dashboardName) }}">%sparkline%</a>
         </div>
     </td>
-{/if}
+{% endif %}