merge from main

This commit is contained in:
Kenneth Kehl
2023-11-22 08:21:34 -08:00
14 changed files with 240 additions and 285 deletions

View File

@@ -15,7 +15,7 @@
</thead>
<tbody>
<tr>
<td>{{ big_number(40000 - sms_allowance_remaining, smaller=True) }}</td>
<td>{{ big_number(sms_sent, smaller=True) }}</td>
<td>
{% if sms_cost %}
{{ big_number(

View File

@@ -45,7 +45,7 @@
</thead>
<tbody>
<tr>
<td>{{ 5000 - daily_global_messages_remaining }}</td>
<td>{{ global_message_limit - daily_global_messages_remaining }}</td>
<td>
{{ daily_global_messages_remaining }}
</td>
@@ -54,7 +54,7 @@
</table>
{% if current_user.has_permissions('manage_service') %}
<h3 class='margin-bottom-0'>2023</h3>
<h3 class='margin-bottom-0' id="current-year"></h3>
{{ ajax_block(partials, updates_url, 'usage') }}
{{ show_more(
url_for(".usage", service_id=current_service['id']),

View File

@@ -22,7 +22,7 @@
<div class='grid-col-12'>
<h2 class="heading-small margin-bottom-1">Daily messages across all services</h2>
<p class="margin-0">You have sent {{ 5000 - daily_global_messages_remaining }} of your 5000 daily messages allowance.</p>
<p class="margin-0">You have sent {{ global_message_limit - daily_global_messages_remaining }} of your {{ global_message_limit }} daily messages allowance.</p>
<p class="margin-0"></p>You have {{ daily_global_messages_remaining }} messages remaining.</p>
<h2 class='heading-small margin-bottom-1'>Text messages</h2>
<div class="keyline-block">