darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-24 16:24:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations

Browse Source 
# Conflicts:
#	app/main/views/dashboard.py
#	app/templates/views/dashboard/dashboard.html
#	package-lock.json
#	package.json
This commit is contained in:
Jonathan Bobel
2024-07-04 13:07:35 -04:00
parent e5204ef7c5 ffd935c4b6
commit 74f4d730a8
22 changed files with 298 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/templates/views/dashboard/dashboard.html
View File

@@ -27,7 +27,8 @@
</h2>
<!-- <button id="sevenDaysButton">7 Days</button>
<canvas id="myChart" data-service-id="{{ service_id }}"></canvas> -->
<canvas id="myChart"></canvas> -->
{{ ajax_block(partials, updates_url, 'inbox') }}
{{ ajax_block(partials, updates_url, 'totals') }}

37
app/templates/views/notifications/preview.html
View File

@@ -5,11 +5,21 @@
{% from "components/components/button/macro.njk" import usaButton %}
{% block service_page_title %}
{{ "Error" if error else "Preview" }}
{% if error %}
{{ "Error" }}
{% elif help %}
{{ "Example text message" }}
{% else %}
{{ "Preview" }}
{% endif %}
{% endblock %}
{% block backLink %}
{{ usaBackLink({ "href": back_link_from_preview }) }}
{% if help %}
{{ usaBackLink({ "href": back_link }) }}
{% else %}
{{ usaBackLink({ "href": back_link_from_preview }) }}
{% endif %}
{% endblock %}
{% block maincolumn_content %}
@@ -40,16 +50,23 @@
{% endcall %}
</div>
{% else %}
{{ page_header('Preview') }}
{{ page_header("Example text message" if help else "Preview") }}
{% endif %}
<div>
<p class="sms-message-scheduler">Scheduled: {{ scheduled_for |format_datetime_scheduled_notification if scheduled_for else 'Now'}}</p>
<p class="sms-message-template">Template: {{template.name}}</p>
<p class="sms-message-sender" >From: {{ template.sender }}</p>
<p class="sms-message-sender" >To: {{ recipient }}</p>
</div>
<h2 id="{{ file_contents_header_id }}">Message</h2>
{% if not help %}
<div>
<p class="sms-message-scheduler">Scheduled: {{ scheduled_for |format_datetime_scheduled_notification if scheduled_for else 'Now'}}</p>
<p class="sms-message-template">Template: {{template.name}}</p>
<p class="sms-message-sender" >From: {{ template.sender }}</p>
<p class="sms-message-sender" >To: {{ recipient }}</p>
</div>
{% endif %}
{% if not help %}
<h2 class="message-header">Message</h2>
{% endif %}
<div class="preview-message"> {{ template|string }}</div>
<div class="js-stick-at-bottom-when-scrolling">