MobileMessaging complete

2 files changed, 66 insertions, 71 deletions

diff --git a/plugins/MobileMessaging/templates/ReportParameters.tpl b/plugins/MobileMessaging/templates/ReportParameters.tpl
deleted file mode 100644
index 24a6154667..0000000000
--- a/plugins/MobileMessaging/templates/ReportParameters.tpl
+++ /dev/null
@@ -1,71 +0,0 @@
-<script>
-    $(function () {ldelim}
-        resetReportParametersFunctions ['{$reportType}'] =
-                function () {ldelim}
-
-                    var reportParameters = {ldelim}
-                        'phoneNumbers': [],
-                        {rdelim};
-
-                    updateReportParametersFunctions['{$reportType}'](reportParameters);
-                    {rdelim
-                };
-
-        updateReportParametersFunctions['{$reportType}'] =
-                function (reportParameters) {ldelim}
-
-                    if (reportParameters == null) return;
-
-                    $('[name=phoneNumbers]').removeProp('checked');
-                    $(reportParameters.phoneNumbers).each(function (index, phoneNumber) {ldelim}
-                        $('#\\' + phoneNumber).prop('checked', 'checked');
-                        {rdelim
-                    });
-                    {rdelim
-                };
-
-        getReportParametersFunctions['{$reportType}'] =
-                function () {ldelim}
-
-                    var parameters = Object();
-
-                    var selectedPhoneNumbers =
-                            $.map(
-                                    $('[name=phoneNumbers]:checked'),
-                                    function (phoneNumber) {ldelim}
-                                        return $(phoneNumber).attr('id');
-                                        {rdelim
-                                    }
-                            );
-
-                    // returning [''] when no phone numbers are selected avoids the "please provide a value for 'parameters'" error message
-                    parameters.phoneNumbers =
-                            selectedPhoneNumbers.length > 0 ? selectedPhoneNumbers : [''];
-
-                    return parameters;
-                    {rdelim
-                };
-        {rdelim
-    });
-</script>
-
-<tr class='{$reportType}'>
-    <td class="first">
-        {'MobileMessaging_MobileReport_PhoneNumbers'|translate}
-    </td>
-    <td>
-        {if $phoneNumbers|@count eq 0}
-        <div class="entityInlineHelp">
-            {'MobileMessaging_MobileReport_NoPhoneNumbers'|translate}
-            {else}
-            {foreach from=$phoneNumbers item=phoneNumber}
-                <label><input name='phoneNumbers' type='checkbox' id='{$phoneNumber}'/>{$phoneNumber}</label>
-                <br/>
-            {/foreach}
-            <div class="entityInlineHelp">
-                {'MobileMessaging_MobileReport_AdditionalPhoneNumbers'|translate}
-                {/if}
-                <a href='{url module="MobileMessaging" updated=null}'>{'MobileMessaging_MobileReport_MobileMessagingSettingsLink'|translate}</a>
-            </div>
-    </td>
-</tr>
diff --git a/plugins/MobileMessaging/templates/ReportParameters.twig b/plugins/MobileMessaging/templates/ReportParameters.twig
new file mode 100644
index 0000000000..13f89c752a
--- /dev/null
+++ b/plugins/MobileMessaging/templates/ReportParameters.twig
@@ -0,0 +1,66 @@
+<script>
+    $(function () {
+        resetReportParametersFunctions ['{$reportType}'] =
+            function () {
+
+                var reportParameters = {
+                    'phoneNumbers': []
+                };
+
+                updateReportParametersFunctions['{{ reportType }}'](reportParameters);
+            };
+
+        updateReportParametersFunctions['{{ reportType }}'] =
+            function (reportParameters) {
+
+                if (reportParameters == null) return;
+
+                $('[name=phoneNumbers]').removeProp('checked');
+                $(reportParameters.phoneNumbers).each(function (index, phoneNumber) {
+                    $('#\\' + phoneNumber).prop('checked', 'checked');
+                });
+
+            };
+
+        getReportParametersFunctions['{{ reportType }}'] =
+            function () {
+
+                var parameters = Object();
+
+                var selectedPhoneNumbers =
+                        $.map(
+                                $('[name=phoneNumbers]:checked'),
+                                function (phoneNumber) {
+                                    return $(phoneNumber).attr('id');
+
+                                }
+                        );
+
+                // returning [''] when no phone numbers are selected avoids the "please provide a value for 'parameters'" error message
+                parameters.phoneNumbers =
+                        selectedPhoneNumbers.length > 0 ? selectedPhoneNumbers : [''];
+
+                return parameters;
+            };
+    });
+</script>
+
+<tr class='{{ reportType }}'>
+    <td class="first">
+        {{ 'MobileMessaging_MobileReport_PhoneNumbers'|translate }}
+    </td>
+    <td>
+        <div class="entityInlineHelp">
+        {% if phoneNumbers|length == 0 %}
+            {{ 'MobileMessaging_MobileReport_NoPhoneNumbers'|translate }}
+        {% else %}
+            {% for phoneNumber in phoneNumbers %}
+                <label><input name='phoneNumbers' type='checkbox' id='{{ phoneNumber }}'/>{{ phoneNumber }}</label>
+                <br/>
+            {% endfor %}
+            {{ 'MobileMessaging_MobileReport_AdditionalPhoneNumbers'|translate }}
+        {% endif %}
+            <a href='{{ url({'module':"MobileMessaging",'updated':null}) }}'>{{ 'MobileMessaging_MobileReport_MobileMessagingSettingsLink'|translate }}</a>
+        </div>
+    </td>
+</tr>