From fe5790de9267853bc036aba8ccbc438c8b6db9f1 Mon Sep 17 00:00:00 2001
From: Alex Gibson <alexgibson@users.noreply.github.com>
Date: Fri, 24 May 2024 09:30:37 +0100
Subject: [PATCH] Review fixes

---
 bedrock/base/templates/base-protocol.html             |  6 ++++++
 bedrock/mozorg/templates/mozorg/robots.txt            |  1 -
 .../privacy/templates/privacy/cookie-settings.html    | 11 ++++++-----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/bedrock/base/templates/base-protocol.html b/bedrock/base/templates/base-protocol.html
index 3fce01408ae..d397feb42db 100644
--- a/bedrock/base/templates/base-protocol.html
+++ b/bedrock/base/templates/base-protocol.html
@@ -121,6 +121,7 @@
     {% block sentry_client %}
       {% if settings.SENTRY_FRONTEND_DSN and switch('sentry-js') %}
         <!--[if !IE]><!-->
+          {# Sentry only runs on evergreen browsers so we exclude it from IE. #}
           {{ js_bundle('sentry') }}
         <!--<![endif]-->
       {% endif %}
@@ -128,6 +129,7 @@
 
     {% block site_js %}
       <!--[if !IE]><!-->
+        {# Standard site JS bundles served to all evergreen browsers plus IE 10 and above. #}
         {{ js_bundle('lib') }}
         {{ js_bundle('ui') }}
         {{ js_bundle('fxa') }}
@@ -135,6 +137,7 @@
       <!--<![endif]-->
 
       <!--[if IE 9]>
+        {# IE9 has its own lib JS bundle containing dependencies for anaytics and consent management. #}
         {{ js_bundle('lib-ie') }}
       <![endif]-->
     {% endblock %}
@@ -143,12 +146,14 @@
     {% block stub_attribution %}
       {% if settings.STUB_ATTRIBUTION_RATE %}
         <!--[if IE 9]><!-->
+          {# Stub attribution is run on all evergreen browsers plus IE9 and above. #}
           {{ js_bundle('stub-attribution') }}
         <!--<![endif]-->
       {% endif %}
     {% endblock %}
 
     <!--[if !IE]><!-->
+    {# Glean only runs on evergreen browsers so we exclude it from IE. #}
     {% block glean %}
       {% if switch('glean-analytics') %}
         {{ js_bundle('glean') }}
@@ -162,6 +167,7 @@
 
     {% block consent_banner_js %}
     <!--[if IE 9]><!-->
+      {# Consent banner is shown to all evergreen browsers plus IE9 and above #}
       {{ js_bundle('consent-banner') }}
     <!--<![endif]-->
     {% endblock %}
diff --git a/bedrock/mozorg/templates/mozorg/robots.txt b/bedrock/mozorg/templates/mozorg/robots.txt
index d6bac1597b0..7003d750158 100644
--- a/bedrock/mozorg/templates/mozorg/robots.txt
+++ b/bedrock/mozorg/templates/mozorg/robots.txt
@@ -6,6 +6,5 @@ disallow: /*/firstrun/
 disallow: /*/newsletter/existing/
 disallow: /*/whatsnew/
 disallow: /*/etc/
-disallow: /*/privacy/websites/cookie-settings/
 {% endif -%}
 Sitemap: {{ request.scheme }}://{{ request.get_host() }}/sitemap.xml
diff --git a/bedrock/privacy/templates/privacy/cookie-settings.html b/bedrock/privacy/templates/privacy/cookie-settings.html
index e079ee2aedd..2447ccbd198 100644
--- a/bedrock/privacy/templates/privacy/cookie-settings.html
+++ b/bedrock/privacy/templates/privacy/cookie-settings.html
@@ -44,11 +44,6 @@
 
       <h1>{{ ftl('cookie-settings-page-title') }}</h1>
 
-      {# noscript warning to enable JavaScript #}
-      <noscript>
-        <p><strong>{{ ftl('cookie-settings-turn-on-javascript') }}</strong></p>
-      </noscript>
-
       <p>{{ ftl('cookie-settings-explainer') }}</p>
 
       <p>{{ ftl('cookie-settings-page-intro-v2', fallback='cookie-settings-page-intro') }}</p>
@@ -158,6 +153,11 @@ <h4 class="cookie-summary-title">
           {{ ftl('cookie-settings-save-changes') }}
         </button>
 
+        {# noscript warning to enable JavaScript #}
+        <noscript>
+          <p><strong>{{ ftl('cookie-settings-turn-on-javascript') }}</strong></p>
+        </noscript>
+
         <p class="hidden cookie-consent-form-submit-success" tabindex="-1">{{ ftl('cookie-settings-your-cookie-settings-have') }}</p>
       </div>
 
@@ -181,6 +181,7 @@ <h2>{{ ftl('cookie-settings-privacy-heading') }}</h2>
 {% block consent_banner_js %}
   {{ super() }}
   <!--[if IE 9]> -->
+    {# Cookie settings page is supported on all evergreen browsers plus IE9 and above #}
     {{ js_bundle('cookie-settings-form') }}
   <!--<![endif]-->
 {% endblock %}