Skip to content

Commit

Permalink
MLPAB-1433: Update CP journey content with policy feedback (#867)
Browse files Browse the repository at this point in the history
  • Loading branch information
acsauk authored Nov 22, 2023
1 parent 7e930b4 commit 53b8ab3
Show file tree
Hide file tree
Showing 8 changed files with 64 additions and 29 deletions.
25 changes: 17 additions & 8 deletions lang/cy.json

Large diffs are not rendered by default.

25 changes: 17 additions & 8 deletions lang/en.json

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion web/template/certificate_provider_read_the_lpa.gohtml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-xl">{{ trFormat .App "readDonorNameLpa" "DonorFullName" .Donor.Donor.FullName }}</h1>

{{ template "warning" (warning .App "youMustReadLpaCarefully") }}
{{ if and .App.IsCertificateProvider .Donor.SignedAt.IsZero }}
{{ template "warning" (warning .App "youShouldReadLpaCarefully") }}
{{ else }}
{{ template "warning" (warning .App "youMustReadLpaCarefully") }}
{{ end }}

<h2 id="decisions" class="govuk-heading-l govuk-!-margin-bottom-2">
{{ tr .App "lpaDecisions" }}
Expand Down
5 changes: 4 additions & 1 deletion web/template/certificate_provider_start.gohtml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-xl">{{ tr .App "beACertificateProvider" }}</h1>

{{ trHtml .App "beACertificateProviderContent" }}
{{ trHtml .App "beACertificateProviderIntroContent" }}
{{ trHtml .App "whatCertificateProvidersDoContent" }}
{{ trHtml .App "whoCanBeACertificateProviderContent" }}
{{ trHtml .App "beforeYouStartContent" }}

<p class="govuk-body">
<a href="{{ link .App .App.Paths.CertificateProvider.Login.Format }}" role="button" draggable="false" class="govuk-button govuk-button--start" data-module="govuk-button">
Expand Down
6 changes: 5 additions & 1 deletion web/template/certificate_provider_what_happens_next.gohtml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-xl">{{ tr .App "whatHappensNext" }}</h1>

{{ trFormatHtml .App "whatHappensNextContent" "DonorFirstNames" .Donor.Donor.FirstNames }}
{{ trFormatHtml .App "whatHappensNextContent" "DonorFirstNames" .Donor.Donor.FirstNames "DonorFullName" .Donor.Donor.FullName }}

<p class="govuk-inset-text">
{{ tr .App "ifYouHaveConcerns" }}
</p>

<div class="govuk-button-group govuk-!-margin-top-4">
<a class="govuk-button" href="{{ link .App (.App.Paths.CertificateProvider.ProvideCertificate.Format .App.LpaID) }}">{{ tr .App "provideYourCertificate" }}</a>
Expand Down
10 changes: 3 additions & 7 deletions web/template/certificate_provider_who_is_eligible.gohtml
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,15 @@
{{ tr .App "whoIsEligibleToBeCertificateProvider" }}
</h1>

{{ $donorFullNamePossessive := possessive .App .DonorFullName }}

{{ trFormatHtml .App "whoIsEligibleToBeCertificateProviderContent" "DonorFullNamePossessive" $donorFullNamePossessive "DonorFirstName" .DonorFirstNames }}
{{ trFormatHtml .App "whoIsEligibleToBeCertificateProviderContent" "DonorFullNamePossessive" (possessive .App .DonorFullName) "DonorFirstName" .DonorFirstNames }}

{{ template "details" (details . "whoIsEligibleToBeCertificateProviderDetails" "whoIsEligibleToBeCertificateProviderDetailsContent" false) }}

<h2 class="govuk-heading-m">{{ tr .App "whoCannotBeCertificateProvider" }}</h2>

{{ $donorFirstNamePossessive := possessive .App .DonorFirstNames }}

{{ trFormatHtml .App "whoCannotBeCertificateProviderContent" "DonorFirstName" .DonorFirstNames "DonorFirstNamePossessive" $donorFirstNamePossessive }}
{{ trFormatHtml .App "whoCannotBeCertificateProviderContent" "DonorFirstName" .DonorFirstNames "DonorFirstNamePossessive" (possessive .App .DonorFirstNames) }}

{{ template "warning" (warning .App "ifAnyStatementsApplyYouCannotBeACertificateProvider") }}
<p class="govuk-inset-text">{{ trFormatHtml .App "theCourtOfProtectionCanAlsoMakeDecisions" }} </p>

<a class="govuk-button" href="{{ link .App (.App.Paths.CertificateProvider.EnterDateOfBirth.Format .App.LpaID) }}" data-module="govuk-button">{{ tr .App "continue" }}</a>
</div>
Expand Down
6 changes: 5 additions & 1 deletion web/template/certificate_provider_your_role.gohtml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-xl">{{ tr .App "yourRoleAsTheCertificateProvider" }}</h1>

{{ trFormatHtml .App "yourRoleAsCertificateProviderContent" "DonorFullName" .Donor.Donor.FullName "DonorFirstNames" .Donor.Donor.FirstNames }}
{{ trFormatHtml .App "readLPAAndDiscussWthDonorContent" "DonorFullName" .Donor.Donor.FullName "DonorFirstNames" .Donor.Donor.FirstNames }}

{{ trFormatHtml .App "witnessTheDonorSiginingTheLPAContent" "DonorFirstNames" .Donor.Donor.FirstNames }}

{{ trFormatHtml .App "provideYourCertificateContent" "DonorFirstNames" .Donor.Donor.FirstNames }}

<div class="govuk-button-group">
<a href="{{ link .App (.App.Paths.CertificateProvider.TaskList.Format .App.LpaID) }}" class="govuk-button">{{ tr .App "goToYourTaskList" }}</a>
Expand Down
10 changes: 8 additions & 2 deletions web/template/provide_certificate.gohtml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-xl">{{ tr .App "provideTheCertificateForThisLpa" }}</h1>

{{ trFormatHtml .App "provideTheCertificateForThisLpaContent" "DonorFullName" .Donor.Donor.FullName }}
{{ trHtml .App "provideTheCertificateForThisLpaContent" }}

<form novalidate method="post">
<div class="govuk-summary-card">
Expand All @@ -26,11 +26,17 @@
</label>
</div>
</div>

<p class="govuk-body govuk-!-margin-top-3">{{ tr .App "whenYouTickTheBoxToConfirmAndSign" }}</p>
</div>
</div>
</div>

<button type="submit" class="govuk-button" data-module="govuk-button">{{ tr .App "submitSignature" }}</button>
<div class="govuk-button-group">
<button type="submit" class="govuk-button" data-module="govuk-button" value="submit">{{ tr .App "submitSignature" }}</button>
<button type="submit" class="govuk-button govuk-button--warning" data-module="govuk-button" value="cannot-submit">{{ tr .App "iCannotProvideTheCertificate" }}</button>
</div>

{{ template "csrf-field" . }}
</form>
</div>
Expand Down

0 comments on commit 53b8ab3

Please sign in to comment.