darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-11 10:28:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make table labels match titles of callback pages

Browse Source 
This makes it consistent from page to page, and match the wording that
Thom came up with.
This commit is contained in:
Chris Hill-Scott
2017-12-13 11:56:26 +00:00
parent 87aee243b6
commit f02ec30979
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/templates/views/api/callbacks.html
+2 -2
View File
@@ -18,13 +18,13 @@
caption_visible=False caption_visible=False
) %} ) %}
{% call row() %} {% call row() %}
{{ text_field('Delivery status callback URL') }} {{ text_field('Callbacks for delivery receipts') }}
{{ optional_text_field(received_text_messages_callback) }} {{ optional_text_field(received_text_messages_callback) }}
{{ edit_field('Change', url_for('.delivery_status_callback', service_id=current_service.id)) }} {{ edit_field('Change', url_for('.delivery_status_callback', service_id=current_service.id)) }}
{% endcall %} {% endcall %}
{% call row() %} {% call row() %}
{{ text_field('Received text messages callback URL') }} {{ text_field('Callbacks for received text messages') }}
{{ optional_text_field(delivery_status_callback) }} {{ optional_text_field(delivery_status_callback) }}
{{ edit_field('Change', url_for('.received_text_messages_callback', service_id=current_service.id)) }} {{ edit_field('Change', url_for('.received_text_messages_callback', service_id=current_service.id)) }}
{% endcall %} {% endcall %}
app/templates/views/api/callbacks/delivery-status-callback.html
+2 -2
View File
@@ -3,13 +3,13 @@
{% from "components/page-footer.html" import page_footer %} {% from "components/page-footer.html" import page_footer %}
{% block service_page_title %} {% block service_page_title %}
Callback for delivery receipts Callbacks for delivery receipts
{% endblock %} {% endblock %}
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="grid-row"> <div class="grid-row">
<div class="column-five-sixths"> <div class="column-five-sixths">
<h1 class="heading-large">Callback for delivery receipts</h1> <h1 class="heading-large">Callbacks for delivery receipts</h1>
<p> <p>
When you send an email or text message, we can tell you if Notify was able to deliver it. When you send an email or text message, we can tell you if Notify was able to deliver it.
Check the <a href="{{ url_for('.callbacks') }}"> callback documentation </a> for more information. Check the <a href="{{ url_for('.callbacks') }}"> callback documentation </a> for more information.
app/templates/views/api/callbacks/received-text-messages-callback.html
+2 -2
View File
@@ -3,13 +3,13 @@
{% from "components/page-footer.html" import page_footer %} {% from "components/page-footer.html" import page_footer %}
{% block service_page_title %} {% block service_page_title %}
Callback for received text messages Callbacks for received text messages
{% endblock %} {% endblock %}
{% block maincolumn_content %} {% block maincolumn_content %}
<h1 class="heading-large">Callbacks for received text messages</h1>
<div class="grid-row"> <div class="grid-row">
<div class="column-five-sixths"> <div class="column-five-sixths">
<h1 class="heading-large">Callback for received text messages</h1>
<p> <p>
When you receive a text message in Notify, we can forward it to your system. When you receive a text message in Notify, we can forward it to your system.
Check the <a href="{{ url_for('.callbacks') }}"> callback documentation </a> for more information. Check the <a href="{{ url_for('.callbacks') }}"> callback documentation </a> for more information.
tests/app/main/views/test_api_keys.py
+5 -3
View File
@@ -467,7 +467,7 @@ def test_callbacks_page_redirects_to_delivery_status_if_service_has_no_inbound_s
_follow_redirects=True, _follow_redirects=True,
) )
assert normalize_spaces(page.select_one('h1').text) == "Callback for delivery receipts" assert normalize_spaces(page.select_one('h1').text) == "Callbacks for delivery receipts"
@pytest.mark.parametrize('has_inbound_sms, expected_link', [ @pytest.mark.parametrize('has_inbound_sms, expected_link', [
@@ -651,8 +651,10 @@ def test_callbacks_page_works_when_no_apis_set(
page = client_request.get('main.api_callbacks', page = client_request.get('main.api_callbacks',
service_id=service_one['id'], service_id=service_one['id'],
_follow_redirects=True) _follow_redirects=True)
expected_rows = ['Delivery status callback URL Not set Change', expected_rows = [
'Received text messages callback URL Not set Change'] 'Callbacks for delivery receipts Not set Change',
'Callbacks for received text messages Not set Change',
]
rows = page.select('tr') rows = page.select('tr')
assert len(rows) == 3 assert len(rows) == 3
for index, row in enumerate(expected_rows): for index, row in enumerate(expected_rows):