Merge branch '4.x-dev' into 5.x-dev

matomo-org · Aug 11, 2023 · 945da58 · 945da58
2 parents c0c262f + 72b9310
commit 945da58
Show file tree

Hide file tree

Showing 13 changed files with 78 additions and 44 deletions.
diff --git a/Context/WebContext.php b/Context/WebContext.php
@@ -248,10 +248,12 @@ public function getInstallInstructions($container, $environment)
         $embedCode = <<<INST
 <!-- Matomo Tag Manager -->
 <script>
-var _mtm = window._mtm = window._mtm || [];
-_mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
-var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-g.async=true; g.src='$path'; s.parentNode.insertBefore(g,s);
+  var _mtm = window._mtm = window._mtm || [];
+  _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
+  (function() {
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src='$path'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
 <!-- End Matomo Tag Manager -->
 INST;

diff --git a/TagManager.php b/TagManager.php
@@ -867,6 +867,7 @@ public function getStylesheetFiles(&$stylesheets)
         $stylesheets[] = "plugins/TagManager/vue/src/ContainerSelector/ContainerSelector.less";
         $stylesheets[] = "plugins/TagManager/vue/src/ContainerDashboard/ContainerDashboard.less";
         $stylesheets[] = "plugins/TagManager/vue/src/Version/VersionEdit.less";
+        $stylesheets[] = "plugins/TagManager/vue/src/TagmanagerTrackingCode/TagManagerTrackingCode.less";
     }
 
     public function getJsFiles(&$jsFiles)

diff --git a/tests/System/expected/test_dev_with_content__TagManager.getContainerEmbedCode.xml b/tests/System/expected/test_dev_with_content__TagManager.getContainerEmbedCode.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>&lt;!-- Matomo Tag Manager --&gt;
 &lt;script&gt;
-var _mtm = window._mtm = window._mtm || [];
-_mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
-var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-g.async=true; g.src='http://example.com/piwik/tests/PHPUnit/proxy/js/container_aaacont1_dev_5145ce110dfb83505890f752.js'; s.parentNode.insertBefore(g,s);
+  var _mtm = window._mtm = window._mtm || [];
+  _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
+  (function() {
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src='http://example.com/piwik/tests/PHPUnit/proxy/js/container_aaacont1_dev_5145ce110dfb83505890f752.js'; s.parentNode.insertBefore(g,s);
+  })();
 &lt;/script&gt;
 &lt;!-- End Matomo Tag Manager --&gt;</result>
diff --git a/tests/System/expected/test_dev_with_content__TagManager.getContainerInstallInstructions.xml b/tests/System/expected/test_dev_with_content__TagManager.getContainerInstallInstructions.xml
@@ -4,10 +4,12 @@
 		<description>To install this container, copy / paste the following code as high as possible into the &lt;head&gt; part of every page of your site.</description>
 		<embedCode>&lt;!-- Matomo Tag Manager --&gt;
 &lt;script&gt;
-var _mtm = window._mtm = window._mtm || [];
-_mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
-var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-g.async=true; g.src='http://example.com/piwik/tests/PHPUnit/proxy/js/container_aaacont1_dev_5145ce110dfb83505890f752.js'; s.parentNode.insertBefore(g,s);
+  var _mtm = window._mtm = window._mtm || [];
+  _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
+  (function() {
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src='http://example.com/piwik/tests/PHPUnit/proxy/js/container_aaacont1_dev_5145ce110dfb83505890f752.js'; s.parentNode.insertBefore(g,s);
+  })();
 &lt;/script&gt;
 &lt;!-- End Matomo Tag Manager --&gt;</embedCode>
 		<helpUrl>https://developer.matomo.org/guides/tagmanager/embedding</helpUrl>

diff --git a/tests/System/expected/test_live_with_content__TagManager.getContainerEmbedCode.xml b/tests/System/expected/test_live_with_content__TagManager.getContainerEmbedCode.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>&lt;!-- Matomo Tag Manager --&gt;
 &lt;script&gt;
-var _mtm = window._mtm = window._mtm || [];
-_mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
-var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-g.async=true; g.src='http://example.com/piwik/tests/PHPUnit/proxy/js/container_aaacont1.js'; s.parentNode.insertBefore(g,s);
+  var _mtm = window._mtm = window._mtm || [];
+  _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
+  (function() {
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src='http://example.com/piwik/tests/PHPUnit/proxy/js/container_aaacont1.js'; s.parentNode.insertBefore(g,s);
+  })();
 &lt;/script&gt;
 &lt;!-- End Matomo Tag Manager --&gt;</result>
diff --git a/tests/System/expected/test_live_with_content__TagManager.getContainerInstallInstructions.xml b/tests/System/expected/test_live_with_content__TagManager.getContainerInstallInstructions.xml
@@ -4,10 +4,12 @@
 		<description>To install this container, copy / paste the following code as high as possible into the &lt;head&gt; part of every page of your site.</description>
 		<embedCode>&lt;!-- Matomo Tag Manager --&gt;
 &lt;script&gt;
-var _mtm = window._mtm = window._mtm || [];
-_mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
-var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-g.async=true; g.src='http://example.com/piwik/tests/PHPUnit/proxy/js/container_aaacont1.js'; s.parentNode.insertBefore(g,s);
+  var _mtm = window._mtm = window._mtm || [];
+  _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
+  (function() {
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src='http://example.com/piwik/tests/PHPUnit/proxy/js/container_aaacont1.js'; s.parentNode.insertBefore(g,s);
+  })();
 &lt;/script&gt;
 &lt;!-- End Matomo Tag Manager --&gt;</embedCode>
 		<helpUrl>https://developer.matomo.org/guides/tagmanager/embedding</helpUrl>

diff --git a/tests/System/expected/test_no_such_release__TagManager.getContainerEmbedCode.xml b/tests/System/expected/test_no_such_release__TagManager.getContainerEmbedCode.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>&lt;!-- Matomo Tag Manager --&gt;
 &lt;script&gt;
-var _mtm = window._mtm = window._mtm || [];
-_mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
-var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-g.async=true; g.src='http://example.com/piwik/tests/PHPUnit/proxy/js/container_aaacont2.js'; s.parentNode.insertBefore(g,s);
+  var _mtm = window._mtm = window._mtm || [];
+  _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
+  (function() {
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src='http://example.com/piwik/tests/PHPUnit/proxy/js/container_aaacont2.js'; s.parentNode.insertBefore(g,s);
+  })();
 &lt;/script&gt;
 &lt;!-- End Matomo Tag Manager --&gt;</result>
diff --git a/tests/System/expected/test_no_such_release__TagManager.getContainerInstallInstructions.xml b/tests/System/expected/test_no_such_release__TagManager.getContainerInstallInstructions.xml
@@ -4,10 +4,12 @@
 		<description>To install this container, copy / paste the following code as high as possible into the &lt;head&gt; part of every page of your site.</description>
 		<embedCode>&lt;!-- Matomo Tag Manager --&gt;
 &lt;script&gt;
-var _mtm = window._mtm = window._mtm || [];
-_mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
-var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-g.async=true; g.src='http://example.com/piwik/tests/PHPUnit/proxy/js/container_aaacont2.js'; s.parentNode.insertBefore(g,s);
+  var _mtm = window._mtm = window._mtm || [];
+  _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
+  (function() {
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src='http://example.com/piwik/tests/PHPUnit/proxy/js/container_aaacont2.js'; s.parentNode.insertBefore(g,s);
+  })();
 &lt;/script&gt;
 &lt;!-- End Matomo Tag Manager --&gt;</embedCode>
 		<helpUrl>https://developer.matomo.org/guides/tagmanager/embedding</helpUrl>

diff --git a/tests/System/expected/test_stating_with_content__TagManager.getContainerEmbedCode.xml b/tests/System/expected/test_stating_with_content__TagManager.getContainerEmbedCode.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>&lt;!-- Matomo Tag Manager --&gt;
 &lt;script&gt;
-var _mtm = window._mtm = window._mtm || [];
-_mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
-var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-g.async=true; g.src='http://example.com/piwik/tests/PHPUnit/proxy/js/container_aaacont1_staging_a7295f29fb160dcfb59d3193.js'; s.parentNode.insertBefore(g,s);
+  var _mtm = window._mtm = window._mtm || [];
+  _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
+  (function() {
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src='http://example.com/piwik/tests/PHPUnit/proxy/js/container_aaacont1_staging_a7295f29fb160dcfb59d3193.js'; s.parentNode.insertBefore(g,s);
+  })();
 &lt;/script&gt;
 &lt;!-- End Matomo Tag Manager --&gt;</result>
diff --git a/...System/expected/test_stating_with_content__TagManager.getContainerInstallInstructions.xml b/...System/expected/test_stating_with_content__TagManager.getContainerInstallInstructions.xml
@@ -4,10 +4,12 @@
 		<description>To install this container, copy / paste the following code as high as possible into the &lt;head&gt; part of every page of your site.</description>
 		<embedCode>&lt;!-- Matomo Tag Manager --&gt;
 &lt;script&gt;
-var _mtm = window._mtm = window._mtm || [];
-_mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
-var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-g.async=true; g.src='http://example.com/piwik/tests/PHPUnit/proxy/js/container_aaacont1_staging_a7295f29fb160dcfb59d3193.js'; s.parentNode.insertBefore(g,s);
+  var _mtm = window._mtm = window._mtm || [];
+  _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
+  (function() {
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src='http://example.com/piwik/tests/PHPUnit/proxy/js/container_aaacont1_staging_a7295f29fb160dcfb59d3193.js'; s.parentNode.insertBefore(g,s);
+  })();
 &lt;/script&gt;
 &lt;!-- End Matomo Tag Manager --&gt;</embedCode>
 		<helpUrl>https://developer.matomo.org/guides/tagmanager/embedding</helpUrl>

diff --git a/tests/System/expected/test_with_content__TagManager.getContainerEmbedCode.xml b/tests/System/expected/test_with_content__TagManager.getContainerEmbedCode.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>&lt;!-- Matomo Tag Manager --&gt;
 &lt;script&gt;
-var _mtm = window._mtm = window._mtm || [];
-_mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
-var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-g.async=true; g.src='http://example.com/piwik/tests/PHPUnit/proxy/js/container_aaacont1.js'; s.parentNode.insertBefore(g,s);
+  var _mtm = window._mtm = window._mtm || [];
+  _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
+  (function() {
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src='http://example.com/piwik/tests/PHPUnit/proxy/js/container_aaacont1.js'; s.parentNode.insertBefore(g,s);
+  })();
 &lt;/script&gt;
 &lt;!-- End Matomo Tag Manager --&gt;</result>
diff --git a/tests/System/expected/test_with_content__TagManager.getContainerInstallInstructions.xml b/tests/System/expected/test_with_content__TagManager.getContainerInstallInstructions.xml
@@ -4,10 +4,12 @@
 		<description>To install this container, copy / paste the following code as high as possible into the &lt;head&gt; part of every page of your site.</description>
 		<embedCode>&lt;!-- Matomo Tag Manager --&gt;
 &lt;script&gt;
-var _mtm = window._mtm = window._mtm || [];
-_mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
-var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-g.async=true; g.src='http://example.com/piwik/tests/PHPUnit/proxy/js/container_aaacont1.js'; s.parentNode.insertBefore(g,s);
+  var _mtm = window._mtm = window._mtm || [];
+  _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
+  (function() {
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src='http://example.com/piwik/tests/PHPUnit/proxy/js/container_aaacont1.js'; s.parentNode.insertBefore(g,s);
+  })();
 &lt;/script&gt;
 &lt;!-- End Matomo Tag Manager --&gt;</embedCode>
 		<helpUrl>https://developer.matomo.org/guides/tagmanager/embedding</helpUrl>

diff --git a/vue/src/TagmanagerTrackingCode/TagManagerTrackingCode.less b/vue/src/TagmanagerTrackingCode/TagManagerTrackingCode.less
@@ -0,0 +1,11 @@
+div[anchor='tagmanager'] div[matomo-tagmanager-tracking-code] {
+  .list-style-decimal {
+    list-style-type: decimal;
+    list-style-position: inside;
+  }
+
+  .tagManagerTrackingCode .row {
+    margin-bottom: 0rem !important;
+    margin-top: -0.5rem !important;
+  }
+}