Split up templates by page type (#971)

ministryofjustice · Jan 22, 2024 · 3e172ba · 3e172ba
1 parent 2e482bb
commit 3e172ba
Show file tree

Hide file tree

Showing 107 changed files with 60 additions and 36 deletions.
diff --git a/cmd/mlpa/main.go b/cmd/mlpa/main.go
@@ -124,6 +124,21 @@ func main() {
 		logger.Fatal(err)
 	}
 
+	donorTmpls, err := parseTemplates(webDir+"/template/donor", layouts)
+	if err != nil {
+		logger.Fatal(err)
+	}
+
+	certificateProviderTmpls, err := parseTemplates(webDir+"/template/certificateprovider", layouts)
+	if err != nil {
+		logger.Fatal(err)
+	}
+
+	attorneyTmpls, err := parseTemplates(webDir+"/template/attorney", layouts)
+	if err != nil {
+		logger.Fatal(err)
+	}
+
 	supporterTmpls, err := parseTemplates(webDir+"/template/supporter", layouts)
 	if err != nil {
 		logger.Fatal(err)
@@ -247,6 +262,9 @@ func main() {
 		bundle.For(localize.Cy),
 		localize.Cy,
 		tmpls,
+		donorTmpls,
+		certificateProviderTmpls,
+		attorneyTmpls,
 		supporterTmpls,
 		sessionStore,
 		lpasDynamoClient,
@@ -263,11 +281,15 @@ func main() {
 		eventClient,
 		lpaStoreClient,
 	)))
+
 	mux.Handle("/", app.App(
 		logger,
 		bundle.For(localize.En),
 		localize.En,
 		tmpls,
+		donorTmpls,
+		certificateProviderTmpls,
+		attorneyTmpls,
 		supporterTmpls,
 		sessionStore,
 		lpasDynamoClient,

diff --git a/internal/app/app.go b/internal/app/app.go
@@ -72,8 +72,7 @@ func App(
 	logger *logging.Logger,
 	localizer page.Localizer,
 	lang localize.Lang,
-	tmpls template.Templates,
-	supporterTmpls template.Templates,
+	tmpls, donorTmpls, certificateProviderTmpls, attorneyTmpls, supporterTmpls template.Templates,
 	sessionStore SessionStore,
 	lpaDynamoClient DynamoClient,
 	appPublicURL string,
@@ -156,6 +155,7 @@ func App(
 		rootMux,
 		logger,
 		tmpls,
+		certificateProviderTmpls,
 		sessionStore,
 		donorStore,
 		oneLoginClient,
@@ -174,6 +174,7 @@ func App(
 		rootMux,
 		logger,
 		tmpls,
+		attorneyTmpls,
 		sessionStore,
 		donorStore,
 		certificateProviderStore,
@@ -190,6 +191,7 @@ func App(
 		rootMux,
 		logger,
 		tmpls,
+		donorTmpls,
 		sessionStore,
 		donorStore,
 		oneLoginClient,

diff --git a/internal/app/app_test.go b/internal/app/app_test.go
@@ -19,7 +19,7 @@ import (
 )
 
 func TestApp(t *testing.T) {
-	app := App(&logging.Logger{}, &localize.Localizer{}, localize.En, template.Templates{}, template.Templates{}, nil, nil, "http://public.url", &pay.Client{}, &notify.Client{}, &place.Client{}, page.RumConfig{}, "?%3fNEI0t9MN", page.Paths, &onelogin.Client{}, "http://onelogin.url", nil, nil, nil)
+	app := App(&logging.Logger{}, &localize.Localizer{}, localize.En, template.Templates{}, template.Templates{}, template.Templates{}, template.Templates{}, template.Templates{}, nil, nil, "http://public.url", &pay.Client{}, &notify.Client{}, &place.Client{}, page.RumConfig{}, "?%3fNEI0t9MN", page.Paths, &onelogin.Client{}, "http://onelogin.url", nil, nil, nil)
 
 	assert.Implements(t, (*http.Handler)(nil), app)
 }

diff --git a/internal/page/attorney/register.go b/internal/page/attorney/register.go
@@ -75,7 +75,7 @@ type ErrorHandler func(http.ResponseWriter, *http.Request, error)
 func Register(
 	rootMux *http.ServeMux,
 	logger Logger,
-	tmpls template.Templates,
+	commonTmpls, tmpls template.Templates,
 	sessionStore SessionStore,
 	donorStore DonorStore,
 	certificateProviderStore CertificateProviderStore,
@@ -94,36 +94,36 @@ func Register(
 	handleRoot(page.Paths.Attorney.LoginCallback, None,
 		page.LoginCallback(oneLoginClient, sessionStore, page.Paths.Attorney.EnterReferenceNumber, dashboardStore, actor.TypeAttorney))
 	handleRoot(page.Paths.Attorney.EnterReferenceNumber, RequireSession,
-		EnterReferenceNumber(tmpls.Get("attorney_enter_reference_number.gohtml"), shareCodeStore, sessionStore, attorneyStore))
+		EnterReferenceNumber(tmpls.Get("enter_reference_number.gohtml"), shareCodeStore, sessionStore, attorneyStore))
 
 	attorneyMux := http.NewServeMux()
 	rootMux.Handle("/attorney/", page.RouteToPrefix("/attorney/", attorneyMux, notFoundHandler))
 	handleAttorney := makeAttorneyHandle(attorneyMux, sessionStore, errorHandler, attorneyStore)
 
 	handleAttorney(page.Paths.Attorney.CodeOfConduct, RequireAttorney,
-		Guidance(tmpls.Get("attorney_code_of_conduct.gohtml"), donorStore))
+		Guidance(tmpls.Get("code_of_conduct.gohtml"), donorStore))
 	handleAttorney(page.Paths.Attorney.TaskList, RequireAttorney,
-		TaskList(tmpls.Get("attorney_task_list.gohtml"), donorStore, certificateProviderStore))
+		TaskList(tmpls.Get("task_list.gohtml"), donorStore, certificateProviderStore))
 	handleAttorney(page.Paths.Attorney.MobileNumber, RequireAttorney,
-		MobileNumber(tmpls.Get("attorney_mobile_number.gohtml"), attorneyStore))
+		MobileNumber(tmpls.Get("mobile_number.gohtml"), attorneyStore))
 	handleAttorney(page.Paths.Attorney.YourPreferredLanguage, RequireAttorney,
-		YourPreferredLanguage(tmpls.Get("your_preferred_language.gohtml"), attorneyStore, donorStore))
+		YourPreferredLanguage(commonTmpls.Get("your_preferred_language.gohtml"), attorneyStore, donorStore))
 	handleAttorney(page.Paths.Attorney.ConfirmYourDetails, RequireAttorney,
-		ConfirmYourDetails(tmpls.Get("attorney_confirm_your_details.gohtml"), attorneyStore, donorStore))
+		ConfirmYourDetails(tmpls.Get("confirm_your_details.gohtml"), attorneyStore, donorStore))
 	handleAttorney(page.Paths.Attorney.ReadTheLpa, RequireAttorney,
-		ReadTheLpa(tmpls.Get("attorney_read_the_lpa.gohtml"), donorStore, attorneyStore))
+		ReadTheLpa(tmpls.Get("read_the_lpa.gohtml"), donorStore, attorneyStore))
 	handleAttorney(page.Paths.Attorney.RightsAndResponsibilities, RequireAttorney,
-		Guidance(tmpls.Get("attorney_legal_rights_and_responsibilities.gohtml"), nil))
+		Guidance(tmpls.Get("legal_rights_and_responsibilities.gohtml"), nil))
 	handleAttorney(page.Paths.Attorney.WhatHappensWhenYouSign, RequireAttorney,
-		Guidance(tmpls.Get("attorney_what_happens_when_you_sign.gohtml"), donorStore))
+		Guidance(tmpls.Get("what_happens_when_you_sign.gohtml"), donorStore))
 	handleAttorney(page.Paths.Attorney.Sign, RequireAttorney,
-		Sign(tmpls.Get("attorney_sign.gohtml"), donorStore, certificateProviderStore, attorneyStore, lpaStoreClient, time.Now))
+		Sign(tmpls.Get("sign.gohtml"), donorStore, certificateProviderStore, attorneyStore, lpaStoreClient, time.Now))
 	handleAttorney(page.Paths.Attorney.WouldLikeSecondSignatory, RequireAttorney,
-		WouldLikeSecondSignatory(tmpls.Get("attorney_would_like_second_signatory.gohtml"), attorneyStore, donorStore, lpaStoreClient))
+		WouldLikeSecondSignatory(tmpls.Get("would_like_second_signatory.gohtml"), attorneyStore, donorStore, lpaStoreClient))
 	handleAttorney(page.Paths.Attorney.WhatHappensNext, RequireAttorney,
-		Guidance(tmpls.Get("attorney_what_happens_next.gohtml"), donorStore))
+		Guidance(tmpls.Get("what_happens_next.gohtml"), donorStore))
 	handleAttorney(page.Paths.Attorney.Progress, RequireAttorney,
-		Progress(tmpls.Get("attorney_progress.gohtml"), attorneyStore, donorStore))
+		Progress(tmpls.Get("progress.gohtml"), attorneyStore, donorStore))
 }
 
 type handleOpt byte

