Merge pull request #2651 from TechnologyEnhancedLearning/Develop/Fix/TD-3880-Add-BodyJs-GoogleTagManager

rshrirohit · web-flow · commit 8ad673651a5a · 2024-05-15T14:13:47.000+01:00
TD-3880-GTM body JS added.
diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_Layout.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_Layout.cshtml
@@ -6,10 +6,15 @@
 @inject Microsoft.Extensions.Configuration.IConfiguration Configuration
 @{
     var userResearchUrl = Configuration["UserResearchUrl"];
+    Context.Request.Cookies.TryGetValue("Dls-cookie-consent", out string cookieConsent);
 }
 <!DOCTYPE html>
 <html lang="en">
 <head>
+    @if (cookieConsent == "true")
+    {
+        @await Html.PartialAsync("~/Views/Shared/_GoogleTagManager.cshtml")
+    }
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@@ -39,16 +44,13 @@
     <meta name="twitter:card" content="summary">
     <meta name="twitter:title" content="@(ViewData["twitter:title"] ?? ViewData["Title"] ?? "Digital Learning Solutions")">
     <meta name="twitter:description" content="@(ViewData["twitter:description"] ?? "")">
-    @{
-        Context.Request.Cookies.TryGetValue("Dls-cookie-consent", out string cookieConsent);
-    }
-    @if (cookieConsent == "true")
-    {
-        @await Html.PartialAsync("~/Views/Shared/_GoogleTagManager.cshtml")
-    }
 </head>
 
 <body>
+    @if (cookieConsent == "true")
+    {
+        @await Html.PartialAsync("~/Views/Shared/_GoogleTagManagerBodyTagJs.cshtml")
+    }
     <div id="pagewrapper">
         <script>document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>
 
diff --git a/DigitalLearningSolutions.Web/Views/Shared/_GoogleTagManagerBodyTagJs.cshtml b/DigitalLearningSolutions.Web/Views/Shared/_GoogleTagManagerBodyTagJs.cshtml
@@ -0,0 +1,3 @@
+﻿<noscript>
+    <iframe src="https://www.googletagmanager.com/ns.html?id=GTM-KJPJHGW" height="0" width="0" style="display:none;visibility:hidden"></iframe>
+</noscript>
diff --git a/DigitalLearningSolutions.Web/Views/Shared/_Layout.cshtml b/DigitalLearningSolutions.Web/Views/Shared/_Layout.cshtml
@@ -22,11 +22,15 @@
     var headerExtension = (string)ViewData[LayoutViewDataKeys.Application];
     var shouldDisplayHelpMenuItem = dlsSubApplication?.DisplayHelpMenuItem ?? headerExtension != DlsSubApplication.TrackingSystem.HeaderExtension;
     var userResearchUrl = Configuration["UserResearchUrl"];
+    Context.Request.Cookies.TryGetValue("Dls-cookie-consent", out string cookieConsent);
 }
 <!DOCTYPE html>
 <html lang="en">
 <head>
-
+    @if (cookieConsent == "true")
+    {
+        @await Html.PartialAsync("~/Views/Shared/_GoogleTagManager.cshtml")
+    }
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@@ -54,17 +58,13 @@
     <meta name="twitter:card" content="summary">
     <meta name="twitter:title" content="@(ViewData["twitter:title"] ?? ViewData[LayoutViewDataKeys.Title] ?? "Digital Learning Solutions")">
     <meta name="twitter:description" content="@(ViewData["twitter:description"] ?? "")">
-    @{
-        Context.Request.Cookies.TryGetValue("Dls-cookie-consent", out string cookieConsent);
-    }
-    @if (cookieConsent == "true")
-    {
-        @await Html.PartialAsync("~/Views/Shared/_GoogleTagManager.cshtml")
-    }
 </head>
 
 <body>
-
+    @if (cookieConsent == "true")
+    {
+        @await Html.PartialAsync("~/Views/Shared/_GoogleTagManagerBodyTagJs.cshtml")
+    }
     <div id="pagewrapper">
         <header>
             <script>document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<noscript>`
	`2`	`+ <iframe src="https://www.googletagmanager.com/ns.html?id=GTM-KJPJHGW" height="0" width="0" style="display:none;visibility:hidden"></iframe>`
	`3`	`+</noscript>`