Skip to content

Commit f61dd90

Browse files
magefanmagefan
authored
Merge pull request #32 from magefan/10850-sst-improvements
10850 sst improvements
2 parents c1bfb4c + 3d48ebc commit f61dd90

File tree

2 files changed

+64
-63
lines changed

2 files changed

+64
-63
lines changed

‎Block/Adminhtml/System/Config/Form/Attention.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Attention extends \Magefan\Community\Block\Adminhtml\System\Config\Form\In
2424
*/
2525
public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
2626
{
27-
return '<div style="padding:10px;background-color:#ffe5e5;border:1px solid #ddd;margin-bottom:7px;">
27+
return '<div style="padding:10px;background-color:#fffbbb;border:1px solid #ddd;margin-bottom:7px;">
2828
<strong>Attention!</strong> Once you change and save the "Web/Server Container", "Google Analytics 4" or "Google Ads" settings,
2929
please don\'t forget to scroll down to the "Export Container" section
3030
and click the "Generate JSON Container & Download File" button to export container data.

‎etc/adminhtml/system.xml‎

Lines changed: 63 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -45,30 +45,28 @@
4545
</field>
4646
<field id="public_id" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
4747
<label>Public ID</label>
48-
<comment><![CDATA[
49-
<div class="default_loader_mfgtm_js_example">
50-
E.g. <strong>GTM-XXXXXXX</strong><br/>
51-
Public ID is used to insert the code to your pages automatically:
52-
<pre style="border: 1px dashed #5f5f5f;padding: 5px;background: #f4f4f4;">
53-
&lt;!-- Google Tag Manager --&gt;
54-
&lt;script&gt;(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({&#39;gtm.start&#39;:
55-
new Date().getTime(),event:&#39;gtm.js&#39;});var f=d.getElementsByTagName(s)[0],
56-
j=d.createElement(s),dl=l!=&#39;dataLayer&#39;?&#39;&amp;l=&#39;+l:&#39;&#39;;j.async=true;j.src=
57-
&#39;https://www.googletagmanager.com/gtm.js?id=&#39;+i+dl;f.parentNode.insertBefore(j,f);
58-
})(window,document,&#39;script&#39;,&#39;dataLayer&#39;,&#39;<strong>GTM-XXXXXXX</strong>&#39;);&lt;/script&gt;
59-
&lt;!-- End Google Tag Manager --&gt;
60-
</pre>
61-
<pre style="border: 1px dashed #5f5f5f;padding: 5px;background: #f4f4f4;">
62-
&lt;!-- Google Tag Manager (noscript) --&gt;
63-
&lt;noscript&gt;&lt;iframe src=&quot;https://www.googletagmanager.com/ns.html?id=<strong>GTM-XXXXXXX</strong>&quot;
64-
height=&quot;0&quot; width=&quot;0&quot; style=&quot;display:none;visibility:hidden&quot;&gt;&lt;/iframe&gt;&lt;/noscript&gt;
65-
&lt;!-- End Google Tag Manager (noscript) --&gt;
66-
</pre>
67-
</div>
68-
<div id="mfgtm_js_example"></div>
69-
If you want to paste the GTM script and noscript manually please use the "Head Script and Body Noscript" option as Google Tag Manager Installation Method.
70-
71-
]]></comment>
48+
<comment>
49+
<![CDATA[
50+
<div class="default_loader_mfgtm_js_example">
51+
E.g. <strong>GTM-XXXXXXX</strong><br/>Public ID is used to insert the code to your pages automatically:
52+
<div style="border: 1px dashed #5f5f5f;padding: 5px;background: #f4f4f4;margin-bottom: 14px;white-space: pre-line;">&lt;!-- Google Tag Manager --&gt;
53+
&lt;script&gt;(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({&#39;gtm.start&#39;:
54+
new Date().getTime(),event:&#39;gtm.js&#39;});var f=d.getElementsByTagName(s)[0],
55+
j=d.createElement(s),dl=l!=&#39;dataLayer&#39;?&#39;&amp;l=&#39;+l:&#39;&#39;;j.async=true;j.src=
56+
&#39;https://www.googletagmanager.com/gtm.js?id=&#39;+i+dl;f.parentNode.insertBefore(j,f);
57+
})(window,document,&#39;script&#39;,&#39;dataLayer&#39;,&#39;<strong>GTM-XXXXXXX</strong>&#39;);&lt;/script&gt;
58+
&lt;!-- End Google Tag Manager --&gt;
59+
</div>
60+
<div style="border: 1px dashed #5f5f5f;padding: 5px;background: #f4f4f4;margin-bottom: 14px;white-space: pre-line;">&lt;!-- Google Tag Manager (noscript) --&gt;
61+
&lt;noscript&gt;&lt;iframe src=&quot;https://www.googletagmanager.com/ns.html?id=<strong>GTM-XXXXXXX</strong>&quot;
62+
height=&quot;0&quot; width=&quot;0&quot; style=&quot;display:none;visibility:hidden&quot;&gt;&lt;/iframe&gt;&lt;/noscript&gt;
63+
&lt;!-- End Google Tag Manager (noscript) --&gt;
64+
</div>
65+
</div>
66+
<div id="mfgtm_js_example"></div>
67+
If you want to paste the GTM script and noscript manually please use the "Head Script and Body Noscript" option as Google Tag Manager Installation Method.
68+
]]>
69+
</comment>
7270
<depends>
7371
<field id="mfgoogletagmanager/web_container/install_gtm">use_public_id</field>
7472
</depends>
@@ -78,18 +76,19 @@ If you want to paste the GTM script and noscript manually please use the "Head S
7876
<depends>
7977
<field id="mfgoogletagmanager/web_container/install_gtm">use_head_and_body_script</field>
8078
</depends>
81-
<comment><![CDATA[
79+
<comment>
80+
<![CDATA[
8281
<p>Please navigate to <a href="https://tagmanager.google.com/" title="Google Tag Manager" target="_blank">Google Tag Manager</a> Workspace > Admin > Install Google Tag Manager and copy the <strong>&lt;head&gt;</strong> script.<br/> E.g.<br/>
83-
<pre style="border: 1px dashed #5f5f5f;padding: 5px;background: #f4f4f4;">
84-
&lt;!-- Google Tag Manager --&gt;
85-
&lt;script&gt;(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({&#39;gtm.start&#39;:
86-
new Date().getTime(),event:&#39;gtm.js&#39;});var f=d.getElementsByTagName(s)[0],
87-
j=d.createElement(s),dl=l!=&#39;dataLayer&#39;?&#39;&amp;l=&#39;+l:&#39;&#39;;j.async=true;j.src=
88-
&#39;https://www.googletagmanager.com/gtm.js?id=&#39;+i+dl;f.parentNode.insertBefore(j,f);
89-
})(window,document,&#39;script&#39;,&#39;dataLayer&#39;,&#39;<strong>GTM-XXXXXXX</strong>&#39;);&lt;/script&gt;
90-
&lt;!-- End Google Tag Manager --&gt;
91-
</pre></p>
92-
<p>Also you can use scripts from the Stape.io or other alternative services for custom GTM Loaders.</p>
82+
<div style="border: 1px dashed #5f5f5f;padding: 5px;background: #f4f4f4;white-space: pre-line;">&lt;!-- Google Tag Manager --&gt;
83+
&lt;script&gt;(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({&#39;gtm.start&#39;:
84+
new Date().getTime(),event:&#39;gtm.js&#39;});var f=d.getElementsByTagName(s)[0],
85+
j=d.createElement(s),dl=l!=&#39;dataLayer&#39;?&#39;&amp;l=&#39;+l:&#39;&#39;;j.async=true;j.src=
86+
&#39;https://www.googletagmanager.com/gtm.js?id=&#39;+i+dl;f.parentNode.insertBefore(j,f);
87+
})(window,document,&#39;script&#39;,&#39;dataLayer&#39;,&#39;<strong>GTM-XXXXXXX</strong>&#39;);&lt;/script&gt;
88+
&lt;!-- End Google Tag Manager --&gt;
89+
</div>
90+
</p>
91+
<p>Also you can use scripts from the Stape.io or other alternative services for custom GTM Loaders.</p>
9392
]]>
9493
</comment>
9594
</field>
@@ -98,31 +97,34 @@ j=d.createElement(s),dl=l!=&#39;dataLayer&#39;?&#39;&amp;l=&#39;+l:&#39;&#39;;j.
9897
<depends>
9998
<field id="mfgoogletagmanager/web_container/install_gtm">use_head_and_body_script</field>
10099
</depends>
101-
<comment><![CDATA[
100+
<comment>
101+
<![CDATA[
102102
<p>Please navigate to <a href="https://tagmanager.google.com/" title="Google Tag Manager" target="_blank">Google Tag Manager</a> Workspace > Admin > Install Google Tag Manager and copy the <strong>&lt;body&gt;</strong> noscript.<br/> E.g.<br/>
103-
<pre style="border: 1px dashed #5f5f5f;padding: 5px;background: #f4f4f4;">
104-
&lt;!-- Google Tag Manager (noscript) --&gt;
105-
&lt;noscript&gt;&lt;iframe src=&quot;https://www.googletagmanager.com/ns.html?id=<strong>GTM-XXXXXXX</strong>&quot;
106-
height=&quot;0&quot; width=&quot;0&quot; style=&quot;display:none;visibility:hidden&quot;&gt;&lt;/iframe&gt;&lt;/noscript&gt;
107-
&lt;!-- End Google Tag Manager (noscript) --&gt;
108-
</pre></p>
109-
<p>Also you can use scripts from the Stape.io or other alternative services for custom GTM Loaders.</p>
103+
<div style="border: 1px dashed #5f5f5f;padding: 5px;background: #f4f4f4;white-space: pre-line;">&lt;!-- Google Tag Manager (noscript) --&gt;
104+
&lt;noscript&gt;&lt;iframe src=&quot;https://www.googletagmanager.com/ns.html?id=<strong>GTM-XXXXXXX</strong>&quot;
105+
height=&quot;0&quot; width=&quot;0&quot; style=&quot;display:none;visibility:hidden&quot;&gt;&lt;/iframe&gt;&lt;/noscript&gt;
106+
&lt;!-- End Google Tag Manager (noscript) --&gt;
107+
</div>
108+
</p>
109+
<p>Also you can use scripts from the Stape.io or other alternative services for custom GTM Loaders.</p>
110110
]]>
111111
</comment>
112112
</field>
113113
<field id="account_id" translate="label comment" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
114114
<label>Account ID</label>
115-
<comment><![CDATA[
115+
<comment>
116+
<![CDATA[
116117
<p>Please get the <a href="https://tagmanager.google.com/" title="Google Tag Manager" target="_blank">Google Tag Manager</a> account ID from the GTM Workspace URL path. E.g.<br/>
117-
<pre style="border: 1px dashed #5f5f5f;padding: 5px;background: #f4f4f4;">https://tagmanager.google.com/#/container/accounts/<strong>XXXXXXXXXX</strong>/containers/XXXXXXXXX</pre></p>
118+
<div style="border: 1px dashed #5f5f5f;padding: 5px;background: #f4f4f4;white-space: pre-line;word-break: break-all;">https://tagmanager.google.com/#/container/accounts/<strong>XXXXXXXXXX</strong>/containers/XXXXXXXXX</div></p>
118119
]]>
119120
</comment>
120121
</field>
121122
<field id="container_id" translate="label comment" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
122123
<label>Container ID</label>
123-
<comment><![CDATA[
124+
<comment>
125+
<![CDATA[
124126
<p>Please get the <a href="https://tagmanager.google.com/" title="Google Tag Manager" target="_blank">Google Tag Manager</a> container ID from the GTM Workspace URL path. E.g.<br/>
125-
<pre style="border: 1px dashed #5f5f5f;padding: 5px;background: #f4f4f4;">https://tagmanager.google.com/#/container/accounts/XXXXXXXXXX/containers/<strong>XXXXXXXXX</strong></pre></p>
127+
<div style="border: 1px dashed #5f5f5f;padding: 5px;background: #f4f4f4;white-space: pre-line;word-break: break-all;">https://tagmanager.google.com/#/container/accounts/XXXXXXXXXX/containers/<strong>XXXXXXXXX</strong></div></p>
126128
]]>
127129
</comment>
128130
</field>
@@ -153,7 +155,7 @@ height=&quot;0&quot; width=&quot;0&quot; style=&quot;display:none;visibility:hid
153155
</depends>
154156
<comment><![CDATA[
155157
<p>Please get the <a href="https://tagmanager.google.com/" title="Google Tag Manager" target="_blank">Google Tag Manager</a> account ID from the GTM Workspace URL path. E.g.<br/>
156-
<pre style="border: 1px dashed #5f5f5f;padding: 5px;background: #f4f4f4;">https://tagmanager.google.com/#/container/accounts/<strong>XXXXXXXXXX</strong>/containers/XXXXXXXXX</pre></p>
158+
<div style="border: 1px dashed #5f5f5f;padding: 5px;background: #f4f4f4;white-space: pre-line;word-break: break-all;">https://tagmanager.google.com/#/container/accounts/<strong>XXXXXXXXXX</strong>/containers/XXXXXXXXX</div></p>
157159
]]>
158160
</comment>
159161
</field>
@@ -164,7 +166,7 @@ height=&quot;0&quot; width=&quot;0&quot; style=&quot;display:none;visibility:hid
164166
</depends>
165167
<comment><![CDATA[
166168
<p>Please get the <a href="https://tagmanager.google.com/" title="Google Tag Manager" target="_blank">Google Tag Manager</a> container ID from the GTM Workspace URL path. E.g.<br/>
167-
<pre style="border: 1px dashed #5f5f5f;padding: 5px;background: #f4f4f4;">https://tagmanager.google.com/#/container/accounts/XXXXXXXXXX/containers/<strong>XXXXXXXXX</strong></pre></p>
169+
<div style="border: 1px dashed #5f5f5f;padding: 5px;background: #f4f4f4;white-space: pre-line;word-break: break-all;">https://tagmanager.google.com/#/container/accounts/XXXXXXXXXX/containers/<strong>XXXXXXXXX</strong></div></p>
168170
]]>
169171
</comment>
170172
</field>
@@ -412,20 +414,19 @@ To create a new secret, navigate in the
412414
<field id="protect" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
413415
<label>Enable Google Consent Mode</label>
414416
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
415-
<comment><![CDATA[
417+
<comment>
418+
<![CDATA[
416419
<p>If set to "Yes" Google Tag Manager Extension will set consent as "denied" by default for measurement capabilities. For example:
417-
<pre style="border: 1px dashed #5f5f5f;padding: 5px;background: #f4f4f4;">
418-
gtag('consent', 'default', {
419-
'ad_storage': 'denied',
420-
'ad_user_data': 'denied',
421-
'ad_personalization': 'denied',
422-
'analytics_storage': 'denied'
423-
...
424-
wait_for_update: 2000
425-
});
426-
</pre>
427-
Lear more about <a href="https://developers.google.com/tag-platform/security/guides/consent?consentmode=advanced" target="_blank" title="Google Consent Mode">Google Consent Mode</a>.<br/>
428-
This option is also compatible with Google Consent Mode V2.
420+
<div style="border: 1px dashed #5f5f5f;padding: 5px;background: #f4f4f4;white-space: pre;"> gtag('consent', 'default', {
421+
'ad_storage': 'denied',
422+
'ad_user_data': 'denied',
423+
'ad_personalization': 'denied',
424+
'analytics_storage': 'denied'
425+
...
426+
wait_for_update: 2000
427+
});</div>
428+
Lear more about <a href="https://developers.google.com/tag-platform/security/guides/consent?consentmode=advanced" target="_blank" title="Google Consent Mode">Google Consent Mode</a>.<br/>
429+
This option is also compatible with Google Consent Mode V2.
429430
]]>
430431
</comment>
431432
</field>

0 commit comments

Comments
 (0)