Improve no data has been recorded page yet (#14527)

5 files changed, 48 insertions, 27 deletions

diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php
index 418657100a..31f6b9e3c3 100644
--- a/plugins/SitesManager/Controller.php
+++ b/plugins/SitesManager/Controller.php
@@ -141,12 +141,8 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
         return $this->renderTemplateAs('siteWithoutData', array(
             'siteName'     => $this->site->getName(),
             'idSite' => $this->idSite,
-            'trackingHelp' => $this->renderTemplateAs('_displayJavascriptCode', array(
-                'displaySiteName' => Common::unsanitizeInputValue($this->site->getName()),
-                'jsTag'           => Request::processRequest('SitesManager.getJavascriptTag', array('idSite' => $this->idSite, 'piwikUrl' => $piwikUrl)),
-                'idSite'          => $this->idSite,
-                'piwikUrl'        => $piwikUrl,
-            ), $viewType = 'basic'),
+            'jsTag'           => Request::processRequest('SitesManager.getJavascriptTag', array('idSite' => $this->idSite, 'piwikUrl' => $piwikUrl)),
+            'piwikUrl'        => $piwikUrl,
         ), $viewType = 'basic');
     }
 }
diff --git a/plugins/SitesManager/lang/en.json b/plugins/SitesManager/lang/en.json
index 4a3560279d..592d9718fd 100644
--- a/plugins/SitesManager/lang/en.json
+++ b/plugins/SitesManager/lang/en.json
@@ -7,6 +7,7 @@
         "ChangingYourTimezoneWillOnlyAffectDataForward": "Changing your time zone will only affect data going forward, and will not be applied retroactively.",
         "Currency": "Currency",
         "CurrencySymbolWillBeUsedForGoals": "The Currency symbol will be displayed next to Goals revenues.",
+        "CustomizeJavaScriptTracker": "Customize JavaScript tracking",
         "DefaultCurrencyForNewWebsites": "Default Currency for new websites",
         "DefaultTimezoneForNewWebsites": "Default Time zone for new websites",
         "DeleteConfirm": "Are you sure you want to delete the website %s?",
diff --git a/plugins/SitesManager/stylesheets/SitesManager.less b/plugins/SitesManager/stylesheets/SitesManager.less
index 2452a806ae..65290e38f7 100644
--- a/plugins/SitesManager/stylesheets/SitesManager.less
+++ b/plugins/SitesManager/stylesheets/SitesManager.less
@@ -100,22 +100,8 @@ td.editable-site-field:hover {
 }
 
 .site-without-data {
-    h2 {
-        border-bottom: 1px solid @theme-color-background-tinyContrast;
-        margin: 25px 0;
-        padding: 0 0 5px 0;
-        font-size: 24px;
-    }
     h3 {
-        margin: 15px 0;
-        font-size: 18px;
-        line-height: 24px;
-        font-weight: normal;
-        color: black;
-    }
-
-    p + p {
-        margin-top: 10px;
+        font-weight: bold;
     }
 }
 
diff --git a/plugins/SitesManager/templates/_displayJavascriptCode.twig b/plugins/SitesManager/templates/_displayJavascriptCode.twig
index 3d49652493..030dcf9bcd 100644
--- a/plugins/SitesManager/templates/_displayJavascriptCode.twig
+++ b/plugins/SitesManager/templates/_displayJavascriptCode.twig
@@ -26,6 +26,9 @@
     <h3>{{ 'SitesManager_MobileAppsAndSDKs'|translate }}</h3>
 
     <p>{{ 'SitesManager_MobileAppsAndSDKsDescription'|translate('<a href="https://matomo.org/integrate/#programming-language-platforms-and-frameworks" rel="noreferrer noopener" target="_blank">','</a>')|raw }}</p>
+
+    <h3>{{ 'CoreAdminHome_HttpTrackingApi'|translate }}</h3>
+    <p>{{ 'CoreAdminHome_HttpTrackingApiDescription'|translate('<a href="https://developer.matomo.org/api-reference/tracking-api" rel="noreferrer noopener" target="_blank">','</a>')|raw }}</p>
     <p></p>
 
     {{ postEvent('Template.endTrackingHelpPage') }}
