Adjusted announcement banner and added tag manager tracking

Author: yoshwaaa

software/templates/SoftwareHomePage.ss

@@ -32,9 +32,7 @@
         <% include SiteBanner %>
         <% include Navigation %>
         <!-- Page Content -->
-        <div class="software-announcement-banner">
-        <% include AnnouncementBanner %>
-        </div>s
+        
         $Message
         <div class="container software">
             <div class="row">

software/templates/SoftwareSubPage.ss

@@ -29,7 +29,7 @@
         <% include SiteBanner %>
         <% include Navigation %>
     <!-- Page Content -->
-    <% include AnnouncementBanner %>
+   
         $Message
     <div class="container software">
         <div class="row">

themes/openstack/templates/Layout/Includes/Page_GoogleAnalytics.ss

@@ -15,6 +15,14 @@ function recordOutboundLink(link, category, action) {
 }
 </script>
 
+<!-- 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','GTM-T59Q8GH');</script>
+<!-- End Google Tag Manager -->
+
 <style>.async-hide { opacity: 0 !important} </style>
 <script>
 // Used to minimize flickering during GA A/B testing

themes/openstack/templates/Layout/Includes/SiteBanner.ss

@@ -1,6 +1,10 @@
 
 <% if SiteConfig.DisplaySiteBanner %>
 <!-- Top Site Banner -->
+<!-- Google Tag Manager (noscript) -->
+<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-T59Q8GH"
+height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+<!-- End Google Tag Manager (noscript) -->
 <div class="top-site-banner">
     <div class="container">
         <div class="logo">

themes/openstack/templates/Layout/NewHomePage.ss

@@ -3,7 +3,6 @@
 <div class="container">
 
 </div>
-<% include AnnouncementBanner %>
 <div class="intro-header featured">
   <div class="container">
     <div class="row">

user-stories/templates/Layout/UserStoriesPage.ss

@@ -1,7 +1,5 @@
 </div> <!-- Killing the main site .container -->
-<div class="user-stories-announcement-banner">
-<% include AnnouncementBanner %>
-</div>
+
 <div class="user-stories-hero container">
     <div class="row">
         <div class="col-sm-10 col-sm-push-1">