Partially conveted MobileMessaging

2 files changed, 109 insertions, 112 deletions

diff --git a/plugins/MobileMessaging/Controller.php b/plugins/MobileMessaging/Controller.php
index ee027c4505..b4e99c3242 100644
--- a/plugins/MobileMessaging/Controller.php
+++ b/plugins/MobileMessaging/Controller.php
@@ -24,11 +24,11 @@ class Piwik_MobileMessaging_Controller extends Piwik_Controller_Admin
      *  - add & activate phone numbers
      *  - check remaining credits
      */
-    function index()
+    public function index()
     {
         Piwik::checkUserIsNotAnonymous();
 
-        $view = Piwik_View::factory('Settings');
+        $view = new Piwik_View('@MobileMessaging/Settings');
 
         $view->isSuperUser = Piwik::isUserIsSuperUser();
 
diff --git a/plugins/MobileMessaging/templates/Settings.twig b/plugins/MobileMessaging/templates/Settings.twig
index 2142fba5c5..b9f93e93eb 100644
--- a/plugins/MobileMessaging/templates/Settings.twig
+++ b/plugins/MobileMessaging/templates/Settings.twig
@@ -1,186 +1,184 @@
-
-{loadJavascriptTranslations plugins='MobileMessaging'}
-
-{literal}
-    <style>#accountForm ul {
-            list-style: circle;
-            margin-left: 17px;
-            line-height: 1.5em;
-        }
-
-        .providerDescription {
-            border: 2px dashed #C5BDAD;
-            border-radius: 16px 16px 16px 16px;
-            margin-left: 24px;
-            padding: 11px;
-            width: 600px;
-        }
-    </style>
-{/literal}
-
-{if $accountManagedByCurrentUser}
-    <h2>{'MobileMessaging_Settings_SMSAPIAccount'|translate}</h2>
-    {if $credentialSupplied}
-        {'MobileMessaging_Settings_CredentialProvided'|translate:$provider}
-        {$creditLeft}
+{% extends 'admin.twig' %}
+
+{% block content %}
+{{ loadJavascriptTranslations(['MobileMessaging'])|raw }}
+
+<style>#accountForm ul {
+        list-style: circle;
+        margin-left: 17px;
+        line-height: 1.5em;
+    }
+
+    .providerDescription {
+        border: 2px dashed #C5BDAD;
+        border-radius: 16px 16px 16px 16px;
+        margin-left: 24px;
+        padding: 11px;
+        width: 600px;
+    }
+</style>
+
+{% if accountManagedByCurrentUser %}
+    <h2>{{ 'MobileMessaging_Settings_SMSAPIAccount'|translate }}</h2>
+    {% if credentialSupplied %}
+        {{ 'MobileMessaging_Settings_CredentialProvided'|translate(provider) }}
+        {{ creditLeft }}
         <br/>
