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

Use new grid classes from GOV.UK frontend

Browse Source
This commit is contained in:
Chris Hill-Scott
2020-02-28 13:40:07 +00:00
parent 408fcf05eb
commit 519176f903
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/templates/views/organisations/organisation/index.html
+8 -8
View File
@@ -16,8 +16,8 @@
{{ pill(years, selected_year, big_number_args={'smallest': True}) }} {{ pill(years, selected_year, big_number_args={'smallest': True}) }}
</div> </div>
<div class="grid-row bottom-gutter"> <div class="govuk-grid-row bottom-gutter">
<div class="column-one-third"> <div class="govuk-grid-column-one-third">
<div class="keyline-block"> <div class="keyline-block">
{{ big_number( {{ big_number(
total_emails_sent, total_emails_sent,
@@ -26,7 +26,7 @@
) }} ) }}
</div> </div>
</div> </div>
<div class="column-one-third"> <div class="govuk-grid-column-one-third">
<div class="keyline-block"> <div class="keyline-block">
{{ big_number( {{ big_number(
total_sms_cost, total_sms_cost,
@@ -36,7 +36,7 @@
) }} ) }}
</div> </div>
</div> </div>
<div class="column-one-third"> <div class="govuk-grid-column-one-third">
<div class="keyline-block"> <div class="keyline-block">
{{ big_number( {{ big_number(
total_letter_cost, total_letter_cost,
@@ -53,15 +53,15 @@
<li class="browse-list-item govuk-!-margin-bottom-1 govuk-!-margin-top-1"> <li class="browse-list-item govuk-!-margin-bottom-1 govuk-!-margin-top-1">
<a href="{{ url_for('main.usage', service_id=service.service_id) }}" class="govuk-link govuk-link--no-visited-state browse-list-link">{{ service.service_name }}</a> <a href="{{ url_for('main.usage', service_id=service.service_id) }}" class="govuk-link govuk-link--no-visited-state browse-list-link">{{ service.service_name }}</a>
</li> </li>
<div class="grid-row"> <div class="govuk-grid-row">
<div class="column-one-third"> <div class="govuk-grid-column-one-third">
{{ big_number( {{ big_number(
service.emails_sent, service.emails_sent,
label='emails sent', label='emails sent',
smallest=True smallest=True
) }} ) }}
</div> </div>
<div class="column-one-third"> <div class="govuk-grid-column-one-third">
{% if service.sms_cost %} {% if service.sms_cost %}
{{ big_number( {{ big_number(
service.sms_cost, service.sms_cost,
@@ -77,7 +77,7 @@
) }} ) }}
{% endif %} {% endif %}
</div> </div>
<div class="column-one-third"> <div class="govuk-grid-column-one-third">
{{ big_number( {{ big_number(
service.letter_cost, service.letter_cost,
'spent on letters', 'spent on letters',
tests/app/main/views/organisations/test_organisation.py
+1 -1
View File
@@ -415,7 +415,7 @@ def test_organisation_services_shows_live_services_and_usage(
mock.assert_called_once_with(ORGANISATION_ID, 2019) mock.assert_called_once_with(ORGANISATION_ID, 2019)
services = page.select('.browse-list-item') services = page.select('.browse-list-item')
usage_rows = page.find_all("div", class_="column-one-third") usage_rows = page.select("main .govuk-grid-column-one-third")
assert len(services) == 2 assert len(services) == 2
# Totals # Totals