diff --git a/cypress/e2e/donor/payment.cy.js b/cypress/e2e/donor/payment.cy.js index af894b8064..c7ca828e25 100644 --- a/cypress/e2e/donor/payment.cy.js +++ b/cypress/e2e/donor/payment.cy.js @@ -277,7 +277,7 @@ describe('Pay for LPA', { pageLoadTimeout: 8000 }, () => { cy.url().should('contain', '/upload-evidence'); cy.get('#uploaded .govuk-summary-list').within(() => { - cy.contains('supporting-evidence.png').parent().contains('button span', 'Delete').click(); + cy.contains('supporting-evidence.png').parent().contains('button', 'Delete').click(); }); cy.url().should('contain', '/upload-evidence'); diff --git a/lang/cy.json b/lang/cy.json index 3f7279c852..de743c91bc 100644 --- a/lang/cy.json +++ b/lang/cy.json @@ -901,9 +901,9 @@ "beforeYouCanProvideYourCertificateForThisLpa": "Cyn y gallwch chi ddarparu tystysgrif ar gyfer LPA {{.DonorFullName}}, rhaid i chi gadarnhau pwy ydych chi.", "confirmYourCertificateProviderIsNotRelated": "Cadarnhau nad yw’ch darparwr tystysgrif yn perthyn i chi neu i’ch atwrneiod", "confirmYourCertificateProviderIsNotRelatedContent": "

Mae’r manylion rydych wedi’u rhoi yn dangos y gallai’ch darparwr tystysgrif fod yn perthyn i chi neu i un o’ch atwrneiod.

Ni all eich darparwr tystysgrif fod yn perthyn i chi neu i unrhyw un o’ch atwrneiod (ar gyfer yr LPA hon neu unrhyw un arall sydd gennych).

Os nad yw’n perthyn i chi, gallwch roi tic yn y blwch i gadarnhau hyn a pharhau.

", - "ifYourCertificateProviderIsRelated": "Os yw’ch darparwr tystysgrif yn perthyn i chi neu’n un o’ch atwrneiod, rhaid i chi", - "deleteYourCurrentCertificateProvider": "dileu darparwr tystysgrif cyfredol a dewis un newydd", + "chooseNewCertificateProvider": "Welsh", "iConfirmThatMyCertificateProviderIsNotRelated": "Rwyf yn cadarnhau nad yw fy narparwr tystysgrif yn perthyn i mi nac i unrhyw un o’m hatwrneiod", + "tickTheBoxToConfirmCertificateProviderNotRelated": "Welsh", "theBoxToConfirmYourCertificateProviderIsNotRelated": "y blwch i gadarnhau nad yw’ch darparwr tystysgrif yn perthyn i chi nac i unrhyw un o’ch atwrneiod", "youMustReviewTheInformationYouHaveEntered": "Rhaid i chi adolygu’r wybodaeth rydych wedi’i rhoi.", "viewAndUseYourRegisteredLpas": "Welsh", diff --git a/lang/en.json b/lang/en.json index 97a7332dd3..7cc3142d68 100644 --- a/lang/en.json +++ b/lang/en.json @@ -820,10 +820,10 @@ "beforeYouSignYourLpa": "Before you sign your LPA, you must confirm your identity.", "beforeYouCanProvideYourCertificateForThisLpa": "Before you can provide a certificate for {{possessive .DonorFullName}} LPA, you must confirm your identity.", "confirmYourCertificateProviderIsNotRelated": "Confirm your certificate provider is not related to you or your attorneys", - "confirmYourCertificateProviderIsNotRelatedContent": "

The details you have given indicate that your certificate provider may be related to you or one of your attorneys.

Your certificate provider cannot be related to you or any of your attorneys (on this LPA or any other LPA you have).

If they are not related, you can tick the box to confirm this and continue.

", - "ifYourCertificateProviderIsRelated": "If your certificate provider is related to you or one of your attorneys, you must", - "deleteYourCurrentCertificateProvider": "delete your current certificate provider and choose a new one", + "confirmYourCertificateProviderIsNotRelatedContent": "

The details you have given indicate that your certificate provider may be related to you or one of your attorneys.

If this is the case, you must choose another certificate provider.

", + "chooseNewCertificateProvider": "Choose a new certificate provider", "iConfirmThatMyCertificateProviderIsNotRelated": "I confirm that my certificate provider is not related to me or any of my attorneys", + "tickTheBoxToConfirmCertificateProviderNotRelated": "Tick the box to confirm your certificate provider is not related to you or your attorneys", "theBoxToConfirmYourCertificateProviderIsNotRelated": "the box to confirm your certificate provider is not related to you or your attorneys, or choose another certificate provider", "youMustReviewTheInformationYouHaveEntered": "You must review the information you have entered.", "viewAndUseYourRegisteredLpas": "View and use your registered LPAs", diff --git a/web/assets/scss/main.scss b/web/assets/scss/main.scss index 6d19b14272..c6bd89f030 100644 --- a/web/assets/scss/main.scss +++ b/web/assets/scss/main.scss @@ -83,19 +83,13 @@ body:not(.js-enabled) .govuk-back-link { background: none; border: none; padding: 0; - font: inherit; cursor: pointer; - outline: inherit; + font-size: inherit; color: $govuk-link-colour; - display: contents; - - // introduce styling on a nested span as 'display: contents' removes some from the button - > span { - @include govuk-link-common; - @include govuk-link-style-default; - @include govuk-link-print-friendly; - @include govuk-link-style-no-visited-state; - } +} + +.app-button-link:focus { + outline: inherit; } .app-tabs-no-border .govuk-tabs__panel { diff --git a/web/template/donor/confirm_your_certificate_provider_is_not_related.gohtml b/web/template/donor/confirm_your_certificate_provider_is_not_related.gohtml index 7d535dca50..8464e9b21c 100644 --- a/web/template/donor/confirm_your_certificate_provider_is_not_related.gohtml +++ b/web/template/donor/confirm_your_certificate_provider_is_not_related.gohtml @@ -23,6 +23,8 @@ {{ $hasError := .Errors.Has .Form.FieldName }}
+ {{ tr .App "tickTheBoxToConfirmCertificateProviderNotRelated" }} + {{ template "error-message" (errorMessage . .Form.FieldName) }} {{ template "checkboxes" (items . .Form.FieldName nil @@ -31,9 +33,11 @@
-

{{ tr .App "ifYourCertificateProviderIsRelated" }} .

- - {{ template "buttons" (button .App "continue") }} +
+ + {{ tr .App "returnToTaskList" }} + +
{{ template "csrf-field" . }} diff --git a/web/template/donor/upload_evidence.gohtml b/web/template/donor/upload_evidence.gohtml index edb829b86a..0da69b855a 100644 --- a/web/template/donor/upload_evidence.gohtml +++ b/web/template/donor/upload_evidence.gohtml @@ -24,8 +24,8 @@
-
diff --git a/web/template/supporter/manage_team_members.gohtml b/web/template/supporter/manage_team_members.gohtml index 34399a9dad..968d8618e4 100644 --- a/web/template/supporter/manage_team_members.gohtml +++ b/web/template/supporter/manage_team_members.gohtml @@ -25,7 +25,7 @@ {{ $statusUpdatedTitle = "teamMemberSuspended" }} {{ $statusUpdatedContent = "emailHasBeenSuspended" }} {{ end }} - + {{ template "notification-banner" (notificationBanner .App $statusUpdatedTitle (trFormatHtml .App $statusUpdatedContent "Email" (.App.Query.Get "statusEmail"))) }} {{ end}} @@ -86,9 +86,8 @@ - {{ template "csrf-field" $ }}