Merge pull request #427 from alphagov/update_for_db_rebase

Update for db rebase
This commit is contained in:
Rebecca Law
2016-04-13 12:05:11 +01:00
17 changed files with 184 additions and 138 deletions

View File

@@ -26,7 +26,7 @@
{{ api_key(secret, key_name) }}
{{ page_footer(
secondary_link=url_for('.api_keys', service_id=service_id),
secondary_link=url_for('.api_keys', service_id=current_service.id),
secondary_link_text='Back to API keys'
) }}

View File

@@ -8,7 +8,7 @@
{{ big_number_with_status(
statistics.get('emails_requested', 0),
'email' if statistics.get('emails_requested') == 1 else 'emails',
statistics.get('emails_error'),
statistics.get('emails_failed'),
statistics.get('emails_failure_rate', 0.0),
statistics.get('emails_failure_rate', 0)|float > 3
) }}
@@ -17,7 +17,7 @@
{{ big_number_with_status(
statistics.get('sms_requested', 0),
'text message' if statistics.get('sms_requested') == 1 else 'text messages',
statistics.get('sms_error'),
statistics.get('sms_failed'),
statistics.get('sms_failure_rate', 0.0),
statistics.get('sms_failure_rate', 0)|float > 3
) }}

View File

@@ -17,8 +17,8 @@
<a href="{{ url_for(".view_notifications", service_id=current_service.id, type="email", page=1) }}">Email messages</a>
</p>
<p>
<a href="{{ url_for(".view_notifications", service_id=current_service.id, status=['sent', 'delivered'], page=1) }}">Successful messages</a>&emsp;
<a href="{{ url_for(".view_notifications", service_id=current_service.id, status=['failed', 'complaint', 'bounce'], page=1) }}">Failed messages</a>
<a href="{{ url_for(".view_notifications", service_id=current_service.id, status=['delivered'], page=1) }}">Successful messages</a>&emsp;
<a href="{{ url_for(".view_notifications", service_id=current_service.id, status=['failed'], page=1) }}">Failed messages</a>
</p>
{% call(item, row_number) list_table(
notifications,