diff options
author | JulienMoumne <julien@piwik.org> | 2012-08-15 00:59:30 +0400 |
---|---|---|
committer | JulienMoumne <julien@piwik.org> | 2012-08-15 00:59:30 +0400 |
commit | 349655b1f93b60e530bf1933884ef6e9176ec406 (patch) | |
tree | ed4702cfc40c8828f12d9a6eab80f5de5769cc3f /plugins | |
parent | 11eef8386a1ec31ea2df71d1378c6c2b5c4444d6 (diff) |
refs #2708
* removing providers' descriptions from language file
* adding providers' logo
* fixing "API returned an error: The parameter 'idSite=' is missing from the request." when a normal user queries MultiSites.getOne
* displaying website name in SMS content even when MultiSites.getAll returns one website
TODO
* integration tests for SMS content
* using POST instead of GET to send SMS to go around a Clockwork limitation
git-svn-id: http://dev.piwik.org/svn/trunk@6758 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/MobileMessaging/API.php | 7 | ||||
-rw-r--r-- | plugins/MobileMessaging/ReportRenderer/Sms.php | 1 | ||||
-rw-r--r-- | plugins/MobileMessaging/SMSProvider.php | 2 | ||||
-rw-r--r-- | plugins/MobileMessaging/images/Clockwork.png | bin | 0 -> 3585 bytes | |||
-rw-r--r-- | plugins/MobileMessaging/lang/en.php | 3 | ||||
-rw-r--r-- | plugins/MobileMessaging/templates/SMSReport.tpl | 3 | ||||
-rw-r--r-- | plugins/MobileMessaging/templates/Settings.tpl | 2 | ||||
-rwxr-xr-x | plugins/MultiSites/API.php | 5 |
8 files changed, 10 insertions, 13 deletions
diff --git a/plugins/MobileMessaging/API.php b/plugins/MobileMessaging/API.php index f5f8e6895e..c9c5f6f80b 100644 --- a/plugins/MobileMessaging/API.php +++ b/plugins/MobileMessaging/API.php @@ -290,13 +290,6 @@ class Piwik_MobileMessaging_API $this->setCurrentUserSettings($settings); } - private function saveSMSSentCount($smsSentCount) - { - $settings = $this->getCurrentUserSettings(); - $settings[Piwik_MobileMessaging::SMS_SENT_COUNT_OPTION] = $smsSentCount; - $this->setCurrentUserSettings($settings); - } - /** * validate phone number * diff --git a/plugins/MobileMessaging/ReportRenderer/Sms.php b/plugins/MobileMessaging/ReportRenderer/Sms.php index 88f64aa81a..a038524c35 100644 --- a/plugins/MobileMessaging/ReportRenderer/Sms.php +++ b/plugins/MobileMessaging/ReportRenderer/Sms.php @@ -117,6 +117,7 @@ class Piwik_MobileMessaging_ReportRenderer_Sms extends Piwik_ReportRenderer $smarty->assign("reportRowsMetadata", $reportRowsMetadata); $smarty->assign("prettyDate", $prettyDate); $smarty->assign("siteHasECommerce", $siteHasECommerce); + $smarty->assign("displaySiteName", $processedReport['metadata']['action'] == 'getAll'); $this->rendering .= $smarty->fetch(PIWIK_USER_PATH . '/plugins/MobileMessaging/templates/SMSReport.tpl'); } diff --git a/plugins/MobileMessaging/SMSProvider.php b/plugins/MobileMessaging/SMSProvider.php index 26faf10403..6de1a9d4da 100644 --- a/plugins/MobileMessaging/SMSProvider.php +++ b/plugins/MobileMessaging/SMSProvider.php @@ -24,7 +24,7 @@ abstract class Piwik_MobileMessaging_SMSProvider const MAX_UCS2_CHARS_IN_ONE_CONCATENATED_SMS = 67; static public $availableSMSProviders = array( - 'Clockwork' => 'MobileMessaging_SMSProvider_Description_Clockwork', + 'Clockwork' => 'You can use <img src="/plugins/MobileMessaging/images/Clockwork.png"/>to send SMS Reports from Piwik.<br/> * First, get an API Key form <a href="http://clockworksms.com/platforms/piwik/">Clockwork</a> (Signup is free with some test messages) <br/> * Put your Clockwork API Key in Piwik. <br/> About Clockwork <br/> * Clockwork gives you fast, reliable high quality worldwide SMS delivery, over 450 networks in every corner of the globe. <br/> * Cost per SMS message is around ~0.08USD (0.06EUR). </br> * Most countries and networks are supported but we suggest you check the latest position on their coverage map here <a href="http://www.clockworksms.com/sms-coverage/">www.clockworksms.com/sms-coverage/</a>', ); /** diff --git a/plugins/MobileMessaging/images/Clockwork.png b/plugins/MobileMessaging/images/Clockwork.png Binary files differnew file mode 100644 index 0000000000..b9874701d1 --- /dev/null +++ b/plugins/MobileMessaging/images/Clockwork.png diff --git a/plugins/MobileMessaging/lang/en.php b/plugins/MobileMessaging/lang/en.php index 8b875ec358..332cff6123 100644 --- a/plugins/MobileMessaging/lang/en.php +++ b/plugins/MobileMessaging/lang/en.php @@ -49,6 +49,5 @@ $translations = array( 'MobileMessaging_MobileReport_MobileMessagingSettingsLink' => 'the Mobile Messaging settings page', 'MobileMessaging_MobileReport_AdditionalPhoneNumbers' => 'You can add more phone numbers by accessing', 'MobileMessaging_SMS_Content_Too_Long' => '[too long]', - 'MobileMessaging_MultiSites_Must_Be_Activated' => 'To generate SMS texts of your website stats, please enable the MultiSites plugin in Piwik.', - 'MobileMessaging_SMSProvider_Description_Clockwork' => 'You can use Clockwork.com to send SMS Reports from Piwik.<br/> * First, get an API Key form <a href="http://clockworksms.com/platforms/piwik/">Clockwork</a> (Signup is free with some test messages) <br/> * Put your Clockwork API Key in Piwik. <br/> About Clockwork <br/> * Clockwork gives you fast, reliable high quality worldwide SMS delivery, over 450 networks in every corner of the globe. <br/> * Cost per SMS message is around ~0.08USD (0.06EUR). </br> * Most countries and networks are supported but we suggest you check the latest position on their coverage map here <a href="www.clockworksms.com/sms-coverage/">www.clockworksms.com/sms-coverage/</a>', + 'MobileMessaging_MultiSites_Must_Be_Activated' => 'To generate SMS texts of your website stats, please enable the MultiSites plugin in Piwik.' ); diff --git a/plugins/MobileMessaging/templates/SMSReport.tpl b/plugins/MobileMessaging/templates/SMSReport.tpl index 80caba02c0..2084ce426f 100644 --- a/plugins/MobileMessaging/templates/SMSReport.tpl +++ b/plugins/MobileMessaging/templates/SMSReport.tpl @@ -10,8 +10,7 @@ {assign var=rowMetrics value=$row->getColumns()} {assign var=rowMetadata value=$reportRowsMetadata[$rowId]->getColumns()} - {*website name (if there is more than one site)*} - {if !$smarty.foreach.reportRows.first or !$smarty.foreach.reportRows.last} + {if $displaySiteName} {$rowMetrics.label}:{literal} {/literal} {/if} diff --git a/plugins/MobileMessaging/templates/Settings.tpl b/plugins/MobileMessaging/templates/Settings.tpl index 556ce7c3f0..56971ee83f 100644 --- a/plugins/MobileMessaging/templates/Settings.tpl +++ b/plugins/MobileMessaging/templates/Settings.tpl @@ -32,7 +32,7 @@ {foreach from=$smsProviders key=smsProvider item=description} <p class='providerDescription' id='{$smsProvider}'> - {$description|translate} + {$description} </p> {/foreach} diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php index 435c8891ba..ebf89c0dfd 100755 --- a/plugins/MultiSites/API.php +++ b/plugins/MultiSites/API.php @@ -188,6 +188,11 @@ class Piwik_MultiSites_API { $dataTable = $dataTable->mergeChildren(); } + else + { + $firstDataTableRow = $dataTable->getFirstRow(); + $firstDataTableRow->setColumn('label', $sites); + } // if the period isn't a range & a lastN/previousN date isn't used, we get the same // data for the last period to show the evolution of visits/actions/revenue |