From 92261d20e77d356c11cadb6ab5779cd9a75e82a6 Mon Sep 17 00:00:00 2001
From: Celia Collins
Date: Tue, 5 Mar 2024 13:41:44 +0000
Subject: [PATCH 1/3] Use govuk-task-list and markup correctly
---
app/assets/stylesheets/application.scss | 5 +-
app/assets/stylesheets/task-list.scss | 68 -------------------
...onal_document_validation_requests.html.erb | 24 ++++---
.../_change_request_state.html.erb | 12 ++--
...iption_change_validation_requests.html.erb | 24 ++++---
.../_fee_change_validation_requests.html.erb | 23 ++++---
..._other_change_validation_requests.html.erb | 24 ++++---
...p_certificate_validation_requests.html.erb | 23 ++++---
...ent_condition_validation_requests.html.erb | 24 ++++---
...undary_change_validation_requests.html.erb | 24 ++++---
...ment_document_validation_requests.html.erb | 24 ++++---
app/views/validation_requests/index.html.erb | 4 +-
12 files changed, 114 insertions(+), 165 deletions(-)
delete mode 100644 app/assets/stylesheets/task-list.scss
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 7ad79ca9..6915d9cc 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -4,7 +4,6 @@ $govuk-font-family: open-sans, sans-serif;
@import "accessible-autocomplete/dist/accessible-autocomplete.min";
@import "components/buttons";
@import "components/flashes";
-@import "task-list";
.image-border {
width: 276px;
@@ -30,3 +29,7 @@ $govuk-font-family: open-sans, sans-serif;
.govuk-tag {
max-width: none;
}
+
+.govuk-list--number ::marker {
+ font-weight: bold;
+}
diff --git a/app/assets/stylesheets/task-list.scss b/app/assets/stylesheets/task-list.scss
deleted file mode 100644
index 8cfe82d9..00000000
--- a/app/assets/stylesheets/task-list.scss
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ==========================================================================
- #TASK LIST
- ========================================================================== */
-
-.moj-task-list {
- list-style-type: none;
- padding-left: 0;
- margin-top: 0;
- margin-bottom: 0;
- @include govuk-media-query($from: tablet) {
- min-width: 550px;
- }
-}
-
-.moj-task-list__section {
- display: table;
- @include govuk-font($size:24, $weight: bold);
-}
-
-.moj-task-list__section-number {
- display: table-cell;
-
- @include govuk-media-query($from: tablet) {
- min-width: govuk-spacing(6);
- padding-right: 0;
- }
-}
-
-.moj-task-list__items {
- @include govuk-font($size: 19);
- @include govuk-responsive-margin(9, "bottom");
- list-style: none;
- padding-left: 0;
- @include govuk-media-query($from: tablet) {
- padding-left: govuk-spacing(6);
- }
-}
-
-.moj-task-list__item {
- border-bottom: 1px solid $govuk-border-colour;
- margin-bottom: 0 !important;
- padding-top: govuk-spacing(2);
- padding-bottom: govuk-spacing(2);
- @include govuk-clearfix;
-}
-
-.moj-task-list__item:first-child {
- border-top: 1px solid $govuk-border-colour;
-}
-
-.moj-task-list__task-name {
- display: block;
- @include govuk-media-query($from: 450px) {
- float: left;
- width: 75%;
- }
-}
-
-.moj-task-list__task-completed {
- margin-top: govuk-spacing(2);
- margin-bottom: govuk-spacing(1);
-
- @include govuk-media-query($from: 450px) {
- float: right;
- margin-top: 0;
- margin-bottom: 0;
- }
-}
diff --git a/app/views/validation_requests/_additional_document_validation_requests.html.erb b/app/views/validation_requests/_additional_document_validation_requests.html.erb
index 61acf9d3..f931c772 100644
--- a/app/views/validation_requests/_additional_document_validation_requests.html.erb
+++ b/app/views/validation_requests/_additional_document_validation_requests.html.erb
@@ -1,15 +1,17 @@
-
-
- <%= count_total_requests(@validation_requests, "additional_document_validation_requests") %> Provide new or missing documents
-
-
+-
+
+ Provide new or missing documents
+
+
<% @validation_requests["data"]["additional_document_validation_requests"].each do |change_request| %>
- -
- <% if change_request["state"] == "open" %>
- <%= link_to "New document", edit_additional_document_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
- <% else %>
- <%= link_to "New document", additional_document_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
- <% end %>
+
-
+
+ <% if change_request["state"] == "open" %>
+ <%= link_to "New document", edit_additional_document_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "govuk-link govuk-task-list__link" %>
+ <% else %>
+ <%= link_to "New document", additional_document_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "govuk-link govuk-task-list__link" %>
+ <% end %>
+
<%= render "validation_requests/change_request_state", change_request: change_request %>
diff --git a/app/views/validation_requests/_change_request_state.html.erb b/app/views/validation_requests/_change_request_state.html.erb
index de144023..d5dc389a 100644
--- a/app/views/validation_requests/_change_request_state.html.erb
+++ b/app/views/validation_requests/_change_request_state.html.erb
@@ -1,13 +1,13 @@
<% if change_request["state"] == 'open' %>
-
+
Not started
-
+
<% elsif change_request["state"] == 'cancelled' %>
-
+
Cancelled
-
+
<% else %>
-
+
Complete
-
+
<% end %>
diff --git a/app/views/validation_requests/_description_change_validation_requests.html.erb b/app/views/validation_requests/_description_change_validation_requests.html.erb
index aa43e454..666ff9c5 100644
--- a/app/views/validation_requests/_description_change_validation_requests.html.erb
+++ b/app/views/validation_requests/_description_change_validation_requests.html.erb
@@ -1,15 +1,17 @@
--
-
- 1. Confirm changes to your application description
-
-
+-
+
+ Confirm changes to your application description
+
+
<% @validation_requests["data"]["description_change_validation_requests"].each do |change_request| %>
- -
- <% if change_request["state"] == "open" %>
- <%= link_to "Description", edit_description_change_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
- <% else %>
- <%= link_to "Description", description_change_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
- <% end %>
+
-
+
+ <% if change_request["state"] == "open" %>
+ <%= link_to "Description", edit_description_change_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
+ <% else %>
+ <%= link_to "Description", description_change_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
+ <% end %>
+
<%= render "validation_requests/change_request_state", change_request: change_request %>
diff --git a/app/views/validation_requests/_fee_change_validation_requests.html.erb b/app/views/validation_requests/_fee_change_validation_requests.html.erb
index 5b309840..7281e917 100644
--- a/app/views/validation_requests/_fee_change_validation_requests.html.erb
+++ b/app/views/validation_requests/_fee_change_validation_requests.html.erb
@@ -1,16 +1,17 @@
--
-
- <%= count_total_requests(@validation_requests, "fee_change_validation_requests") %>
+
-
+
Respond to fee change request
-
-
+
<% @validation_requests["data"]["fee_change_validation_requests"].each do |change_request| %>
- -
- <% if change_request["state"] == "open" %>
- <%= link_to "Fee change", edit_fee_change_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
- <% else %>
- <%= link_to "Fee change", fee_change_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
- <% end %>
+
-
+
+ <% if change_request["state"] == "open" %>
+ <%= link_to "Fee change", edit_fee_change_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
+ <% else %>
+ <%= link_to "Fee change", fee_change_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
+ <% end %>
+
<%= render "validation_requests/change_request_state", change_request: change_request %>
diff --git a/app/views/validation_requests/_other_change_validation_requests.html.erb b/app/views/validation_requests/_other_change_validation_requests.html.erb
index e57b93a1..d84a3c0f 100644
--- a/app/views/validation_requests/_other_change_validation_requests.html.erb
+++ b/app/views/validation_requests/_other_change_validation_requests.html.erb
@@ -1,15 +1,17 @@
--
-
- <%= count_total_requests(@validation_requests, "other_change_validation_requests") %>Respond to other request
-
-
+-
+
+ Respond to other request
+
+
<% @validation_requests["data"]["other_change_validation_requests"].each do |change_request| %>
- -
- <% if change_request["state"] == "open" %>
- <%= link_to "Other request", edit_other_change_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
- <% else %>
- <%= link_to "Other request", other_change_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
- <% end %>
+
-
+
+ <% if change_request["state"] == "open" %>
+ <%= link_to "Other request", edit_other_change_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
+ <% else %>
+ <%= link_to "Other request", other_change_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
+ <% end %>
+
<%= render "validation_requests/change_request_state", change_request: change_request %>
diff --git a/app/views/validation_requests/_ownership_certificate_validation_requests.html.erb b/app/views/validation_requests/_ownership_certificate_validation_requests.html.erb
index eb7a4562..c48a4dfd 100644
--- a/app/views/validation_requests/_ownership_certificate_validation_requests.html.erb
+++ b/app/views/validation_requests/_ownership_certificate_validation_requests.html.erb
@@ -1,16 +1,17 @@
--
-
- <%= count_total_requests(@validation_requests, "ownership_certificate_validation_requests") %>
+
-
+
Confirm ownership of the land
-
-
+
<% @validation_requests["data"]["ownership_certificate_validation_requests"].each do |change_request| %>
- -
- <% if change_request["state"] == "open" %>
- <%= link_to "Confirm ownership", edit_ownership_certificate_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
- <% else %>
- <%= link_to "Confirm ownership", ownership_certificate_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
- <% end %>
+
-
+
+ <% if change_request["state"] == "open" %>
+ <%= link_to "Confirm ownership", edit_ownership_certificate_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
+ <% else %>
+ <%= link_to "Confirm ownership", ownership_certificate_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
+ <% end %>
+
<%= render "validation_requests/change_request_state", change_request: change_request %>
diff --git a/app/views/validation_requests/_pre_commencement_condition_validation_requests.html.erb b/app/views/validation_requests/_pre_commencement_condition_validation_requests.html.erb
index 4383aedd..ae5215d1 100644
--- a/app/views/validation_requests/_pre_commencement_condition_validation_requests.html.erb
+++ b/app/views/validation_requests/_pre_commencement_condition_validation_requests.html.erb
@@ -1,16 +1,18 @@
--
-
- <%= count_total_requests(@validation_requests, "pre_commencement_condition_validation_requests") %>Respond to pre-commencement conditions
-
-
+-
+
+ Respond to pre-commencement conditions
+
+
<% @validation_requests["data"]["pre_commencement_condition_validation_requests"].group_by{ |request| request["condition_id"] }.each do |id, group| %>
<% request = group.sort_by{ |request| request["created_at"] }.last %>
- -
- <% if request["state"] == "open" %>
- <%= link_to request["condition"]["title"], edit_pre_commencement_condition_validation_request_path(request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
- <% else %>
- <%= link_to request["condition"]["title"], pre_commencement_condition_validation_request_path(request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
- <% end %>
+
-
+
+ <% if request["state"] == "open" %>
+ <%= link_to request["condition"]["title"], edit_pre_commencement_condition_validation_request_path(request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
+ <% else %>
+ <%= link_to request["condition"]["title"], pre_commencement_condition_validation_request_path(request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
+ <% end %>
+
<%= render "validation_requests/change_request_state", change_request: request %>
diff --git a/app/views/validation_requests/_red_line_boundary_change_validation_requests.html.erb b/app/views/validation_requests/_red_line_boundary_change_validation_requests.html.erb
index f74ac153..ee6dcc28 100644
--- a/app/views/validation_requests/_red_line_boundary_change_validation_requests.html.erb
+++ b/app/views/validation_requests/_red_line_boundary_change_validation_requests.html.erb
@@ -1,15 +1,17 @@
--
-
- <%= count_total_requests(@validation_requests, "red_line_boundary_change_validation_requests") %>Confirm changes to your application's red line boundary
-
-
+-
+
+ Confirm changes to your application's red line boundary
+
+
<% @validation_requests["data"]["red_line_boundary_change_validation_requests"].each do |change_request| %>
- -
- <% if change_request["state"] == "open" %>
- <%= link_to "Red Line Boundary", edit_red_line_boundary_change_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
- <% else %>
- <%= link_to "Red Line Boundary", red_line_boundary_change_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
- <% end %>
+
-
+
+ <% if change_request["state"] == "open" %>
+ <%= link_to "Red Line Boundary", edit_red_line_boundary_change_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
+ <% else %>
+ <%= link_to "Red Line Boundary", red_line_boundary_change_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
+ <% end %>
+
<%= render "validation_requests/change_request_state", change_request: change_request %>
diff --git a/app/views/validation_requests/_replacement_document_validation_requests.html.erb b/app/views/validation_requests/_replacement_document_validation_requests.html.erb
index f56072eb..3c17517a 100644
--- a/app/views/validation_requests/_replacement_document_validation_requests.html.erb
+++ b/app/views/validation_requests/_replacement_document_validation_requests.html.erb
@@ -1,15 +1,17 @@
--
-
- <%= count_total_requests(@validation_requests, "replacement_document_validation_requests") %>Provide replacement documents
-
-
+-
+
+ Provide replacement documents
+
+
<% @validation_requests["data"]["replacement_document_validation_requests"].each do |change_request| %>
- -
- <% if change_request["state"] == "open" %>
- <%= link_to "#{change_request["old_document"]["name"]}", edit_replacement_document_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
- <% else %>
- <%= link_to "#{change_request["old_document"]["name"]}", replacement_document_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
- <% end %>
+
-
+
+ <% if change_request["state"] == "open" %>
+ <%= link_to "#{change_request["old_document"]["name"]}", edit_replacement_document_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
+ <% else %>
+ <%= link_to "#{change_request["old_document"]["name"]}", replacement_document_validation_request_path(change_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]), class: "moj-task-list__task-name" %>
+ <% end %>
+
<%= render "validation_requests/change_request_state", change_request: change_request %>
diff --git a/app/views/validation_requests/index.html.erb b/app/views/validation_requests/index.html.erb
index a998d920..7d7adb4f 100644
--- a/app/views/validation_requests/index.html.erb
+++ b/app/views/validation_requests/index.html.erb
@@ -11,7 +11,7 @@
<%= t(".the_case_officer") %>
- <%= t(".what_you_need") %>
+ <%= t(".what_you_need") %>
- <%= t(".each_link_below") %>
- <%= t(".click_on_each") %>
@@ -22,7 +22,7 @@
-
+
<% if @validation_requests["data"]["description_change_validation_requests"].present? %>
<%= render "description_change_validation_requests" %>
<% end %>
From 889fff2aa76419516f358b439935419f11a21e45 Mon Sep 17 00:00:00 2001
From: Celia Collins
Date: Tue, 5 Mar 2024 13:47:40 +0000
Subject: [PATCH 2/3] Add skip to content link
---
app/assets/stylesheets/application.scss | 6 ++++++
app/views/layouts/application.html.erb | 3 +++
2 files changed, 9 insertions(+)
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 6915d9cc..35744a6e 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -33,3 +33,9 @@ $govuk-font-family: open-sans, sans-serif;
.govuk-list--number ::marker {
font-weight: bold;
}
+
+.skip-to-content-link {
+ left: 50%;
+ position: absolute;
+ transform: translateY(-100%);
+}
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 9f66564f..371e4854 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,6 +1,9 @@
+
+ Skip to content
+
<%= content_for?(:page_title) ? yield(:page_title) : "Back-Office Planning System" %>
<%= csrf_meta_tags %>
From 0dd2c4325022b66b61618ff46a5991fe312237e8 Mon Sep 17 00:00:00 2001
From: Celia Collins
Date: Tue, 5 Mar 2024 14:01:30 +0000
Subject: [PATCH 3/3] Every apge has a title
---
.../edit.html.erb | 2 +-
.../show.html.erb | 2 +-
.../show.html.erb | 2 +-
.../fee_change_validation_requests/show.html.erb | 2 +-
app/views/neighbour_responses/_about_you.html.erb | 4 ++++
app/views/neighbour_responses/_check.html.erb | 4 ++++
app/views/neighbour_responses/_response.html.erb | 4 ++++
app/views/neighbour_responses/_thoughts.html.erb | 4 ++++
app/views/neighbour_responses/new.html.erb | 6 ++----
app/views/neighbour_responses/start.html.erb | 4 ++++
app/views/neighbour_responses/thank_you.html.erb | 4 ++++
.../other_change_validation_requests/show.html.erb | 2 +-
.../show.html.erb | 2 +-
app/views/ownership_certificates/edit.html.erb | 9 ++++-----
app/views/ownership_certificates/show.html.erb | 4 ++++
app/views/planning_applications/show.html.erb | 7 +++++++
.../show.html.erb | 2 +-
.../show.html.erb | 2 +-
.../show.html.erb | 2 +-
app/views/site_notices/download.html.erb | 2 ++
app/views/validation_requests/index.html.erb | 2 ++
config/locales/en.yml | 14 ++++++++++++++
spec/system/validation_request_spec.rb | 2 +-
23 files changed, 69 insertions(+), 19 deletions(-)
diff --git a/app/views/additional_document_validation_requests/edit.html.erb b/app/views/additional_document_validation_requests/edit.html.erb
index 014c2456..299a43d1 100644
--- a/app/views/additional_document_validation_requests/edit.html.erb
+++ b/app/views/additional_document_validation_requests/edit.html.erb
@@ -1,5 +1,5 @@
<% content_for :page_title do %>
- Additional document validation request #<%= @validation_request["id"] %> - Back-Office Planning System
+ <%= t(".page_title", id: @validation_request["id"]) %>
<% end %>
diff --git a/app/views/additional_document_validation_requests/show.html.erb b/app/views/additional_document_validation_requests/show.html.erb
index 786b743a..2923e029 100644
--- a/app/views/additional_document_validation_requests/show.html.erb
+++ b/app/views/additional_document_validation_requests/show.html.erb
@@ -1,5 +1,5 @@
<% content_for :page_title do %>
- Additional document validation request #<%= @validation_request["id"] %> - Back-Office Planning System
+ <%= t(".page_title", id: @validation_request["id"]) %>
<% end %>
diff --git a/app/views/description_change_validation_requests/show.html.erb b/app/views/description_change_validation_requests/show.html.erb
index 32d95f7e..c946a862 100644
--- a/app/views/description_change_validation_requests/show.html.erb
+++ b/app/views/description_change_validation_requests/show.html.erb
@@ -1,5 +1,5 @@
<% content_for :page_title do %>
- Description change validation request #<%= @validation_request["id"] %> - Back-Office Planning System
+ <%= t(".page_title", id: @validation_request["id"]) %>
<% end %>
diff --git a/app/views/fee_change_validation_requests/show.html.erb b/app/views/fee_change_validation_requests/show.html.erb
index c962301f..b804e3c2 100644
--- a/app/views/fee_change_validation_requests/show.html.erb
+++ b/app/views/fee_change_validation_requests/show.html.erb
@@ -1,5 +1,5 @@
<% content_for :page_title do %>
- Other change validation request #<%= @validation_request["id"] %> - Back-Office Planning System
+ <%= t(".page_title", id: @validation_request["id"]) %>
<% end %>
diff --git a/app/views/neighbour_responses/_about_you.html.erb b/app/views/neighbour_responses/_about_you.html.erb
index e70157e6..a46230c6 100644
--- a/app/views/neighbour_responses/_about_you.html.erb
+++ b/app/views/neighbour_responses/_about_you.html.erb
@@ -1,3 +1,7 @@
+<% content_for :page_title do %>
+ About you
+<% end %>
+