Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Aubry <mattab@users.noreply.github.com>2017-09-05 07:38:21 +0300
committerGitHub <noreply@github.com>2017-09-05 07:38:21 +0300
commitb018cf1dad2f96dd15464b4617599298b5f02e3e (patch)
treea18702ac6e6c601cc22a47502811bd4bbcdb6908
parent8a23b7e718ed107abeba1efbfbfbdd2d6b9ab58e (diff)
Add a link to Campaign tracking docs + URL Builder + Marketing Campaigns Reporting plugin (#11997)
* Add a link to Campaign tracking docs + URL Builder + Marketing Campaigns Reporting plugin * Update UI tests
-rw-r--r--plugins/ProfessionalServices/ProfessionalServices.php12
-rw-r--r--plugins/ProfessionalServices/templates/promoBelowCampaigns.twig7
-rw-r--r--plugins/Referrers/Reports/GetCampaigns.php15
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png4
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_referrers_campaigns.png4
5 files changed, 38 insertions, 4 deletions
diff --git a/plugins/ProfessionalServices/ProfessionalServices.php b/plugins/ProfessionalServices/ProfessionalServices.php
index d11bc22b38..5e6ef3f6f0 100644
--- a/plugins/ProfessionalServices/ProfessionalServices.php
+++ b/plugins/ProfessionalServices/ProfessionalServices.php
@@ -26,6 +26,7 @@ class ProfessionalServices extends \Piwik\Plugin
'Template.afterGoalCannotAddNewGoal' => array('function' => 'getGoalOverviewPromo', 'after' => true),
'Template.endGoalEditTable' => array('function' => 'getGoalFunnelOverviewPromo', 'after' => true),
'Template.afterEventsReport' => 'getEventsPromo',
+ 'Template.afterCampaignsReport' => 'getCampaignsPromo',
'Template.afterReferrersKeywordsReport' => 'getSearchKeywordsPerformancePromo',
'Template.afterOverlaySidebar' => 'getHeatmapPromo',
'Template.afterVisitorProfileOverview' => 'getSessionRecordingPromo',
@@ -124,6 +125,17 @@ class ProfessionalServices extends \Piwik\Plugin
$out .= $view->render();
}
+ public function getCampaignsPromo(&$out)
+ {
+ if ($this->isRequestForDashboardWidget()) {
+ return;
+ }
+
+ $view = new View('@ProfessionalServices/promoBelowCampaigns');
+ $view->displayMarketingCampaignsReportingAd = !$this->isPluginActivated('MarketingCampaignsReporting');
+ $out .= $view->render();
+ }
+
private function shouldShowPromoForPlugin($pluginName)
{
return !$this->isPluginActivated($pluginName) && !$this->isRequestForDashboardWidget();
diff --git a/plugins/ProfessionalServices/templates/promoBelowCampaigns.twig b/plugins/ProfessionalServices/templates/promoBelowCampaigns.twig
new file mode 100644
index 0000000000..f929642bd5
--- /dev/null
+++ b/plugins/ProfessionalServices/templates/promoBelowCampaigns.twig
@@ -0,0 +1,7 @@
+<p style="margin-top:3em" class=" alert-info alert">Did you know?
+ <br/> <a target="_blank" rel="noreferrer" href="https://piwik.org/docs/tracking-campaigns/">Campaign tracking</a> lets you measure the effectiveness of your marketing campaigns such as emails marketing, paid search, banner ads, affiliates links, etc.
+ Use the <a target="_blank" rel="noreferrer" href="https://piwik.org/docs/tracking-campaigns/">URL Builder tool</a> to create your links with new URL campaign parameters.
+ {% if displayMarketingCampaignsReportingAd %}
+ <br/> Install our <a target="_blank" rel="noreferrer" href="https://plugins.piwik.org/MarketingCampaignsReporting">Marketing Campaigns Reporting plugin</a> to get even more campaigns reports and new segments for up to five marketing channels (campaign, source, medium, keyword, content).
+ {% endif %}
+</p> \ No newline at end of file
diff --git a/plugins/Referrers/Reports/GetCampaigns.php b/plugins/Referrers/Reports/GetCampaigns.php
index 1d375423d8..a1b5f6fd94 100644
--- a/plugins/Referrers/Reports/GetCampaigns.php
+++ b/plugins/Referrers/Reports/GetCampaigns.php
@@ -8,6 +8,7 @@
*/
namespace Piwik\Plugins\Referrers\Reports;
+use Piwik\EventDispatcher;
use Piwik\Piwik;
use Piwik\Plugin\ViewDataTable;
use Piwik\Plugins\Referrers\Columns\Campaign;
@@ -34,6 +35,20 @@ class GetCampaigns extends Base
$view->config->addTranslation('label', $this->dimension->getName());
$view->requestConfig->filter_limit = 25;
+
+ $this->configureFooterMessage($view);
}
+
+ protected function configureFooterMessage(ViewDataTable $view)
+ {
+ if ($this->isSubtableReport) {
+ // no footer message for subtables
+ return;
+ }
+
+ $out = '';
+ EventDispatcher::getInstance()->postEvent('Template.afterCampaignsReport', array(&$out));
+ $view->config->show_footer_message = $out;
+ }
}
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
index 1cebb1c2bb..92d654820c 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1c0689353b63f4653dccd40fdcdfa8a07056ac91e131f6e52ed91b703155db39
-size 3586678
+oid sha256:b1bb94534f9c3934ec11ab71101bfcf9f920a8642fa9f93b031af2d954a3e5cd
+size 3656858
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_campaigns.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_campaigns.png
index ca47e8302f..298502dcc7 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_campaigns.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_campaigns.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:42cb386c1179cce6c78303edc5775dbc10afefbe3a82e95f9de51fbfd3f6dee0
-size 37974
+oid sha256:14950e045cb8344354c56f36e717a0503e4eef22429335465b2cadd61182d5c2
+size 70605