Improve set up tracking code no data page (#15367)

5 files changed, 37 insertions, 18 deletions

diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php
index 459132fcd8..807757b845 100644
--- a/plugins/SitesManager/Controller.php
+++ b/plugins/SitesManager/Controller.php
@@ -176,6 +176,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
             'jsTag'         => $jsTag,
             'piwikUrl'      => $piwikUrl,
             'emailBody'     => $emailContent,
+            'showMatomoLinks' => $showMatomoLinks,
             'googleAnalyticsImporterMessage' => $googleAnalyticsImporterMessage,
         ), $viewType = 'basic');
     }
diff --git a/plugins/SitesManager/lang/en.json b/plugins/SitesManager/lang/en.json
index cbb36a04e5..3dd108c0b8 100644
--- a/plugins/SitesManager/lang/en.json
+++ b/plugins/SitesManager/lang/en.json
@@ -34,6 +34,10 @@
         "GlobalListExcludedUserAgents_Desc": "If the visitor's user agent string contains any of the strings you specify, the visitor will be excluded from Matomo.",
         "GlobalSettings": "Global settings",
         "GlobalWebsitesSettings": "Global websites settings",
+        "InstallationGuides": "Installation Guides",
+        "InstallationGuidesIntro": "We provide step by step guides explaining how to embed the tracking code for some popular CMS and website builders:",
+        "ExtraInformationNeeded": "To setup Matomo on your system, you may need the following information:",
+        "Integrations": "Integrations",
         "HelpExcludedIpAddresses": "Enter the list of IPs, one per line, that you wish to exclude from being tracked by Matomo. You can use CIDR notation eg. %1$s or you can use wildcards, eg. %2$s or %3$s",
         "JsTrackingTagHelp": "Here is the JavaScript Tracking code to include on all your pages",
         "KeepURLFragments": "Page URL fragments tracking",
@@ -74,7 +78,6 @@
         "SiteWithoutDataDescription": "No analytics data has been tracked for this website yet.",
         "SiteWithoutDataSetupTracking": "Please set up the %1$stracking code%2$s below into your website or mobile app if you haven't done already.",
         "SiteWithoutDataMessageDisappears": "This message will disappear as soon as some data was tracked for this website.",
-        "SiteWithoutDataSetupGoals": "In the meantime, maybe you would like to %1$sset up some goals%2$s or learn more about the %3$sfeatures%4$s of Matomo in one of our %5$sguides%6$s or %7$sFAQs%8$s.",
         "SiteWithoutDataIgnoreMessage": "Don't show this message for the next hour",
         "SuperUserAccessCan": "A user with Super User access can also %1$s specify global settings%2$s for new websites.",
         "Timezone": "Time zone",
diff --git a/plugins/SitesManager/templates/_trackingCodeEmail.twig b/plugins/SitesManager/templates/_trackingCodeEmail.twig
index fa746daab5..156eef5530 100644
--- a/plugins/SitesManager/templates/_trackingCodeEmail.twig
+++ b/plugins/SitesManager/templates/_trackingCodeEmail.twig
@@ -9,7 +9,13 @@
 {{ 'SitesManager_EmailInstructionsGenerateTrackingCode'|translate(piwikUrl ~ linkTo({'module': 'CoreAdminHome', 'action': 'trackingCodeGenerator'}))|raw }}
 
 {% if showMatomoLinks %}
-** Integrations
+** {{ 'SitesManager_InstallationGuides'|translate }}
+WordPress: https://matomo.org/faq/new-to-piwik/how-do-i-install-the-matomo-tracking-code-on-wordpress/
+Squarespace: https://matomo.org/faq/new-to-piwik/how-do-i-integrate-matomo-with-squarespace-website/
+Wix: https://matomo.org/faq/new-to-piwik/how-do-i-install-the-matomo-analytics-tracking-code-on-wix/
+SharePoint: https://matomo.org/faq/how-to-install/faq_19424/
+
+** {{ 'SitesManager_Integrations'|translate }}
 {{ 'CoreAdminHome_JSTrackingIntro3a'|translate('', '') }}
 https://matomo.org/integrate/
 
