diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html index 770aa785a..757616832 100644 --- a/app/templates/main_nav.html +++ b/app/templates/main_nav.html @@ -11,7 +11,6 @@ {% if not current_user.has_permissions('view_activity') %}
  • Sent messages
  • {% endif %} -
  • Team members
  • {% if current_user.has_permissions('manage_service', allow_org_user=True) %}
  • Usage
  • @@ -20,7 +19,7 @@
  • Settings
  • {% endif %} {% if current_user.has_permissions('manage_api_keys') %} -
  • API integration
  • + {% endif %} {% elif current_user.has_permissions(allow_org_user=True) %}
  • Usage
  • diff --git a/app/templates/views/api/index.html b/app/templates/views/api/index.html index 0a869c970..cff7a30c7 100644 --- a/app/templates/views/api/index.html +++ b/app/templates/views/api/index.html @@ -13,13 +13,13 @@ diff --git a/app/templates/views/dashboard/_totals.html b/app/templates/views/dashboard/_totals.html index 8aaefd124..f8738b766 100644 --- a/app/templates/views/dashboard/_totals.html +++ b/app/templates/views/dashboard/_totals.html @@ -2,18 +2,6 @@
    -
    - {{ big_number_with_status( - statistics['email']['requested'], - statistics['email']['requested']|message_count_label('email', suffix='sent'), - statistics['email']['failed'], - statistics['email']['failed_percentage'], - statistics['email']['show_warning'], - failure_link=url_for(".view_notifications", service_id=service_id, message_type='email', status='failed'), - link=url_for(".view_notifications", service_id=service_id, message_type='email', status='sending,delivered,failed'), - smaller=True, - ) }} -
    {{ big_number_with_status( statistics['sms']['requested'], @@ -24,19 +12,18 @@ failure_link=url_for(".view_notifications", service_id=service_id, message_type='sms', status='failed'), link=url_for(".view_notifications", service_id=service_id, message_type='sms', status='sending,delivered,failed'), smaller=True, - ) }} + ) }} +
    +
    + + + + 0 + emails sent + + + No failures + +
    - -
    diff --git a/app/templates/views/dashboard/_usage.html b/app/templates/views/dashboard/_usage.html index c853e66fc..27ae70678 100644 --- a/app/templates/views/dashboard/_usage.html +++ b/app/templates/views/dashboard/_usage.html @@ -1,11 +1,6 @@ {% from "components/big-number.html" import big_number %}
    -
    -
    - {{ big_number("Unlimited", 'free email allowance', smaller=True) }} -
    -
    {% if sms_cost %} @@ -20,14 +15,9 @@ {% endif %}
    - +
    diff --git a/app/templates/views/dashboard/monthly.html b/app/templates/views/dashboard/monthly.html index 22476e8df..7ab23172e 100644 --- a/app/templates/views/dashboard/monthly.html +++ b/app/templates/views/dashboard/monthly.html @@ -29,9 +29,8 @@ empty_message='', field_headings=[ 'Month', - 'Emails', 'Text messages', - 'letters', + 'Emails', ], field_headings_visible=False, equal_length=True @@ -41,9 +40,8 @@ {{ month.name }} {% endcall %} {% for counts, template_type in [ - (month.email_counts, 'email'), (month.sms_counts, 'sms'), - (month.letter_counts, 'letter') + (month.email_counts, 'email'), ] %} {% call field(align='left') %} {{ big_number( diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html index 99b3fc0b5..43bfb061f 100644 --- a/app/templates/views/service-settings.html +++ b/app/templates/views/service-settings.html @@ -48,7 +48,7 @@ {% endcall %} {% endcall %} - {% call mapping_table( + {% call mapping_table( caption='Text message settings', diff --git a/app/templates/views/usage.html b/app/templates/views/usage.html index 162b83839..1897a8b55 100644 --- a/app/templates/views/usage.html +++ b/app/templates/views/usage.html @@ -18,13 +18,7 @@
    -
    -

    Emails

    -
    - {{ big_number(emails_sent, 'sent', smaller=True) }} - {{ big_number("Unlimited", 'free allowance', smaller=True) }} -
    -
    +

    Text messages

    @@ -44,15 +38,16 @@ {% endfor %}
    - +
    -
    + - -
    + --> {% if months %}