Refactor minor (#11528)

11 files changed, 91 insertions, 48 deletions

diff --git a/plugins/CoreHome/templates/_donate.twig b/plugins/CoreHome/templates/_donate.twig
index c4de056774..fff06f2cc1 100755
--- a/plugins/CoreHome/templates/_donate.twig
+++ b/plugins/CoreHome/templates/_donate.twig
@@ -5,7 +5,7 @@
         {% else %}
             <p>{{ 'CoreHome_DonateCall1'|translate }}</p>
             <p><strong>{{ 'CoreHome_DonateCall2'|translate }}</strong></p>
-            <p>{{ 'CoreHome_DonateCall3'|translate('<strong>','</strong>', '<a target="_blank" rel="nofollow" href="https://plugins.piwik.org/premium"><strong>', '</strong></a>')|raw }}</p>
+            <p>{{ 'CoreHome_DonateCall3'|translate('<strong>','</strong>', '<a target="_blank" rel="nofollow" href="https://piwik.org/recommends/premium-plugins/"><strong>', '</strong></a>')|raw }}</p>
         {% endif %}
     </div>
 
diff --git a/plugins/Feedback/templates/index.twig b/plugins/Feedback/templates/index.twig
index b17d13d05f..d90c1caebe 100644
--- a/plugins/Feedback/templates/index.twig
+++ b/plugins/Feedback/templates/index.twig
@@ -63,6 +63,7 @@
             <p> &bull;  <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/form-analytics/'>Form Analytics</a>: increase conversions and get better leads from your website forms.</p>
             <p> &bull;  <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/media-analytics-website/'>Video and Audio Analytics</a>: powerful insights into how your audience watches your videos and listens to your audio.</p>
             <p> &bull;  <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/roll-up-reporting/'>Roll-Up Reporting</a>: aggregate data from multiple websites, apps and shops into a Roll-Up site to gain new insights.</p>
+            <p> &bull;  <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/search-keywords-performance/'>Search Keywords Performance</a>: all keywords searched by your users on Google+Bing+Yahoo into your Piwik reports.</p>
             <p> &bull;  <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/activity-log/'>Audit log</a>: better security and problem diagnostic with a detailed audit log of Piwik user activities.</p>
             <p> &bull;  <a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/white-label/'>White Label</a>: give your clients access to their analytics reports where all Piwik-branded widgets are removed.</p>
             <p> &bull;  <strong><a rel='noreferrer' target='_blank' href='https://piwik.org/recommends/premium-plugins'>All premium plugins.</a></strong></p>
diff --git a/plugins/Marketplace/API.php b/plugins/Marketplace/API.php
index 0ebdaec905..b8a817e5ab 100644
--- a/plugins/Marketplace/API.php
+++ b/plugins/Marketplace/API.php
@@ -15,7 +15,7 @@ use Piwik\Plugins\Marketplace\Api\Service;
 use Piwik\Plugins\Marketplace\Plugins\InvalidLicenses;
 
 /**
- * The Marketplace API lets you manage your license key so you can download & install in one-click <a target="_blank" rel="noreferrer" href="https://plugins.piwik.org/premium">paid premium plugins</a> you have subscribed to.
+ * The Marketplace API lets you manage your license key so you can download & install in one-click <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/premium-plugins/">paid premium plugins</a> you have subscribed to.
  *
  * @method static \Piwik\Plugins\Marketplace\API getInstance()
  */
diff --git a/plugins/Marketplace/templates/licenseform.twig b/plugins/Marketplace/templates/licenseform.twig
index c43a4fd4df..17cc2d2a52 100644
--- a/plugins/Marketplace/templates/licenseform.twig
+++ b/plugins/Marketplace/templates/licenseform.twig
@@ -49,7 +49,7 @@
 
     {% else %}
         {% if isSuperUser %}
-            {{ 'Marketplace_PaidPluginsNoLicenseKeyIntro'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://plugins.piwik.org/premium'>", "</a>")|raw }}
+            {{ 'Marketplace_PaidPluginsNoLicenseKeyIntro'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/recommends/premium-plugins/'>", "</a>")|raw }}
 
             <br/>
 
@@ -60,7 +60,7 @@
             <div piwik-activity-indicator loading="licenseController.isUpdating"></div>
 
         {% else %}
-            {{ 'Marketplace_PaidPluginsNoLicenseKeyIntroNoSuperUserAccess'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://plugins.piwik.org/premium'>", "</a>")|raw }}
+            {{ 'Marketplace_PaidPluginsNoLicenseKeyIntroNoSuperUserAccess'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/recommends/premium-plugins/'>", "</a>")|raw }}
         {% endif %}
 
     {% endif %}
diff --git a/plugins/ProfessionalServices/ProfessionalServices.php b/plugins/ProfessionalServices/ProfessionalServices.php
index 8dafa079bd..5dd848e61d 100644
--- a/plugins/ProfessionalServices/ProfessionalServices.php
+++ b/plugins/ProfessionalServices/ProfessionalServices.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\ProfessionalServices;
 
 use Piwik\Common;
+use Piwik\View;
 
 class ProfessionalServices extends \Piwik\Plugin
 {
@@ -24,6 +25,7 @@ class ProfessionalServices extends \Piwik\Plugin
             'Template.afterGoalCannotAddNewGoal' => array('function' => 'getGoalOverviewPromo', 'after' => true),
             'Template.endGoalEditTable' => array('function' => 'getGoalFunnelOverviewPromo', 'after' => true),
             'Template.afterEventsReport' => 'getEventsPromo',
+            'Template.afterReferrersKeywordsReport' => 'getSearchKeywordsPerformancePromo',
         );
     }
 
@@ -58,6 +60,17 @@ class ProfessionalServices extends \Piwik\Plugin
         return $isWidget;
     }
 
+    public function getSearchKeywordsPerformancePromo(&$out)
+    {
+        if(\Piwik\Plugin\Manager::getInstance()->isPluginActivated('SearchEngineKeywordsPerformance')
+            || $this->isRequestForDashboardWidget()) {
+            return;
+        }
+
+        $view = new View('@ProfessionalServices/promoSearchKeywords');
+        $out .= $view->render();
+    }
+
     public function getGoalFunnelOverviewPromo(&$out)
     {
         if(\Piwik\Plugin\Manager::getInstance()->isPluginActivated('Funnels')
@@ -65,12 +78,8 @@ class ProfessionalServices extends \Piwik\Plugin
             return;
         }
 
-        $out .= '
-            <p style="margin-top:3em;margin-bottom:3em" class=" alert-info alert">Did you know?
-                A Funnel defines a series of actions that you expect your visitors to take on their way to converting a goal.
-                <br/>With <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/conversion-funnel/">Funnels for Piwik</a>,
-                you can easily determine your funnel and see where your visitors drop off and how to focus efforts to increase your conversions.
-            </p>';
+        $view = new View('@ProfessionalServices/promoFunnel');
+        $out .= $view->render();
     }
 
 
@@ -81,11 +90,8 @@ class ProfessionalServices extends \Piwik\Plugin
             return;
         }
 
-        $out .= '
-            <p style="margin-top:3em" class=" alert-info alert">Did you know?
-                With <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/ab-testing-learn-more/">A/B Testing for Piwik</a> you can immediately increase conversions and sales by creating different versions of a page to see which one grows your business.
-            </p>
-            ';
+        $view = new View('@ProfessionalServices/promoExperiments.twig');
+        $out .= $view->render();
     }
 
     public function getEventsPromo(&$out)
@@ -93,14 +99,8 @@ class ProfessionalServices extends \Piwik\Plugin
         if($this->isRequestForDashboardWidget()) {
             return;
         }
-        $inlineAd = '';
-        if(!\Piwik\Plugin\Manager::getInstance()->isPluginActivated('MediaAnalytics')) {
-            $inlineAd = '<br/>When you publish videos or audios, <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/media-analytics-website">Media Analytics gives deep insights into your audience</a> and how they watch your videos or listens to your music.';
-        }
-        $out .= '<p style="margin-top:3em" class=" alert-info alert">Did you know?
-                <br/>Using Events you can measure any user interaction and gain amazing insights into your audience. <a target="_blank" href="?module=Proxy&action=redirect&url=http://piwik.org/docs/event-tracking/">Learn more</a>.
-              <br/> To measure blocks of content such as image galleries, listings or ads: use <a target="_blank" href="?module=Proxy&action=redirect&url=http://developer.piwik.org/guides/content-tracking">Content Tracking</a> and see exactly which content is viewed and clicked.
-              ' . $inlineAd . '
-            </p>';
+        $view = new View('@ProfessionalServices/promoBelowEvents');
+        $view->displayMediaAnalyticsAd = !\Piwik\Plugin\Manager::getInstance()->isPluginActivated('MediaAnalytics');
+        $out .= $view->render();
     }
 }
diff --git a/plugins/ProfessionalServices/Promo.php b/plugins/ProfessionalServices/Promo.php
index 630b2c98c0..d163843627 100644
--- a/plugins/ProfessionalServices/Promo.php
+++ b/plugins/ProfessionalServices/Promo.php
@@ -37,13 +37,19 @@ class Promo
                 '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',
                 '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.',
             ),
 
+            // Form
+            array(
+                'campaignContent' => 'formAnalytics',
+                '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',
+            ),
+
             // Funnels
             array(
                 'campaignContent' => 'funnels',
@@ -57,41 +63,40 @@ class Promo
                 '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.'
             ),
-
-
-
-            // Piwik PRO
-            // https://piwik.org/recommends/piwik-pro-from-app
+            // Keywords performance
             array(
-                'campaignContent' => 'discoverPower',
-                'url' => 'https://piwik.org/recommends/piwik-pro-from-app',
-                'text' => 'Discover the power of open-source combined with enterprise-grade support and premium functionalities.'
+                'campaignContent' => 'searchKeywords',
+                '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' => 'bringEnterpriseLevel',
-                'url' => 'https://piwik.org/recommends/piwik-pro-from-app',
-                'text' => 'Bring your analytics to enterprise level. Upgrade your Piwik platform and receive access to numerous premium features and assistance from experts.'
+                'campaignContent' => 'rollUp',
+                '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' => 'monitoringAndIncident',
-                'url' => 'https://piwik.org/recommends/piwik-pro-from-app',
-                'text' => 'Do you need 24/7 Monitoring and Incident Handling for your Piwik? Get Premium features and enterprise-grade support.'
+                'campaignContent' => 'whiteLabel',
+                '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',
+                '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',
-                'url' => 'https://piwik.org/recommends/piwik-pro-from-app',
+                'url' => 'https://piwik.org/recommends/enterprise/',
                 'text' => 'Is your Piwik slowing down? Piwik experts can help with your server setup!'
             ),
             array(
-                'campaignContent' => 'whiteLabel',
-                'url' => 'https://piwik.org/recommends/piwik-pro-from-app',
-                'text' => 'Did you know you can adjust the look and feel of Piwik to your brand, and even replace "Piwik" with your product name? Try the White Label product!',
+                'campaignContent' => 'discoverPower',
+                'url' => 'https://piwik.org/recommends/enterprise/',
+                'text' => 'Discover the power of open-source combined with enterprise-grade support and premium functionalities.'
             ),
-            array(
-                'campaignContent' => 'metaSites',
-                'url' => 'https://piwik.org/recommends/piwik-pro-from-app',
-                'text' => 'Did you know you can aggregate the collected data across hundreds of sites and display it in a single dashboard? Get Premium features and enterprise-grade support.',
-            )
         );
     }
 
