diff --git a/app/assets/javascripts/errorBanner.js b/app/assets/javascripts/errorBanner.js index 2efef7d95..c05c821ea 100644 --- a/app/assets/javascripts/errorBanner.js +++ b/app/assets/javascripts/errorBanner.js @@ -12,6 +12,5 @@ hideBanner: () => $('.banner-dangerous').addClass('display-none'), showBanner: () => $('.banner-dangerous') .removeClass('display-none') - .trigger('focus'), }; })(window); diff --git a/app/assets/javascripts/fileUpload.js b/app/assets/javascripts/fileUpload.js index 9ef72d531..ea6c7ac62 100644 --- a/app/assets/javascripts/fileUpload.js +++ b/app/assets/javascripts/fileUpload.js @@ -15,9 +15,9 @@ // The label gets styled like a button and is used to hide the native file upload control. This is so that // users see a button that looks like the others on the site. -// - this.$form.find('label.file-upload-button').addClass('usa-button margin-bottom-1'); + this.$form.find('label.file-upload-button').addClass('usa-button margin-bottom-1').attr( {role: 'button', tabindex: '0'} ); + // Clear the form if the user navigates back to the page $(window).on("pageshow", () => this.$form[0].reset()); diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 144b2ba67..3cc17c20d 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -16,8 +16,6 @@ $(() => GOVUK.modules.start()); $(() => $('.error-message, .usa-error-message').eq(0).parent('label').next('input').trigger('focus')); -$(() => $('.banner-dangerous').eq(0).trigger('focus')); - $(() => $('.govuk-header__container').on('click', function() { $(this).css('border-color', '#005ea5'); })); diff --git a/app/templates/components/components/alert/template.njk b/app/templates/components/components/alert/template.njk index 85d40a785..d89405e64 100644 --- a/app/templates/components/components/alert/template.njk +++ b/app/templates/components/components/alert/template.njk @@ -11,7 +11,7 @@
{{params.heading}}

- {{params.text}} + {{params.text | safe }}

diff --git a/app/templates/partials/check/message-too-long.html b/app/templates/partials/check/message-too-long.html index 35facdffe..f44ed84b5 100644 --- a/app/templates/partials/check/message-too-long.html +++ b/app/templates/partials/check/message-too-long.html @@ -1,7 +1,9 @@ -

- Message too long -

-

- Text messages cannot be longer than {{ SMS_CHAR_COUNT_LIMIT }} characters. - Your message is {{ template.content_count }} characters. -

+ diff --git a/app/templates/partials/check/not-allowed-to-send-to.html b/app/templates/partials/check/not-allowed-to-send-to.html index ff566a76a..b438f296f 100644 --- a/app/templates/partials/check/not-allowed-to-send-to.html +++ b/app/templates/partials/check/not-allowed-to-send-to.html @@ -1,12 +1,16 @@ -

- You cannot send to - {{ 'this' if count_of_recipients == 1 else 'these' }} - {{ template_type_label }} - {%- if count_of_recipients != 1 -%} - {{ 'es' if 'email address' == template_type_label else 's' }} - {%- endif %} -

-

- In trial mode you can only - send to yourself and members of your team -

+ diff --git a/app/templates/partials/check/sent-previously.html b/app/templates/partials/check/sent-previously.html index 0f657e047..49bf82cdf 100644 --- a/app/templates/partials/check/sent-previously.html +++ b/app/templates/partials/check/sent-previously.html @@ -1,6 +1,8 @@ -

- These messages have already been sent today -

-

- If you need to resend them, rename the file and upload it again. -

+ \ No newline at end of file diff --git a/app/templates/partials/check/too-many-messages.html b/app/templates/partials/check/too-many-messages.html index ef2a87f06..932574981 100644 --- a/app/templates/partials/check/too-many-messages.html +++ b/app/templates/partials/check/too-many-messages.html @@ -1,23 +1,30 @@ -

- {% if original_file_name %} - Too many recipients - {% else %} - Daily limit reached - {% endif %} -

-

- You can only send {{ current_service.message_limit|format_thousands }} messages per day - {%- if current_service.trial_mode %} - in trial mode - {%- endif -%} - . -

-{% if original_file_name %} -

- {% if current_service.message_limit != remaining_messages %} +

+ + + diff --git a/app/templates/views/check/column-errors.html b/app/templates/views/check/column-errors.html index d63a1258c..404302ffe 100644 --- a/app/templates/views/check/column-errors.html +++ b/app/templates/views/check/column-errors.html @@ -6,193 +6,208 @@ {% from "components/components/back-link/macro.njk" import usaBackLink %} {% block service_page_title %} - Error +Error {% endblock %} {% block backLink %} - {{ usaBackLink({ "href": back_link }) }} +{{ usaBackLink({ "href": back_link }) }} {% endblock %} {% block maincolumn_content %} -
- {% call banner_wrapper(type='dangerous') %} +
+ {% call banner_wrapper(type='dangerous') %} - {% if recipients.too_many_rows %} + {% if recipients.too_many_rows %} -

