diff --git a/plugins/ProfessionalServices/Promo.php b/plugins/ProfessionalServices/Promo.php
index d16384362750768378f9f30a0366857672ea898a..ee480776f6437e198e789a3eb36c1510351b7313 100644
--- a/plugins/ProfessionalServices/Promo.php
+++ b/plugins/ProfessionalServices/Promo.php
@@ -22,11 +22,13 @@ class Promo
// A/B Testing
array(
'campaignContent' => 'abTesting',
+ 'title' => 'A/B Testing',
'url' => 'https://piwik.org/recommends/ab-testing-learn-more',
'text' => 'Ever wondered what A/B testing is and why it is so important? Check out how you can increase conversions and sales on your website and app.'
),
array(
'campaignContent' => 'abTesting',
+ 'title' => 'A/B Testing',
'url' => ' https://piwik.org/recommends/ab-testing-website',
'text' => 'Increase revenue and conversions by comparing different versions of your websites or apps, ad detect the winning variation that will grow your business!'
),
@@ -34,11 +36,13 @@ class Promo
// Media Analytics
array(
'campaignContent' => 'mediaAnalytics',
+ 'title' => 'Media Analytics',
'url' => 'https://piwik.org/recommends/media-analytics-website',
'text' => 'Ever wondered how people interact and engage with videos or audios on your website? Well now you can, and it integrates perfectly into your Piwik.',
),
array(
'campaignContent' => 'mediaAnalytics',
+ 'title' => 'Media Analytics',
'url' => 'https://piwik.org/recommends/media-analytics',
'text' => 'Get powerful insights into how your audience watches your videos and listens to your audio. Media Analytics is now available on the Marketplace.',
),
@@ -46,6 +50,7 @@ class Promo
// Form
array(
'campaignContent' => 'formAnalytics',
+ 'title' => 'Form Analytics',
'url' => 'https://piwik.org/recommends/form-analytics',
'text' => 'Increase the conversions on your online forms, by learning everything about your users behavior and their pain points on your forms',
),
@@ -53,6 +58,7 @@ class Promo
// Funnels
array(
'campaignContent' => 'funnels',
+ 'title' => 'Funnels',
'url' => 'https://piwik.org/recommends/conversion-funnels',
'text' => 'Increase your conversions, sales and revenue by understanding your conversion funnels and where your visitors drop off with Funnels for Piwik.'
),
@@ -60,40 +66,47 @@ class Promo
// Piwik training
array(
'campaignContent' => 'userTraining',
+ 'title' => 'Training',
'url' => 'https://piwik.org/training/?pk_campaign=' . Advertising::CAMPAIGN_NAME_PROFESSIONAL_SERVICES . '&pk_source=Piwik_App',
'text' => 'Want to know how to use all the exciting features in Piwik? Try a User training to be up to speed with working with Piwik.'
),
// Keywords performance
array(
'campaignContent' => 'searchKeywords',
+ 'title' => 'Search Keywords',
'url' => 'https://piwik.org/recommends/search-keywords-performance/',
'text' => 'Which queries caused your website to appear in search results? Improve your SEO efforts and monitor your position and performance for each Keyword directly in your Piwik reports.',
),
// Roll-Up Reporting
array(
'campaignContent' => 'rollUp',
+ 'title' => 'Roll-Up Reporting',
'url' => 'https://piwik.org/recommends/roll-up-reporting/',
'text' => 'Did you know you can aggregate the collected data across hundreds of sites and display it in a single dashboard?',
),
// White label
array(
'campaignContent' => 'whiteLabel',
+ 'title' => 'White Label',
'url' => 'https://piwik.org/recommends/white-label/',
'text' => 'Did you know you can give your clients access to their analytics reports where all Piwik-branded widgets are removed? Try the White Label product!',
),
// Enterprise
array(
'campaignContent' => 'bringEnterpriseLevel',
+ 'title' => 'Enterprise',
'url' => 'https://piwik.org/recommends/enterprise/',
'text' => 'Bring your analytics to enterprise level. Upgrade your Piwik platform and receive access to numerous premium features and assistance from experts.'
),
array(
'campaignContent' => 'slowingDown',
+ 'title' => 'Enterprise',
'url' => 'https://piwik.org/recommends/enterprise/',
'text' => 'Is your Piwik slowing down? Piwik experts can help with your server setup!'
),
array(
'campaignContent' => 'discoverPower',
+ 'title' => 'Enterprise',
'url' => 'https://piwik.org/recommends/enterprise/',
'text' => 'Discover the power of open-source combined with enterprise-grade support and premium functionalities.'
),
diff --git a/plugins/ProfessionalServices/Widgets/PromoServices.php b/plugins/ProfessionalServices/Widgets/PromoServices.php
index 8a34d5500e714ca3a127622e7f4030a6a5380d0f..35eca8d35aaa7865898c0a901e0f7a0ced06d04c 100644
--- a/plugins/ProfessionalServices/Widgets/PromoServices.php
+++ b/plugins/ProfessionalServices/Widgets/PromoServices.php
@@ -35,7 +35,7 @@ class PromoServices extends \Piwik\Widget\Widget
public static function configure(WidgetConfig $config)
{
$config->setCategoryId('About Piwik');
- $config->setName('ProfessionalServices_WidgetProfessionalServicesForPiwik');
+ $config->setName('ProfessionalServices_WidgetPremiumServicesForPiwik');
$advertising = StaticContainer::get('Piwik\ProfessionalServices\Advertising');
$config->setIsEnabled($advertising->areAdsForProfessionalServicesEnabled());
@@ -49,6 +49,7 @@ class PromoServices extends \Piwik\Widget\Widget
$view->ctaLinkUrl = $promo['url'];
$view->ctaText = $promo['text'];
+ $view->ctaTitle = $promo['title'];
$view->ctaLinkTitle = $this->promo->getLinkTitle();
return $view->render();
diff --git a/plugins/ProfessionalServices/images/promo.png b/plugins/ProfessionalServices/images/promo.png
index ac15b596df4d082573e2d36487c00d595b001182..1a2ecd4adb102569e779f7447844796140c61ede 100644
Binary files a/plugins/ProfessionalServices/images/promo.png and b/plugins/ProfessionalServices/images/promo.png differ
diff --git a/plugins/ProfessionalServices/lang/en.json b/plugins/ProfessionalServices/lang/en.json
index 86d44f4d0a55f32f0ad3dccbc3f78a38269c4cb0..9b390d0a4d99f2cb4eee6e6ca2dd3c6ae274989e 100644
--- a/plugins/ProfessionalServices/lang/en.json
+++ b/plugins/ProfessionalServices/lang/en.json
@@ -1,5 +1,5 @@
{
"ProfessionalServices": {
- "WidgetProfessionalServicesForPiwik": "Premium Products & Services for Piwik"
+ "WidgetPremiumServicesForPiwik": "Premium Features & Services for Piwik"
}
}
\ No newline at end of file
diff --git a/plugins/ProfessionalServices/stylesheets/widget.less b/plugins/ProfessionalServices/stylesheets/widget.less
index fdb9cb1eae03582355e04f69b00b41e4feddea3c..ab99bd4f16759df9d894c776ea9605da93af51a9 100644
--- a/plugins/ProfessionalServices/stylesheets/widget.less
+++ b/plugins/ProfessionalServices/stylesheets/widget.less
@@ -3,22 +3,29 @@
background-color: white;
.promo {
- padding: 20px;
+ padding: 10px;
&:after {
content: '';
clear: both;
visibility: hidden;
}
+
+ h2 {
+ font-size: 20px;
+ }
}
.text {
overflow: hidden;
}
hr {
- margin: 0px;
+ margin: 0;
}
.link {
padding: 20px;
}
+ .btn {
+ background: @theme-color-link;
+ }
.icon {
margin-top:20px;
width: 64px;
diff --git a/plugins/ProfessionalServices/templates/promoServicesWidget.twig b/plugins/ProfessionalServices/templates/promoServicesWidget.twig
index 67f87df40a788ad3915f87396ad86bc8726019b9..29edd9358f4280c41f2cd55046e94880bd956e62 100644
--- a/plugins/ProfessionalServices/templates/promoServicesWidget.twig
+++ b/plugins/ProfessionalServices/templates/promoServicesWidget.twig
@@ -1,8 +1,9 @@
<div class="promoWidget">
<div class="promo">
- <img class="icon" src="plugins/ProfessionalServices/images/promo.png">
+ <a href="{{ ctaLinkUrl|e('html_attr') }}" target="_blank" rel="noreferrer"><img class="icon" src="plugins/ProfessionalServices/images/promo.png"></a>
+ <h2>{{ ctaTitle }}</h2>
<p class="text">
- {{ ctaText }}
+ <span>{{ ctaText }}</span>
<br /><br />
<a class="btn" href="{{ ctaLinkUrl|e('html_attr') }}" target="_blank" rel="noreferrer">
{{ ctaLinkTitle }}
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
index c064ffd44117114ac11155c1287c25b302056460..3bf0a56ac327f22cb56d636e02a3c3f4808346ed 100755
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
@@ -3364,7 +3364,7 @@
<isWide>0</isWide>
</row>
<row>
- <name>Premium Products & Services for Piwik</name>
+ <name>Premium Features & Services for Piwik</name>
<category>
<id>About Piwik</id>
<name>About Piwik</name>
diff --git a/tests/UI/expected-screenshots/DashboardManager_create_new.png b/tests/UI/expected-screenshots/DashboardManager_create_new.png
index dc4b931886d3181dded27d1069519054276d317c..c2bbc138951e0b1926334492be741d66180fe6a7 100644
Binary files a/tests/UI/expected-screenshots/DashboardManager_create_new.png and b/tests/UI/expected-screenshots/DashboardManager_create_new.png differ
diff --git a/tests/UI/expected-screenshots/Dashboard_reset.png b/tests/UI/expected-screenshots/Dashboard_reset.png
index aa6004a698d6faf90c8b3f4bb1a8c02fe345a360..22398b788c287faf377cf1bb349705a3b47445b3 100644
Binary files a/tests/UI/expected-screenshots/Dashboard_reset.png and b/tests/UI/expected-screenshots/Dashboard_reset.png differ
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png
index ea7f3b4a76b18f3c38fdcc63bd9843de55774543..390ad437df41f7afebed8769eacba73c2e3e9548 100644
Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png and b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png differ