Merge pull request #425 from epimorphics/issue/409-a11y

Issue/409 a11y
epimorphics · Aug 16, 2024 · 412cc21 · 412cc21
2 parents 3cf2137 + f156029
commit 412cc21
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## 1.7.5 - 2024-08
 
+- (Bogdan) Fixed a duplicate character bug when selecting dates
+- (Bogdan) Added page titles for each individual view [GH-409](https://github.com/epimorphics/ukhpi/issues/409)
 - (Bogdan) Set correct values for `aria-label` link attributes on the about page
   [GH-413](https://github.com/epimorphics/ukhpi/issues/413)
 - (Bogdan) Increased contrast for compare location dropdowns [GH-412](https://github.com/epimorphics/ukhpi/issues/412)

diff --git a/app/views/browse/show.html.haml b/app/views/browse/show.html.haml
@@ -1,3 +1,5 @@
+= content_for(:title, t('browse.show.main_heading'))
+
 .grid-row
   .column-full
     %article

diff --git a/app/views/changelog/_changelog_cy.html.haml b/app/views/changelog/_changelog_cy.html.haml
@@ -1,5 +1,8 @@
+= content_for(:title, "Hanes Newid")
+
 %section#main.c-changelog
-  %h1.heading-large Mynegai Prisiau Tai y DU: hanes newid
+  %h1.heading-large
+    = I18n.t('common.header.app_title') + " : " + yield(:title)
 
   %h2.heading-medium Ebrill 2023 &ndash; Newidiadau i ddaearyddiaeth awdurdodau lleol yn Lloegr
 

diff --git a/app/views/changelog/_changelog_en.html.haml b/app/views/changelog/_changelog_en.html.haml
@@ -1,5 +1,8 @@
+= content_for(:title, "Change History")
+
 %section#main.c-changelog
-  %h1.heading-large UK House Price Index: change history
+  %h1.heading-large
+    = I18n.t('common.header.app_title') + " : " + yield(:title)
 
   %h2.heading-medium April 2023 &ndash; Changes to local authority geography in England
 

diff --git a/app/views/compare/show.html.haml b/app/views/compare/show.html.haml
@@ -1,3 +1,5 @@
+= content_for(:title, t('compare.show.heading'))
+
 .grid-row
   .column-full
     %article.c-compare

diff --git a/app/views/doc/_about_ukhpi_cy.html.haml b/app/views/doc/_about_ukhpi_cy.html.haml
@@ -1,4 +1,7 @@
-%h1.heading-large Data Cysylltiedig Mynegai Prisiau Tai y DU
+= content_for(:title, "Am")
+
+%h1.heading-large
+  = I18n.t('common.header.app_title') + " : " + yield(:title)
 
 %h2.heading-medium
   Beth sydd wedi ei gynnwys yn Set Ddata’r Mynegai Prisiau Tai?

diff --git a/app/views/doc/_about_ukhpi_en.html.haml b/app/views/doc/_about_ukhpi_en.html.haml
@@ -1,4 +1,7 @@
-%h1.heading-large UK House Price Index Linked Data
+= content_for(:title, "About")
+
+%h1.heading-large
+  = I18n.t('common.header.app_title') + " : " + yield(:title)
 
 %h2.heading-medium
   What does the House Price Index Dataset consist of?

diff --git a/app/views/landing/_index_cy.html.haml b/app/views/landing/_index_cy.html.haml
@@ -1,5 +1,6 @@
 %section#main.c-landing-page.u-lang--en
-  %h1.heading-large Mynegai Prisiau Tai y DU
+  %h1.heading-large
+    = I18n.t('common.header.app_title')
 
   %p
     Defnyddiwch y teclyn chwilio i weld tueddiadau prisiau tai yn y DU:

diff --git a/app/views/landing/_index_en.html.haml b/app/views/landing/_index_en.html.haml
@@ -1,5 +1,6 @@
 %section#main.c-landing-page.u-lang--en
-  %h1.heading-large UK House Price Index
+  %h1.heading-large
+    = I18n.t('common.header.app_title')
 
   %p
     Use the search tool to find house price trends in the UK:

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -5,7 +5,7 @@
     %meta{ 'http-equiv' => 'x-ua-compatible', content: 'ie=edge' }
     %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no' }
     %title
-      = I18n.t('common.header.app_title')
+      = (yield(:title) + " - " unless yield(:title).blank?).to_s + I18n.t('common.header.app_title')
     - if Rails.env.production?
       = render partial: 'common/google-analytics'
       = javascript_include_tag 'cookie', defer: true

diff --git a/app/views/layouts/print.html.haml b/app/views/layouts/print.html.haml
@@ -5,7 +5,7 @@
     %meta{ 'http-equiv' => 'x-ua-compatible', content: 'ie=edge' }
     %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no' }
     %title
-      = I18n.t('common.header.app_title')
+      = (yield(:title) + " - " unless yield(:title).blank?).to_s + I18n.t('common.header.app_title')
     - if Rails.env.production?
       = render partial: 'common/google-analytics'
       = csrf_meta_tags

diff --git a/app/views/layouts/webpack_application.html.haml b/app/views/layouts/webpack_application.html.haml
@@ -5,7 +5,7 @@
     %meta{ 'http-equiv' => 'x-ua-compatible', content: 'ie=edge' }
     %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1, shrink-to-fit=no' }
     %title
-      = I18n.t('common.header.app_title')
+      = (yield(:title) + " - " unless yield(:title).blank?).to_s + I18n.t('common.header.app_title')
     :javascript
       document.querySelector('html').classList.add('js');
       window.ukhpi = window.ukhpi || {};

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
@@ -238,8 +238,8 @@ cy:
     dates_picker:
       select_dates: "newid dyddiad dechrau neu ddiwedd"
       date_range_prompt: "Newid amrediad y dyddiadau"
-      start: "Dechrau:"
-      end: "Diwedd:"
+      start: "Dechrau"
+      end: "Diwedd"
 
   date:
     abbr_day_names:

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -238,8 +238,8 @@ en:
     dates_picker:
       select_dates: "change start or end date"
       date_range_prompt: "Change the date range"
-      start: "Start:"
-      end: "End:"
+      start: "Start"
+      end: "End"
 
 # old-------------