From 02a23fea440546300061213ba3d6fca70a33d2f5 Mon Sep 17 00:00:00 2001
From: Thomas ZILLIOX <thomas@zilliox.me>
Date: Thu, 20 Jun 2013 01:11:32 +0200
Subject: [PATCH] Remove styles tags from MobileMessagingSettings plugin
---
plugins/MobileMessaging/MobileMessaging.php | 11 +
.../stylesheets/MobileMessagingSettings.css | 13 +
plugins/MobileMessaging/templates/index.twig | 345 +++++++++---------
3 files changed, 191 insertions(+), 178 deletions(-)
create mode 100644 plugins/MobileMessaging/stylesheets/MobileMessagingSettings.css
diff --git a/plugins/MobileMessaging/MobileMessaging.php b/plugins/MobileMessaging/MobileMessaging.php
index 1235be46c3..76f994517f 100644
--- a/plugins/MobileMessaging/MobileMessaging.php
+++ b/plugins/MobileMessaging/MobileMessaging.php
@@ -78,6 +78,7 @@ class Piwik_MobileMessaging extends Piwik_Plugin
return array(
'AdminMenu.add' => 'addMenu',
'AssetManager.getJsFiles' => 'getJsFiles',
+ 'AssetManager.getCssFiles' => 'getCssFiles',
'PDFReports.getReportParameters' => 'getReportParameters',
'PDFReports.validateReportParameters' => 'validateReportParameters',
'PDFReports.getReportMetadata' => 'getReportMetadata',
@@ -112,6 +113,16 @@ class Piwik_MobileMessaging extends Piwik_Plugin
$jsFiles[] = "plugins/MobileMessaging/javascripts/MobileMessagingSettings.js";
}
+ /**
+ * @param Piwik_Event_Notification $notification notification object
+ */
+ function getCssFiles($notification)
+ {
+ $cssFiles = & $notification->getNotificationObject();
+
+ $cssFiles[] = "plugins/MobileMessaging/stylesheets/MobileMessagingSettings.css";
+ }
+
/**
* @param Piwik_Event_Notification $notification notification object
*/
diff --git a/plugins/MobileMessaging/stylesheets/MobileMessagingSettings.css b/plugins/MobileMessaging/stylesheets/MobileMessagingSettings.css
new file mode 100644
index 0000000000..028c8fa804
--- /dev/null
+++ b/plugins/MobileMessaging/stylesheets/MobileMessagingSettings.css
@@ -0,0 +1,13 @@
+#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;
+}
\ No newline at end of file
diff --git a/plugins/MobileMessaging/templates/index.twig b/plugins/MobileMessaging/templates/index.twig
index adbd93d2bf..eec3528b04 100644
--- a/plugins/MobileMessaging/templates/index.twig
+++ b/plugins/MobileMessaging/templates/index.twig
@@ -1,208 +1,197 @@
{% 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 }}
- {% endif %}
- <div id='accountForm' {% if credentialSupplied %}style='display: none;'{% endif %}>
- <br/>
- {{ 'MobileMessaging_Settings_SMSProvider'|translate }}
- <select id='smsProviders'>
- {% for smsProvider, description in smsProviders %}
- <option value='{{ smsProvider }}'>
- {{ smsProvider }}
- </option>
- {% endfor %}
- </select>
+ {{ loadJavascriptTranslations(['MobileMessaging'])|raw }}
- {{ 'MobileMessaging_Settings_APIKey'|translate }}
- <input size='25' id='apiKey'/>
-
- <input type='submit' value='{{ 'General_Save'|translate }}' id='apiAccountSubmit' class='submit'/>
+ {% 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 }}
+ {% endif %}
+ <div id='accountForm' {% if credentialSupplied %}style='display: none;'{% endif %}>
+ <br/>
+ {{ 'MobileMessaging_Settings_SMSProvider'|translate }}
+ <select id='smsProviders'>
+ {% for smsProvider, description in smsProviders %}
+ <option value='{{ smsProvider }}'>
+ {{ smsProvider }}
+ </option>
+ {% endfor %}
+ </select>
+
+ {{ 'MobileMessaging_Settings_APIKey'|translate }}
+ <input size='25' id='apiKey'/>
+
+ <input type='submit' value='{{ 'General_Save'|translate }}' id='apiAccountSubmit' class='submit'/>
- {% for smsProvider, description in smsProviders %}
- <div class='providerDescription' id='{{ smsProvider }}'>
- {{ description|raw }}
- </div>
- {% endfor %}
+ {% for smsProvider, description in smsProviders %}
+ <div class='providerDescription' id='{{ smsProvider }}'>
+ {{ description|raw }}
+ </div>
+ {% endfor %}
- </div>
-{% endif %}
+ </div>
+ {% endif %}
-{% import 'ajaxMacros.twig' as ajax %}
-{{ ajax.errorDiv('ajaxErrorMobileMessagingSettings') }}
+ {% import 'ajaxMacros.twig' as ajax %}
+ {{ ajax.errorDiv('ajaxErrorMobileMessagingSettings') }}
-<h2>{{ 'MobileMessaging_Settings_PhoneNumbers'|translate }}</h2>
-{% if not credentialSupplied %}
- {% if accountManagedByCurrentUser %}
- {{ 'MobileMessaging_Settings_CredentialNotProvided'|translate }}
+ <h2>{{ 'MobileMessaging_Settings_PhoneNumbers'|translate }}</h2>
+ {% if not credentialSupplied %}
+ {% if accountManagedByCurrentUser %}
+ {{ 'MobileMessaging_Settings_CredentialNotProvided'|translate }}
+ {% else %}
+ {{ 'MobileMessaging_Settings_CredentialNotProvidedByAdmin'|translate }}
+ {% endif %}
{% 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/>
+ {{ '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/>
<span id='suspiciousPhoneNumber' style='display:none;'>
{{ 'MobileMessaging_Settings_SuspiciousPhoneNumber'|translate('54184032') }}
<br/><br/>
</span>
- + <input id='countryCallingCode' size='4' maxlength='4'/>
- <input id='newPhoneNumber'/>
- <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>
- <br/><br/>
-
- {{ 'MobileMessaging_Settings_PhoneNumbers_CountryCode_Help'|translate }}
-
- <select id='countries'>
- {# this is a trick to avoid selecting the first country when no default could be found #}
- <option value=''> </option>
- {% for countryCode, country in countries %}
- <option value='{{ country.countryCallingCode }}'
- {% if defaultCountry==countryCode %} selected='selected' {% endif %}
- >
- {{ country.countryName|truncate(15) }}
- </option>
- {% endfor %}
- </select>
-
- </td>
- <td style="width:220px">
- {% import 'macros.twig' as piwik %}
- {{ piwik.inlineHelp(strHelpAddPhone) }}
- </td>
- </tr>
- <tr>
- <td colspan="2">
-
- {% if phoneNumbers|length > 0 %}
- <br/>
- <br/>
- <strong>{{ 'MobileMessaging_Settings_ManagePhoneNumbers'|translate }}</strong>
+ + <input id='countryCallingCode' size='4' maxlength='4'/>
+ <input id='newPhoneNumber'/>
+ <input type='submit' value='{{ 'MobileMessaging_Settings_AddPhoneNumber'|translate }}'
+ id='addPhoneNumberSubmit'/>
<br/>
- <br/>
- {% endif %}
-
- {{ ajax.errorDiv('invalidVerificationCodeAjaxError') }}
-
- <div id='phoneNumberActivated' class="ajaxSuccess" style="display:none;">
- {{ 'MobileMessaging_Settings_PhoneActivated'|translate }}
- </div>
-
- <div id='invalidActivationCode' style="display:none;">
- {{ 'MobileMessaging_Settings_InvalidActivationCode'|translate }}
- </div>
+
+ <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/>
- <ul>
- {% for phoneNumber, validated in phoneNumbers %}
- <li>
- <span class='phoneNumber'>{{ phoneNumber }}</span>
- {% if not validated %}
- <input class='verificationCode'/>
+ {{ 'MobileMessaging_Settings_PhoneNumbers_CountryCode_Help'|translate }}
+
+ <select id='countries'>
+ {# this is a trick to avoid selecting the first country when no default could be found #}
+ <option value=''> </option>
+ {% for countryCode, country in countries %}
+ <option value='{{ country.countryCallingCode }}'
+ {% if defaultCountry==countryCode %} selected='selected' {% endif %}
+ >
+ {{ country.countryName|truncate(15) }}
+ </option>
+ {% endfor %}
+ </select>
+
+ </td>
+ <td style="width:220px">
+ {% import 'macros.twig' as piwik %}
+ {{ piwik.inlineHelp(strHelpAddPhone) }}
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+
+ {% if phoneNumbers|length > 0 %}
+ <br/>
+ <br/>
+ <strong>{{ 'MobileMessaging_Settings_ManagePhoneNumbers'|translate }}</strong>
+ <br/>
+ <br/>
+ {% endif %}
+
+ {{ ajax.errorDiv('invalidVerificationCodeAjaxError') }}
+
+ <div id='phoneNumberActivated' class="ajaxSuccess" style="display:none;">
+ {{ 'MobileMessaging_Settings_PhoneActivated'|translate }}
+ </div>
+
+ <div id='invalidActivationCode' style="display:none;">
+ {{ 'MobileMessaging_Settings_InvalidActivationCode'|translate }}
+ </div>
+
+ <ul>
+ {% for phoneNumber, validated in phoneNumbers %}
+ <li>
+ <span class='phoneNumber'>{{ phoneNumber }}</span>
+ {% if not validated %}
+ <input class='verificationCode'/>
+ <input
+ type='submit'
+ value='{{ 'MobileMessaging_Settings_ValidatePhoneNumber'|translate }}'
+ class='validatePhoneNumberSubmit'
+ />
+ {% endif %}
<input
type='submit'
- value='{{ 'MobileMessaging_Settings_ValidatePhoneNumber'|translate }}'
- class='validatePhoneNumberSubmit'
+ value='{{ 'MobileMessaging_Settings_RemovePhoneNumber'|translate }}'
+ class='removePhoneNumberSubmit'
/>
- {% endif %}
- <input
- type='submit'
- value='{{ 'MobileMessaging_Settings_RemovePhoneNumber'|translate }}'
- class='removePhoneNumberSubmit'
- />
- {% if not validated %}
+ {% if not validated %}
+ <br/>
+ <span class='form-description'>{{ 'MobileMessaging_Settings_VerificationCodeJustSent'|translate }}</span>
+ {% endif %}
<br/>
- <span class='form-description'>{{ 'MobileMessaging_Settings_VerificationCodeJustSent'|translate }}</span>
- {% endif %}
- <br/>
+ <br/>
+ </li>
+ {% endfor %}
+ </ul>
+
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ {% endif %}
+
+ {% 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:250px'>
+ <fieldset>
+ <label>
+ <input
+ type='radio'
+ value='false'
+ name='delegatedManagement' {% if not delegatedManagement %} checked='checked'{% endif %} />
+ {{ 'General_No'|translate }}
<br/>
- </li>
- {% endfor %}
- </ul>
-
- </td>
- </tr>
- </tbody>
- </table>
-{% endif %}
-
-{% 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:250px'>
- <fieldset>
- <label>
- <input
- type='radio'
- value='false'
- 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 }}
+ ({{ 'General_Default'|translate }}
+ ) {{ 'MobileMessaging_Settings_LetUsersManageAPICredential_No_Help'|translate }}
</span>
- </label>
- <br/>
- <br/>
- <label>
- <input
- type='radio'
- value='true'
- name='delegatedManagement' {% if delegatedManagement %} checked='checked'{% endif %} />
- {{ 'General_Yes'|translate }}
+ </label>
<br/>
- <span class='form-description'>{{ 'MobileMessaging_Settings_LetUsersManageAPICredential_Yes_Help'|translate }}</span>
- </label>
+ <br/>
+ <label>
+ <input
+ type='radio'
+ value='true'
+ name='delegatedManagement' {% if delegatedManagement %} checked='checked'{% endif %} />
+ {{ 'General_Yes'|translate }}
+ <br/>
+ <span class='form-description'>{{ 'MobileMessaging_Settings_LetUsersManageAPICredential_Yes_Help'|translate }}</span>
+ </label>
- </fieldset>
- </tr>
- </table>
-{% endif %}
+ </fieldset>
+ </tr>
+ </table>
+ {% endif %}
-{{ ajax.loadingDiv('ajaxLoadingMobileMessagingSettings') }}
+ {{ 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 }}'/>
-</div>
+ <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 }}'/>
+ </div>
{% endblock %}
\ No newline at end of file
--
GitLab