<%= @duplicate_logs.count == 1 ? "This log" : "These logs" %> will be deleted:
- 2.1. In this Agreement the following words and phrases shall have the following meanings, unless expressly stated to the contrary:
- 2.2. Headings are included in this Agreement for ease of reference only and shall not affect the interpretation or construction of this Agreement.
2.3. References in this Agreement to Clauses, Paragraphs and Annexes are, unless otherwise provided, references to the Clauses, Paragraphs and Annexes of this Agreement.
2.4. In the event and to the extent only of any conflict or inconsistency between the provisions of this Agreement and the provisions of any document referred to or referenced herein, the provisions of this Agreement shall prevail.
@@ -95,11 +91,13 @@
8.5. All work carried out by MHCLG will follow appropriate security measures and procedures to ensure the protection of the data.
9.1. CORE data providers and MHCLG agree that they shall:
- 9.2. The data providers and MHCLG shall comply at all times with the Data Protection Legislation and shall ensure that they each perform their obligations under this agreement in full compliance with the Data Protection Legislation and any other applicable law, in particular the Human Rights Act 1998 and the common law duty of confidentiality.
9.3. CORE data providers should limit access to CORE to a small number of individuals who can be named on request. CORE access is limited to registered users only via password, but it is the responsibility of the CORE data providers to ensure that all individuals granted access to the datasets should be briefed on the legal requirements around handling and storing the Data from CORE.
16.1. The Parties shall comply with all relevant legislation, regulations, orders, statutory instruments and any amendments or re-enactments thereof from the commencement of this agreement.
As witness of which the parties have set their hands on the day and year first above written
signed for and on behalf of the Data Protection Officer for <%= org_name_for_data_sharing_agreement(@data_protection_confirmation, current_user) %>, by:
- SIGNED for and on behalf of the deputy director of the data, analytics & statistics in the Ministry of Housing, Communities and Local Government, by:
-
diff --git a/app/views/organisations/duplicate_schemes.html.erb b/app/views/organisations/duplicate_schemes.html.erb
index 79f7d435f..a1f341f7f 100644
--- a/app/views/organisations/duplicate_schemes.html.erb
+++ b/app/views/organisations/duplicate_schemes.html.erb
@@ -29,11 +29,11 @@
Since your organisation recently merged, we’ve reviewed your schemes for possible duplicates.
These sets of schemes and locations might be duplicates because they have the same answers for certain fields.
What you need to do
-
- - Review each set of schemes or locations and decide if they are duplicates.
- - If they are, choose one to keep and deactivate the others on the date your organisation merged.
- - When you have resolved all duplicates, confirm below.
-
+ <%= govuk_list [
+ "Review each set of schemes or locations and decide if they are duplicates.",
+ "If they are, choose one to keep and deactivate the others on the date your organisation merged.",
+ "When you have resolved all duplicates, confirm below.",
+ ], type: :bullet %>
If you need help with this, <%= govuk_link_to "contact the helpdesk (opens in a new tab)", GlobalConstants::HELPDESK_URL, target: "#" %>.
<% if @duplicate_schemes.any? %>
@@ -43,17 +43,17 @@
These schemes have the same answers for the following fields:
-
- - Type of scheme
- - Registered under Care Standards Act 2000
- - Housing stock owned by
- - Support services provided by
- - Primary client group
- - Has another client group
- - Secondary client group
- - Level of support given
- - Intended length of stay
-
+ <%= govuk_list [
+ "Type of scheme",
+ "Registered under Care Standards Act 2000",
+ "Housing stock owned by",
+ "Support services provided by",
+ "Primary client group",
+ "Has another client group",
+ "Secondary client group",
+ "Level of support given",
+ "Intended length of stay",
+ ], type: :bullet %>
<% end %>
The links below open in a new tab.
@@ -68,13 +68,7 @@
<% @duplicate_schemes.each do |duplicate_set| %>
<% body.with_row do |row| %>
<% row.with_cell do %>
-
- <% duplicate_set.each do |scheme| %>
- -
- <%= govuk_link_to scheme.service_name, scheme, target: "#" %>
-
- <% end %>
-
+ <%= govuk_list duplicate_set.map { |scheme| govuk_link_to(scheme.service_name, scheme, target: "#") }, type: :number %>
<% end %>
<% end %>
<% end %>
@@ -89,10 +83,7 @@
These locations belong to the same scheme and have the same answers for the following fields:
-
- - Postcode
- - Mobility standards
-
+ <%= govuk_list ["Postcode", "Mobility standards"], type: :bullet %>
<% end %>
The links below open in a new tab.
@@ -108,13 +99,7 @@
<% @duplicate_locations.each do |duplicate_set| %>
<% body.with_row do |row| %>
<% row.with_cell do %>
-
- <% duplicate_set[:locations].each do |location| %>
- -
- <%= govuk_link_to location.name, scheme_location_path(location), target: "#" %>
-
- <% end %>
-
+ <%= govuk_list duplicate_set[:locations].map { |location| govuk_link_to(location.name, scheme_location_path(location), target: "#") }, type: :number %>
<% end %>
<% row.with_cell do %>
<%= govuk_link_to duplicate_set[:scheme].service_name, duplicate_set[:scheme], target: "#" %>
diff --git a/app/views/schemes/changes.html.erb b/app/views/schemes/changes.html.erb
index 9040d7a05..03ec75e0c 100644
--- a/app/views/schemes/changes.html.erb
+++ b/app/views/schemes/changes.html.erb
@@ -15,11 +15,11 @@
We have restructured the way we group supported housing scheme data.
On old CORE, a scheme’s data was split into management group and scheme. On new CORE, the data is split into scheme and location.
These are the main changes:
-
- - Schemes now store data about the stock owner and support provider. This was previously stored in management group.
- - Schemes still store data about the type of support, as they did in old CORE.
- - Schemes no longer store data about postcodes where support is provided. These are now in locations.
-
+ <%= govuk_list [
+ "Schemes now store data about the stock owner and support provider. This was previously stored in management group.",
+ "Schemes still store data about the type of support, as they did in old CORE.",
+ "Schemes no longer store data about postcodes where support is provided. These are now in locations.",
+ ], type: :bullet %>
This new structure means data coordinators only needs to fill in support details once.
How schemes are migrated from old CORE
If your organisation has migrated from old CORE to new CORE, your existing schemes are on the <%= govuk_link_to("schemes page", schemes_path) %>, with the same details.
diff --git a/app/views/start/guidance.html.erb b/app/views/start/guidance.html.erb
index 6fbd157f0..367c6f05f 100644
--- a/app/views/start/guidance.html.erb
+++ b/app/views/start/guidance.html.erb
@@ -21,46 +21,50 @@
<%= accordion.with_section(heading_text: "Types of lettings you should create logs for") do %>
You’ll need to create a log for:
-
- - Tenants in general needs housing allocated a new letting. This includes tenants moving into the social rented sector from outside, existing social tenants moving between properties or landlords, and existing social tenants renewing lettings in the same property. If fixed-term and social or affordable rent, only include tenancies of 2 years or more.
- - Tenants in supported housing (social housing, sheltered accommodation and care homes) allocated a new letting. This includes tenants moving into the social rented sector from outside, existing social tenants moving between properties or landlords, and existing social tenants renewing lettings in the same property. All supported housing tenancies should be reported regardless of length.
- - Starter tenancies provided by local authorities (LAs) and lettings with an introductory period provided by private registered providers (PRPs) should be completed in CORE at the beginning of the starter or introductory period. The tenancy type and length entered should be based on the tenancy the tenant will roll onto once the starter or introductory period has been completed. You do not need to submit another CORE log once the period has been completed.
- - Room moves within a shared housing unit that result in a different property type or support needs – this is classed as an internal transfer of an existing social tenant to another property.
- - Existing tenants who are issued with a new tenancy agreement when stock is acquired, transferred or permanently decanted.
- - Tenants under the Rough Sleepers Initiative or Rough Sleeping Accommodation Programme, where accommodation is permanent.
- - Households previously provided with temporary accommodation to meet a duty under the homelessness legislation who are allocated a tenancy as a settled home ending the duty (this may be the same property).
- - Refugees and asylum seekers who have been granted indefinite leave to remain, humanitarian protection or exceptional leave to remain.
- - Affordable Rent lettings – where up to 80% of market rent can be charged and a new supply agreement is signed.
- - London Affordable Rent lettings – a type of Affordable Rent available in London through the Greater London Authority (GLA).
- - Intermediate Rent lettings – where the rent must not exceed 80% of the current market rate (including any service charges).
- - Rent to Buy lettings – where a discount of up to 20% market rent is charged for a single rental period for a minimum of 5 years. After that period, the tenant is offered the chance to purchase the property (either shared ownership or outright) at full market value.
- - London Living Rent lettings – a type of Intermediate Rent available in London through the Greater London Authority (GLA).
-
+ <%= govuk_list [
+ "Tenants in general needs housing allocated a new letting. This includes tenants moving into the social rented sector from outside, existing social tenants moving between properties or landlords, and existing social tenants renewing lettings in the same property. If fixed-term and social or affordable rent, only include tenancies of 2 years or more.",
+ "Tenants in supported housing (social housing, sheltered accommodation and care homes) allocated a new letting. This includes tenants moving into the social rented sector from outside, existing social tenants moving between properties or landlords, and existing social tenants renewing lettings in the same property. All supported housing tenancies should be reported regardless of length.",
+ "Starter tenancies provided by local authorities (LAs) and lettings with an introductory period provided by private registered providers (PRPs) should be completed in CORE at the beginning of the starter or introductory period. The tenancy type and length entered should be based on the tenancy the tenant will roll onto once the starter or introductory period has been completed. You do not need to submit another CORE log once the period has been completed.",
+ "Room moves within a shared housing unit that result in a different property type or support needs – this is classed as an internal transfer of an existing social tenant to another property.",
+ "Existing tenants who are issued with a new tenancy agreement when stock is acquired, transferred or permanently decanted.",
+ "Tenants under the Rough Sleepers Initiative or Rough Sleeping Accommodation Programme, where accommodation is permanent.",
+ "Households previously provided with temporary accommodation to meet a duty under the homelessness legislation who are allocated a tenancy as a settled home ending the duty (this may be the same property).",
+ "Refugees and asylum seekers who have been granted indefinite leave to remain, humanitarian protection or exceptional leave to remain.",
+ "Affordable Rent lettings – where up to 80% of market rent can be charged and a new supply agreement is signed.",
+ "London Affordable Rent lettings – a type of Affordable Rent available in London through the Greater London Authority (GLA).",
+ "Intermediate Rent lettings – where the rent must not exceed 80% of the current market rate (including any service charges).",
+ "Rent to Buy lettings – where a discount of up to 20% market rent is charged for a single rental period for a minimum of 5 years. After that period, the tenant is offered the chance to purchase the property (either shared ownership or outright) at full market value.",
+ "London Living Rent lettings – a type of Intermediate Rent available in London through the Greater London Authority (GLA).",
+ ],
+ type: :bullet %>
<% end %>
<%= accordion.with_section(heading_text: "Types of lettings you should not create logs for") do %>
You don’t need to create a log for:
-
- - Temporary general needs housing with a fixed period of less than 2 years if they are social or affordable rent. (Temporary lettings for intermediate rent and supported housing should be recorded).
- - Starter tenancies or lettings with an introductory period that roll onto or convert into the main tenancy. The CORE log should be completed at the beginning of this period.
- - Changes from sole to joint or joint to sole tenancies, where the number of people in the household has not changed.
- - Moves within a shared housing unit resulting in the same support needs or property type, even if a new tenancy or licence agreement is issued.
- - Lettings where no new tenancy agreement is signed.
- - Where stock is acquired, transferred or permanently decanted and the existing tenants are not issued with a new tenancy agreement.
- - Mutual exchanges including lettings where registered provider tenants have exchanged homes, for example through the national HOMESWAP system.
- - Successions and assignments.
- - Demotion of a secure or assured tenancy, and any subsequent conversion of the demoted tenancy to a secure or assured tenancy.
- - Lettings made to asylum seekers who are awaiting a decision on their applications for asylum under the Immigration and Asylum Act 1999.
- - Non-social lettings, including market-rented properties, employer-provided housing where the employer provides financial support, homes for staff of social landlords linked to employment, homes social landlords manage for organisations who are not social landlords, homes social landlords own but lease in entirety to organisations who are not social landlords, and freehold housing with variable charges for services and communal facilities.
-
+ <%= govuk_list [
+ "Temporary general needs housing with a fixed period of less than 2 years if they are social or affordable rent. (Temporary lettings for intermediate rent and supported housing should be recorded).",
+ "Starter tenancies or lettings with an introductory period that roll onto or convert into the main tenancy. The CORE log should be completed at the beginning of this period.",
+ "Changes from sole to joint or joint to sole tenancies, where the number of people in the household has not changed.",
+ "Moves within a shared housing unit resulting in the same support needs or property type, even if a new tenancy or licence agreement is issued.",
+ "Lettings where no new tenancy agreement is signed.",
+ "Where stock is acquired, transferred or permanently decanted and the existing tenants are not issued with a new tenancy agreement.",
+ "Mutual exchanges including lettings where registered provider tenants have exchanged homes, for example through the national HOMESWAP system.",
+ "Successions and assignments.",
+ "Demotion of a secure or assured tenancy, and any subsequent conversion of the demoted tenancy to a secure or assured tenancy.",
+ "Lettings made to asylum seekers who are awaiting a decision on their applications for asylum under the Immigration and Asylum Act 1999.",
+ "Non-social lettings, including market-rented properties, employer-provided housing where the employer provides financial support, homes for staff of social landlords linked to employment, homes social landlords manage for organisations who are not social landlords, homes social landlords own but lease in entirety to organisations who are not social landlords, and freehold housing with variable charges for services and communal facilities.",
+ ],
+ type: :bullet %>
<% end %>
<%= accordion.with_section(heading_text: "What if someone is reluctant to answer any questions?") do %>
If a tenant or buyer is reluctant to answer questions as part of a log, you should explain that:
-
- - all information they provide is anonymous and will not affect their housing, benefits or other services they receive.
- - the data they provide is vital in helping to build a complete picture of social housing in England and is used to inform social housing policy.
-
+ <%= govuk_list [
+ "all information they provide is anonymous and will not affect their housing, benefits or other services they receive.",
+ "the data they provide is vital in helping to build a complete picture of social housing in England and is used to inform social housing policy.",
+ ],
+ type: :bullet %>
+
If a tenant or buyer is still unwilling or unable to answer questions, select the ‘Don’t know’ or ‘Tenant/person prefers not to say’ options.
<% end %>
<% end %>
diff --git a/package.json b/package.json
index ef37dc8aa..32063907c 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
"css-loader": "^6.7.1",
"custom-event-polyfill": "^1.0.7",
"file-loader": "^6.2.0",
- "govuk-frontend": "5.1.0",
+ "govuk-frontend": "5.7.1",
"html5shiv": "^3.7.3",
"intersection-observer": "^0.12.0",
"mini-css-extract-plugin": "^2.6.0",
diff --git a/spec/components/primary_navigation_component_spec.rb b/spec/components/primary_navigation_component_spec.rb
index f5f41bff0..aeefa6130 100644
--- a/spec/components/primary_navigation_component_spec.rb
+++ b/spec/components/primary_navigation_component_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe PrimaryNavigationComponent, type: :component do
it "then that item appears as selected" do
result = render_inline(described_class.new(items:))
- expect(result.css('.app-primary-navigation__link[aria-current="page"]').text).to include("Organisations")
+ expect(result.css('.govuk-service-navigation__link[aria-current="page"]').text).to include("Organisations")
end
end
diff --git a/spec/requests/auth/passwords_controller_spec.rb b/spec/requests/auth/passwords_controller_spec.rb
index 7f9bdfa30..f35df1c5a 100644
--- a/spec/requests/auth/passwords_controller_spec.rb
+++ b/spec/requests/auth/passwords_controller_spec.rb
@@ -70,7 +70,7 @@ RSpec.describe Auth::PasswordsController, type: :request do
put "/account/password", params: update_password_params
# Devise redirects once after re-sign in with new password and then root redirects as well.
follow_redirect!
- expect(page).to have_css("div", class: "govuk-notification-banner__heading", text: message)
+ expect(page).to have_css("p", class: "govuk-notification-banner__heading", text: message)
end
end
end
diff --git a/spec/requests/organisation_relationships_controller_spec.rb b/spec/requests/organisation_relationships_controller_spec.rb
index 8733fba4b..1b1b3169e 100644
--- a/spec/requests/organisation_relationships_controller_spec.rb
+++ b/spec/requests/organisation_relationships_controller_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
end
it "shows the tab navigation" do
- expected_html = "