deemphasize non-sms elements

This commit is contained in:
stvnrlly
2022-12-01 08:53:50 -05:00
parent b3a682630b
commit 3e28baa733
7 changed files with 32 additions and 74 deletions

View File

@@ -11,7 +11,6 @@
{% if not current_user.has_permissions('view_activity') %}
<li><a class="govuk-link govuk-link--no-visited-state{{ casework_navigation.is_selected('sent-messages') }}" href="{{ url_for('.view_notifications', service_id=current_service.id, status='sending,delivered,failed') }}">Sent messages</a></li>
{% endif %}
<!-- <li><a class="govuk-link govuk-link--no-visited-state{{ main_navigation.is_selected('uploads') }} demo-tooltip" data-demo-tooltip="⚠️ This feature is not available in demo mode" href="{{ url_for('main.uploads', service_id=current_service.id) }}">Letters</a></li> -->
<li><a class="govuk-link govuk-link--no-visited-state{{ main_navigation.is_selected('team-members') }}" href="{{ url_for('.manage_users', service_id=current_service.id) }}">Team members</a></li>
{% if current_user.has_permissions('manage_service', allow_org_user=True) %}
<li><a class="govuk-link govuk-link--no-visited-state{{ main_navigation.is_selected('usage') }}" href="{{ url_for('.usage', service_id=current_service.id) }}">Usage</a></li>
@@ -20,7 +19,7 @@
<li><a class="govuk-link govuk-link--no-visited-state{{ main_navigation.is_selected('settings') }}" href="{{ url_for('.service_settings', service_id=current_service.id) }}">Settings</a></li>
{% endif %}
{% if current_user.has_permissions('manage_api_keys') %}
<li><a class="govuk-link govuk-link--no-visited-state{{ main_navigation.is_selected('api-integration') }}" href="{{ url_for('.api_integration', service_id=current_service.id) }}">API integration</a></li>
<!-- <li><a class="govuk-link govuk-link--no-visited-state{{ main_navigation.is_selected('api-integration') }}" href="{{ url_for('.api_integration', service_id=current_service.id) }}">API integration</a></li> -->
{% endif %}
{% elif current_user.has_permissions(allow_org_user=True) %}
<li><a class="govuk-link govuk-link--no-visited-state{{ main_navigation.is_selected('usage') }}" href="{{ url_for('.usage', service_id=current_service.id) }}">Usage</a></li>

View File

@@ -13,13 +13,13 @@
</h1>
<nav class="govuk-grid-row bottom-gutter-1-2">
<div class="govuk-grid-column-one-third demo-tooltip" data-demo-tooltip="⚠️ This feature is not available in demo mode">
<div class="govuk-grid-column-one-third">
<a class="govuk-link govuk-link--no-visited-state pill-separate-item" href="{{ url_for('.api_keys', service_id=current_service.id) }}">API keys</a>
</div>
<div class="govuk-grid-column-one-third demo-tooltip" data-demo-tooltip="⚠️ This feature is not available in demo mode">
<div class="govuk-grid-column-one-third">
<a class="govuk-link govuk-link--no-visited-state pill-separate-item" href="{{ url_for('.guest_list', service_id=current_service.id) }}">Guest list</a>
</div>
<div class="govuk-grid-column-one-third demo-tooltip" data-demo-tooltip="⚠️ This feature is not available in demo mode">
<div class="govuk-grid-column-one-third">
<a class="govuk-link govuk-link--no-visited-state pill-separate-item" href="{{ url_for(callbacks_link, service_id=current_service.id) }}">Callbacks</a>
</div>
</nav>

View File

