clean up admin ui & update tests

This commit is contained in:
stvnrlly
2022-10-14 18:58:55 +00:00
parent a2c6c2f08c
commit 38fa1286b2
7 changed files with 75 additions and 70 deletions

View File

@@ -2,10 +2,10 @@
<nav>
<a class="govuk-link govuk-link--no-visited-state pill-separate-item" href="{{ url_for('.choose_template', service_id=current_service.id) }}">
{% if 'letter' in current_service.permissions %}
<!-- {% if 'letter' in current_service.permissions %}
Write an email, text message or letter
{% else %}
{% else %} -->
Write an email or text message
{% endif %}
<!-- {% endif %} -->
</a>
</nav>

View File

@@ -33,7 +33,7 @@
{{ big_number(
total_sms_cost,
'spent',
currency="£",
currency="$",
smaller=True
) }}
</div>
@@ -44,7 +44,7 @@
{{ big_number(
total_letter_cost,
'spent',
currency="£",
currency="$",
smaller=True
) }}
</div>
@@ -70,19 +70,19 @@
<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>
</h3>
<div class="govuk-grid-row">
<div class="govuk-grid-column-one-half">
<div class="govuk-grid-column-one-third">
{{ big_number(
service.emails_sent,
label=service.emails_sent|message_count_label('email'),
smallest=True
) }}
</div>
<div class="govuk-grid-column-one-half">
<div class="govuk-grid-column-one-third">
{% if service.sms_cost %}
{{ big_number(
service.sms_cost,
'spent on text messages',
currency="£",
currency="$",
smallest=True
) }}
{% else %}
@@ -93,14 +93,14 @@
) }}
{% endif %}
</div>
<!-- <div class="govuk-grid-column-one-third">
<div class="govuk-grid-column-one-third">
{{ big_number(
service.letter_cost,
'spent on letters',
currency="£",
currency="$",
smallest=True
) }}
</div> -->
</div>
</div>
</div>
{% endfor %}

View File

@@ -109,7 +109,7 @@
)
}}
{% endcall %}
{% call row() %}
<!-- {% call row() %}
{{ text_field('Default letter branding') }}
{{ optional_text_field(
current_org.letter_branding.name,
@@ -121,7 +121,7 @@
suffix='default letter branding for the organisation'
)
}}
{% endcall %}
{% endcall %} -->
{% call row() %}
{{ text_field('Known email domains') }}
{{ optional_text_field(current_org.domains or None, default='None') }}