Merge branch 'release' into 'master'

Release 72.0 See merge request buckinghamshire-council/bc!710
Buckinghamshire-Digital-Service · Jun 25, 2024 · 0be7644 · 0be7644
2 parents 06bf515 + 7981f17
commit 0be7644
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 54 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Release History
 
+## 72.00 (2024-06-25)
+
+Compare: <https://git.torchbox.com/buckinghamshire-council/bc/compare/71.01...72.00>
+
+- Update link block component to always display list items for all screen sizes (following user testing feedback)
+- Accessibility fix: page does not start with a h1
+- Accessibility fix: aria-label not allowed on subpages div
+- Accessibility fix: heading order not correct for footer column headings
+
 ## 71.01 (2024-06-17)
 
 Compare: <https://git.torchbox.com/buckinghamshire-council/bc/compare/71.00...71.01>

diff --git a/bc/project_styleguide/templates/patterns/molecules/cookie-message/cookie-message.html b/bc/project_styleguide/templates/patterns/molecules/cookie-message/cookie-message.html
@@ -2,7 +2,7 @@
 <section class="cookie wrapper wrapper--large" aria-label="cookie banner" data-cookie-message {% if page.rc_consent_required %}data-rc-consent-required{% endif %}>
     <div class="cookie__container">
         <div class="cookie__message">
-            <h2 class="cookie__heading heading heading--l">This site uses cookies</h2>
+            <p class="cookie__heading heading heading--l">This site uses cookies</p>
             <p>We use some essential cookies to make this website work.</p>
             <p>We’d like to set additional cookies to understand how you use the website, remember your settings and improve our services.</p>
             <div class="cookie__buttons">

diff --git a/bc/project_styleguide/templates/patterns/molecules/navigation/blocks/footer_column.html b/bc/project_styleguide/templates/patterns/molecules/navigation/blocks/footer_column.html
@@ -1,8 +1,7 @@
 {% load wagtailcore_tags %}
 <div class="footer__column">
     {% if value.heading %}
-        <h5 class="footer__column-heading">{{ value.heading }}</h5>
-        {# FIXME Would a h5 be an issue for screen readers due to the jump in levels? #}
+        <h2 class="footer__column-heading">{{ value.heading }}</h2>
     {% endif %}
     {{ value.content|richtext }}
 </div>
diff --git a/bc/project_styleguide/templates/patterns/pages/standardpages/index_page--fis-cat1.html b/bc/project_styleguide/templates/patterns/pages/standardpages/index_page--fis-cat1.html
@@ -11,7 +11,7 @@ <h1 class="heading heading--xxl">{{ page.title }}</h1>
             <p>{{ page.introduction }}</p>
         {% endif %}
 
-        <div
+        <section
             aria-label="Subpages"
             class="grid grid--fis-index grid--index grid--thirds"
             data-height-equalizer
@@ -35,7 +35,7 @@ <h2 class="card__title heading">
                     </div>
                 </a>
             {% endfor %}
-        </div>
+        </section>
     </div>
 
     {% include "patterns/molecules/directory-banner/directory-banner.html" with classes="directory-banner--with-space" %}

diff --git a/bc/project_styleguide/templates/patterns/pages/standardpages/index_page--fis-cat2.html b/bc/project_styleguide/templates/patterns/pages/standardpages/index_page--fis-cat2.html
@@ -13,7 +13,7 @@ <h1 class="heading heading--xxl">{{ page.title }}</h1>
 
         <div class="wrapper wrapper--desktop-reverse">
 
-            <div
+            <section
                 aria-label="Subpages"
                 class="grid grid--fis-index grid--index grid--thirds"
                 data-height-equalizer
@@ -28,7 +28,7 @@ <h2 class="card__title heading">
                         {% endif %}
                     </a>
                 {% endfor %}
-            </div>
+            </section>
 
             {% include "patterns/molecules/directory-banner/directory-banner.html" %}
         </div>

diff --git a/bc/settings/local.py.example b/bc/settings/local.py.example
@@ -52,39 +52,41 @@ YANDEX_VERIFICATION_STRING = "test_string"
 # ENABLE_JOBS_SEARCH_ALERT_SUBSCRIPTIONS = False  # Uncomment to disable
 
 
+# Wagtail Search - Uncomment to use a personal Bonsai elasticsearch instance.
 # NB we're not overriding all of this, only the URL, but because of the order of imports
 # it's easier just to paste the lot
-PERSONAL_BONSAI_URL = "See docs. Get a free sandbox Bonsai instance from bonsai.io"
-WAGTAILSEARCH_BACKENDS = {
-    "default": {
-        "BACKEND": "bc.search.elasticsearch7",
-        "URLS": [PERSONAL_BONSAI_URL],
-        "INDEX": "wagtail",
-        "TIMEOUT": 5,
-        "OPTIONS": {},
-        "INDEX_SETTINGS": {
-            "settings": {
-                "index": {"number_of_shards": 1, "number_of_replicas": 0},
-                "analysis": {
-                    "analyzer": {
-                        "default": {
-                            "tokenizer": "whitespace",
-                            "filter": [
-                                "lowercase",
-                                "synonym",  # see bc.search.elasticsearch7.SearchBackend
-                                "porter_stem",
-                                "english_stop_words",
-                            ]
-                        },
-                    },
-                    "filter": {
-                        "english_stop_words": {
-                            "type": "stop",
-                            "stopwords": "_english_",
-                        },
-                    },
-                },
-            },
-        }
-    }
-}
+# --------------------------------------------------------------------------------------
+# PERSONAL_BONSAI_URL = "See docs. Get a free sandbox Bonsai instance from bonsai.io"
+# WAGTAILSEARCH_BACKENDS = {
+#     "default": {
+#         "BACKEND": "bc.search.elasticsearch7",
+#         "URLS": [PERSONAL_BONSAI_URL],
+#         "INDEX": "wagtail",
+#         "TIMEOUT": 5,
+#         "OPTIONS": {},
+#         "INDEX_SETTINGS": {
+#             "settings": {
+#                 "index": {"number_of_shards": 1, "number_of_replicas": 0},
+#                 "analysis": {
+#                     "analyzer": {
+#                         "default": {
+#                             "tokenizer": "whitespace",
+#                             "filter": [
+#                                 "lowercase",
+#                                 "synonym",  # see bc.search.elasticsearch7.SearchBackend
+#                                 "porter_stem",
+#                                 "english_stop_words",
+#                             ]
+#                         },
+#                     },
+#                     "filter": {
+#                         "english_stop_words": {
+#                             "type": "stop",
+#                             "stopwords": "_english_",
+#                         },
+#                     },
+#                 },
+#             },
+#         }
+#     }
+# }
diff --git a/bc/static_src/sass/components/_cookie-message.scss b/bc/static_src/sass/components/_cookie-message.scss
@@ -32,7 +32,7 @@
     }
 
     &__message {
-        p {
+        p:not(.cookie__heading) {
             line-height: 1.5;
             margin-top: 0;
             margin-bottom: 0;

diff --git a/bc/static_src/sass/components/_link-block.scss b/bc/static_src/sass/components/_link-block.scss
@@ -6,18 +6,6 @@
         @include font-size(m);
     }
 
-    &__list {
-        display: none;
-
-        #{$root}--inlineindex & {
-            display: block;
-        }
-
-        @include media-query(px550) {
-            display: block;
-        }
-    }
-
     &__list-item {
         padding-left: 25px;
         margin-bottom: 5px;