From fa26a7255254344f8eacff8ac87d55cc57dcb527 Mon Sep 17 00:00:00 2001 From: Gurdeep Atwal Date: Fri, 17 Jan 2025 16:21:59 +0000 Subject: [PATCH 1/9] add help link to hub page --- exporter/templates/core/hub.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/exporter/templates/core/hub.html b/exporter/templates/core/hub.html index 60576abde3..7815f773f9 100644 --- a/exporter/templates/core/hub.html +++ b/exporter/templates/core/hub.html @@ -152,6 +152,9 @@

View guidance on LITE document digital signatures.
+
+ Get help and support. +
{% else %} From bfc73f28eb6571baee8c51b55ab95fc2ff994e38 Mon Sep 17 00:00:00 2001 From: Henry Cooksley Date: Wed, 15 Jan 2025 17:12:39 +0000 Subject: [PATCH 2/9] Update button labels to 'Save and continue' --- .../applications/goods-locations/goods-locations-summary.html | 2 +- exporter/templates/applications/party-summary.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exporter/templates/applications/goods-locations/goods-locations-summary.html b/exporter/templates/applications/goods-locations/goods-locations-summary.html index d30778f7da..c98066aac8 100644 --- a/exporter/templates/applications/goods-locations/goods-locations-summary.html +++ b/exporter/templates/applications/goods-locations/goods-locations-summary.html @@ -63,7 +63,7 @@

Product location and journey summary

- Submit + Save and continue Edit
{% endblock %} diff --git a/exporter/templates/applications/party-summary.html b/exporter/templates/applications/party-summary.html index 7851923153..e561e6cd46 100644 --- a/exporter/templates/applications/party-summary.html +++ b/exporter/templates/applications/party-summary.html @@ -6,7 +6,7 @@ {% block body %}
- +

@@ -260,7 +260,7 @@

- Submit + Save and continue Remove end-user From 7b9e0dc666884d5b0a6fcb213c0e4d7e229ee8e1 Mon Sep 17 00:00:00 2001 From: Henry Cooksley Date: Thu, 16 Jan 2025 10:09:43 +0000 Subject: [PATCH 3/9] Update ui tests to use 'Save and continue' --- .../exporter/features/submit_standard_application.feature | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui_tests/exporter/features/submit_standard_application.feature b/ui_tests/exporter/features/submit_standard_application.feature index 16d2703a0a..35e8d342a2 100644 --- a/ui_tests/exporter/features/submit_standard_application.feature +++ b/ui_tests/exporter/features/submit_standard_application.feature @@ -87,7 +87,7 @@ Feature: I want to indicate the standard licence I want And I select "yes" to permanently exported And I select "yes" to shipping air waybill or lading And I select "directly to the end-user" to who products are going - And I click on "Submit" + And I click on "Save and continue" And I click on "Do you have a security approval?" And I select "No" to if you are exporting classified products And I click save and continue link @@ -99,7 +99,7 @@ Feature: I want to indicate the standard licence I want And I enter "123 Main Street" and "France" for end user address And I enter "Joe Bloggs" for signatory name And I select no and enter "reason" for end user document - And I click on "Submit" + And I click on "Save and continue" And I submit the application Then my answers are played back to me And I see "Standard Individual Export Licence" as the Licence @@ -218,7 +218,7 @@ Feature: I want to indicate the standard licence I want And I select "yes" to permanently exported And I select "yes" to shipping air waybill or lading And I select "directly to the end-user" to who products are going - And I click on "Submit" + And I click on "Save and continue" And I click on "Do you have a security approval?" And I select "No" to if you are exporting classified products And I click save and continue link @@ -230,7 +230,7 @@ Feature: I want to indicate the standard licence I want And I enter "123 Main Street" and "France" for end user address And I enter "Joe Bloggs" for signatory name And I select no and enter "reason" for end user document - And I click on "Submit" + And I click on "Save and continue" And I submit the application Then my answers are played back to me And I see "Standard Individual Export Licence" as the Licence From 701b9e1ee5add40c97bcef0ef80491d8ead0a15e Mon Sep 17 00:00:00 2001 From: Henry Cooksley Date: Thu, 16 Jan 2025 10:28:14 +0000 Subject: [PATCH 4/9] Fix element visual alignment --- exporter/templates/applications/party-summary.html | 4 ++-- .../security-approvals/security-approvals-summary.html | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/exporter/templates/applications/party-summary.html b/exporter/templates/applications/party-summary.html index e561e6cd46..e681b73086 100644 --- a/exporter/templates/applications/party-summary.html +++ b/exporter/templates/applications/party-summary.html @@ -5,7 +5,7 @@ {% endblock %} {% block body %} -
+
@@ -258,7 +258,7 @@

