Skip to content

Commit 64184cc

Browse files
Replaced hardcoded values with Layout:ServiceName (#147)
* Replaced hardcoded values with Layout:ServiceName * Corrected LSRP config phase text * Removed the word "form" from the go to button on contributors page
1 parent 3778a7f commit 64184cc

9 files changed

Lines changed: 34 additions & 16 deletions

File tree

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,8 @@ All notable changes to this service will be documented in this file.
6262

6363
## [1.2.12]
6464
### Notes
65-
- Added root level template property "hideFieldLabelWhenOnlyOneField" to toggle labels hiding for single field pages.
65+
- Added root level template property "hideFieldLabelWhenOnlyOneField" to toggle labels hiding for single field pages.
66+
67+
- ## [1.2.13]
68+
### Notes
69+
- Replaced hardcoded values with Layout:ServiceName

src/DfE.ExternalApplications.Web/DfE.ExternalApplications.Web.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<UserSecretsId>8051c984-585b-4a5e-b6d7-833e5dd4afe7</UserSecretsId>
8-
<Version>1.2.12</Version>
9-
<InformationalVersion>1.2.12</InformationalVersion>
8+
<Version>1.2.13</Version>
9+
<InformationalVersion>1.2.13</InformationalVersion>
1010
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
1111
</PropertyGroup>
1212

src/DfE.ExternalApplications.Web/Pages/Applications/Contributors.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353

5454
<form method="post">
5555
<button id="proceed-to-application-form" class="govuk-button govuk-button--secondary" type="submit" asp-page-handler="ProceedToForm" data-module="govuk-button">
56-
Go to @AppTerminology.Singular form
56+
Go to @AppTerminology.Singular
5757
</button>
5858
</form>
5959
</div>

src/DfE.ExternalApplications.Web/Pages/Feedback/General.cshtml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
@page "/Feedback/General"
22
@using GovUK.Dfe.CoreLibs.Contracts.ExternalApplications.Models.Request
33
@model DfE.ExternalApplications.Web.Pages.Feedback.GeneralModel
4+
@inject Microsoft.Extensions.Configuration.IConfiguration Configuration
45
@{
5-
ViewData["Title"] = "Give feedback on the Apply to transfer an academy into your trust service";
6+
var serviceName = Configuration["Layout:ServiceName"] ?? "External Applications";
7+
ViewData["Title"] = $"Give feedback on the {serviceName} service";
68
}
79

810
@section BeforeContent {
@@ -19,7 +21,7 @@
1921
<div class="govuk-grid-row">
2022
<div class="govuk-grid-column-two-thirds">
2123
<h1 class="govuk-heading-l">
22-
Give feedback on the Apply to transfer an academy into your trust service
24+
Give feedback on the @serviceName service
2325
</h1>
2426

2527
<form method="post">

src/DfE.ExternalApplications.Web/Pages/Shared/Cookies.cshtml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
@page "/Cookies"
1+
@page "/Cookies"
22
@using GovUk.Frontend.AspNetCore
33
@using Microsoft.AspNetCore.Http.Features;
44
@using Microsoft.AspNetCore.Http;
55
@model DfE.ExternalApplications.Web.Pages.Shared.CookiesModel;
6+
@inject Microsoft.Extensions.Configuration.IConfiguration Configuration
67

78
@{
89
ViewData["Title"] = "Cookies";
910

1011
var consentFeature = this.HttpContext.Features.Get<ITrackingConsentFeature>();
1112
var canTrack = consentFeature?.CanTrack ?? false;
13+
var serviceName = Configuration["Layout:ServiceName"] ?? "External Applications";
1214
}
1315

1416
@{
@@ -37,7 +39,7 @@
3739
<p class="govuk-body">Cookies are small files saved on your phone, tablet or computer when you visit a website.</p>
3840
<p class="govuk-body">We use cookies to make this service work and collect information about how you use our service.</p>
3941
<h2 class="govuk-heading-m">Essential cookies</h2>
40-
<p class="govuk-body">Essential cookies keep your information secure while you use Apply to transfer an academy into your trust. We do not need to ask permission to use them.</p>
42+
<p class="govuk-body">Essential cookies keep your information secure while you use @serviceName. We do not need to ask permission to use them.</p>
4143
<table class="govuk-table">
4244
<thead class="govuk-table__head">
4345
<tr class="govuk-table__row">

src/DfE.ExternalApplications.Web/Pages/Shared/PrivacyNotice.cshtml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
@page "/Privacy"
1+
@page "/Privacy"
2+
@inject Microsoft.Extensions.Configuration.IConfiguration Configuration
3+
@{
4+
var serviceName = Configuration["Layout:ServiceName"] ?? "External Applications";
5+
}
26

37
<div class="govuk-grid-row">
48
<div class="govuk-grid-column-two-thirds">
5-
<h1 class="govuk-heading-xl">Privacy notice for the Apply to transfer an academy into your trust service</h1>
9+
<h1 class="govuk-heading-xl">Privacy notice for the @serviceName service</h1>
610
<p class="govuk-body">
7-
The Department for Education (DfE) owns the Apply to transfer an academy into your trust service and is the <a href="https://ico.org.uk/for-organisations/guide-to-data-protection/guide-to-the-general-data-protection-regulation-gdpr/controllers-and-processors/what-are-controllers-and-processors/">data controller (opens in new tab)</a> for it.
11+
The Department for Education (DfE) owns the @serviceName service and is the <a href="https://ico.org.uk/for-organisations/guide-to-data-protection/guide-to-the-general-data-protection-regulation-gdpr/controllers-and-processors/what-are-controllers-and-processors/">data controller (opens in new tab)</a> for it.
812
</p>
913
<p class="govuk-body">
1014
For detailed information on how we handle personal data, including your rights and our responsibilities, see our department’s privacy notice - <a href="https://www.gov.uk/government/publications/privacy-information-education-providers-workforce-including-teachers/privacy-information-education-providers-workforce-including-teachers#using-your-data-when-you-usedfesign-in">Privacy information: education providers’ workforce, including teachers</a>. This document includes the principles and practices we follow to make sure your information is processed securely as required by applicable data protection laws.

src/DfE.ExternalApplications.Web/Pages/Shared/TermsAndConditions.cshtml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
@page "/Terms"
1+
@page "/Terms"
2+
@inject Microsoft.Extensions.Configuration.IConfiguration Configuration
3+
@{
4+
var serviceName = Configuration["Layout:ServiceName"] ?? "External Applications";
5+
}
26
<div class="govuk-grid-row">
37
<div class="govuk-grid-column-two-thirds">
48
<h1 class="govuk-heading-xl">Terms and Conditions</h1>
59

610
<h2 class="govuk-heading-l">All Users</h2>
7-
<h3 class="govuk-heading-m">Using the Apply to transfer an academy into your trust service</h3>
11+
<h3 class="govuk-heading-m">Using the @serviceName service</h3>
812
<p class="govuk-body">
913
Please read these Terms of Use (“General Terms”) carefully before using this service (the “Service”).
1014
</p>

src/DfE.ExternalApplications.Web/Pages/Shared/_CookiesBanner.cshtml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
@using Microsoft.AspNetCore.Http.Features
1+
@using Microsoft.AspNetCore.Http.Features
2+
@inject Microsoft.Extensions.Configuration.IConfiguration Configuration
23

34
@{
5+
var serviceName = Configuration["Layout:ServiceName"] ?? "External Applications";
46
var consentFeature = Context.Features.Get<ITrackingConsentFeature>();
57

68
var showBanner = !(consentFeature?.CanTrack ?? false) && Context.Session.GetInt32("cookiesRejected") != 1;
79
var returnPath = Context.Request.Path;
8-
var label = "Cookies on Apply to transfer an academy into your trust";
10+
var label = $"Cookies on {serviceName}";
911
}
1012

1113
@if (showBanner)

src/DfE.ExternalApplications.Web/configurations/Lsrp/appsettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
"Layout": {
123123
"ServiceName": "Local SEND Reform Plans",
124124
"PhaseBanner": {
125-
"PhaseText": "Beta",
125+
"PhaseText": "Alpha",
126126
"FeedbackLink": "/Feedback"
127127
}
128128
},

0 commit comments

Comments
 (0)