diff --git a/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss b/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss index 283c1aeec..34bb42526 100644 --- a/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss +++ b/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss @@ -48,6 +48,7 @@ .page-footer { margin-bottom: 0; + min-height: 50px; } .notification-status { diff --git a/app/templates/views/check/ok.html b/app/templates/views/check/ok.html index b35e6a040..52804960e 100644 --- a/app/templates/views/check/ok.html +++ b/app/templates/views/check/ok.html @@ -39,7 +39,7 @@ {% if template.template_type != 'letter' or not request.args.from_test %} {% else %} - Download as a printable PDF + Download as a PDF {% endif %} Back diff --git a/app/templates/views/notifications/check.html b/app/templates/views/notifications/check.html index 8ab9434cc..21854b4b7 100644 --- a/app/templates/views/notifications/check.html +++ b/app/templates/views/notifications/check.html @@ -65,7 +65,7 @@ {% endif %} Back {% if template.template_type == 'letter' %} - Download as a printable PDF + Download as a PDF {% endif %} diff --git a/app/templates/views/notifications/notification.html b/app/templates/views/notifications/notification.html index 7fc689cac..d0e8c9613 100644 --- a/app/templates/views/notifications/notification.html +++ b/app/templates/views/notifications/notification.html @@ -51,22 +51,24 @@

Estimated delivery date: {{ estimated_letter_delivery_date|string|format_date_short }}

-

- Download as a PDF -

{% endif %} {% endif %} {{ template|string }} - {% if template.template_type != 'letter' %} - - {% if template.template_type == 'email' %}
{% endif %} - + {% if template.template_type == 'letter' %} +
+ +
+ {% elif template.template_type == 'email' %} +
+ {{ ajax_block(partials, updates_url, 'status', finished=finished) }} +
+ {% elif template.template_type == 'sms' %} {{ ajax_block(partials, updates_url, 'status', finished=finished) }} - - {% if template.template_type == 'email' %}
{% endif %} - {% endif %} {% if current_user.has_permissions('send_messages') and current_user.has_permissions('view_activity') and template.template_type == 'sms' and can_receive_inbound %} diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index 3325501c4..b8e9073f7 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -2803,7 +2803,7 @@ def test_one_off_letters_have_download_link( template_id=fake_uuid, filetype='pdf', ) - assert page.select_one('a[download]').text == 'Download as a printable PDF' + assert page.select_one('a[download]').text == 'Download as a PDF' def test_send_one_off_letter_errors_in_trial_mode( @@ -2848,7 +2848,7 @@ def test_send_one_off_letter_errors_in_trial_mode( assert not page.select('[type=submit]') assert page.select_one('.page-footer-back-link').text == 'Back' - assert page.select_one('a[download]').text == 'Download as a printable PDF' + assert page.select_one('a[download]').text == 'Download as a PDF' def test_check_messages_shows_over_max_row_error(