From 10b696edc5aedba5203f52d5e66d7bd068bb06fc Mon Sep 17 00:00:00 2001
From: spiderr <spiderr@bitweaver.org>
Date: Sat, 25 Nov 2023 14:29:14 -0500
Subject: move noscript tags to footer

---
 templates/footer_inc.tpl    | 12 ++++++++++++
 templates/html_head_inc.tpl | 13 +++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 templates/footer_inc.tpl

diff --git a/templates/footer_inc.tpl b/templates/footer_inc.tpl
new file mode 100644
index 0000000..d04da7d
--- /dev/null
+++ b/templates/footer_inc.tpl
@@ -0,0 +1,12 @@
+{* **** GOOGLE TAG MANAGER **** *}
+{if $gBitSystem->getConfig('google_tagmanager_id')}
+<!-- Google Tag Manager (noscript) -->
+<noscript><iframe src="https://www.googletagmanager.com/ns.html?id={$gBitSystem->getConfig('google_tagmanager_id')}" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+<!-- End Google Tag Manager (noscript) -->
+{/if}
+
+{* **** MICROSOFT ANALYTICS **** *}
+{if $gBitSystem->getConfig('analytics_microsoft_ti')}
+<noscript><img src="//bat.bing.com/action/0?ti={$gBitSystem->getConfig('analytics_microsoft_ti')}&Ver=2" height="0" width="0" style="display:none; visibility: hidden;" alt="."></noscript>
+{/if}
+
diff --git a/templates/html_head_inc.tpl b/templates/html_head_inc.tpl
index 862c0f0..787847c 100644
--- a/templates/html_head_inc.tpl
+++ b/templates/html_head_inc.tpl
@@ -8,9 +8,6 @@
 <!-- Google Tag Manager -->
 <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); })(window,document,'script','dataLayer','{/literal}{$gBitSystem->getConfig('google_tagmanager_id')}{literal}');</script>
 <!-- End Google Tag Manager -->
-<!-- Google Tag Manager (noscript) -->
-<noscript><iframe src="https://www.googletagmanager.com/ns.html?id={/literal}{$gBitSystem->getConfig('google_tagmanager_id')}{literal}" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
-<!-- End Google Tag Manager (noscript) -->
 {/literal}
 	{/if}
 
@@ -39,11 +36,11 @@
 </script>
 	{/if}
 
-	{* **** MICROSOFT ANALYTICS **** *}
-	{if $gBitSystem->getConfig('analytics_microsoft_ti')}{literal}
+{/if}
+
+{* **** MICROSOFT ANALYTICS **** *}
+{if $gBitSystem->getConfig('analytics_microsoft_ti')}{literal}
 <script>(function(w,d,t,r,u){var f,n,i;w[u]=w[u]||[],f=function(){var o={ti:"{/literal}{$gBitSystem->getConfig('analytics_microsoft_ti')}{literal}"};o.q=w[u],w[u]=new UET(o),w[u].push("pageLoad")},n=d.createElement(t),n.src=r,n.async=1,n.onload=n.onreadystatechange=function(){var s=this.readyState;s&&s!=="loaded"&&s!=="complete"||(f(),n.onload=n.onreadystatechange=null)},i=d.getElementsByTagName(t)[0],i.parentNode.insertBefore(n,i)})(window,document,"script","//bat.bing.com/bat.js","uetq");</script>
-<noscript><img src="//bat.bing.com/action/0?ti={/literal}{$gBitSystem->getConfig('analytics_microsoft_ti')}{literal}&Ver=2" height="0" width="0" style="display:none; visibility: hidden;" /></noscript>
-	{/literal}{/if}
+{/literal}{/if}
 
-{/if}
 {/strip}
-- 
cgit v1.3