From 690fcc5217415bacf246bc676292ba447421d0c2 Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Fri, 16 Aug 2024 11:21:06 +0100 Subject: [PATCH 1/3] updates page titles --- CHANGELOG.md | 1 + app/views/download_report/bad_request.html.haml | 2 ++ app/views/landing/index.html.haml | 4 +++- app/views/report_design/review_report.html.haml | 2 ++ app/views/report_design/select_aggregation_type.html.haml | 2 ++ app/views/report_design/select_area_type.html.haml | 2 ++ app/views/report_design/select_country.html.haml | 2 ++ app/views/report_design/select_county.html.haml | 2 ++ app/views/report_design/select_dates.html.haml | 2 ++ app/views/report_design/select_district.html.haml | 2 ++ app/views/report_design/select_options.html.haml | 2 ++ app/views/report_design/select_pc_area.html.haml | 2 ++ app/views/report_design/select_pc_district.html.haml | 2 ++ app/views/report_design/select_pc_sector.html.haml | 2 ++ app/views/report_design/select_region.html.haml | 2 ++ app/views/report_design/select_report.html.haml | 2 ++ 16 files changed, 32 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aff8de0..0eab42d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 1.5.3 - 2024-08 +- (Dan) Updates the page titles throughout the app [116](https://github.com/epimorphics/standard-reports-ui/issues/116) - (Dan) Updates the button text on reports page to be dynamic and adds aria labels to help screen readers [119](https://github.com/epimorphics/standard-reports-ui/issues/119) - (Dan) Update the error message for the postcode selectors step 3/7 [120](https://github.com/epimorphics/standard-reports-ui/issues/120) - (Dan) Update the error message for the postcode selectors step 3/7 [120](https://github.com/epimorphics/standard-reports-ui/issues/120) diff --git a/app/views/download_report/bad_request.html.haml b/app/views/download_report/bad_request.html.haml index dab30a8..d25c355 100644 --- a/app/views/download_report/bad_request.html.haml +++ b/app/views/download_report/bad_request.html.haml @@ -1,3 +1,5 @@ += content_for(:title, "Invalid request".html_safe) + %h1.heading-large Invalid request %p diff --git a/app/views/landing/index.html.haml b/app/views/landing/index.html.haml index 4fe612f..0ee78c1 100644 --- a/app/views/landing/index.html.haml +++ b/app/views/landing/index.html.haml @@ -1,5 +1,7 @@ += content_for(:title, 'Price Paid Data – Standard Reports'.html_safe) + %h1.heading-large - Price Paid Data – Standard Reports + = yield(:title) %p HM Land Registry publishes open data on prices paid for properties sold in England and Wales. For customers who want diff --git a/app/views/report_design/review_report.html.haml b/app/views/report_design/review_report.html.haml index 80b2c34..75e3048 100644 --- a/app/views/report_design/review_report.html.haml +++ b/app/views/report_design/review_report.html.haml @@ -1,3 +1,5 @@ += content_for(:title, "Your report file".html_safe) + = render partial: "help" .review-report diff --git a/app/views/report_design/select_aggregation_type.html.haml b/app/views/report_design/select_aggregation_type.html.haml index d56d040..7472aeb 100644 --- a/app/views/report_design/select_aggregation_type.html.haml +++ b/app/views/report_design/select_aggregation_type.html.haml @@ -1,3 +1,5 @@ += content_for(:title, "#{@workflow.step_progress_summary} – Report Design".html_safe) + = render partial: "help" .select-aggregation-type diff --git a/app/views/report_design/select_area_type.html.haml b/app/views/report_design/select_area_type.html.haml index 1826c1e..35a1448 100644 --- a/app/views/report_design/select_area_type.html.haml +++ b/app/views/report_design/select_area_type.html.haml @@ -1,3 +1,5 @@ += content_for(:title, "#{@workflow.step_progress_summary} – Report Design".html_safe) + = render partial: "help" .select-area-type diff --git a/app/views/report_design/select_country.html.haml b/app/views/report_design/select_country.html.haml index b2a042b..0223440 100644 --- a/app/views/report_design/select_country.html.haml +++ b/app/views/report_design/select_country.html.haml @@ -1,3 +1,5 @@ += content_for(:title, "#{@workflow.step_progress_summary} – Report Design".html_safe) + = render partial: "help" .select-country diff --git a/app/views/report_design/select_county.html.haml b/app/views/report_design/select_county.html.haml index 95f770c..c358fac 100644 --- a/app/views/report_design/select_county.html.haml +++ b/app/views/report_design/select_county.html.haml @@ -1,3 +1,5 @@ += content_for(:title, "#{@workflow.step_progress_summary} – Report Design".html_safe) + = render partial: "help" .select-county diff --git a/app/views/report_design/select_dates.html.haml b/app/views/report_design/select_dates.html.haml index ef86ff5..2c319e7 100644 --- a/app/views/report_design/select_dates.html.haml +++ b/app/views/report_design/select_dates.html.haml @@ -1,3 +1,5 @@ += content_for(:title, "#{@workflow.step_progress_summary} – Report Design".html_safe) + = render partial: "help" - step = @workflow.current_step - values = step.values( @workflow ) diff --git a/app/views/report_design/select_district.html.haml b/app/views/report_design/select_district.html.haml index 8acb570..635bbda 100644 --- a/app/views/report_design/select_district.html.haml +++ b/app/views/report_design/select_district.html.haml @@ -1,3 +1,5 @@ += content_for(:title, "#{@workflow.step_progress_summary} – Report Design".html_safe) + = render partial: "help" .select-district diff --git a/app/views/report_design/select_options.html.haml b/app/views/report_design/select_options.html.haml index abe0893..ec35ced 100644 --- a/app/views/report_design/select_options.html.haml +++ b/app/views/report_design/select_options.html.haml @@ -1,3 +1,5 @@ += content_for(:title, "#{@workflow.step_progress_summary} – Report Design".html_safe) + = render partial: "help" .select-options diff --git a/app/views/report_design/select_pc_area.html.haml b/app/views/report_design/select_pc_area.html.haml index a67aef1..2c976e9 100644 --- a/app/views/report_design/select_pc_area.html.haml +++ b/app/views/report_design/select_pc_area.html.haml @@ -1,3 +1,5 @@ += content_for(:title, "#{@workflow.step_progress_summary} – Report Design".html_safe) + = render partial: "help" .select-pc-area diff --git a/app/views/report_design/select_pc_district.html.haml b/app/views/report_design/select_pc_district.html.haml index 3ae1cc5..bdb0a73 100644 --- a/app/views/report_design/select_pc_district.html.haml +++ b/app/views/report_design/select_pc_district.html.haml @@ -1,3 +1,5 @@ += content_for(:title, "#{@workflow.step_progress_summary} – Report Design".html_safe) + = render partial: "help" .select-pc-district diff --git a/app/views/report_design/select_pc_sector.html.haml b/app/views/report_design/select_pc_sector.html.haml index 37586fb..f70eac2 100644 --- a/app/views/report_design/select_pc_sector.html.haml +++ b/app/views/report_design/select_pc_sector.html.haml @@ -1,3 +1,5 @@ += content_for(:title, "#{@workflow.step_progress_summary} – Report Design".html_safe) + = render partial: "help" .select-pc-sector diff --git a/app/views/report_design/select_region.html.haml b/app/views/report_design/select_region.html.haml index 6a82384..20736a3 100644 --- a/app/views/report_design/select_region.html.haml +++ b/app/views/report_design/select_region.html.haml @@ -1,3 +1,5 @@ += content_for(:title, "#{@workflow.step_progress_summary} – Report Design".html_safe) + = render partial: "help" .select-region diff --git a/app/views/report_design/select_report.html.haml b/app/views/report_design/select_report.html.haml index 88affb0..ea82630 100644 --- a/app/views/report_design/select_report.html.haml +++ b/app/views/report_design/select_report.html.haml @@ -1,3 +1,5 @@ += content_for(:title, "#{@workflow.step_progress_summary} – Report Design".html_safe) + - step = @workflow.current_step - step_values = step.values( @workflow ) From f9b85278cdd3f7c3975ee04748b8dc49383610e3 Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Fri, 16 Aug 2024 13:41:38 +0100 Subject: [PATCH 2/3] removes html_safe and drys code --- app/views/download_report/bad_request.html.haml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/download_report/bad_request.html.haml b/app/views/download_report/bad_request.html.haml index d25c355..57e57a9 100644 --- a/app/views/download_report/bad_request.html.haml +++ b/app/views/download_report/bad_request.html.haml @@ -1,6 +1,7 @@ -= content_for(:title, "Invalid request".html_safe) += content_for(:title, "Invalid request") -%h1.heading-large Invalid request +%h1.heading-large + = yield(:title) %p Your request could not be processed, due to: From 55f065ea1f1593642f28e4e14f3bd24b748b12b9 Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Fri, 16 Aug 2024 13:42:30 +0100 Subject: [PATCH 3/3] removes html_safe from report file --- app/views/report_design/review_report.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/report_design/review_report.html.haml b/app/views/report_design/review_report.html.haml index 75e3048..09c2904 100644 --- a/app/views/report_design/review_report.html.haml +++ b/app/views/report_design/review_report.html.haml @@ -1,4 +1,4 @@ -= content_for(:title, "Your report file".html_safe) += content_for(:title, "Your report file") = render partial: "help" .review-report