mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-24 16:24:08 -04:00
Make sure partials always have a wrapping <div>
The diffDOM Javascript sometimes throws an error if it can’t calculate a diff between the original content of the page and the updated HTML delivered via AJAX. The problem seems to be when there’s not one, consistent top-level element for it to base its calculations on. This commit: - makes sure that all AJAX-delivered partials have a wrapping `<div>` - that this `<div>` has a consistent class name to make it clear why it’s there
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
{% from "components/pill.html" import pill %}
|
{% from "components/pill.html" import pill %}
|
||||||
|
|
||||||
<div class="bottom-gutter">
|
<div class="bottom-gutter ajax-block-container">
|
||||||
{{ pill('Status', counts, request.args.get('status', '')) }}
|
{{ pill('Status', counts, request.args.get('status', '')) }}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,71 +1,73 @@
|
|||||||
{% from "components/table.html" import list_table, field, right_aligned_field_heading, date_field, row_heading %}
|
{% from "components/table.html" import list_table, field, right_aligned_field_heading, date_field, row_heading %}
|
||||||
|
|
||||||
{% if job.job_status == 'scheduled' %}
|
<div class="ajax-block-container">
|
||||||
|
{% if job.job_status == 'scheduled' %}
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
Sending will start at {{ job.scheduled_for|format_time }}
|
Sending will start at {{ job.scheduled_for|format_time }}
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
{% else %}
|
{% else %}
|
||||||
|
|
||||||
{% if notifications %}
|
{% if notifications %}
|
||||||
<div class="dashboard-table">
|
<div class="dashboard-table">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if not help %}
|
{% if not help %}
|
||||||
{% if percentage_complete < 100 %}
|
{% if percentage_complete < 100 %}
|
||||||
<p class="bottom-gutter-1-2 hint">
|
<p class="bottom-gutter-1-2 hint">
|
||||||
Report is {{ "{:.0f}%".format(percentage_complete) }} complete…
|
Report is {{ "{:.0f}%".format(percentage_complete) }} complete…
|
||||||
</p>
|
</p>
|
||||||
{% elif notifications %}
|
{% elif notifications %}
|
||||||
<p class="bottom-gutter">
|
<p class="bottom-gutter">
|
||||||
<a href="{{ download_link }}" download="download" class="heading-small">Download this report</a>
|
<a href="{{ download_link }}" download="download" class="heading-small">Download this report</a>
|
||||||
 
|
 
