darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-11 02:23:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into convert-all-links-to-govuk-frontend

Browse Source
This commit is contained in:
Tom Byers
2020-02-24 10:12:58 +00:00
committed by GitHub
parent f90b6b46e6 95b41b6bfa
commit 97172cca30
34 changed files with 468 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/templates/views/dashboard/_inbox.html
+19 -6
View File
@@ -2,19 +2,32 @@
{% from "components/message-count-label.html" import message_count_label %}
<div class="ajax-block">
{% if inbound_sms_summary != None %}
<a id="total-received" class="govuk-link govuk-link--no-visited-state banner-dashboard" href="{{ url_for('.inbox', service_id=current_service.id) }}">
{% if current_service.inbound_sms_summary != None %}
<a id="total-received" class="govuk-link govuk-link--no-visited-state banner-dashboard" class="banner-dashboard" href="{{ url_for('.inbox', service_id=current_service.id) }}">
<span class="banner-dashboard-count">
{{ inbound_sms_summary.count|format_thousands }}
{{ current_service.inbound_sms_summary.count|format_thousands }}
</span>
<span class="banner-dashboard-count-label">
{{ message_count_label(inbound_sms_summary.count, 'sms', suffix='received') }}
{{ message_count_label(current_service.inbound_sms_summary.count, 'sms', suffix='received') }}
</span>
{% if inbound_sms_summary.most_recent %}
{% if current_service.inbound_sms_summary.most_recent %}
<span class="banner-dashboard-meta">
latest message {{ inbound_sms_summary.most_recent | format_delta }}
latest message {{ current_service.inbound_sms_summary.most_recent | format_delta }}
</span>
{% endif %}
</a>
{% endif %}
{% if current_service.returned_letter_summary %}
<a id="total-returned-letters" class="govuk-link govuk-link--no-visited-state banner-dashboard" href="{{ url_for('main.returned_letter_summary', service_id=current_service.id) }}">
<span class="banner-dashboard-count">
{{ current_service.count_of_returned_letters_in_last_7_days|format_thousands }}
</span>
<span class="banner-dashboard-count-label">
returned {{ message_count_label(current_service.count_of_returned_letters_in_last_7_days, 'letter', suffix='') }}
</span>
<span class="banner-dashboard-meta">
latest report {{ current_service.most_recent_returned_letter_report|format_delta_days }}
</span>
</a>
{% endif %}
</div>
app/templates/views/dashboard/inbox.html
+5 -3
View File
@@ -1,4 +1,5 @@
{% from "components/ajax-block.html" import ajax_block %}
{% from "components/page-header.html" import page_header %}
{% extends "withnav_template.html" %}
@@ -8,9 +9,10 @@
{% block maincolumn_content %}
<h1 class="heading-large">
Received text messages
</h1>
{{ page_header(
'Received text messages',
back_link=url_for('main.service_dashboard', service_id=current_service.id)
) }}
{{ ajax_block(
partials,