diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss index 72bc7f88e..9b88d44a7 100644 --- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss +++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss @@ -238,9 +238,6 @@ td.table-empty-message { // Dashboard .dashboard { - .big-number-number { - font-weight: bold; - } .big-number-with-status { a { background: color("blue-60v"); diff --git a/app/templates/views/dashboard/_usage.html b/app/templates/views/dashboard/_usage.html index 34e63c496..57b7a35ae 100644 --- a/app/templates/views/dashboard/_usage.html +++ b/app/templates/views/dashboard/_usage.html @@ -2,22 +2,34 @@
-
- {% if sms_cost %} - {{ big_number( - sms_cost, - 'spent on text messages', - currency="$", - smaller=True - ) }} - {% else %} - {{ big_number(sms_allowance_remaining, 'free text messages left', smaller=True) }} - {% endif %} -
+ + + + + + + + + + + + + + + +
+ Daily +
UsageRemaining
{{ big_number(40000 - sms_allowance_remaining, smaller=True) }} + {% if sms_cost %} + {{ big_number( + sms_cost, + 'spent on text messages', + currency="$", + smaller=True + ) }} + {% else %} + {{ big_number(sms_allowance_remaining, smaller=True) }} + {% endif %} +
-
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html index 6676f3a95..3838da9bd 100644 --- a/app/templates/views/dashboard/dashboard.html +++ b/app/templates/views/dashboard/dashboard.html @@ -19,9 +19,10 @@ {{ ajax_block(partials, updates_url, 'upcoming') }} -

- In the last seven days +

+ Messages sent

+

In the last seven days

{{ ajax_block(partials, updates_url, 'inbox') }} @@ -29,15 +30,35 @@ {{ ajax_block(partials, updates_url, 'template-statistics') }} -

Daily messages across all services

-

{{ daily_global_messages_remaining }} free text messages left

+

Usage

+

Daily

+

Across all services

+ + + + + + + + + + + + + + +
+ Daily +
UsageRemaining
{{ 5000 - daily_global_messages_remaining }} + {{ daily_global_messages_remaining }} +
{% if current_user.has_permissions('manage_service') %} -

This year

+

2023

{{ ajax_block(partials, updates_url, 'usage') }} {{ show_more( url_for(".usage", service_id=current_service['id']), - 'See usage' + 'See all usage' ) }} {% endif %} diff --git a/app/templates/views/usage.html b/app/templates/views/usage.html index 90fc1c098..a9801aabd 100644 --- a/app/templates/views/usage.html +++ b/app/templates/views/usage.html @@ -22,7 +22,8 @@

Daily messages across all services

-

{{ daily_global_messages_remaining }} free text messages left

+

You have sent {{ 5000 - daily_global_messages_remaining }} of your 5000 daily messages allowance.

+

You have {{ daily_global_messages_remaining }} messages remaining.

Text messages

You have sent