darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-05 22:38:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into styleguide-l

Browse Source
This commit is contained in:
Chris Hill-Scott
2018-01-15 14:12:07 +00:00
committed by GitHub
parent 36f68b960a 58d242198e
commit c68b10590d
12 changed files with 235 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/templates/views/api/callbacks.html
View File

@@ -30,4 +30,8 @@
{% endcall %}
{% endcall %}
</div>
{{ page_footer(
secondary_link=url_for('.api_integration', service_id=current_service.id),
secondary_link_text='Back to API integration'
) }}
{% endblock %}

10
app/templates/views/notifications.html
View File

@@ -42,8 +42,16 @@
<input type="hidden" name="to" value="{{ search_form.to.data }}">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
</form>
{% else %}
<form id="search-form" method="post">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
</form>
{% endif %}
<!--<p class="bottom-gutter">-->
<!--<a href="{{ download_link }}" download="download" class="heading-small">Download this report</a>-->
<!--&emsp;-->
<!--Data available for 7 days-->
<!--</p>-->
{{ ajax_block(
partials,
url_for('.get_notifications_as_json', service_id=current_service.id, message_type=message_type, status=status, page=page),

15
app/templates/views/service-settings/name.html
View File

@@ -10,13 +10,16 @@
<h1 class="heading-large">Change your service name</h1>
<div class="form-group">
<p>Users will see your service name:</p>
<ul class="list-bullet">
<li>at the start of every text message, eg ‘Vehicle tax: we received your payment, thank you’</li>
<li>as your email sender name</li>
</ul>
{% if current_service.prefix_sms %}
<p>Users will see your service name:</p>
<ul class="list-bullet">
<li>at the start of every text message, eg ‘{{ current_service.name }}: This is an example message’</li>
<li>as your email sender name</li>
</ul>
{% else %}
<p>Users will see your service name as your email sender name.</p>
{% endif %}
</div>
<form method="post">

6
app/templates/views/service-settings/set-inbound-sms.html
View File

@@ -19,6 +19,12 @@
If you want to turn this feature off,
<a href="{{ url_for('.support') }}">get in touch with the GOV.UK Notify team</a>.
</p>
{% if current_user.has_permissions(['manage_api_keys'], admin_override=True) %}
<p>
You can set up callbacks for received text messages on the
<a href="{{ url_for('.api_callbacks', service_id=current_service.id) }}">API integration page</a>.
</p>
{% endif %}
{% else %}
<p>
Receiving text messages from your users is an