- Your file has too many rows -

-

+

+ {% elif not count_of_recipients %} -
-
- {% if not request.args.from_test %} - {{ file_upload( - form.file, - allowed_file_extensions=allowed_file_extensions, - action=url_for('.send_messages', service_id=current_service.id, template_id=template.id), - button_text='Upload your file again' - ) }} + - {% if not request.args.from_test %} + {% elif not recipients.has_recipient_columns %} - {% set column_headers = recipients._raw_column_headers if recipients.duplicate_recipient_column_headers else recipients.column_headers %} + -

{{ original_file_name }}

+ {% elif recipients.duplicate_recipient_column_headers %} -
- {% call(item, row_number) list_table( - recipients.displayed_rows, - caption=original_file_name, - caption_visible=False, - field_headings=[ - 'Row in file'|safe - ] + column_headers - ) %} - {% call index_field() %} - - {% set displayed_index = item.index + 2 %} - {{ displayed_index }} - - {% endcall %} - {% for column in column_headers %} - {% if item[column].error and not recipients.missing_column_headers %} - {% call field() %} - - {{ item[column].error }} - {{ item[column].data if item[column].data != None }} - - {% endcall %} - {% elif item[column].ignore %} - {{ text_field(item[column].data or '', status='default') }} - {% else %} - {{ text_field(item[column].data or '') }} - {% endif %} - {% endfor %} - {% if item[None].data %} - {% for column in item[None].data %} - {{ text_field(column, status='default') }} - {% endfor %} - {% endif %} - {% endcall %} + + + {% elif recipients.missing_column_headers %} + + + + {% elif sent_previously %} + + {% include "partials/check/sent-previously.html" %} + + {% elif not recipients.allowed_to_send_to %} + + {% with + count_of_recipients=count_of_recipients, + template_type_label=recipients.recipient_column_headers[0] + %} + {% include "partials/check/not-allowed-to-send-to.html" %} + {% endwith %} + + {% elif recipients.more_rows_than_can_send %} + + {% include "partials/check/too-many-messages.html" %} + + {% endif %} + + {% endcall %} +
+ + +
+
+ {% if not request.args.from_test %} + {{ file_upload( + form.file, + allowed_file_extensions=allowed_file_extensions, + action=url_for('.send_messages', service_id=current_service.id, template_id=template.id), + button_text='Upload your file again' + ) }} {% endif %}
+ Back to top +
- {% if recipients.too_many_rows %} -

- Only showing the first {{ count_of_displayed_recipients }} rows -

- {% elif count_of_displayed_recipients < count_of_recipients %} -

- {% if row_errors and not recipients.missing_column_headers %} - Only showing the first {{ count_of_displayed_recipients }} rows with errors - {% else %} - Only showing the first {{ count_of_displayed_recipients }} rows - {% endif %} -

+{% if not request.args.from_test %} + +{% set column_headers = recipients._raw_column_headers if recipients.duplicate_recipient_column_headers else +recipients.column_headers %} + +

{{ original_file_name }}

+ +
+ {% call(item, row_number) list_table( + recipients.displayed_rows, + caption=original_file_name, + caption_visible=False, + field_headings=[ + 'Row in file'|safe + ] + column_headers + ) %} + {% call index_field() %} + + {% set displayed_index = item.index + 2 %} + {{ displayed_index }} + + {% endcall %} + {% for column in column_headers %} + {% if item[column].error and not recipients.missing_column_headers %} + {% call field() %} + + {{ item[column].error }} + {{ item[column].data if item[column].data != None }} + + {% endcall %} + {% elif item[column].ignore %} + {{ text_field(item[column].data or '', status='default') }} + {% else %} + {{ text_field(item[column].data or '') }} + {% endif %} + {% endfor %} + {% if item[None].data %} + {% for column in item[None].data %} + {{ text_field(column, status='default') }} + {% endfor %} + {% endif %} + {% endcall %} + {% endif %} +
+ +{% if recipients.too_many_rows %} +

+ Only showing the first {{ count_of_displayed_recipients }} rows +

+{% elif count_of_displayed_recipients < count_of_recipients %}

+ {% if row_errors and not recipients.missing_column_headers %} + Only showing the first {{ count_of_displayed_recipients }} rows with errors + {% else %} + Only showing the first {{ count_of_displayed_recipients }} rows + {% endif %} +

{% elif row_errors and not recipients.missing_column_headers %} -

- Only showing rows with errors -

+

+ Only showing rows with errors +

{% endif %}

Preview of {{ template.name }}

{{ template|string }} -{% endblock %} + {% endblock %} \ No newline at end of file