diff --git a/app/assets/stylesheets/components/message.scss b/app/assets/stylesheets/components/message.scss index bf8a2c8ab..bcac5f7a5 100644 --- a/app/assets/stylesheets/components/message.scss +++ b/app/assets/stylesheets/components/message.scss @@ -29,10 +29,6 @@ } - .primary { - @include bold-19; - } - } } diff --git a/app/main/views/send.py b/app/main/views/send.py index c3a0fcb2f..faeb3acf4 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -242,11 +242,16 @@ def check_messages(service_id, template_type, upload_id): ) if current_service['restricted'] else None ) - if request.args.get('from_test') and len(template.placeholders): + if request.args.get('from_test'): extra_args = {'help': 1} if request.args.get('help', '0') != '0' else {} - back_link = url_for( - '.send_test', service_id=service_id, template_id=template.id, **extra_args - ) + if len(template.placeholders): + back_link = url_for( + '.send_test', service_id=service_id, template_id=template.id, **extra_args + ) + else: + back_link = url_for( + '.choose_template', service_id=service_id, template_type=template.template_type, **extra_args + ) else: back_link = url_for('.send_messages', service_id=service_id, template_id=template.id) diff --git a/app/templates/views/check.html b/app/templates/views/check.html index 539ed320f..9f3571dad 100644 --- a/app/templates/views/check.html +++ b/app/templates/views/check.html @@ -9,7 +9,7 @@ {% from "components/message-count-label.html" import message_count_label %} {% block page_title %} - {{ "Error" if errors else "Check and confirm" }} – GOV.UK Notify + {{ "Error" if errors else "Preview" }} – GOV.UK Notify {% endblock %} {% block maincolumn_content %} @@ -136,7 +136,7 @@ {% else %}

- Check and confirm + Preview

{% endif %} diff --git a/app/templates/views/send-test.html b/app/templates/views/send-test.html index 95f298c30..980ba2a1b 100644 --- a/app/templates/views/send-test.html +++ b/app/templates/views/send-test.html @@ -14,7 +14,7 @@ {% if request.args['help'] %}

Example text message

{% else %} -

Send a test

+

Send yourself a test

{% endif %} {% if 'sms' == template.template_type %} @@ -54,8 +54,8 @@ {% endfor %} {% endcall %} - {{ page_footer("Check and confirm", back_link=( - url_for('.send_messages', service_id=current_service.id, template_id=template.id)) if not request.args['help'] else None + {{ page_footer("Preview", back_link=( + url_for('.choose_template', service_id=current_service.id, template_type=template.template_type)) if not request.args['help'] else None ) }} diff --git a/app/templates/views/send.html b/app/templates/views/send.html index 4b85152bc..67da7501f 100644 --- a/app/templates/views/send.html +++ b/app/templates/views/send.html @@ -11,7 +11,7 @@ {% block maincolumn_content %} -

Send {{ 'text messages' if 'sms' == template.template_type else 'emails' }}

+

Upload recipients

{% if 'sms' == template.template_type %}
@@ -35,42 +35,34 @@ -
- +

Your file needs to look like this example

+
+ {% call(item, row_number) list_table( + example, + caption="Example", + caption_visible=False, + field_headings=[''] + column_headings + ) %} + {{ index_field(row_number - 1) }} + {% for column in item %} + {{ text_field(column) }} + {% endfor %} + {% endcall %} +
+ - -
+

Accepted file formats

+