Merge branch 'main' of https://github.com/GSA/notifications-admin into notify-678

This commit is contained in:
Andrew Shumway
2023-10-03 14:37:04 -06:00
15 changed files with 88 additions and 42 deletions

View File

@@ -1,5 +1,5 @@
{% macro mapping_table(caption='', field_headings=[], field_headings_visible=True, caption_visible=True, equal_length=False) -%}
<table class="usa-table usa-table--borderless">
<table class="usa-table usa-table--borderless width-full">
<caption class="font-body-lg table-heading{{ ' usa-sr-only' if not caption_visible}}">
{{ caption }}
</caption>

View File

@@ -14,7 +14,6 @@
{% call mapping_table(
caption='General',
field_headings=['Label', 'Value', 'Action'],
field_headings_visible=False,
caption_visible=False
) %}

View File

@@ -20,15 +20,18 @@
<div id='pill-selected-item'>
<div class='grid-row'>
<div class='grid-col-6'>
<div class='grid-col-12'>
<h2 class='heading-small'>Text messages</h2>
<div class="keyline-block">
{{ big_number(sms_sent, 'sent', smaller=True) }}
{{ big_number(sms_free_allowance, 'free allowance', smaller=True) }}
You have sent
{{ big_number(sms_sent, 'messages of your', smaller=True) }}
{{ big_number(sms_free_allowance, 'free messages allowance.', smaller=True) }}
<br />
You have
{% if sms_free_allowance > 0 %}
{{ big_number(sms_allowance_remaining, 'free allowance remaining', smaller=True) }}
{{ big_number(sms_allowance_remaining, 'messages remaining.', smaller=True) }}
{% endif %}
{% for row in sms_breakdown %}
{# {% for row in sms_breakdown %}
{% if row.charged_units > 0 %}
{{ big_number(
row.charged_units,
@@ -36,7 +39,7 @@
smaller=True
) }}
{% endif %}
{% endfor %}
{% endfor %} #}
</div>
</div>
{# <div class='grid-col-6'>

View File

@@ -13,7 +13,6 @@
<div class="body-copy-table">
{% call mapping_table(
caption='Your profile',
field_headings=['Label', 'Value', 'Action'],
field_headings_visible=False,
caption_visible=False
) %}