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

Replace column-one-third with govuk-grid-column-one-third

Browse Source 
Also replaces `column-third`, with `govuk-grid-column-one-third`, since
this appears to be an alias of `column-one-third`.
This commit is contained in:
Katie Smith
2020-02-19 12:29:28 +00:00
parent 076d99c9dc
commit 07bcb4220e
16 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/templates/views/api/index.html
View File

@@ -15,13 +15,13 @@
</h1>
<nav class="govuk-grid-row bottom-gutter-1-2">
<div class="column-one-third">
<div class="govuk-grid-column-one-third">
<a class="govuk-link govuk-link--no-visited-state pill-separate-item" href="{{ url_for('.api_keys', service_id=current_service.id) }}">API keys</a>
</div>
<div class="column-one-third">
<div class="govuk-grid-column-one-third">
<a class="govuk-link govuk-link--no-visited-state pill-separate-item" href="{{ url_for('.whitelist', service_id=current_service.id) }}">Whitelist</a>
</div>
<div class="column-one-third">
<div class="govuk-grid-column-one-third">
<a class="govuk-link govuk-link--no-visited-state pill-separate-item" href="{{ url_for(callbacks_link, service_id=current_service.id) }}">Callbacks</a>
</div>
</nav>

2
app/templates/views/conversations/messages.html
View File

@@ -9,7 +9,7 @@
</div>
</div>
{% else %}
<div class="column-one-third">
<div class="govuk-grid-column-one-third">
&nbsp;
</div>
<div class="column-two-thirds">

6
app/templates/views/dashboard/_totals.html
View File