diff --git a/plugins/ProfessionalServices/templates/promoBelowEvents.twig b/plugins/ProfessionalServices/templates/promoBelowEvents.twig
new file mode 100644
index 0000000000..8121d9c1cb
--- /dev/null
+++ b/plugins/ProfessionalServices/templates/promoBelowEvents.twig
@@ -0,0 +1,7 @@
+<p style="margin-top:3em" class=" alert-info alert">Did you know?
+    <br/>Using Events you can measure any user interaction and gain amazing insights into your audience. <a target="_blank" href="?module=Proxy&action=redirect&url=http://piwik.org/docs/event-tracking/">Learn more</a>.
+    <br/> To measure blocks of content such as image galleries, listings or ads: use <a target="_blank" href="?module=Proxy&action=redirect&url=http://developer.piwik.org/guides/content-tracking">Content Tracking</a> and see exactly which content is viewed and clicked.
+    {% if displayMediaAnalyticsAd %}
+        <br/>When you publish videos or audios, <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/media-analytics-website">Media Analytics gives deep insights into your audience</a> and how they watch your videos or listens to your music.
+    {% endif %}
+</p>
\ No newline at end of file
diff --git a/plugins/ProfessionalServices/templates/promoExperiments.twig b/plugins/ProfessionalServices/templates/promoExperiments.twig
new file mode 100644
index 0000000000..cfef975e0c
--- /dev/null
+++ b/plugins/ProfessionalServices/templates/promoExperiments.twig
@@ -0,0 +1,3 @@
+<p style="margin-top:3em" class=" alert-info alert">Did you know?
+    With <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/ab-testing-learn-more/">A/B Testing for Piwik</a> you can immediately increase conversions and sales by creating different versions of a page to see which one grows your business.
+</p>
\ No newline at end of file
diff --git a/plugins/ProfessionalServices/templates/promoFunnel.twig b/plugins/ProfessionalServices/templates/promoFunnel.twig
new file mode 100644
index 0000000000..4e1118a0ef
--- /dev/null
+++ b/plugins/ProfessionalServices/templates/promoFunnel.twig
@@ -0,0 +1,5 @@
+<p style="margin-top:3em;margin-bottom:3em" class="alert-info alert">Did you know?
+    A Funnel defines a series of actions that you expect your visitors to take on their way to converting a goal.
+    <br/>With <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/conversion-funnel/">Funnels for Piwik</a>,
+    you can easily determine your funnel and see where your visitors drop off and how to focus efforts to increase your conversions.
+</p>
\ No newline at end of file
diff --git a/plugins/ProfessionalServices/templates/promoSearchKeywords.twig b/plugins/ProfessionalServices/templates/promoSearchKeywords.twig
new file mode 100644
index 0000000000..aaa283b68f
--- /dev/null
+++ b/plugins/ProfessionalServices/templates/promoSearchKeywords.twig
@@ -0,0 +1,6 @@
+<p style="margin-top:3em;margin-bottom:3em" class=" alert-info alert">Did you know?<br/>
+    Use <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/search-keywords-performance/">Search Keywords Performance</a>
+    to see all keywords behind 'keyword not defined'.
+    All keywords searched by your users on Google, Bing and other search engines will be listed
+    and you can even monitor the SEO position of your website in their search results.
+</p>
\ No newline at end of file
diff --git a/plugins/Referrers/Reports/GetKeywords.php b/plugins/Referrers/Reports/GetKeywords.php
index 3239fefde0..7cd0473fe0 100644
--- a/plugins/Referrers/Reports/GetKeywords.php
+++ b/plugins/Referrers/Reports/GetKeywords.php
@@ -8,6 +8,7 @@
  */
 namespace Piwik\Plugins\Referrers\Reports;
 
+use Piwik\EventDispatcher;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable;
@@ -39,6 +40,21 @@ class GetKeywords extends Base
         if ($view->isViewDataTableId(HtmlTable::ID)) {
             $view->config->disable_subtable_when_show_goals = true;
         }
+
+        $this->configureFooterMessage($view);
     }
 
+    protected function configureFooterMessage(ViewDataTable $view)
+    {
+        if ($this->isSubtableReport) {
+            // no footer message for subtables
+            return;
+        }
+
+        $out = '';
+        EventDispatcher::getInstance()->postEvent('Template.afterReferrersKeywordsReport', array(&$out));
+        $view->config->show_footer_message = $out;
+    }
+
+
 }