@@ -2,18 +2,6 @@
<div class="ajax-block-container">
<div class="govuk-grid-row">
<div id="total-email" class="govuk-grid-column-one-half">
{{ 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,
) }}
</div>
<div id="total-sms" class="govuk-grid-column-one-half">
{{ 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,
) }}
) }}
</div>
<div id="total-email" class="govuk-grid-column-one-half">
<span class="big-number-with-status">
<a class="govuk-link govuk-link--no-visited-state big-number-link" style="background-color: gray; border-color: gray;">
<span class="big-number-smaller">
<span class="big-number-number" style="color: lightgray;">0</span>
<span class="big-number-label" style="color: lightgray;">emails sent</span>
</span>
</a>
<span class="big-number-status" style="background-color: gray; border-color: gray; color: lightgray;">No failures</span>
</span>
</div>
</div>
<!-- <div id="total-letters" class="govuk-grid-column-one-third">
{{ big_number_with_status(
statistics['letter']['requested'],
statistics['letter']['requested']|message_count_label('letter', suffix='sent'),
statistics['letter']['failed'],
statistics['letter']['failed_percentage'],
statistics['letter']['show_warning'],
failure_link=url_for(".view_notifications", service_id=service_id, message_type='letter', status='failed'),
link=url_for(".view_notifications", service_id=service_id, message_type='letter', status=''),
smaller=True,
) }}
</div> -->
</div>
</div>

View File

@@ -1,11 +1,6 @@
{% from "components/big-number.html" import big_number %}
<div class='govuk-grid-row ajax-block-container'>
<div class='govuk-grid-column-one-half'>
<div class="keyline-block">
{{ big_number("Unlimited", 'free email allowance', smaller=True) }}
</div>
</div>
<div class='govuk-grid-column-one-half'>
<div class="keyline-block">
{% if sms_cost %}
@@ -20,14 +15,9 @@
{% endif %}
</div>
</div>
<!-- <div class='govuk-grid-column-one-third'>
<div class='govuk-grid-column-one-half'>
<div class="keyline-block">
{{ big_number(
letter_cost,
'spent on letters',
currency="$",
smaller=True
) }}
{{ big_number("No email", 'during SMS pilot', smaller=True) }}
</div>
</div> -->
</div>
</div>

View File

@@ -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(

View File

@@ -48,7 +48,7 @@
{% endcall %}
{% endcall %}
{% call mapping_table(
<!-- {% call mapping_table(
caption='Email settings',
field_headings=['Label', 'Value', 'Action'],
field_headings_visible=False,
@@ -117,7 +117,7 @@
)}}
{% endcall %}
{% endcall %}
{% endcall %} -->
{% call mapping_table(
caption='Text message settings',

View File

@@ -18,13 +18,7 @@
</div>
<div id='pill-selected-item'>
<div class='govuk-grid-row'>
<div class='govuk-grid-column-one-half'>
<h2 class='heading-small'>Emails</h2>
<div class="keyline-block">
{{ big_number(emails_sent, 'sent', smaller=True) }}
{{ big_number("Unlimited", 'free allowance', smaller=True) }}
</div>
</div>
<div class='govuk-grid-column-one-half'>
<h2 class='heading-small'>Text messages</h2>
<div class="keyline-block">
@@ -44,15 +38,16 @@
{% endfor %}
</div>
</div>
<!-- <div class='govuk-grid-column-one-third'>
<h2 class='heading-small'>Letters</h2>
<div class='govuk-grid-column-one-half'>
<h2 class='heading-small'>Emails</h2>
<div class="keyline-block">
{{ big_number(letter_sent, 'sent', smaller=True) }}
{{ big_number(emails_sent, 'sent', smaller=True) }}
{{ big_number("No email", 'during SMS pilot', smaller=True) }}
</div>
</div> -->
</div>
</div>
<div class='govuk-grid-row'>
<!-- <div class='govuk-grid-row'>
<div class='govuk-grid-column-one-half'>
<div class="keyline-block">
&nbsp;
@@ -68,18 +63,7 @@
) }}
</div>
</div>
<!-- <div class='govuk-grid-column-one-third'>
<div class="keyline-block">
{{ big_number(
letter_cost,
'spent',
currency="$",
smaller=True
) }}
</div>
</div> -->
</div>
</div> -->
{% if months %}
<div class="dashboard-table usage-table body-copy-table">