diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2020-02-25 00:02:38 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-25 00:02:38 +0300 |
commit | 787d9d928b5ebc91869b19965c9ebb3dbaec2cee (patch) | |
tree | 0bda6eb105c29590f6f9b1d91dc75ca5b9b2d4a6 | |
parent | 7c517de3c74b8417230d813ae35e6b5eba06605e (diff) |
Remove donation widget from dashboard (#15614)
* Remove donation widget from dashboard
* fix some ui tests
5 files changed, 9 insertions, 9 deletions
diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php index cf027c6c64..f60aeb9125 100644 --- a/plugins/Dashboard/Dashboard.php +++ b/plugins/Dashboard/Dashboard.php @@ -155,11 +155,7 @@ class Dashboard extends \Piwik\Plugin if ($advertising->areAdsForProfessionalServicesEnabled() && Plugin\Manager::getInstance()->isPluginActivated('ProfessionalServices')) { $advertisingWidget = '{"uniqueId":"widgetProfessionalServicespromoServices","parameters":{"module":"ProfessionalServices","action":"promoServices"}},'; } - if (Piwik::hasUserSuperUserAccess()) { - $piwikPromoWidget = '{"uniqueId":"widgetCoreHomegetDonateForm","parameters":{"module":"CoreHome","action":"getDonateForm"}}'; - } else { - $piwikPromoWidget = '{"uniqueId":"widgetCoreHomegetPromoVideo","parameters":{"module":"CoreHome","action":"getPromoVideo"}}'; - } + $piwikPromoWidget = '{"uniqueId":"widgetCoreHomegetPromoVideo","parameters":{"module":"CoreHome","action":"getPromoVideo"}}'; $defaultLayout = '[ [ {"uniqueId":"widgetLivewidget","parameters":{"module":"Live","action":"widget"}}, diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png index 0758e86dee..ede6b1c22a 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd7a915297b1e0133b9a4ea0f2582e08de7b25dca0d6e31bc6907bb74aebb31a -size 287727 +oid sha256:f780b9205bc7687d0f0a66aabe57462200bdb1eef9c2b39a2b39e68f99749ad0 +size 299642 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png index 32c1ff560d..3bb46bfe79 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66ce0f6234d80c90741d0e9ff99d871c141b403101fee5616a2257bb945c2cc0 -size 281686 +oid sha256:32c1b69c45423575c081bb49ae123f5458024d833d7b64b55c6240ab0e0f207b +size 309668 diff --git a/plugins/Marketplace/lang/en.json b/plugins/Marketplace/lang/en.json index a84b879240..7d9cbf34aa 100644 --- a/plugins/Marketplace/lang/en.json +++ b/plugins/Marketplace/lang/en.json @@ -8,6 +8,7 @@ "AllowedUploadFormats": "You may upload a plugin or theme in .zip format via this page.", "Authors": "Authors", "Browse": "Browse", + "SupportMatomoThankYou": "Any purchase will help fund the future of the Matomo open-source project. Thank you for your support!", "LatestMarketplaceUpdates": "Latest Marketplace Updates", "BackToMarketplace": "Back to Marketplace", "BrowseMarketplace": "Browse Marketplace", diff --git a/plugins/Marketplace/templates/getPremiumFeatures.twig b/plugins/Marketplace/templates/getPremiumFeatures.twig index fa0fe83744..3663ff69c0 100644 --- a/plugins/Marketplace/templates/getPremiumFeatures.twig +++ b/plugins/Marketplace/templates/getPremiumFeatures.twig @@ -1,5 +1,8 @@ <div class="getNewPlugins getPremiumFeatures widgetBody"> <div class="row"> + <div class="col s12 m12"> + <h3 style="margin-bottom: 28px;">{{ 'Marketplace_SupportMatomoThankYou'|translate }}</h3></div> + {% for plugin in plugins %} <div class="col s12 m4"> |