darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-15 02:39:36 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
4d0da6594de60fcf37dc7796279462e32072d7a1
notifications-admin/app/templates/views/notifications/check.html

90 lines
3.4 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 %}
Replace all existing back-links with component Includes: - all existing macros - all imports for the existing macros
2019-11-29 09:02:16 +00:00
{% from "components/page-header.html" import page_header %}
{% from "components/back-link/macro.njk" import govukBackLink %}
Replace straightforward buttons and links styled like buttons This replaces the buttons that aren't part of a macro and that we don't need to write additional styles for with their govuk-frontend equivalent. There were some links that were styled to look like buttons, so these have also been replaced with the new govuk-frontend macro. There was one button on the `choose-account.html` template that was in a section of code that was never reached - this has been deleted.
2020-01-30 14:01:13 +00:00
{% from "components/button/macro.njk" import govukButton %}
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
{% 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 %}
Replace all existing back-links with component Includes: - all existing macros - all imports for the existing macros
2019-11-29 09:02:16 +00:00
{{ govukBackLink({ "href": back_link }) }}
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
{% 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' %}
Replace all existing back-links with component Includes: - all existing macros - all imports for the existing macros
2019-11-29 09:02:16 +00:00
{{ govukBackLink({ "href": back_link }) }}
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' %}
Replace all existing back-links with component Includes: - all existing macros - all imports for the existing macros
2019-11-29 09:02:16 +00:00
{{ govukBackLink({ "href": back_link }) }}
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 #}
Replace all existing back-links with component Includes: - all existing macros - all imports for the existing macros
2019-11-29 09:02:16 +00:00
{{ govukBackLink({ "href": back_link }) }}
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>
Move letter too long banner message over from utils, also refactor
2019-10-01 17:16:15 +01:00
{% elif letter_too_long %}
{% set error = 'letter-too-long' %}
Replace all existing back-links with component Includes: - all existing macros - all imports for the existing macros
2019-11-29 09:02:16 +00:00
{{ govukBackLink({ "href": back_link }) }}
Move letter too long banner message over from utils, also refactor
2019-10-01 17:16:15 +01:00
<div class="bottom-gutter">
Test letter too long error banner using exisitng data-error-type attribute This way we can avoid both creating an id attribute for testing and testing by content.
2019-10-24 14:17:01 +01:00
{% call banner_wrapper(type='dangerous') %}
Move letter too long banner message over from utils, also refactor
2019-10-01 17:16:15 +01:00
{% include "partials/check/letter-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 %}
Add GOV.UK Design System style back links The Design System has standardised on back links being at the top of the page, decorated with a small text-coloured arrow. I think this makes more sense than having them at the bottom, because it suggests, in some way, being able to go back before commiting to any of the forms on the page. Whereas the things at the bottom of the page should be performing actions on what’s in the page. The reason for making this change now is that it de-clutters the area around the green buttons. This was presenting a design challenge where multiple levels of interaction were happening in the same form. Moving these back links to the top of the page should mean that, in these complicated forms, there’s one fewer thing to compete for the user’s attention. I’ve componentised this into a `page_header` macro so that the change is easier to roll out and maintain.
2019-04-29 11:44:05 +01:00
{{ page_header(
'Preview of ‘{}’'.format(template.name),
back_link=back_link
) }}
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
{% 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() }}" />
Move letter too long banner message over from utils, also refactor
2019-10-01 17:16:15 +01:00
{% if not error %}
Replace straightforward buttons and links styled like buttons This replaces the buttons that aren't part of a macro and that we don't need to write additional styles for with their govuk-frontend equivalent. There were some links that were styled to look like buttons, so these have also been replaced with the new govuk-frontend macro. There was one button on the `choose-account.html` template that was in a section of code that was never reached - this has been deleted.
2020-01-30 14:01:13 +00:00
{% set button_text %}Send 1 {{ message_count_label(1, template.template_type, suffix='') }}{% endset %}
{{ govukButton({ "text": button_text }) }}
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 %}
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' %}
Update all links to use GOVUK Frontend style Includes: - turning off :visited styles to match existing design - swapping heading classes used to make links bold for the GOVUK Frontend bold override class - adding visually hidden text to some links to make them work when isolated from their context We may need to revisit whether some links, such as those for documentation and features, may benefit from having some indication that their target has been visited.
2019-12-06 07:53:46 +00:00
<a href="{{ url_for('no_cookie.check_notification_preview', service_id=current_service.id, template_id=template.id, filetype='pdf') }}" download class="govuk-link govuk-link--no-visited-state page-footer-right-aligned-link{% if error %}-without-button{% endif %}">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