diff options
author | Thomas Steur <thomas.steur@googlemail.com> | 2014-05-20 10:10:27 +0400 |
---|---|---|
committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-05-20 10:10:27 +0400 |
commit | 307ec31f2cfebd9c8bf9caba575e2864d42c8597 (patch) | |
tree | 2d6120c412b272344d204e9947fb3859bb7b3aa7 /plugins/ScheduledReports | |
parent | 45ae10e999baf0dfa066e5daae00bca824a68191 (diff) |
refs #5192 added generator for menus, updated more plugins to use menu class, fixed some bugs, improved design, fixed tests, ...
Diffstat (limited to 'plugins/ScheduledReports')
-rw-r--r-- | plugins/ScheduledReports/Menu.php | 16 | ||||
-rw-r--r-- | plugins/ScheduledReports/ScheduledReports.php | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/plugins/ScheduledReports/Menu.php b/plugins/ScheduledReports/Menu.php index 7d9f180062..b70782ac63 100644 --- a/plugins/ScheduledReports/Menu.php +++ b/plugins/ScheduledReports/Menu.php @@ -15,6 +15,9 @@ use Piwik\Plugins\MobileMessaging\API as APIMobileMessaging; class Menu extends \Piwik\Plugin\Menu { + const MOBILE_MESSAGING_TOP_MENU_TRANSLATION_KEY = 'MobileMessaging_TopMenu'; + const PDF_REPORTS_TOP_MENU_TRANSLATION_KEY = 'ScheduledReports_EmailReports'; + public function configureUserMenu(MenuUser $menu) { $tooltip = Piwik::translate( @@ -35,10 +38,10 @@ class Menu extends \Piwik\Plugin\Menu { // if MobileMessaging is not activated, display 'Email reports' if (!\Piwik\Plugin\Manager::getInstance()->isPluginActivated('MobileMessaging')) - return ScheduledReports::PDF_REPORTS_TOP_MENU_TRANSLATION_KEY; + return self::PDF_REPORTS_TOP_MENU_TRANSLATION_KEY; if (Piwik::isUserIsAnonymous()) { - return ScheduledReports::MOBILE_MESSAGING_TOP_MENU_TRANSLATION_KEY; + return self::MOBILE_MESSAGING_TOP_MENU_TRANSLATION_KEY; } try { @@ -50,13 +53,12 @@ class Menu extends \Piwik\Plugin\Menu // - configured: display 'Email & SMS reports' if ($reportCount == 0) { return APIMobileMessaging::getInstance()->areSMSAPICredentialProvided() ? - ScheduledReports::MOBILE_MESSAGING_TOP_MENU_TRANSLATION_KEY : ScheduledReports::PDF_REPORTS_TOP_MENU_TRANSLATION_KEY; + self::MOBILE_MESSAGING_TOP_MENU_TRANSLATION_KEY : self::PDF_REPORTS_TOP_MENU_TRANSLATION_KEY; } } catch(\Exception $e) { - return ScheduledReports::PDF_REPORTS_TOP_MENU_TRANSLATION_KEY; + return self::PDF_REPORTS_TOP_MENU_TRANSLATION_KEY; } - $anyMobileReport = false; foreach ($reports as $report) { if ($report['type'] == MobileMessaging::MOBILE_TYPE) { @@ -67,10 +69,10 @@ class Menu extends \Piwik\Plugin\Menu // if there is at least one sms report, display 'Email & SMS reports' if ($anyMobileReport) { - return ScheduledReports::MOBILE_MESSAGING_TOP_MENU_TRANSLATION_KEY; + return self::MOBILE_MESSAGING_TOP_MENU_TRANSLATION_KEY; } - return ScheduledReports::PDF_REPORTS_TOP_MENU_TRANSLATION_KEY; + return self::PDF_REPORTS_TOP_MENU_TRANSLATION_KEY; } } diff --git a/plugins/ScheduledReports/ScheduledReports.php b/plugins/ScheduledReports/ScheduledReports.php index afb0e7a22c..14f662724d 100644 --- a/plugins/ScheduledReports/ScheduledReports.php +++ b/plugins/ScheduledReports/ScheduledReports.php @@ -29,8 +29,6 @@ use Zend_Mime; */ class ScheduledReports extends \Piwik\Plugin { - const MOBILE_MESSAGING_TOP_MENU_TRANSLATION_KEY = 'MobileMessaging_TopMenu'; - const PDF_REPORTS_TOP_MENU_TRANSLATION_KEY = 'ScheduledReports_EmailReports'; const DISPLAY_FORMAT_GRAPHS_ONLY_FOR_KEY_METRICS = 1; // Display Tables Only (Graphs only for key metrics) const DISPLAY_FORMAT_GRAPHS_ONLY = 2; // Display Graphs Only for all reports |