diff options
| author | Sarah German <sgerman@gitlab.com> | 2023-07-31 20:52:47 +0300 |
|---|---|---|
| committer | David O'Regan <doregan@gitlab.com> | 2023-07-31 20:52:47 +0300 |
| commit | dff2078c817a005622ed7d34dd8927be44ccdd3d (patch) | |
| tree | 8803553ddc6224893ac5029eeadd5cd8860eb160 /layouts | |
| parent | a80feac7026abf747f08123a3d92c46076761e77 (diff) | |
Clean up and document analytics scripts
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/analytics.html | 23 | ||||
| -rw-r--r-- | layouts/default.html | 7 | ||||
| -rw-r--r-- | layouts/gtm.html | 7 | ||||
| -rw-r--r-- | layouts/head.html | 5 | ||||
| -rw-r--r-- | layouts/home.html | 1 | ||||
| -rw-r--r-- | layouts/search.html | 1 |
6 files changed, 13 insertions, 31 deletions
diff --git a/layouts/analytics.html b/layouts/analytics.html index f18097f5..5b28acd9 100644 --- a/layouts/analytics.html +++ b/layouts/analytics.html @@ -1,22 +1,19 @@ <% if production_and_default_branch? %> -<!-- Facebook --> -<script src="<%= @items['/assets/javascripts/facebook_analytics.*'].path %>"></script> -<noscript><img height="1" width="1" style="display:none" -src="https://www.facebook.com/tr?id=1689559637958103&ev=PageView&noscript=1" -/></noscript> +<!-- Google Tag Manager --> +<script async src="<%= @items['/assets/javascripts/gtag_analytics.*'].path %>"></script> +<script async src="<%= @items['/assets/javascripts/google_tagmanager.*'].path %>"></script> +<noscript> + <iframe src="https://www.googletagmanager.com/ns.html?id=GTM-NJXWQL" height="0" width="0" style="display:none;visibility:hidden"></iframe> +</noscript> <!-- Marketo --> -<script src="<%= @items['/assets/javascripts/marketo_analytics.*'].path %>"></script> +<script async src="<%= @items['/assets/javascripts/marketo_analytics.*'].path %>"></script> <!-- Bizible --> -<script type="text/javascript" src="https://cdn.bizible.com/scripts/bizible.js" async=""></script> - -<!-- Global site tag (gtag.js) - Google Ads: 923339191 --> -<script async src="https://www.googletagmanager.com/gtag/js?id=AW-923339191"></script> -<script src="<%= @items['/assets/javascripts/gtag_analytics.*'].path %>"></script> +<script async src="https://cdn.bizible.com/scripts/bizible.js"></script> -<!-- Linkedin --> -<script src="<%= @items['/assets/javascripts/linkedin_analytics.*'].path %>"></script> +<!-- LinkedIn --> +<script async src="<%= @items['/assets/javascripts/linkedin_analytics.*'].path %>"></script> <noscript> <img height="1" width="1" style="display:none;" alt="" src="https://dc.ads.linkedin.com/collect/?pid=30694&fmt=gif" /> </noscript> diff --git a/layouts/default.html b/layouts/default.html index 5b0d6462..2d7905ea 100644 --- a/layouts/default.html +++ b/layouts/default.html @@ -6,7 +6,6 @@ <%= render '/canonical_urls.*' %> </head> <body itemscope itemtype="http://schema.org/WebPage" data-spy="scroll" data-target="#doc-nav" data-offset="90"> - <%= render '/gtm.*' %> <%= render '/header.*' %> <section class="gl-docs container-fluid gl-mt-9"> <div class="row"> @@ -89,9 +88,6 @@ <script src="/assets/vendor/mermaid.min.js"></script> <script src="<%= @items['/assets/javascripts/mermaid.*'].path %>"></script> <% end %> - - <%# Add analytics only in production %> - <%= render '/analytics.*' %> <% if @item.identifier.to_s == '/ee/update/deprecations.md' %> <script src="<%= @items['/frontend/deprecations/deprecations.*'].path %>"></script> <% end %> @@ -100,5 +96,8 @@ <% end %> <script src="<%= @items['/frontend/header/index.*'].path %>"></script> <script src="<%= @items['/assets/javascripts/tables.*'].path %>"></script> + + <%# Add analytics only in production %> + <%= render '/analytics.*' %> </body> </html> diff --git a/layouts/gtm.html b/layouts/gtm.html deleted file mode 100644 index bbeb2c59..00000000 --- a/layouts/gtm.html +++ /dev/null @@ -1,7 +0,0 @@ -<% if production_and_default_branch? %> - <%# Adds GTM only in production // leave this immediately after the opening the body tag%> - <!-- Google Tag Manager (noscript) --> - <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-NJXWQL" - height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> - <!-- End Google Tag Manager (noscript) --> -<% end %> diff --git a/layouts/head.html b/layouts/head.html index 4a38c6a4..6a35e3eb 100644 --- a/layouts/head.html +++ b/layouts/head.html @@ -58,11 +58,6 @@ <% end %> <% if production_and_default_branch? %> - <%# Adds GTM only in production %> - <!-- Google Tag Manager --> - <script src="<%= @items['/assets/javascripts/google_tagmanager.*'].path %>"></script> - <!-- End Google Tag Manager --> - <!-- Google webmasters verification --> <meta name="google-site-verification" content="AcGSBNaKDWnLgcYotlVibGy6STm2Y6_KJSaRxrA90xY" /> <!-- Ashraf Khamis --> <meta name="google-site-verification" content="6eFQOFLxYAer08ROqc3I-SAi44F9NmvH7PrUUBR3oCI" /> <!-- Achilleas Pipinellis --> diff --git a/layouts/home.html b/layouts/home.html index 1fb9d186..4e57fe2e 100644 --- a/layouts/home.html +++ b/layouts/home.html @@ -5,7 +5,6 @@ <link rel="canonical" href="<%= @config[:base_url] %>/"> </head> <body class="landing" data-is-homepage="true"> - <%= render '/gtm.*' %> <%= render '/header.*' %> <%= yield %> <%# Add analytics only in production %> diff --git a/layouts/search.html b/layouts/search.html index 41368b2c..49b8d486 100644 --- a/layouts/search.html +++ b/layouts/search.html @@ -5,7 +5,6 @@ <link rel="canonical" href="<%= @config[:base_url] %>/search/"> </head> <body> - <%= render '/gtm.*' %> <%= render '/header.*' %> <section class="gl-docs container pt-5"> <div class="row"> |