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

Swap order of message and areas

Browse Source 
This then matches the order in which the message is drafted, first the
content, then the areas. It also matches the order we’re going to have
on the new dashboard.
This commit is contained in:
Chris Hill-Scott
2020-10-14 13:59:20 +01:00
parent 274eff5f25
commit a43321cbb3
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/templates/views/broadcast/preview-message.html
View File

@@ -14,19 +14,17 @@
{{ page_header("Preview", back_link=url_for('.preview_broadcast_areas', service_id=current_service.id, broadcast_message_id=broadcast_message.id)) }}
{% for area in broadcast_message.areas %}
{% if loop.first %}
<ul class="area-list">
{% endif %}
{{ broadcast_message.template|string }}
<div class="govuk-!-margin-bottom-3">
<ul class="area-list">
{% for area in broadcast_message.areas %}
<li class="area-list-item area-list-item--unremoveable">
{{ area.name }}
</li>
{% if loop.last %}
</ul>
{% endif %}
{% endfor %}
{{ broadcast_message.template|string }}
{% endfor %}
</ul>
</div>
{% call form_wrapper() %}
{{ page_footer('Submit for approval') }}

6
app/templates/views/broadcast/view-message.html
View File

@@ -126,9 +126,11 @@
</p>
{% endif %}
{{ broadcast_message.template|string }}
{% for area in broadcast_message.areas %}
{% if loop.first %}
<ul class="area-list govuk-!-margin-bottom-4">
<ul class="area-list">
{% endif %}
<li class="area-list-item area-list-item--unremoveable">
{{ area.name }}
@@ -145,6 +147,4 @@
}) }}
</div>
{{ broadcast_message.template|string }}
{% endblock %}