-        {'MobileMessaging_Settings_UpdateOrDeleteAccount'|translate:"<a id='displayAccountForm'>":"</a>":"<a id='deleteAccount'>":"</a>"}
-    {else}
-        {'MobileMessaging_Settings_PleaseSignUp'|translate}
-    {/if}
-    <div id='accountForm' {if $credentialSupplied}style='display: none;'{/if}>
+        {{ 'MobileMessaging_Settings_UpdateOrDeleteAccount'|translate("<a id='displayAccountForm'>","</a>","<a id='deleteAccount'>","</a>"( }}
+    {% else %}
+        {{ 'MobileMessaging_Settings_PleaseSignUp'|translate }}
+    {% endif %}
+    <div id='accountForm' {% if credentialSupplied %}style='display: none;'{% endif %}>
         <br/>
-        {'MobileMessaging_Settings_SMSProvider'|translate}
+        {{ 'MobileMessaging_Settings_SMSProvider'|translate }}
         <select id='smsProviders'>
-            {foreach from=$smsProviders key=smsProvider item=description}
-                <option value='{$smsProvider}'>
-                    {$smsProvider}
+            {% for smsProvider, description in smsProviders %}
+                <option value='{{ smsProvider }}'>
+                    {{ smsProvider }}
                 </option>
-            {/foreach}
+            {% endfor %}
         </select>
 
-        {'MobileMessaging_Settings_APIKey'|translate}
+        {{ 'MobileMessaging_Settings_APIKey'|translate }}
         <input size='25' id='apiKey'/>
 
-        <input type='submit' value='{'General_Save'|translate}' id='apiAccountSubmit' class='submit'/>
+        <input type='submit' value='{{ 'General_Save'|translate }}' id='apiAccountSubmit' class='submit'/>
 
-        {foreach from=$smsProviders key=smsProvider item=description}
-            <div class='providerDescription' id='{$smsProvider}'>
-                {$description}
+        {% for smsProvider, description in smsProviders %}
+            <div class='providerDescription' id='{{ smsProvider }}'>
+                {{ description }}
             </div>
-        {/foreach}
+        {% endfor %}
 
     </div>
-{/if}
-
-{ajaxErrorDiv id=ajaxErrorMobileMessagingSettings}
-
-<h2>{'MobileMessaging_Settings_PhoneNumbers'|translate}</h2>
-{if !$credentialSupplied}
-    {if $accountManagedByCurrentUser}
-        {'MobileMessaging_Settings_CredentialNotProvided'|translate}
-    {else}
-        {'MobileMessaging_Settings_CredentialNotProvidedByAdmin'|translate}
-    {/if}
-{else}
-
-    {'MobileMessaging_Settings_PhoneNumbers_Help'|translate}
+{% endif %}
+
+{% import 'ajaxMacros.twig' as ajax %}
+{{ ajax.errorDiv('ajaxErrorMobileMessagingSettings') }}
+
+<h2>{{ 'MobileMessaging_Settings_PhoneNumbers'|translate }}</h2>
+{% if not credentialSupplied %}
+    {% if accountManagedByCurrentUser %}
+        {{ 'MobileMessaging_Settings_CredentialNotProvided'|translate }}
+    {% else %}
+        {{ 'MobileMessaging_Settings_CredentialNotProvidedByAdmin'|translate }}
+    {% endif %}
+{% else %}
+    {{ 'MobileMessaging_Settings_PhoneNumbers_Help'|translate }}
     <br/>
     <br/>
     <table style="width:900px;" class="adminTable">
         <tbody>
         <tr>
             <td style="width:480px">
-                <strong>{'MobileMessaging_Settings_PhoneNumbers_Add'|translate}</strong><br/><br/>
+                <strong>{{ 'MobileMessaging_Settings_PhoneNumbers_Add'|translate }}</strong>
+                <br/><br/>
 	
-		<span id='suspiciousPhoneNumber' style='display:none;'>
-			{'MobileMessaging_Settings_SuspiciousPhoneNumber'|translate:'54184032'}<br/><br/>
-		</span>
+                <span id='suspiciousPhoneNumber' style='display:none;'>
+                    {{ 'MobileMessaging_Settings_SuspiciousPhoneNumber'|translate('54184032') }}
+                    <br/><br/>
+                </span>
 
                 + <input id='countryCallingCode' size='4' maxlength='4'/>&nbsp;
                 <input id='newPhoneNumber'/>
-                <input
-                        type='submit'
-                        value='{'MobileMessaging_Settings_AddPhoneNumber'|translate}'
-                        id='addPhoneNumberSubmit'
-                        />
-
+                <input type='submit' value='{{ 'MobileMessaging_Settings_AddPhoneNumber'|translate }}' id='addPhoneNumberSubmit' />
                 <br/>
 		
-		<span style=' font-size: 11px;'><span class="form-description">{'MobileMessaging_Settings_CountryCode'|translate}</span>
-			<span class="form-description" style="margin-left:50px">{'MobileMessaging_Settings_PhoneNumber'|translate}</span></span>
+		<span style=' font-size: 11px;'><span class="form-description">{{ 'MobileMessaging_Settings_CountryCode'|translate }}</span>
+			<span class="form-description" style="margin-left:50px">{{ 'MobileMessaging_Settings_PhoneNumber'|translate }}</span></span>
                 <br/><br/>
 
-                {'MobileMessaging_Settings_PhoneNumbers_CountryCode_Help'|translate}
+                {{ 'MobileMessaging_Settings_PhoneNumbers_CountryCode_Help'|translate }}
 
                 <select id='countries'>
-                    <option value=''>&nbsp;</option> {* this is a trick to avoid selecting the first country when no default could be found *}
-                    {foreach from=$countries key=countryCode item=country}
-                        <option
-                                value='{$country.countryCallingCode}'
-                                {if $defaultCountry==$countryCode} selected='selected' {/if}
+                    {# this is a trick to avoid selecting the first country when no default could be found #}
+                    <option value=''>&nbsp;</option>
+                    {% for countryCode, country in countries %}
+                        <option value='{{ country.countryCallingCode }}'
+                                {% if defaultCountry==countryCode %} selected='selected' {% endif %}
                                 >
-                            {$country.countryName|truncate:15:'...'}
+                            {{ country.countryName|truncate(15) }}
                         </option>
-                    {/foreach}
+                    {% endfor %}
                 </select>
 
             </td>
             <td style="width:220px">
-                {$strHelpAddPhone|inlineHelp}
+                {{ strHelpAddPhone|inlineHelp }}
 
             </td>
         </tr>
         <tr>
             <td colspan="2">
 
-                {if $phoneNumbers|@count gt 0}
+                {% if phoneNumbers|length > 0 %}
                     <br/>
                     <br/>
-                    <strong>{'MobileMessaging_Settings_ManagePhoneNumbers'|translate}</strong>
+                    <strong>{{ 'MobileMessaging_Settings_ManagePhoneNumbers'|translate }}</strong>
                     <br/>
                     <br/>
-                {/if}
+                {% endif %}
 
-                {ajaxErrorDiv id=invalidVerificationCodeAjaxError}
+                {{ ajax.errorDiv('invalidVerificationCodeAjaxError') }}
 
                 <div id='phoneNumberActivated' class="ajaxSuccess" style="display:none;">
-                    {'MobileMessaging_Settings_PhoneActivated'|translate}
+                    {{ 'MobileMessaging_Settings_PhoneActivated'|translate }}
                 </div>
 
                 <div id='invalidActivationCode' style="display:none;">
-                    {'MobileMessaging_Settings_InvalidActivationCode'|translate}
+                    {{ 'MobileMessaging_Settings_InvalidActivationCode'|translate }}
                 </div>
 
                 <ul>
-                    {foreach from=$phoneNumbers key=phoneNumber item=validated}
+                    {% for phoneNumber, validated in phoneNumbers %}
                         <li>
-                            <span class='phoneNumber'>{$phoneNumber}</span>
-                            {if !$validated}
+                            <span class='phoneNumber'>{{ phoneNumber }}</span>
+                            {% if not validated %}
                                 <input class='verificationCode'/>
                                 <input
                                         type='submit'
-                                        value='{'MobileMessaging_Settings_ValidatePhoneNumber'|translate}'
+                                        value='{{ 'MobileMessaging_Settings_ValidatePhoneNumber'|translate }}'
                                         class='validatePhoneNumberSubmit'
                                         />
-                            {/if}
+                            {% endif %}
                             <input
                                     type='submit'
-                                    value='{'MobileMessaging_Settings_RemovePhoneNumber'|translate}'
+                                    value='{{ 'MobileMessaging_Settings_RemovePhoneNumber'|translate }}'
                                     class='removePhoneNumberSubmit'
                                     />
-                            {if !$validated}
+                            {% if not validated %}
                                 <br/>
-                                <span class='form-description'>{'MobileMessaging_Settings_VerificationCodeJustSent'|translate}</span>
-                            {/if}
+                                <span class='form-description'>{{ 'MobileMessaging_Settings_VerificationCodeJustSent'|translate }}</span>
+                            {% endif %}
                             <br/>
                             <br/>
                         </li>
-                    {/foreach}
+                    {% endfor %}
                 </ul>
 
             </td>
         </tr>
         </tbody>
     </table>
-{/if}
+{% endif %}
 
-{if $isSuperUser}
-    <h2>{'MobileMessaging_Settings_SuperAdmin'|translate}</h2>
+{% if isSuperUser %}
+    <h2>{{ 'MobileMessaging_Settings_SuperAdmin'|translate }}</h2>
     <table class='adminTable' style='width:650px;'>
         <tr>
-            <td style='width:400px'>{'MobileMessaging_Settings_LetUsersManageAPICredential'|translate}</td>
+            <td style='width:400px'>{{ 'MobileMessaging_Settings_LetUsersManageAPICredential'|translate }}</td>
             <td style='width:250px'>
                 <fieldset>
                     <label>
                         <input
                                 type='radio'
                                 value='false'
-                                name='delegatedManagement' {if !$delegatedManagement} checked='checked'{/if} />
-                        {'General_No'|translate}
+                                name='delegatedManagement' {% if not delegatedManagement %} checked='checked'{% endif %} />
+                        {{ 'General_No'|translate }}
                         <br/>
-                        <span class='form-description'>({'General_Default'|translate}
-                            ) {'MobileMessaging_Settings_LetUsersManageAPICredential_No_Help'|translate}</span>
+                        <span class='form-description'>
+                            ({{ 'General_Default'|translate }}) {{ 'MobileMessaging_Settings_LetUsersManageAPICredential_No_Help'|translate }}
+                        </span>
                     </label>
                     <br/>
                     <br/>
@@ -188,24 +186,23 @@
                         <input
                                 type='radio'
                                 value='true'
-                                name='delegatedManagement' {if $delegatedManagement} checked='checked'{/if} />
-                        {'General_Yes'|translate}
+                                name='delegatedManagement' {% if delegatedManagement %} checked='checked'{% endif %} />
+                        {{ 'General_Yes'|translate }}
                         <br/>
-                        <span class='form-description'>{'MobileMessaging_Settings_LetUsersManageAPICredential_Yes_Help'|translate}</span>
+                        <span class='form-description'>{{ 'MobileMessaging_Settings_LetUsersManageAPICredential_Yes_Help'|translate }}</span>
                     </label>
 
                 </fieldset>
         </tr>
     </table>
-{/if}
-
-{ajaxLoadingDiv id=ajaxLoadingMobileMessagingSettings}
+{% endif %}
 
-{include file='CoreAdminHome/templates/footer.tpl'}
+{{ ajax.loadingDiv('ajaxLoadingMobileMessagingSettings') }}
 
 <div class='ui-confirm' id='confirmDeleteAccount'>
-    <h2>{'MobileMessaging_Settings_DeleteAccountConfirm'|translate}</h2>
-    <input role='yes' type='button' value='{'General_Yes'|translate}'/>
-    <input role='no' type='button' value='{'General_No'|translate}'/>
+    <h2>{{ 'MobileMessaging_Settings_DeleteAccountConfirm'|translate }}</h2>
+    <input role='yes' type='button' value='{{ 'General_Yes'|translate }}'/>
+    <input role='no' type='button' value='{{ 'General_No'|translate }}'/>
 </div>
 
+{% endblock %}
\ No newline at end of file