|
||||||
<span id="time-left">{{ time_left }}</span>
|
<span id="time-left">{{ time_left }}</span>
|
||||||
|
</p>
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% call(item, row_number) list_table(
|
||||||
|
notifications,
|
||||||
|
caption=uploaded_file_name,
|
||||||
|
caption_visible=False,
|
||||||
|
empty_message="No messages to show",
|
||||||
|
field_headings=[
|
||||||
|
'Recipient',
|
||||||
|
'Time',
|
||||||
|
'Status'
|
||||||
|
],
|
||||||
|
field_headings_visible=False
|
||||||
|
) %}
|
||||||
|
{% call row_heading() %}
|
||||||
|
{{ item.to }}
|
||||||
|
{% endcall %}
|
||||||
|
{{ date_field(
|
||||||
|
(item.updated_at or item.created_at)|format_datetime_short
|
||||||
|
) }}
|
||||||
|
{% call field(
|
||||||
|
align='right',
|
||||||
|
status=item.status|format_notification_status_as_field_status
|
||||||
|
) %}
|
||||||
|
{% if item.status|format_notification_status_as_url %}
|
||||||
|
<a href="{{ item.status|format_notification_status_as_url }}">
|
||||||
|
{% endif %}
|
||||||
|
{{ item.status|format_notification_status(item.template.template_type) }}
|
||||||
|
{% if item.status|format_notification_status_as_url %}
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
{% endcall %}
|
||||||
|
{% endcall %}
|
||||||
|
|
||||||
|
{% if more_than_one_page %}
|
||||||
|
<p class="table-show-more-link">
|
||||||
|
Only showing the first 50 rows
|
||||||
</p>
|
</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
{% if notifications %}
|
||||||
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% call(item, row_number) list_table(
|
|
||||||
notifications,
|
|
||||||
caption=uploaded_file_name,
|
|
||||||
caption_visible=False,
|
|
||||||
empty_message="No messages to show",
|
|
||||||
field_headings=[
|
|
||||||
'Recipient',
|
|
||||||
'Time',
|
|
||||||
'Status'
|
|
||||||
],
|
|
||||||
field_headings_visible=False
|
|
||||||
) %}
|
|
||||||
{% call row_heading() %}
|
|
||||||
{{ item.to }}
|
|
||||||
{% endcall %}
|
|
||||||
{{ date_field(
|
|
||||||
(item.updated_at or item.created_at)|format_datetime_short
|
|
||||||
) }}
|
|
||||||
{% call field(
|
|
||||||
align='right',
|
|
||||||
status=item.status|format_notification_status_as_field_status
|
|
||||||
) %}
|
|
||||||
{% if item.status|format_notification_status_as_url %}
|
|
||||||
<a href="{{ item.status|format_notification_status_as_url }}">
|
|
||||||
{% endif %}
|
|
||||||
{{ item.status|format_notification_status(item.template.template_type) }}
|
|
||||||
{% if item.status|format_notification_status_as_url %}
|
|
||||||
</a>
|
|
||||||
{% endif %}
|
|
||||||
{% endcall %}
|
|
||||||
{% endcall %}
|
|
||||||
|
|
||||||
{% if more_than_one_page %}
|
|
||||||
<p class="table-show-more-link">
|
|
||||||
Only showing the first 50 rows
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if notifications %}
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
</div>
|
||||||
{% endif %}
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<div>
|
<div class="ajax-block-container">
|
||||||
<p class='heading-small bottom-gutter'>
|
<p class='heading-small bottom-gutter'>
|
||||||
Uploaded by {{ job.created_by.name }} on {{ job.created_at|format_datetime_short }}
|
Uploaded by {{ job.created_by.name }} on {{ job.created_at|format_datetime_short }}
|
||||||
</p>
|
</p>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading %}
|
{% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading %}
|
||||||
{% from "components/big-number.html" import big_number -%}
|
{% from "components/big-number.html" import big_number -%}
|
||||||
|
|
||||||
<div class='dashboard-table'>
|
<div class='dashboard-table ajax-block-container'>
|
||||||
{% call(item, row_number) list_table(
|
{% call(item, row_number) list_table(
|
||||||
jobs,
|
jobs,
|
||||||
caption="Recent files uploaded",
|
caption="Recent files uploaded",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{% from "components/big-number.html" import big_number_with_status %}
|
{% from "components/big-number.html" import big_number_with_status %}
|
||||||
{% from "components/message-count-label.html" import message_count_label %}
|
{% from "components/message-count-label.html" import message_count_label %}
|
||||||
|
|
||||||
<div class="grid-row">
|
<div class="grid-row ajax-block-container">
|
||||||
<div class="column-half">
|
<div class="column-half">
|
||||||
{{ big_number_with_status(
|
{{ big_number_with_status(
|
||||||
statistics['email']['requested'],
|
statistics['email']['requested'],
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{% from "components/big-number.html" import big_number %}
|
{% from "components/big-number.html" import big_number %}
|
||||||
|
|
||||||
<div class='grid-row'>
|
<div class='grid-row ajax-block-container'>
|
||||||
<div class='column-half'>
|
<div class='column-half'>
|
||||||
<div class="keyline-block">
|
<div class="keyline-block">
|
||||||
{{ big_number("Unlimited", 'free email allowance', smaller=True) }}
|
{{ big_number("Unlimited", 'free email allowance', smaller=True) }}
|
||||||
|
|||||||
Reference in New Issue
Block a user