diff --git a/internal/page/attorney/register_test.go b/internal/page/attorney/register_test.go
@@ -18,7 +18,7 @@ import (
 
 func TestRegister(t *testing.T) {
 	mux := http.NewServeMux()
-	Register(mux, nil, template.Templates{}, nil, nil, nil, nil, nil, nil, nil, nil, &mockDashboardStore{}, &lpastore.Client{})
+	Register(mux, nil, template.Templates{}, template.Templates{}, nil, nil, nil, nil, nil, nil, nil, nil, &mockDashboardStore{}, &lpastore.Client{})
 
 	assert.Implements(t, (*http.Handler)(nil), mux)
 }

diff --git a/internal/page/certificateprovider/register.go b/internal/page/certificateprovider/register.go
@@ -93,7 +93,7 @@ type ErrorHandler func(http.ResponseWriter, *http.Request, error)
 func Register(
 	rootMux *http.ServeMux,
 	logger Logger,
-	tmpls template.Templates,
+	commonTmpls, tmpls template.Templates,
 	sessionStore SessionStore,
 	donorStore DonorStore,
 	oneLoginClient OneLoginClient,
@@ -114,38 +114,38 @@ func Register(
 	handleRoot(page.Paths.CertificateProvider.LoginCallback,
 		page.LoginCallback(oneLoginClient, sessionStore, page.Paths.CertificateProvider.EnterReferenceNumber, dashboardStore, actor.TypeCertificateProvider))
 	handleRoot(page.Paths.CertificateProvider.EnterReferenceNumber,
-		EnterReferenceNumber(tmpls.Get("certificate_provider_enter_reference_number.gohtml"), shareCodeStore, sessionStore, certificateProviderStore))
+		EnterReferenceNumber(tmpls.Get("enter_reference_number.gohtml"), shareCodeStore, sessionStore, certificateProviderStore))
 
 	certificateProviderMux := http.NewServeMux()
 	rootMux.Handle("/certificate-provider/", page.RouteToPrefix("/certificate-provider/", certificateProviderMux, notFoundHandler))
 	handleCertificateProvider := makeCertificateProviderHandle(certificateProviderMux, sessionStore, errorHandler)
 
 	handleCertificateProvider(page.Paths.CertificateProvider.WhoIsEligible, page.None,
-		WhoIsEligible(tmpls.Get("certificate_provider_who_is_eligible.gohtml"), donorStore))
+		WhoIsEligible(tmpls.Get("who_is_eligible.gohtml"), donorStore))
 	handleCertificateProvider(page.Paths.CertificateProvider.TaskList, page.None,
-		TaskList(tmpls.Get("certificate_provider_task_list.gohtml"), donorStore, certificateProviderStore))
+		TaskList(tmpls.Get("task_list.gohtml"), donorStore, certificateProviderStore))
 	handleCertificateProvider(page.Paths.CertificateProvider.EnterDateOfBirth, page.CanGoBack,
-		EnterDateOfBirth(tmpls.Get("certificate_provider_enter_date_of_birth.gohtml"), donorStore, certificateProviderStore))
+		EnterDateOfBirth(tmpls.Get("enter_date_of_birth.gohtml"), donorStore, certificateProviderStore))
 	handleCertificateProvider(page.Paths.CertificateProvider.YourPreferredLanguage, page.CanGoBack,
-		YourPreferredLanguage(tmpls.Get("your_preferred_language.gohtml"), certificateProviderStore, donorStore))
+		YourPreferredLanguage(commonTmpls.Get("your_preferred_language.gohtml"), certificateProviderStore, donorStore))
 	handleCertificateProvider(page.Paths.CertificateProvider.WhatIsYourHomeAddress, page.None,
-		WhatIsYourHomeAddress(logger, tmpls.Get("certificate_provider_what_is_your_home_address.gohtml"), addressClient, certificateProviderStore))
+		WhatIsYourHomeAddress(logger, tmpls.Get("what_is_your_home_address.gohtml"), addressClient, certificateProviderStore))
 	handleCertificateProvider(page.Paths.CertificateProvider.ConfirmYourDetails, page.None,
-		ConfirmYourDetails(tmpls.Get("certificate_provider_confirm_your_details.gohtml"), donorStore, certificateProviderStore))
+		ConfirmYourDetails(tmpls.Get("confirm_your_details.gohtml"), donorStore, certificateProviderStore))
 	handleCertificateProvider(page.Paths.CertificateProvider.YourRole, page.CanGoBack,
-		Guidance(tmpls.Get("certificate_provider_your_role.gohtml"), donorStore, nil))
+		Guidance(tmpls.Get("your_role.gohtml"), donorStore, nil))
 
 	handleCertificateProvider(page.Paths.CertificateProvider.ProveYourIdentity, page.None,
-		Guidance(tmpls.Get("certificate_provider_prove_your_identity.gohtml"), nil, nil))
+		Guidance(tmpls.Get("prove_your_identity.gohtml"), nil, nil))
 	handleCertificateProvider(page.Paths.CertificateProvider.IdentityWithOneLogin, page.None,
 		IdentityWithOneLogin(oneLoginClient, sessionStore, random.String))
 	handleCertificateProvider(page.Paths.CertificateProvider.IdentityWithOneLoginCallback, page.None,
-		IdentityWithOneLoginCallback(tmpls.Get("identity_with_one_login_callback.gohtml"), oneLoginClient, sessionStore, certificateProviderStore, donorStore))
+		IdentityWithOneLoginCallback(commonTmpls.Get("identity_with_one_login_callback.gohtml"), oneLoginClient, sessionStore, certificateProviderStore, donorStore))
 
 	handleCertificateProvider(page.Paths.CertificateProvider.ReadTheLpa, page.None,
-		ReadTheLpa(tmpls.Get("certificate_provider_read_the_lpa.gohtml"), donorStore, certificateProviderStore))
+		ReadTheLpa(tmpls.Get("read_the_lpa.gohtml"), donorStore, certificateProviderStore))
 	handleCertificateProvider(page.Paths.CertificateProvider.WhatHappensNext, page.CanGoBack,
-		Guidance(tmpls.Get("certificate_provider_what_happens_next.gohtml"), donorStore, nil))
+		Guidance(tmpls.Get("what_happens_next.gohtml"), donorStore, nil))
 	handleCertificateProvider(page.Paths.CertificateProvider.ProvideCertificate, page.CanGoBack,
 		ProvideCertificate(tmpls.Get("provide_certificate.gohtml"), donorStore, certificateProviderStore, notifyClient, shareCodeSender, lpaStoreClient, time.Now))
 	handleCertificateProvider(page.Paths.CertificateProvider.CertificateProvided, page.None,

diff --git a/internal/page/certificateprovider/register_test.go b/internal/page/certificateprovider/register_test.go
@@ -20,7 +20,7 @@ import (
 
 func TestRegister(t *testing.T) {
 	mux := http.NewServeMux()
-	Register(mux, &log.Logger{}, template.Templates{}, nil, nil, &onelogin.Client{}, nil, nil, nil, nil, &place.Client{}, &notify.Client{}, nil, &mockDashboardStore{}, nil)
+	Register(mux, &log.Logger{}, template.Templates{}, template.Templates{}, nil, nil, &onelogin.Client{}, nil, nil, nil, nil, &place.Client{}, &notify.Client{}, nil, &mockDashboardStore{}, nil)
 
 	assert.Implements(t, (*http.Handler)(nil), mux)
 }

diff --git a/internal/page/donor/register.go b/internal/page/donor/register.go
@@ -149,7 +149,7 @@ type ErrorHandler func(http.ResponseWriter, *http.Request, error)
 func Register(
 	rootMux *http.ServeMux,
 	logger Logger,
-	tmpls template.Templates,
+	commonTmpls, tmpls template.Templates,
 	sessionStore SessionStore,
 	donorStore DonorStore,
 	oneLoginClient OneLoginClient,
@@ -210,7 +210,7 @@ func Register(
 	handleWithDonor(page.Paths.WeHaveUpdatedYourDetails, page.None,
 		Guidance(tmpls.Get("we_have_updated_your_details.gohtml")))
 	handleWithDonor(page.Paths.YourPreferredLanguage, page.None,
-		YourPreferredLanguage(tmpls.Get("your_preferred_language.gohtml"), donorStore))
+		YourPreferredLanguage(commonTmpls.Get("your_preferred_language.gohtml"), donorStore))
 	handleWithDonor(page.Paths.LpaType, page.None,
 		LpaType(tmpls.Get("lpa_type.gohtml"), donorStore))
 	handleWithDonor(page.Paths.CheckYouCanSign, page.None,
@@ -350,7 +350,7 @@ func Register(
 	handleWithDonor(page.Paths.IdentityWithOneLogin, page.CanGoBack,
 		IdentityWithOneLogin(oneLoginClient, sessionStore, random.String))
 	handleWithDonor(page.Paths.IdentityWithOneLoginCallback, page.CanGoBack,
-		IdentityWithOneLoginCallback(tmpls.Get("identity_with_one_login_callback.gohtml"), oneLoginClient, sessionStore, donorStore))
+		IdentityWithOneLoginCallback(commonTmpls.Get("identity_with_one_login_callback.gohtml"), oneLoginClient, sessionStore, donorStore))
 
 	handleWithDonor(page.Paths.ReadYourLpa, page.None,
 		Guidance(tmpls.Get("read_your_lpa.gohtml")))

diff --git a/internal/page/donor/register_test.go b/internal/page/donor/register_test.go
@@ -23,7 +23,7 @@ import (
 
 func TestRegister(t *testing.T) {
 	mux := http.NewServeMux()
-	Register(mux, &log.Logger{}, template.Templates{}, nil, nil, &onelogin.Client{}, &place.Client{}, "http://example.org", &pay.Client{}, nil, &mockWitnessCodeSender{}, nil, nil, nil, nil, &notify.Client{}, nil, nil, nil, nil, nil)
+	Register(mux, &log.Logger{}, template.Templates{}, template.Templates{}, nil, nil, &onelogin.Client{}, &place.Client{}, "http://example.org", &pay.Client{}, nil, &mockWitnessCodeSender{}, nil, nil, nil, nil, &notify.Client{}, nil, nil, nil, nil, nil)
 
 	assert.Implements(t, (*http.Handler)(nil), mux)
 }

diff --git a/web/template/attorney_code_of_conduct.gohtml → web/template/attorney/code_of_conduct.gohtml b/web/template/attorney_code_of_conduct.gohtml → web/template/attorney/code_of_conduct.gohtml
diff --git a/...late/attorney_confirm_your_details.gohtml → ...late/attorney/confirm_your_details.gohtml b/...late/attorney_confirm_your_details.gohtml → ...late/attorney/confirm_your_details.gohtml
diff --git a/web/template/attorney_date_of_birth.gohtml → web/template/attorney/date_of_birth.gohtml b/web/template/attorney_date_of_birth.gohtml → web/template/attorney/date_of_birth.gohtml
diff --git a/...te/attorney_enter_reference_number.gohtml → ...te/attorney/enter_reference_number.gohtml b/...te/attorney_enter_reference_number.gohtml → ...te/attorney/enter_reference_number.gohtml
diff --git a/..._legal_rights_and_responsibilities.gohtml → .../legal_rights_and_responsibilities.gohtml b/..._legal_rights_and_responsibilities.gohtml → .../legal_rights_and_responsibilities.gohtml
diff --git a/web/template/attorney_mobile_number.gohtml → web/template/attorney/mobile_number.gohtml b/web/template/attorney_mobile_number.gohtml → web/template/attorney/mobile_number.gohtml
diff --git a/web/template/attorney_progress.gohtml → web/template/attorney/progress.gohtml b/web/template/attorney_progress.gohtml → web/template/attorney/progress.gohtml
diff --git a/web/template/attorney_read_the_lpa.gohtml → web/template/attorney/read_the_lpa.gohtml b/web/template/attorney_read_the_lpa.gohtml → web/template/attorney/read_the_lpa.gohtml
diff --git a/web/template/attorney_sign.gohtml → web/template/attorney/sign.gohtml b/web/template/attorney_sign.gohtml → web/template/attorney/sign.gohtml
diff --git a/web/template/attorney_task_list.gohtml → web/template/attorney/task_list.gohtml b/web/template/attorney_task_list.gohtml → web/template/attorney/task_list.gohtml
diff --git a/...emplate/attorney_what_happens_next.gohtml → ...emplate/attorney/what_happens_next.gohtml b/...emplate/attorney_what_happens_next.gohtml → ...emplate/attorney/what_happens_next.gohtml
diff --git a/...ttorney_what_happens_when_you_sign.gohtml → ...ttorney/what_happens_when_you_sign.gohtml b/...ttorney_what_happens_when_you_sign.gohtml → ...ttorney/what_happens_when_you_sign.gohtml
diff --git a/...torney_would_like_second_signatory.gohtml → ...torney/would_like_second_signatory.gohtml b/...torney_would_like_second_signatory.gohtml → ...torney/would_like_second_signatory.gohtml
diff --git a/web/template/certificate_provided.gohtml → ...icateprovider/certificate_provided.gohtml b/web/template/certificate_provided.gohtml → ...icateprovider/certificate_provided.gohtml
diff --git a/...cate_provider_confirm_your_details.gohtml → ...icateprovider/confirm_your_details.gohtml b/...cate_provider_confirm_your_details.gohtml → ...icateprovider/confirm_your_details.gohtml
diff --git a/...icate_provider_enter_date_of_birth.gohtml → ...ficateprovider/enter_date_of_birth.gohtml b/...icate_provider_enter_date_of_birth.gohtml → ...ficateprovider/enter_date_of_birth.gohtml
diff --git a/...te_provider_enter_reference_number.gohtml → ...ateprovider/enter_reference_number.gohtml b/...te_provider_enter_reference_number.gohtml → ...ateprovider/enter_reference_number.gohtml
diff --git a/...icate_provider_prove_your_identity.gohtml → ...ficateprovider/prove_your_identity.gohtml b/...icate_provider_prove_your_identity.gohtml → ...ficateprovider/prove_your_identity.gohtml
diff --git a/web/template/provide_certificate.gohtml → ...ficateprovider/provide_certificate.gohtml b/web/template/provide_certificate.gohtml → ...ficateprovider/provide_certificate.gohtml
diff --git a/.../certificate_provider_read_the_lpa.gohtml → ...e/certificateprovider/read_the_lpa.gohtml b/.../certificate_provider_read_the_lpa.gohtml → ...e/certificateprovider/read_the_lpa.gohtml
diff --git a/...ate/certificate_provider_task_list.gohtml → ...late/certificateprovider/task_list.gohtml b/...ate/certificate_provider_task_list.gohtml → ...late/certificateprovider/task_list.gohtml
diff --git a/...ificate_provider_what_happens_next.gohtml → ...tificateprovider/what_happens_next.gohtml b/...ificate_provider_what_happens_next.gohtml → ...tificateprovider/what_happens_next.gohtml
diff --git a/...provider_what_is_your_home_address.gohtml → ...provider/what_is_your_home_address.gohtml b/...provider_what_is_your_home_address.gohtml → ...provider/what_is_your_home_address.gohtml
diff --git a/...rtificate_provider_who_is_eligible.gohtml → ...ertificateprovider/who_is_eligible.gohtml b/...rtificate_provider_who_is_eligible.gohtml → ...ertificateprovider/who_is_eligible.gohtml
diff --git a/...ate/certificate_provider_your_role.gohtml → ...late/certificateprovider/your_role.gohtml b/...ate/certificate_provider_your_role.gohtml → ...late/certificateprovider/your_role.gohtml
diff --git a/web/template/about_payment.gohtml → web/template/donor/about_payment.gohtml b/web/template/about_payment.gohtml → web/template/donor/about_payment.gohtml
diff --git a/..._applying_for_a_different_fee_type.gohtml → ..._applying_for_a_different_fee_type.gohtml b/..._applying_for_a_different_fee_type.gohtml → ..._applying_for_a_different_fee_type.gohtml
diff --git a/...plate/certificate_provider_details.gohtml → ...donor/certificate_provider_details.gohtml b/...plate/certificate_provider_details.gohtml → ...donor/certificate_provider_details.gohtml
diff --git a/web/template/change_mobile_number.gohtml → ...emplate/donor/change_mobile_number.gohtml b/web/template/change_mobile_number.gohtml → ...emplate/donor/change_mobile_number.gohtml
diff --git a/web/template/check_you_can_sign.gohtml → web/template/donor/check_you_can_sign.gohtml b/web/template/check_you_can_sign.gohtml → web/template/donor/check_you_can_sign.gohtml
diff --git a/web/template/check_your_lpa.gohtml → web/template/donor/check_your_lpa.gohtml b/web/template/check_your_lpa.gohtml → web/template/donor/check_your_lpa.gohtml
diff --git a/web/template/choose_address.gohtml → web/template/donor/choose_address.gohtml b/web/template/choose_address.gohtml → web/template/donor/choose_address.gohtml
diff --git a/web/template/choose_attorneys.gohtml → web/template/donor/choose_attorneys.gohtml b/web/template/choose_attorneys.gohtml → web/template/donor/choose_attorneys.gohtml
diff --git a/...template/choose_attorneys_guidance.gohtml → ...te/donor/choose_attorneys_guidance.gohtml b/...template/choose_attorneys_guidance.gohtml → ...te/donor/choose_attorneys_guidance.gohtml
diff --git a/web/template/choose_attorneys_summary.gohtml → ...ate/donor/choose_attorneys_summary.gohtml b/web/template/choose_attorneys_summary.gohtml → ...ate/donor/choose_attorneys_summary.gohtml
diff --git a/...te/choose_new_certificate_provider.gohtml → ...or/choose_new_certificate_provider.gohtml b/...te/choose_new_certificate_provider.gohtml → ...or/choose_new_certificate_provider.gohtml
diff --git a/web/template/choose_people_to_notify.gohtml → ...late/donor/choose_people_to_notify.gohtml b/web/template/choose_people_to_notify.gohtml → ...late/donor/choose_people_to_notify.gohtml
diff --git a/...te/choose_people_to_notify_summary.gohtml → ...or/choose_people_to_notify_summary.gohtml b/...te/choose_people_to_notify_summary.gohtml → ...or/choose_people_to_notify_summary.gohtml
diff --git a/...plate/choose_replacement_attorneys.gohtml → ...donor/choose_replacement_attorneys.gohtml b/...plate/choose_replacement_attorneys.gohtml → ...donor/choose_replacement_attorneys.gohtml
diff --git a/...oose_replacement_attorneys_summary.gohtml → ...oose_replacement_attorneys_summary.gohtml b/...oose_replacement_attorneys_summary.gohtml → ...oose_replacement_attorneys_summary.gohtml
diff --git a/...e/choose_your_certificate_provider.gohtml → ...r/choose_your_certificate_provider.gohtml b/...e/choose_your_certificate_provider.gohtml → ...r/choose_your_certificate_provider.gohtml
diff --git a/...ertificate_provider_is_not_related.gohtml → ...ertificate_provider_is_not_related.gohtml b/...ertificate_provider_is_not_related.gohtml → ...ertificate_provider_is_not_related.gohtml
diff --git a/web/template/delete_this_lpa.gohtml → web/template/donor/delete_this_lpa.gohtml b/web/template/delete_this_lpa.gohtml → web/template/donor/delete_this_lpa.gohtml
diff --git a/.../do_you_want_replacement_attorneys.gohtml → .../do_you_want_replacement_attorneys.gohtml b/.../do_you_want_replacement_attorneys.gohtml → .../do_you_want_replacement_attorneys.gohtml
diff --git a/...plate/do_you_want_to_notify_people.gohtml → ...donor/do_you_want_to_notify_people.gohtml b/...plate/do_you_want_to_notify_people.gohtml → ...donor/do_you_want_to_notify_people.gohtml
diff --git a/...nter_replacement_trust_corporation.gohtml → ...nter_replacement_trust_corporation.gohtml b/...nter_replacement_trust_corporation.gohtml → ...nter_replacement_trust_corporation.gohtml
diff --git a/web/template/enter_trust_corporation.gohtml → ...late/donor/enter_trust_corporation.gohtml b/web/template/enter_trust_corporation.gohtml → ...late/donor/enter_trust_corporation.gohtml
diff --git a/web/template/evidence_required.gohtml → web/template/donor/evidence_required.gohtml b/web/template/evidence_required.gohtml → web/template/donor/evidence_required.gohtml
diff --git a/...ate/evidence_successfully_uploaded.gohtml → ...nor/evidence_successfully_uploaded.gohtml b/...ate/evidence_successfully_uploaded.gohtml → ...nor/evidence_successfully_uploaded.gohtml
diff --git a/web/template/fee_denied.gohtml → web/template/donor/fee_denied.gohtml b/web/template/fee_denied.gohtml → web/template/donor/fee_denied.gohtml
diff --git a/web/template/getting_help_signing.gohtml → ...emplate/donor/getting_help_signing.gohtml b/web/template/getting_help_signing.gohtml → ...emplate/donor/getting_help_signing.gohtml
diff --git a/...you_know_your_certificate_provider.gohtml → ...you_know_your_certificate_provider.gohtml b/...you_know_your_certificate_provider.gohtml → ...you_know_your_certificate_provider.gohtml
diff --git a/...ave_you_known_certificate_provider.gohtml → ...ave_you_known_certificate_provider.gohtml b/...ave_you_known_certificate_provider.gohtml → ...ave_you_known_certificate_provider.gohtml
diff --git a/...ow_should_attorneys_make_decisions.gohtml → ...ow_should_attorneys_make_decisions.gohtml b/...ow_should_attorneys_make_decisions.gohtml → ...ow_should_attorneys_make_decisions.gohtml
diff --git a/...placement_attorneys_make_decisions.gohtml → ...placement_attorneys_make_decisions.gohtml b/...placement_attorneys_make_decisions.gohtml → ...placement_attorneys_make_decisions.gohtml
diff --git a/...ould_replacement_attorneys_step_in.gohtml → ...ould_replacement_attorneys_step_in.gohtml b/...ould_replacement_attorneys_step_in.gohtml → ...ould_replacement_attorneys_step_in.gohtml
diff --git a/..._to_confirm_your_identity_and_sign.gohtml → ..._to_confirm_your_identity_and_sign.gohtml b/..._to_confirm_your_identity_and_sign.gohtml → ..._to_confirm_your_identity_and_sign.gohtml
diff --git a/...der_prefer_to_carry_out_their_role.gohtml → ...der_prefer_to_carry_out_their_role.gohtml b/...der_prefer_to_carry_out_their_role.gohtml → ...der_prefer_to_carry_out_their_role.gohtml
diff --git a/...ow_would_you_like_to_send_evidence.gohtml → ...ow_would_you_like_to_send_evidence.gohtml b/...ow_would_you_like_to_send_evidence.gohtml → ...ow_would_you_like_to_send_evidence.gohtml
diff --git a/...template/life_sustaining_treatment.gohtml → ...te/donor/life_sustaining_treatment.gohtml b/...template/life_sustaining_treatment.gohtml → ...te/donor/life_sustaining_treatment.gohtml
diff --git a/web/template/lpa_details_saved.gohtml → web/template/donor/lpa_details_saved.gohtml b/web/template/lpa_details_saved.gohtml → web/template/donor/lpa_details_saved.gohtml
diff --git a/web/template/lpa_progress.gohtml → web/template/donor/lpa_progress.gohtml b/web/template/lpa_progress.gohtml → web/template/donor/lpa_progress.gohtml
diff --git a/web/template/lpa_type.gohtml → web/template/donor/lpa_type.gohtml b/web/template/lpa_type.gohtml → web/template/donor/lpa_type.gohtml
diff --git a/web/template/make_a_new_lpa.gohtml → web/template/donor/make_a_new_lpa.gohtml b/web/template/make_a_new_lpa.gohtml → web/template/donor/make_a_new_lpa.gohtml
diff --git a/...ate/need_help_signing_confirmation.gohtml → ...nor/need_help_signing_confirmation.gohtml b/...ate/need_help_signing_confirmation.gohtml → ...nor/need_help_signing_confirmation.gohtml
diff --git a/web/template/payment_confirmation.gohtml → ...emplate/donor/payment_confirmation.gohtml b/web/template/payment_confirmation.gohtml → ...emplate/donor/payment_confirmation.gohtml
diff --git a/...mplate/previous_application_number.gohtml → .../donor/previous_application_number.gohtml b/...mplate/previous_application_number.gohtml → .../donor/previous_application_number.gohtml
diff --git a/web/template/previous_fee.gohtml → web/template/donor/previous_fee.gohtml b/web/template/previous_fee.gohtml → web/template/donor/previous_fee.gohtml
diff --git a/web/template/prove_your_identity.gohtml → ...template/donor/prove_your_identity.gohtml b/web/template/prove_your_identity.gohtml → ...template/donor/prove_your_identity.gohtml
diff --git a/web/template/read_your_lpa.gohtml → web/template/donor/read_your_lpa.gohtml b/web/template/read_your_lpa.gohtml → web/template/donor/read_your_lpa.gohtml
diff --git a/web/template/remove_attorney.gohtml → web/template/donor/remove_attorney.gohtml b/web/template/remove_attorney.gohtml → web/template/donor/remove_attorney.gohtml
diff --git a/web/template/remove_person_to_notify.gohtml → ...late/donor/remove_person_to_notify.gohtml b/web/template/remove_person_to_notify.gohtml → ...late/donor/remove_person_to_notify.gohtml
diff --git a/web/template/resend_witness_code.gohtml → ...template/donor/resend_witness_code.gohtml b/web/template/resend_witness_code.gohtml → ...template/donor/resend_witness_code.gohtml
diff --git a/web/template/restrictions.gohtml → web/template/donor/restrictions.gohtml b/web/template/restrictions.gohtml → web/template/donor/restrictions.gohtml
diff --git a/...late/send_us_your_evidence_by_post.gohtml → ...onor/send_us_your_evidence_by_post.gohtml b/...late/send_us_your_evidence_by_post.gohtml → ...onor/send_us_your_evidence_by_post.gohtml
diff --git a/web/template/sign_the_lpa_on_behalf.gohtml → ...plate/donor/sign_the_lpa_on_behalf.gohtml b/web/template/sign_the_lpa_on_behalf.gohtml → ...plate/donor/sign_the_lpa_on_behalf.gohtml
diff --git a/web/template/sign_your_lpa.gohtml → web/template/donor/sign_your_lpa.gohtml b/web/template/sign_your_lpa.gohtml → web/template/donor/sign_your_lpa.gohtml
diff --git a/web/template/task_list.gohtml → web/template/donor/task_list.gohtml b/web/template/task_list.gohtml → web/template/donor/task_list.gohtml
diff --git a/web/template/upload_evidence.gohtml → web/template/donor/upload_evidence.gohtml b/web/template/upload_evidence.gohtml → web/template/donor/upload_evidence.gohtml
diff --git a/...plate/we_have_updated_your_details.gohtml → ...donor/we_have_updated_your_details.gohtml b/...plate/we_have_updated_your_details.gohtml → ...donor/we_have_updated_your_details.gohtml
diff --git a/...e/what_a_certificate_provider_does.gohtml → ...r/what_a_certificate_provider_does.gohtml b/...e/what_a_certificate_provider_does.gohtml → ...r/what_a_certificate_provider_does.gohtml
diff --git a/...te/what_happens_next_post_evidence.gohtml → ...or/what_happens_next_post_evidence.gohtml b/...te/what_happens_next_post_evidence.gohtml → ...or/what_happens_next_post_evidence.gohtml
diff --git a/web/template/when_can_the_lpa_be_used.gohtml → ...ate/donor/when_can_the_lpa_be_used.gohtml b/web/template/when_can_the_lpa_be_used.gohtml → ...ate/donor/when_can_the_lpa_be_used.gohtml
diff --git a/...hich_fee_type_are_you_applying_for.gohtml → ...hich_fee_type_are_you_applying_for.gohtml b/...hich_fee_type_are_you_applying_for.gohtml → ...hich_fee_type_are_you_applying_for.gohtml
diff --git a/web/template/withdraw_this_lpa.gohtml → web/template/donor/withdraw_this_lpa.gohtml b/web/template/withdraw_this_lpa.gohtml → web/template/donor/withdraw_this_lpa.gohtml
diff --git a/...witnessing_as_certificate_provider.gohtml → ...witnessing_as_certificate_provider.gohtml b/...witnessing_as_certificate_provider.gohtml → ...witnessing_as_certificate_provider.gohtml
diff --git a/.../witnessing_as_independent_witness.gohtml → .../witnessing_as_independent_witness.gohtml b/.../witnessing_as_independent_witness.gohtml → .../witnessing_as_independent_witness.gohtml
diff --git a/...template/witnessing_your_signature.gohtml → ...te/donor/witnessing_your_signature.gohtml b/...template/witnessing_your_signature.gohtml → ...te/donor/witnessing_your_signature.gohtml
diff --git a/...plate/you_cannot_sign_your_lpa_yet.gohtml → ...donor/you_cannot_sign_your_lpa_yet.gohtml b/...plate/you_cannot_sign_your_lpa_yet.gohtml → ...donor/you_cannot_sign_your_lpa_yet.gohtml
diff --git a/...mplate/you_have_submitted_your_lpa.gohtml → .../donor/you_have_submitted_your_lpa.gohtml b/...mplate/you_have_submitted_your_lpa.gohtml → .../donor/you_have_submitted_your_lpa.gohtml
diff --git a/web/template/your_address.gohtml → web/template/donor/your_address.gohtml b/web/template/your_address.gohtml → web/template/donor/your_address.gohtml
diff --git a/...template/your_authorised_signatory.gohtml → ...te/donor/your_authorised_signatory.gohtml b/...template/your_authorised_signatory.gohtml → ...te/donor/your_authorised_signatory.gohtml
diff --git a/web/template/your_date_of_birth.gohtml → web/template/donor/your_date_of_birth.gohtml b/web/template/your_date_of_birth.gohtml → web/template/donor/your_date_of_birth.gohtml
diff --git a/web/template/your_details.gohtml → web/template/donor/your_details.gohtml b/web/template/your_details.gohtml → web/template/donor/your_details.gohtml
diff --git a/web/template/your_independent_witness.gohtml → ...ate/donor/your_independent_witness.gohtml b/web/template/your_independent_witness.gohtml → ...ate/donor/your_independent_witness.gohtml
diff --git a/...te/your_independent_witness_mobile.gohtml → ...or/your_independent_witness_mobile.gohtml b/...te/your_independent_witness_mobile.gohtml → ...or/your_independent_witness_mobile.gohtml
diff --git a/..._legal_rights_and_responsibilities.gohtml → ..._legal_rights_and_responsibilities.gohtml b/..._legal_rights_and_responsibilities.gohtml → ..._legal_rights_and_responsibilities.gohtml
diff --git a/web/template/your_name.gohtml → web/template/donor/your_name.gohtml b/web/template/your_name.gohtml → web/template/donor/your_name.gohtml