{% endif %}

-
+
Save and continue diff --git a/exporter/templates/applications/security-approvals/security-approvals-summary.html b/exporter/templates/applications/security-approvals/security-approvals-summary.html index f78ee47ea4..afed25a7e1 100644 --- a/exporter/templates/applications/security-approvals/security-approvals-summary.html +++ b/exporter/templates/applications/security-approvals/security-approvals-summary.html @@ -5,8 +5,8 @@ {% endblock %} {% block body %} -
-
+
+

@@ -98,9 +98,8 @@

{% endif %} -
-
Save and continue +
{% endblock %} From 57b1f226fde0d79526233232948db99743660778 Mon Sep 17 00:00:00 2001 From: Henry Cooksley Date: Thu, 16 Jan 2025 11:44:01 +0000 Subject: [PATCH 5/9] Update call to action button on UEU page --- .../templates/applications/parties/ultimate-end-users.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/exporter/templates/applications/parties/ultimate-end-users.html b/exporter/templates/applications/parties/ultimate-end-users.html index 5603db7ca8..1b86b2d2bd 100644 --- a/exporter/templates/applications/parties/ultimate-end-users.html +++ b/exporter/templates/applications/parties/ultimate-end-users.html @@ -3,7 +3,7 @@ {% load svg %} {% block back_link %} - {% lcs "applications.UltimateEndUsersPage.BACK" %} + Back {% endblock %} {% block body %} @@ -25,7 +25,7 @@