@@ -3,7 +3,7 @@
<div class="ajax-block-container">
<div class="govuk-grid-row">
<div id="total-email" class="column-third">
<div id="total-email" class="govuk-grid-column-one-third">
{{ big_number_with_status(
statistics['email']['requested'],
message_count_label(statistics['email']['requested'], 'email', suffix='sent'),
@@ -15,7 +15,7 @@
smaller=True,
) }}
</div>
<div id="total-sms" class="column-third">
<div id="total-sms" class="govuk-grid-column-one-third">
{{ big_number_with_status(
statistics['sms']['requested'],
message_count_label(statistics['sms']['requested'], 'sms', suffix='sent'),
@@ -27,7 +27,7 @@
smaller=True,
) }}
</div>
<div id="total-letters" class="column-third">
<div id="total-letters" class="govuk-grid-column-one-third">
{{ big_number_with_status(
statistics['letter']['requested'],
message_count_label(statistics['letter']['requested'], 'letter', suffix='sent'),

6
app/templates/views/dashboard/_usage.html
View File

@@ -1,12 +1,12 @@
{% from "components/big-number.html" import big_number %}
<div class='govuk-grid-row ajax-block-container'>
<div class='column-third'>
<div class='govuk-grid-column-one-third'>
<div class="keyline-block">
{{ big_number("Unlimited", 'free email allowance', smaller=True) }}
</div>
</div>
<div class='column-third'>
<div class='govuk-grid-column-one-third'>
<div class="keyline-block">
{% if sms_chargeable %}
{{ big_number(
@@ -20,7 +20,7 @@
{% endif %}
</div>
</div>
<div class='column-third'>
<div class='govuk-grid-column-one-third'>
<div class="keyline-block">
{{ big_number(
letter_cost,

6
app/templates/views/platform-admin/_global_stats.html
View File

@@ -1,7 +1,7 @@
{% from "components/big-number.html" import big_number_with_status %}
{% from "components/message-count-label.html" import message_count_label %}
<div class="govuk-grid-row bottom-gutter">
<div class="column-third">
<div class="govuk-grid-column-one-third">
{{ big_number_with_status(
global_stats.email.delivered + global_stats.email.failed,
message_count_label(global_stats.email.delivered, 'email'),
@@ -11,7 +11,7 @@
smaller=True
) }}
</div>
<div class="column-third">
<div class="govuk-grid-column-one-third">
{{ big_number_with_status(
global_stats.sms.delivered + global_stats.sms.failed,
message_count_label(global_stats.sms.delivered, 'sms'),
@@ -21,7 +21,7 @@
smaller=True
) }}
</div>
<div class="column-third">
<div class="govuk-grid-column-one-third">
{{ big_number_with_status(
global_stats.letter.requested,
message_count_label(global_stats.letter.requested, 'letter'),

4
app/templates/views/platform-admin/index.html
View File

@@ -34,7 +34,7 @@
<div class="govuk-grid-row bottom-gutter">
{% for noti_type in global_stats %}
<div class="column-third">
<div class="govuk-grid-column-one-third">
{{ big_number_simple(
noti_type.black_box.number,
message_count_label(noti_type.black_box.number, noti_type.black_box.notification_type)
@@ -55,7 +55,7 @@
<div class="govuk-grid-row bottom-gutter">
{% for noti_type in global_stats %}
<div class="column-third">
<div class="govuk-grid-column-one-third">
<div class="bordered-text-box">
<span class="big-number-number">{{ "{:,}".format(noti_type.test_data.number) }}</span>
{{ noti_type.test_data.label }}

4
app/templates/views/providers/edit-sms-provider-ratio.html
View File

@@ -20,7 +20,7 @@
<div class="bottom-gutter">
<div class="history-list-item">
<div class="govuk-grid-row">
<div class="column-one-third">&nbsp;</div>
<div class="govuk-grid-column-one-third">&nbsp;</div>
<div class="column-two-thirds">
<div class="history-list-percentage-without-border">
<div class="history-list-percentage-left-label">
@@ -60,7 +60,7 @@
{% for version in versions %}
<li class="history-list-item">
<div class="govuk-grid-row">
<div class="column-one-third">
<div class="govuk-grid-column-one-third">
<div class="history-list-user">
{{ version.created_by.name or ('&nbsp;'|safe) }}
</div>

2
app/templates/views/send-test.html
View File

@@ -30,7 +30,7 @@
) }}
</div>
{% if skip_link %}
<div class="column-one-third">
<div class="govuk-grid-column-one-third">
<a href="{{ skip_link[1] }}" class="govuk-link govuk-link--no-visited-state top-gutter-4-3">{{ skip_link[0] }}</a>
</div>
{% endif %}

2
app/templates/views/service-settings/data-retention.html
View File

@@ -15,7 +15,7 @@
Data retention
</h1>
</div>
<div class="column-one-third">
<div class="govuk-grid-column-one-third">
{{ govukButton({
"element": "a",
"text": "Add data retention",

4
app/templates/views/styleguide.html
View File

@@ -43,10 +43,10 @@
<p>Used to show some important statistics.</p>
<div class="govuk-grid-row">
<div class="column-one-third">
<div class="govuk-grid-column-one-third">
{{ big_number("567") }}
</div>
<div class="column-one-third">
<div class="govuk-grid-column-one-third">
{{ big_number("2", "Messages delivered") }}
</div>
</div>

2
app/templates/views/temp-history.html
View File

@@ -33,7 +33,7 @@
{% for event in events %}
<li class="history-list-item">
<div class="govuk-grid-row">
<div class="column-one-third">
<div class="govuk-grid-column-one-third">
<div class="history-list-user">
{{ user_getter(event.user_id) }}
</div>

14
app/templates/views/usage.html
View File

@@ -18,14 +18,14 @@
</div>
<div id='pill-selected-item'>
<div class='govuk-grid-row'>
<div class='column-one-third'>
<div class='govuk-grid-column-one-third'>
<h2 class='heading-small'>Emails</h2>
<div class="keyline-block">
{{ big_number(emails_sent, 'sent', smaller=True) }}
{{ big_number("Unlimited", 'free allowance', smaller=True) }}
</div>
</div>
<div class='column-one-third'>
<div class='govuk-grid-column-one-third'>
<h2 class='heading-small'>Text messages</h2>
<div class="keyline-block">
{{ big_number(sms_sent, 'sent', smaller=True) }}
@@ -40,7 +40,7 @@
{% endif %}
</div>
</div>
<div class='column-one-third'>
<div class='govuk-grid-column-one-third'>
<h2 class='heading-small'>Letters</h2>
<div class="keyline-block">
{{ big_number(letter_sent, 'sent', smaller=True) }}
@@ -49,12 +49,12 @@
</div>
<div class='govuk-grid-row'>
<div class='column-one-third'>
<div class='govuk-grid-column-one-third'>
<div class="keyline-block">
&nbsp;
</div>
</div>
<div class='column-one-third'>
<div class='govuk-grid-column-one-third'>
<div class="keyline-block">
{{ big_number(
(sms_chargeable * sms_rate),
@@ -64,7 +64,7 @@
) }}
</div>
</div>
<div class='column-one-third'>
<div class='govuk-grid-column-one-third'>
<div class="keyline-block">
{{ big_number(
letter_cost,
@@ -124,7 +124,7 @@
</div>
<div class="govuk-grid-row">
<div class="column-one-third">
<div class="govuk-grid-column-one-third">
<p class="align-with-heading-copy">
Financial year ends 31&nbsp;March
</p>

2
app/templates/views/using-notify.html
View File

@@ -8,7 +8,7 @@
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="column-one-third">
<div class="govuk-grid-column-one-third">
{{ sub_navigation(navigation_links) }}
</div>
<div class="column-two-thirds">

2
app/templates/withnav_template.html
View File

@@ -22,7 +22,7 @@
</div>
<div class="govuk-grid-row govuk-!-padding-bottom-12">
{% if help %}
<div class="column-one-third">
<div class="govuk-grid-column-one-third">
{% else %}
<div class="column-one-quarter">
{% endif %}

8
tests/app/main/views/test_dashboard.py
View File

@@ -895,9 +895,9 @@ def test_correct_font_size_for_big_numbers(
)
assert (
len(page.select_one('[data-key=totals]').select('.column-third'))
len(page.select_one('[data-key=totals]').select('.govuk-grid-column-one-third'))
) == (
len(page.select_one('[data-key=usage]').select('.column-third'))
len(page.select_one('[data-key=usage]').select('.govuk-grid-column-one-third'))
) == (
len(page.select('.big-number-with-status .big-number-smaller'))
) == 3
@@ -996,7 +996,7 @@ def test_usage_page(
mock_get_usage.assert_called_once_with(SERVICE_ONE_ID, 2011)
mock_get_free_sms_fragment_limit.assert_called_with(SERVICE_ONE_ID, 2011)
cols = page.find_all('div', {'class': 'column-one-third'})
cols = page.find_all('div', {'class': 'govuk-grid-column-one-third'})
nav = page.find('ul', {'class': 'pill', 'role': 'tablist'})
nav_links = nav.find_all('a')
@@ -1038,7 +1038,7 @@ def test_usage_page_with_letters(
mock_get_usage.assert_called_once_with(SERVICE_ONE_ID, 2011)
mock_get_free_sms_fragment_limit.assert_called_with(SERVICE_ONE_ID, 2011)
cols = page.find_all('div', {'class': 'column-one-third'})
cols = page.find_all('div', {'class': 'govuk-grid-column-one-third'})
nav = page.find('ul', {'class': 'pill', 'role': 'tablist'})
nav_links = nav.find_all('a')

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

@@ -663,18 +663,20 @@ def test_platform_admin_displays_stats_in_right_boxes_and_with_correct_styling(
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
# Email permanent failure status box - number is correct
assert '3 permanent failures' in page.find_all('div', class_='column-third')[0].find(string=re.compile('permanent'))
assert '3 permanent failures' in page.find_all(
'div', class_='govuk-grid-column-one-third'
)[0].find(string=re.compile('permanent'))
# Email complaints status box - link exists and number is correct
assert page.find('a', string='15 complaints')
# SMS total box - number is correct
assert page.find_all('div', class_='big-number-number')[1].text.strip() == '168'
# Test SMS box - number is correct
assert '5' in page.find_all('div', class_='column-third')[4].text
assert '5' in page.find_all('div', class_='govuk-grid-column-one-third')[4].text
# SMS technical failure status box - number is correct and failure class is used
assert '1 technical failures' in page.find_all('div', class_='column-third')[1].find(
assert '1 technical failures' in page.find_all('div', class_='govuk-grid-column-one-third')[1].find(
'div', class_='big-number-status-failing').text
# Letter virus scan failure status box - number is correct and failure class is used
assert '1 virus scan failures' in page.find_all('div', class_='column-third')[2].find(
assert '1 virus scan failures' in page.find_all('div', class_='govuk-grid-column-one-third')[2].find(
'div', class_='big-number-status-failing').text