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

Merge pull request #3004 from alphagov/empty-usage

Browse Source 
Only show the en dash if month is totally empty
This commit is contained in:
Chris Hill-Scott
2019-06-05 16:53:50 +01:00
committed by GitHub
parent ecfd20b9cf 6b494a2b86
commit d44dad2817
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/templates/views/usage-with-letters.html
View File

@@ -99,7 +99,7 @@
currency="£", currency="£",
smallest=True smallest=True
) }} ) }}
<ul> <ul>
{% if month.free %} {% if month.free %}
<li class="tabular-numbers">{{ "{:,}".format(month.free) }} free {{ message_count_label(month.free, 'sms', '') }}</li> <li class="tabular-numbers">{{ "{:,}".format(month.free) }} free {{ message_count_label(month.free, 'sms', '') }}</li>
{% endif %} {% endif %}
@@ -107,18 +107,16 @@
<li class="tabular-numbers">{{ "{:,}".format(month.paid) }} {{ message_count_label(month.paid, 'sms', '') }}at <li class="tabular-numbers">{{ "{:,}".format(month.paid) }} {{ message_count_label(month.paid, 'sms', '') }}at
{{- ' {:.2f}p'.format(sms_rate * 100) }}</li> {{- ' {:.2f}p'.format(sms_rate * 100) }}</li>
{% endif %} {% endif %}
{% if not (month.free or month.paid) %}
<li aria-hidden="true">–</li>
{% endif %}
</ul>
<ul>
{% for letter in month.letters%} {% for letter in month.letters%}
{% if letter[0] %} {% if letter[0] %}
<li class="tabular-numbers">{{ "{:,} {}".format(letter[0], letter[3])}} class {{ message_count_label(letter[0], 'letter', '') }}at <li class="tabular-numbers">{{ "{:,} {}".format(letter[0], letter[3])}} class {{ message_count_label(letter[0], 'letter', '') }}at
{{ '{:.0f}p'.format(letter[1] * 100) }}</li> {{ '{:.0f}p'.format(letter[1] * 100) }}</li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</ul> {% if not (month.free or month.paid or month.letters) %}
<li aria-hidden="true">–</li>
{% endif %}
</ul>
{% endcall %} {% endcall %}
{% endcall %} {% endcall %}
</div> </div>