darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-23 20:01:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
203393de235631db0ce3c38dec85da170a634fba
notifications-admin/app/templates/views/notifications/check.html

74 lines
2.7 KiB
HTML
Raw Normal View History

add new endpoints for one-off flow rather than creating a job, after entering the placeholders, you now send a single notification. This means we don't clog up s3 by creating lots of one line CSV files.
2017-06-23 15:02:20 +01:00
{% extends "withnav_template.html" %}
Make sure errors on one-off flow have red border When I split up the error messages on the check CSV page into multiple templates, I also reduced the repetition of wrapping `<div>`s and macro calls by moving them up outside the conditional blocks (see 8e947f315d9b864f79ffd8771b36cd0061eacc3d). Unfortunately I didn’t make the same adjustments for the one-off flow, which meant that errors on these pages lost their styling. This commit re-adds the styling for these error messages.
2017-07-25 22:57:01 +01:00
{% from "components/banner.html" import banner_wrapper %}
add new endpoints for one-off flow rather than creating a job, after entering the placeholders, you now send a single notification. This means we don't clog up s3 by creating lots of one line CSV files.
2017-06-23 15:02:20 +01:00
{% from "components/message-count-label.html" import message_count_label %}
{% block service_page_title %}
Make it clear which template you’re sending The one downside of skipping the template page is that you no longer get such strong confirmation that you’ve picked the correct template. You still see the preview of the template, but it’s further down the page, and the name of the template has disappeared. This commit adds the name of the template to the page title, to: - have some continuity from the previous page - make it easier to double-check you’ve chosen the correct template
2018-08-06 11:20:50 +01:00
{{ "Error" if error else "Preview of ‘{}’".format(template.name) }}
add new endpoints for one-off flow rather than creating a job, after entering the placeholders, you now send a single notification. This means we don't clog up s3 by creating lots of one line CSV files.
2017-06-23 15:02:20 +01:00
{% endblock %}
{% block maincolumn_content %}
Show error banner for one off letter in trial mode In trial mode you can’t send letters. But it’s still useful to be able to build up a letter to see how it work. Best place to put this error is before someone tries to send a letter for real.
2018-10-30 16:32:10 +00:00
{% if template.template_type == 'letter' and current_service.trial_mode %}
{% set error = 'trial-mode-letters' %}
<div class="bottom-gutter">
Fix double error border
2018-11-01 14:45:12 +00:00
{% call banner_wrapper(type='dangerous') %}
{% with
count_of_recipients=1
%}
Show error banner for one off letter in trial mode In trial mode you can’t send letters. But it’s still useful to be able to build up a letter to see how it work. Best place to put this error is before someone tries to send a letter for real.
2018-10-30 16:32:10 +00:00
{% include "partials/check/trying-to-send-letters-in-trial-mode.html" %}
Fix double error border
2018-11-01 14:45:12 +00:00
{% endwith %}
{% endcall %}
Show error banner for one off letter in trial mode In trial mode you can’t send letters. But it’s still useful to be able to build up a letter to see how it work. Best place to put this error is before someone tries to send a letter for real.
2018-10-30 16:32:10 +00:00
</div>
{% elif error == 'not-allowed-to-send-to' %}
Make sure errors on one-off flow have red border When I split up the error messages on the check CSV page into multiple templates, I also reduced the repetition of wrapping `<div>`s and macro calls by moving them up outside the conditional blocks (see 8e947f315d9b864f79ffd8771b36cd0061eacc3d). Unfortunately I didn’t make the same adjustments for the one-off flow, which meant that errors on these pages lost their styling. This commit re-adds the styling for these error messages.
2017-07-25 22:57:01 +01:00
<div class="bottom-gutter">
{% call banner_wrapper(type='dangerous') %}
{% with
count_of_recipients=1,
Make one-off error refer to correct message type This was hard coded to say ‘You can’t send to this phone number’ even when you were trying to send an email.
2017-07-25 23:06:55 +01:00
template_type_label=(
'phone number' if template.template_type == 'sms' else 'email address'
)
Make sure errors on one-off flow have red border When I split up the error messages on the check CSV page into multiple templates, I also reduced the repetition of wrapping `<div>`s and macro calls by moving them up outside the conditional blocks (see 8e947f315d9b864f79ffd8771b36cd0061eacc3d). Unfortunately I didn’t make the same adjustments for the one-off flow, which meant that errors on these pages lost their styling. This commit re-adds the styling for these error messages.
2017-07-25 22:57:01 +01:00
%}
{% include "partials/check/not-allowed-to-send-to.html" %}
{% endwith %}
{% endcall %}
</div>
add other send notification error branches and tests
2017-06-29 16:06:36 +01:00
{% elif error == 'too-many-messages' %}
Make sure errors on one-off flow have red border When I split up the error messages on the check CSV page into multiple templates, I also reduced the repetition of wrapping `<div>`s and macro calls by moving them up outside the conditional blocks (see 8e947f315d9b864f79ffd8771b36cd0061eacc3d). Unfortunately I didn’t make the same adjustments for the one-off flow, which meant that errors on these pages lost their styling. This commit re-adds the styling for these error messages.
2017-07-25 22:57:01 +01:00
<div class="bottom-gutter">
{% call banner_wrapper(type='dangerous') %}
{% include "partials/check/too-many-messages.html" %}
{% endcall %}
</div>
add other send notification error branches and tests
2017-06-29 16:06:36 +01:00
{% elif error == 'message-too-long' %}
make partials source-agnostic they're currently expecting a RecipientsCSV object - but we won't always have that available if we're handling a single notification. So make the partials take generic variables, and then use a jinja with block to pass in the correct values from either the check csv page or the check notification page. Additionally set the notification check page to show errors nicely - hide the send button if there were problems, and replace the header
2017-06-29 15:33:31 +01:00
{# the only row_errors we can get when sending one off messages is that the message is too long #}
Make sure errors on one-off flow have red border When I split up the error messages on the check CSV page into multiple templates, I also reduced the repetition of wrapping `<div>`s and macro calls by moving them up outside the conditional blocks (see 8e947f315d9b864f79ffd8771b36cd0061eacc3d). Unfortunately I didn’t make the same adjustments for the one-off flow, which meant that errors on these pages lost their styling. This commit re-adds the styling for these error messages.
2017-07-25 22:57:01 +01:00
<div class="bottom-gutter">
{% call banner_wrapper(type='dangerous') %}
{% include "partials/check/message-too-long.html" %}
{% endcall %}
</div>
make partials source-agnostic they're currently expecting a RecipientsCSV object - but we won't always have that available if we're handling a single notification. So make the partials take generic variables, and then use a jinja with block to pass in the correct values from either the check csv page or the check notification page. Additionally set the notification check page to show errors nicely - hide the send button if there were problems, and replace the header
2017-06-29 15:33:31 +01:00
{% else %}
<h1 class="heading-large">
Make it clear which template you’re sending The one downside of skipping the template page is that you no longer get such strong confirmation that you’ve picked the correct template. You still see the preview of the template, but it’s further down the page, and the name of the template has disappeared. This commit adds the name of the template to the page title, to: - have some continuity from the previous page - make it easier to double-check you’ve chosen the correct template
2018-08-06 11:20:50 +01:00
Preview of ‘{{ template.name }}’
make partials source-agnostic they're currently expecting a RecipientsCSV object - but we won't always have that available if we're handling a single notification. So make the partials take generic variables, and then use a jinja with block to pass in the correct values from either the check csv page or the check notification page. Additionally set the notification check page to show errors nicely - hide the send button if there were problems, and replace the header
2017-06-29 15:33:31 +01:00
</h1>
{% endif %}
add new endpoints for one-off flow rather than creating a job, after entering the placeholders, you now send a single notification. This means we don't clog up s3 by creating lots of one line CSV files.
2017-06-23 15:02:20 +01:00
{{ template|string }}
Put sticky footers on check one-off page This page is a good use case for sticky footers because the primary action on the page would otherwise be off the bottom of the viewport.
2018-11-19 15:21:09 +00:00
<div class="js-stick-at-bottom-when-scrolling">
help (aka tour) now works correctly throughout the notification flow
2017-06-30 11:49:03 +01:00
<form method="post" enctype="multipart/form-data" action="{{url_for(
'main.send_notification',
service_id=current_service.id,
template_id=template.id,
help='3' if help else 0
)}}" class='page-footer'>
add new endpoints for one-off flow rather than creating a job, after entering the placeholders, you now send a single notification. This means we don't clog up s3 by creating lots of one line CSV files.
2017-06-23 15:02:20 +01:00
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
make partials source-agnostic they're currently expecting a RecipientsCSV object - but we won't always have that available if we're handling a single notification. So make the partials take generic variables, and then use a jinja with block to pass in the correct values from either the check csv page or the check notification page. Additionally set the notification check page to show errors nicely - hide the send button if there were problems, and replace the header
2017-06-29 15:33:31 +01:00
{% if not error %}
Use `<button>` not `<input>`s for form submission Both `<button type='submit'>Submit<button>` and `<input type='submit' value='Submit'>` can be used to submit a form. We have historically[1] used `<input>` because it’s better-supported by IE6 in that: - the `submit` attribute is mandatory on `<button>`, not on `<input>` - the `innerHTML` of a button will be submitted to the server, not the value (as in other browsers) Reasons to now use `<button>` instead: - IE6/7 support is no longer a concern (especially with deprecation of TLS 1.0 on the way) - Because an `<input>` element can’t have children, the pseudo-element hack[2] used to ensure the top edge of the button is clickable doesn’t work. We’re seeing this bug[3] affect real users in research. 1. We inhereted our buttons from Digital Marketplace, here is me making that change in their code: https://github.com/alphagov/digitalmarketplace-frontend-toolkit/commit/8df7e2e79e53f85e26ca69d0439a5c7879323cd0#diff-b1420f7b7a25657d849edf90a70ef541 2. https://github.com/alphagov/govuk_frontend_toolkit/commit/24e1906c0d908f0e15609ad2376feb7dd56f5731#diff-ef0e4eb6f1e90b44b0c3fe39dce274a4R79 3. https://github.com/alphagov/govuk_elements/issues/545
2018-02-01 13:32:27 +00:00
<button type="submit" class="button">Send 1 {{ message_count_label(1, template.template_type, suffix='') }}</button>
add new endpoints for one-off flow rather than creating a job, after entering the placeholders, you now send a single notification. This means we don't clog up s3 by creating lots of one line CSV files.
2017-06-23 15:02:20 +01:00
{% endif %}
<a href="{{ back_link }}" class="page-footer-back-link">Back</a>
Always show download link for PDF This feature is useful for people to try the letter thing out and see how it feels, maybe print one on their own printer before incurring cost.
2018-10-30 14:27:09 +00:00
{% if template.template_type == 'letter' %}
Remove the word ‘printable’ Don’t think it’s necessary. Makes things consistent with the sent letter page, which only says ‘Download as a PDF’. This inconsistency would be more glaring now these pieces of text appear in the same place, in adjacent steps of a journey.
2018-11-22 12:17:11 +00:00
<a href="{{ url_for('main.check_notification_preview', service_id=current_service.id, template_id=template.id, filetype='pdf') }}" download class="page-footer-right-aligned-link">Download as a PDF</a>
Always show download link for PDF This feature is useful for people to try the letter thing out and see how it feels, maybe print one on their own printer before incurring cost.
2018-10-30 14:27:09 +00:00
{% endif %}
add new endpoints for one-off flow rather than creating a job, after entering the placeholders, you now send a single notification. This means we don't clog up s3 by creating lots of one line CSV files.
2017-06-23 15:02:20 +01:00
</form>
</div>
{% endblock %}
Reference in New Issue Copy Permalink