darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-11 09:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
43ef3e86ae9e1578aacc42db07c913ea8d253abd
notifications-admin/app/templates/views/send.html

63 lines
1.9 KiB
HTML
Raw Normal View History

Added main nav to logged in pages
2015-12-14 16:53:07 +00:00
{% extends "withnav_template.html" %}
Get SASS compilation working Main thing that was missing was including the main CSS file in the template. There are a few hacky bits here, like moving the whole of toolkit inside the stylesheets directory. Would arguably be cleaner using something that isn’t Flask Assets, but that’s something for later.
2015-12-10 15:57:32 +00:00
{% from "components/sms-message.html" import sms_message %}
Make send the send flow generic This commit parameterises all methods in the send view so that they can send either emails or SMS messages. It works out what kind of message it is sending from the `template_type` property of the template object. This means that the `Template` util class needs to know about these properties, which means that this commit depends on: https://github.com/alphagov/notifications-utils/pull/2 This commit does _not_ add tests for sending emails. The existing tests for sending SMS still pass, but actually sending emails is outside the scope of this story.
2016-02-22 17:17:18 +00:00
{% from "components/email-message.html" import email_message %}
Rename `submit_form` component to `page_footer` Submit form was - a confusing name in itself - not descriptive, because it also has an optional ‘back’ link This commit also puts this component in as many pages as possible, stripping out any hard-coded buttons and links. It replaces any usage of buttons for ‘back’, because these are links, not buttons (ie they don’t change any data).
2016-01-07 20:11:22 +00:00
{% from "components/page-footer.html" import page_footer %}
Add custom file upload to the send SMS page This is the only place we’re doing file upload at the moment.
2016-02-03 13:00:26 +00:00
{% from "components/file-upload.html" import file_upload %}
Add row numbers to tables When a table is showing the contents of a CSV file, it should look something like a spreadsheet. The minimally skeuomorphic way to do this is by adding row numbers. This commit doesn’t - make the row numbers monospace (it’s barely noticeable and doesn’t reflect what actual spreadsheets do) - make the first column heading ‘Row’ (again, doesn’t reflect how actual spreadsheets work, and takes up more valuable space)
2016-04-05 11:16:29 +01:00
{% from "components/table.html" import list_table, text_field, index_field, index_field_heading %}
Shell page for sending text messages
2015-11-30 14:17:54 +00:00
{% block page_title %}
Make page titles consistent This commit modifies the HTML `<title>` tags for all the pages. It makes two main changes: - make the title tag match the `<h1>` of the page, for better or worse - put the service name after the page title, seperated by an en dash, as per GOV.UK
2016-02-08 09:23:51 +00:00
Send text messages – GOV.UK Notify
Shell page for sending text messages
2015-11-30 14:17:54 +00:00
{% endblock %}
Added main nav to logged in pages
2015-12-14 16:53:07 +00:00
{% block maincolumn_content %}
Updates to display of jobs This commit: - adds the template to the jobs page (and puts it at the top of the send SMS page) so that it consistently appears in the same place throughout the journey - put the real data about a job on the jobs page and on the dashboard
2016-02-03 14:43:16 +00:00
Make the flow of using templates better For users who: - want to send messages from a template - want to edit templates For developers: - who need to get the ID of a template This commit mainly cleans up the choose template page so there are less options, and the options that are there are less wordy. This means: - moving ‘send yourself a test’ onto the send messages page, and making it button - stripping a lot of stuff out of the ‘send from API’ page, so it’s more obvious what the template ID is
2016-04-18 11:10:47 +01:00
<h1 class="heading-large">Send {{ 'text messages' if 'sms' == template.template_type else 'emails' }}</h1>
<div class="grid-row">
<div class="column-two-thirds">
{% if 'sms' == template.template_type %}
Prefix text messages with service name Brings in: https://github.com/alphagov/notifications-utils/pull/4
2016-02-26 09:33:45 +00:00
{{ sms_message(template.formatted_as_markup) }}
Make the flow of using templates better For users who: - want to send messages from a template - want to edit templates For developers: - who need to get the ID of a template This commit mainly cleans up the choose template page so there are less options, and the options that are there are less wordy. This means: - moving ‘send yourself a test’ onto the send messages page, and making it button - stripping a lot of stuff out of the ‘send from API’ page, so it’s more obvious what the template ID is
2016-04-18 11:10:47 +01:00
{% elif 'email' == template.template_type %}
{{ email_message(
template.formatted_subject_as_markup,
template.formatted_as_markup
) }}
{% endif %}
</div>
<div class="column-one-third">
<a href="{{ url_for(".send_message_to_self", service_id=current_service.id, template_id=template.id) }}" class='secondary-button'>Send yourself a test</a>
Consolidate page templates for emails + texts Use one page template for each of: - choosing a message template - adding recipients - checking an email message - looking at a job This commit consolidates the two templates into one, and adds logic to show the SMS message pattern or the email message pattern depending on the type of template. It also gives email templates a bit more width, because the body and the from address tend to be quite long.
2016-02-25 16:37:39 +00:00
</div>
Make the flow of using templates better For users who: - want to send messages from a template - want to edit templates For developers: - who need to get the ID of a template This commit mainly cleans up the choose template page so there are less options, and the options that are there are less wordy. This means: - moving ‘send yourself a test’ onto the send messages page, and making it button - stripping a lot of stuff out of the ‘send from API’ page, so it’s more obvious what the template ID is
2016-04-18 11:10:47 +01:00
</div>
Consolidate page templates for emails + texts Use one page template for each of: - choosing a message template - adding recipients - checking an email message - looking at a job This commit consolidates the two templates into one, and adds logic to show the SMS message pattern or the email message pattern depending on the type of template. It also gives email templates a bit more width, because the body and the from address tend to be quite long.
2016-02-25 16:37:39 +00:00
Make heading sizes more consistent On: - the API keys page - the ‘send’ page There are some inconsistently small heading sizes. This commit makes them consistent with the heading sizes on other pages.
2016-04-11 10:43:59 +01:00
<h2 class="heading-medium">
Make the flow of using templates better For users who: - want to send messages from a template - want to edit templates For developers: - who need to get the ID of a template This commit mainly cleans up the choose template page so there are less options, and the options that are there are less wordy. This means: - moving ‘send yourself a test’ onto the send messages page, and making it button - stripping a lot of stuff out of the ‘send from API’ page, so it’s more obvious what the template ID is
2016-04-18 11:10:47 +01:00
Make a CSV file with
Show an example of a CSV on the ‘send’ page This should help: - understanding of what the CSV should contain - understanding what ‘download example’ will do
2016-04-01 15:36:35 +01:00
{{ template.placeholders|length + 1 }}
{% if template.placeholders %}
Make the flow of using templates better For users who: - want to send messages from a template - want to edit templates For developers: - who need to get the ID of a template This commit mainly cleans up the choose template page so there are less options, and the options that are there are less wordy. This means: - moving ‘send yourself a test’ onto the send messages page, and making it button - stripping a lot of stuff out of the ‘send from API’ page, so it’s more obvious what the template ID is
2016-04-18 11:10:47 +01:00
columns,
Show an example of a CSV on the ‘send’ page This should help: - understanding of what the CSV should contain - understanding what ‘download example’ will do
2016-04-01 15:36:35 +01:00
{% else %}
Make the flow of using templates better For users who: - want to send messages from a template - want to edit templates For developers: - who need to get the ID of a template This commit mainly cleans up the choose template page so there are less options, and the options that are there are less wordy. This means: - moving ‘send yourself a test’ onto the send messages page, and making it button - stripping a lot of stuff out of the ‘send from API’ page, so it’s more obvious what the template ID is
2016-04-18 11:10:47 +01:00
column,
Show an example of a CSV on the ‘send’ page This should help: - understanding of what the CSV should contain - understanding what ‘download example’ will do
2016-04-01 15:36:35 +01:00
{% endif %}
Make the flow of using templates better For users who: - want to send messages from a template - want to edit templates For developers: - who need to get the ID of a template This commit mainly cleans up the choose template page so there are less options, and the options that are there are less wordy. This means: - moving ‘send yourself a test’ onto the send messages page, and making it button - stripping a lot of stuff out of the ‘send from API’ page, so it’s more obvious what the template ID is
2016-04-18 11:10:47 +01:00
like this:
Make heading sizes more consistent On: - the API keys page - the ‘send’ page There are some inconsistently small heading sizes. This commit makes them consistent with the heading sizes on other pages.
2016-04-11 10:43:59 +01:00
</h2>
Show an example of a CSV on the ‘send’ page This should help: - understanding of what the CSV should contain - understanding what ‘download example’ will do
2016-04-01 15:36:35 +01:00
Add row numbers to tables When a table is showing the contents of a CSV file, it should look something like a spreadsheet. The minimally skeuomorphic way to do this is by adding row numbers. This commit doesn’t - make the row numbers monospace (it’s barely noticeable and doesn’t reflect what actual spreadsheets do) - make the first column heading ‘Row’ (again, doesn’t reflect how actual spreadsheets work, and takes up more valuable space)
2016-04-05 11:16:29 +01:00
{% call(item, row_number) list_table(
Show an example of a CSV on the ‘send’ page This should help: - understanding of what the CSV should contain - understanding what ‘download example’ will do
2016-04-01 15:36:35 +01:00
example,
caption="Example",
caption_visible=False,
Change display of placeholder columns On the send page, it should hightlight the placeholders so they match what you need to put in the CSV file. On the check page, they should not be highlighted, to match what’s in the (rendered) template.
2016-04-11 10:38:43 +01:00
field_headings=['1'] + [recipient_column] + template.placeholders_as_markup|list
Show an example of a CSV on the ‘send’ page This should help: - understanding of what the CSV should contain - understanding what ‘download example’ will do
2016-04-01 15:36:35 +01:00
) %}
Add row numbers to tables When a table is showing the contents of a CSV file, it should look something like a spreadsheet. The minimally skeuomorphic way to do this is by adding row numbers. This commit doesn’t - make the row numbers monospace (it’s barely noticeable and doesn’t reflect what actual spreadsheets do) - make the first column heading ‘Row’ (again, doesn’t reflect how actual spreadsheets work, and takes up more valuable space)
2016-04-05 11:16:29 +01:00
{{ index_field(row_number) }}
Show an example of a CSV on the ‘send’ page This should help: - understanding of what the CSV should contain - understanding what ‘download example’ will do
2016-04-01 15:36:35 +01:00
{% for column in item %}
{{ text_field(column) }}
{% endfor %}
{% endcall %}
Truncate previews of email messages to ~3 lines Emails can get very long. When you’re trying to do other things on the page this results in a lot of scrolling. This commit truncates email messages to about 3 lines, and adds a JS toggle which reveal the full contents of the email.
2016-04-11 15:16:41 +01:00
<p class="table-show-more-link">
Added current_service to flask context and template context. Fix all tests and conflicts. Removed comment line.
2016-04-04 16:53:52 +01:00
<a href="{{ url_for('.get_example_csv', service_id=current_service.id, template_id=template.id) }}">Download this example</a>
Show an example of a CSV on the ‘send’ page This should help: - understanding of what the CSV should contain - understanding what ‘download example’ will do
2016-04-01 15:36:35 +01:00
</p>
Give users better guidance about CSV files This commit adds some guidance on the ‘Add recipients’ page about what should be in the CSV file. The guidance is contextual to the template, and based on the problems that we saw users having yesterday.
2016-02-26 16:22:07 +00:00
{{file_upload(form.file, button_text='Upload your CSV file')}}
Remove the weird table from the send SMS page It was weird.
2016-02-18 17:29:16 +00:00
Fix incorrect heading on send page Accidentally reverted here: https://github.com/alphagov/notifications-admin/commit/f84797e6d538d1aec15c0ce324c8b76563236df7#diff-f7abe60b3b6c55859d983b3e19008838L14 Matches the link on the choose template page.
2016-04-05 11:20:52 +01:00
{% endblock %}
Reference in New Issue Copy Permalink