diff --git a/plugins/SitesManager/templates/siteWithoutData.twig b/plugins/SitesManager/templates/siteWithoutData.twig
index fa48a0c392..f4e13772e4 100644
--- a/plugins/SitesManager/templates/siteWithoutData.twig
+++ b/plugins/SitesManager/templates/siteWithoutData.twig
@@ -28,29 +28,38 @@
         <div piwik-content-block content-title="{{ 'SitesManager_SiteWithoutDataTitle'|translate|e('html_attr') }}">
 
         <p>
-            {{ 'SitesManager_SiteWithoutDataDescription'|translate }}
+            {{ 'SitesManager_SiteWithoutDataDescription'|translate }} {{ 'Installation_JSTracking_Intro'|translate }}
             {{ 'SitesManager_SiteWithoutDataSetupTracking'|translate('<a href="' ~ linkTo({
                 'module': 'CoreAdminHome',
                 'action': 'trackingCodeGenerator',
             }) ~ '">', "</a>")|raw }}
-        </p>
-
-        <p>
+            <br />
+            <br />
             {{ 'SitesManager_SiteWithoutDataMessageDisappears'|translate }}
-            {{ 'SitesManager_SiteWithoutDataSetupGoals'|translate('<a href="' ~ linkTo({
-                'module': 'Goals',
-                'action': 'manage',
-            }) ~ '">', "</a>",
-            '<a href="https://matomo.org/features/" rel="noreferrer noopener" target="_blank">', "</a>",
-            '<a href="https://matomo.org/docs/" rel="noreferrer noopener" target="_blank">', "</a>",
-            '<a href="https://matomo.org/faq/" rel="noreferrer noopener" target="_blank">', "</a>")|raw }}
-<br />
+
         </p>
 
             <div class='trackingHelp'>
+                {% if showMatomoLinks %}
+                <h3>{{ 'SitesManager_InstallationGuides'|translate }}</h3>
+                <p>{{ 'SitesManager_InstallationGuidesIntro'|translate }}
+
+                <a target="_blank" rel="noreferrer noopener" href='https://matomo.org/faq/new-to-piwik/how-do-i-install-the-matomo-tracking-code-on-wordpress/'>WordPress</a>
+                | <a target="_blank" rel="noreferrer noopener" href='https://matomo.org/faq/new-to-piwik/how-do-i-integrate-matomo-with-squarespace-website/'>Squarespace</a>
+                | <a target="_blank" rel="noreferrer noopener" href='https://matomo.org/faq/new-to-piwik/how-do-i-install-the-matomo-analytics-tracking-code-on-wix/'>Wix</a>
+                | <a target="_blank" rel="noreferrer noopener" href='https://matomo.org/faq/how-to-install/faq_19424/'>SharePoint</a>
+                    <br >
+                    <br >
+                    {{ 'SitesManager_ExtraInformationNeeded'|translate }}
+                    <br >
+                    Matomo URL: <code piwik-select-on-focus>{{ piwikUrl }}</code>
+                    <br >
+                    {{ 'SitesManager_EmailInstructionsYourSiteId'|translate('<code piwik-select-on-focus>' ~ idSite ~ '</code>')|raw }}
+                    <br >
+                </p>
+                {% endif %}
 
-                <h3>Integrations</h3>
-                <p>{{ 'Installation_JSTracking_Intro'|translate }}</p>
+                <h3>{{ 'SitesManager_Integrations'|translate }}</h3>
 
                 <p>{{ 'CoreAdminHome_JSTrackingIntro3a'|translate('<a href="https://matomo.org/integrate/" rel="noreferrer noopener" target="_blank">','</a>')|raw }} {{ 'CoreAdminHome_JSTrackingIntro3b'|translate|raw }}</p>
 
diff --git a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png
index ad363d0705..398f1992d8 100644
--- a/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png
+++ b/tests/UI/expected-screenshots/EmptySite_emptySiteDashboard.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8cef5fcd6834947f4332f80404bf93d1dc4e5c7c177fd6542aa2d51612fd811
-size 275785
+oid sha256:5659a10d7a765d14695f644d0f261ec48e3837b4e2d76cf4adc35cf201a47b48
+size 299416