diff --git a/plugins/SitesManager/templates/siteWithoutData.twig b/plugins/SitesManager/templates/siteWithoutData.twig
index c21c1e41e8..dc7ac2b408 100644
--- a/plugins/SitesManager/templates/siteWithoutData.twig
+++ b/plugins/SitesManager/templates/siteWithoutData.twig
@@ -25,8 +25,7 @@
     </script>
 
     <div class="site-without-data">
-
-        <h2>{{ 'SitesManager_SiteWithoutDataTitle'|translate }}</h2>
+        <div piwik-content-block content-title="{{ 'SitesManager_SiteWithoutDataTitle'|translate|e('html_attr') }}">
 
         <p>
             {{ 'SitesManager_SiteWithoutDataDescription'|translate }}
@@ -45,16 +44,52 @@
             '<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'>
+
+                <h3>Integrations</h3>
+                <p>{{ 'Installation_JSTracking_Intro'|translate }}</p>
+
+                <p>{{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="https://matomo.org/integrate/" rel="noreferrer noopener" target="_blank">','</a>')|raw }}</p>
+
+                <h3>{{ 'General_JsTrackingTag'|translate }}</h3>
+
+                <p>{{ 'CoreAdminHome_JSTracking_CodeNoteBeforeClosingHead'|translate("&lt;/head&gt;")|raw }}</p>
+
+                <pre piwik-select-on-focus>{{ jsTag|raw }}</pre>
+
+                <p>{{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a rel="noreferrer noopener" target="_blank" href="https://developer.matomo.org/guides/tracking-javascript-guide">','</a>')|raw }}</p>
+
+                <p><br />{{ 'CoreAdminHome_JSTracking_EndNote'|translate('<a href="' ~ linkTo({'module': 'CoreAdminHome', 'action': 'trackingCodeGenerator'}) ~'">','</a>')|raw }}
+                <br />
+                <br />
+                    <a href="{{ linkTo({module: 'CoreAdminHome', action: 'trackingCodeGenerator'}) }}"class="btn"><span class="icon-configure"></span> {{ 'SitesManager_CustomizeJavaScriptTracker'|translate }}</a></p>
 
+                <h3>{{ 'SitesManager_LogAnalytics'|translate }}</h3>
+
+                <p>{{ 'SitesManager_LogAnalyticsDescription'|translate('<a href="https://matomo.org/log-analytics/" rel="noreferrer noopener" target="_blank">', '</a>')|raw }}</p>
+
+                <h3>{{ 'SitesManager_MobileAppsAndSDKs'|translate }}</h3>
+
+                <p>{{ 'SitesManager_MobileAppsAndSDKsDescription'|translate('<a href="https://matomo.org/integrate/#programming-language-platforms-and-frameworks" rel="noreferrer noopener" target="_blank">','</a>')|raw }}</p>
+
+                <h3>{{ 'CoreAdminHome_HttpTrackingApi'|translate }}</h3>
+                <p>{{ 'CoreAdminHome_HttpTrackingApiDescription'|translate('<a href="https://developer.matomo.org/api-reference/tracking-api" rel="noreferrer noopener" target="_blank">','</a>')|raw }}</p>
+                <p></p>
+
+                {{ postEvent('Template.endTrackingHelpPage') }}
+
+            </div>
+
+            {{ postEvent('Template.siteWithoutData.afterIntro') }}
             <br />
             <br />
             <a href="{{ linkTo({module: 'SitesManager', action: 'ignoreNoDataMessage'}) }}"
                class="btn ignoreSitesWithoutData">{{ 'SitesManager_SiteWithoutDataIgnoreMessage'|translate }}</a>
-        </p>
-
-        {{ postEvent('Template.siteWithoutData.afterIntro') }}
 
-        {{ trackingHelp|raw }}
+        </div>
 
         {{ postEvent('Template.siteWithoutData.afterTrackingHelp') }}
     </div>