darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-24 16:24:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move day and test key messages to <p> instead of left column

Browse Source 
We don't want large numbers in Production to start overlapping other columns
in the tables when they have less space available, and putting these messages
at the top of the page under the h1 means that we don't need an extra column
on the page yet.
This commit is contained in:
Jenny Duckett
2016-12-06 12:38:12 +00:00
parent df265f188d
commit 93405dd56b
2 changed files with 33 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
app/templates/views/platform-admin.html
View File

@@ -87,45 +87,38 @@
Platform admin Platform admin
</h1> </h1>
<div class="grid-row"> <p class="bottom-gutter-2">
<div class="column-one-third"> Showing stats for today&emsp;
<nav class="navigation"> {% if include_from_test_key %}
<ul> Including test keys (<a href="{{ url_for('.platform_admin', include_from_test_key=False) }}">change</a>)
<li>Showing stats for today</li> {% else %}
{% if include_from_test_key %} Excluding test keys (<a href="{{ url_for('.platform_admin') }}">change</a>)
<li>Including test key (<a href="{{ url_for('.platform_admin', include_from_test_key=False) }}">change</a>)</li> {% endif %}
{% else %} </p>
<li>Excluding test key (<a href="{{ url_for('.platform_admin') }}">change</a>)</li>
{% endif %} <div class="grid-row bottom-gutter">
</ul> <div class="column-half">
</nav> {{ big_number_with_status(
global_stats.email.delivered,
message_count_label(global_stats.email.delivered, 'email'),
global_stats.email.failed,
global_stats.email.failure_rate,
global_stats.email.failure_rate|float > 3,
) }}
</div>
<div class="column-half">
{{ big_number_with_status(
global_stats.sms.delivered,
message_count_label(global_stats.sms.delivered, 'sms'),
global_stats.sms.failed,
global_stats.sms.failure_rate,
global_stats.sms.failure_rate|float > 3,
) }}
</div> </div>
<main role="main" class="column-two-thirds column-main">
<div class="grid-row bottom-gutter">
<div class="column-half">
{{ big_number_with_status(
global_stats.email.delivered,
message_count_label(global_stats.email.delivered, 'email'),
global_stats.email.failed,
global_stats.email.failure_rate,
global_stats.email.failure_rate|float > 3,
) }}
</div>
<div class="column-half">
{{ big_number_with_status(
global_stats.sms.delivered,
message_count_label(global_stats.sms.delivered, 'sms'),
global_stats.sms.failed,
global_stats.sms.failure_rate,
global_stats.sms.failure_rate|float > 3,
) }}
</div>
</div>
{{ services_table(live_services, 'Live services') }}
{{ services_table(trial_mode_services, 'Trial mode services') }}
</main>
</div> </div>
{{ services_table(live_services, 'Live services') }}
{{ services_table(trial_mode_services, 'Trial mode services') }}
{% endblock %} {% endblock %}

4
tests/app/main/views/test_platform_admin.py
View File

@@ -88,8 +88,8 @@ def test_should_render_platform_admin_page(
@pytest.mark.parametrize('include_from_test_key, expected_text, unexpected_text, api_args', [ @pytest.mark.parametrize('include_from_test_key, expected_text, unexpected_text, api_args', [
(True, 'Including test key', 'Excluding test key', {'detailed': True}), (True, 'Including test keys', 'Excluding test keys', {'detailed': True}),
(False, 'Excluding test key', 'Including test key', {'detailed': True, 'include_from_test_key': False}) (False, 'Excluding test keys', 'Including test keys', {'detailed': True, 'include_from_test_key': False})
]) ])
def test_platform_admin_toggle_including_from_test_key( def test_platform_admin_toggle_including_from_test_key(
include_from_test_key, include_from_test_key,