{% block title %}{% lcs 'applications.UltimateEndUse

{% if application.status.key in 'applicant_editing,draft' %}
- + {% lcs "applications.UltimateEndUsersPage.ADD_BUTTON" %}
@@ -97,4 +97,7 @@

{% block title %}{% lcs 'applications.UltimateEndUse {% else %} {% include "includes/notice.html" with text="applications.UltimateEndUsersPage.NOTICE" help_title="applications.UltimateEndUsersPage.HELP" help="applications.UltimateEndUsersPage.DESCRIPTION" %} {% endif %} + + Save and continue + {% endblock %} From d0553b81b6d367c2007ee36ebd1d220335766ac5 Mon Sep 17 00:00:00 2001 From: Henry Cooksley Date: Thu, 16 Jan 2025 11:46:35 +0000 Subject: [PATCH 6/9] Update call to action button on Third parties page --- exporter/templates/applications/parties/third-parties.html | 7 +++++-- exporter/templates/core/hub.html | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/exporter/templates/applications/parties/third-parties.html b/exporter/templates/applications/parties/third-parties.html index 0a33c3298a..6b57fd2143 100644 --- a/exporter/templates/applications/parties/third-parties.html +++ b/exporter/templates/applications/parties/third-parties.html @@ -3,7 +3,7 @@ {% load svg %} {% block back_link %} - Back to application overview + Back {% endblock %} {% block body %} @@ -13,7 +13,7 @@

{% block title %}{% lcs 'applications.ThirdPartiesPa

{% if application.status.key in 'applicant_editing,draft' %}
- + {% lcs 'applications.ThirdPartiesPage.ADD' %}
@@ -105,4 +105,7 @@

{% block title %}{% lcs 'applications.ThirdPartiesPa {% else %} {% include 'includes/notice.html' with text='applications.ThirdPartiesPage.NO_RESULTS' %} {% endif %} + + Save and continue + {% endblock %} diff --git a/exporter/templates/core/hub.html b/exporter/templates/core/hub.html index 7815f773f9..74ebc83f09 100644 --- a/exporter/templates/core/hub.html +++ b/exporter/templates/core/hub.html @@ -145,6 +145,9 @@

{% lcs 'hub.Tiles.HELP_AND_SUPPORT' %}

+
+ Get help with your application. +
{% comment %}/PS-IGNORE{% endcomment %}For support with this service, contact LITE.support@businessandtrade.gov.uk or call +44(0)20 7215 4595 (select option 2). @@ -152,9 +155,6 @@

View guidance on LITE document digital signatures.
-
- Get help and support. -

{% else %} From 363e281fc92b08c76bb22f2565be659d309f646d Mon Sep 17 00:00:00 2001 From: Henry Cooksley Date: Fri, 17 Jan 2025 12:06:15 +0000 Subject: [PATCH 7/9] Fix back link for add end user page --- exporter/applications/views/parties/end_users.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/exporter/applications/views/parties/end_users.py b/exporter/applications/views/parties/end_users.py index a4eba248ad..17a33bfb22 100644 --- a/exporter/applications/views/parties/end_users.py +++ b/exporter/applications/views/parties/end_users.py @@ -78,7 +78,13 @@ class AddEndUserView(LoginRequiredMixin, FormView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - context["form_title"] = self.form_class.Layout.TITLE + context.update( + { + "form_title": self.form_class.Layout.TITLE, + "back_link_text": "Back to application overview", + "back_link_url": reverse("applications:task_list", kwargs=self.kwargs), + } + ) return context def form_valid(self, form): From 5effce5fed4ed1dc636b0e6dd8fbeb2cc2ac7959 Mon Sep 17 00:00:00 2001 From: Henry Cooksley Date: Fri, 17 Jan 2025 12:09:13 +0000 Subject: [PATCH 8/9] Fix back link for initial set end user page --- exporter/applications/views/parties/end_users.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/exporter/applications/views/parties/end_users.py b/exporter/applications/views/parties/end_users.py index 17a33bfb22..f12861b637 100644 --- a/exporter/applications/views/parties/end_users.py +++ b/exporter/applications/views/parties/end_users.py @@ -142,6 +142,13 @@ class SetPartyView(LoginRequiredMixin, BaseSessionWizardView): def application(self): return get_application(self.request, self.kwargs["pk"]) + # back_link_url only needs to be set for the first question in the form wizard, + # for subsequent questions the back link is generated through another mechanism + def get_context_data(self, form, **kwargs): + context = super().get_context_data(form, **kwargs) + context.update({"back_link_url": reverse("applications:add_end_user", kwargs=self.kwargs)}) + return context + def get_form_kwargs(self, step=None): kwargs = super().get_form_kwargs(step) From d627fb22795595db30d7e6371259e6f5af4ebf9d Mon Sep 17 00:00:00 2001 From: Henry Cooksley Date: Mon, 20 Jan 2025 10:26:05 +0000 Subject: [PATCH 9/9] Fix margin below help text --- exporter/templates/includes/notice.html | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/exporter/templates/includes/notice.html b/exporter/templates/includes/notice.html index 4d262bf1aa..c3cd622e13 100644 --- a/exporter/templates/includes/notice.html +++ b/exporter/templates/includes/notice.html @@ -5,9 +5,8 @@ {% lcs text %}

- -{% if help %} -

+

+ {% if help %} {% lcs help %} -

-{% endif %} + {% endif %} +