Style areas on dashboard the same as alert preview

Our style for areas is pale blue background with black keylines or bold
black text.

This commit makes the display of area names on the dashboard consistent
with that visual style.

This also means that we’re not truncating the list of areas, which is
appropriate because no one area is more important than any of the
others.
This commit is contained in:
Chris Hill-Scott
2020-10-14 10:43:04 +01:00
parent 5c9a886edc
commit e2f16e414d
3 changed files with 10 additions and 14 deletions

View File

@@ -76,12 +76,6 @@ class BroadcastMessage(JSONModel):
for parent in area.parents:
yield parent
@property
def initial_area_names(self):
return [
area.name for area in self.areas
][:10]
@cached_property
def polygons(self):
return Polygons(

View File

@@ -15,12 +15,14 @@
{% call row_heading() %}
<div class="file-list">
<a class="file-list-filename-large govuk-link govuk-link--no-visited-state" href="{{ url_for('.view_broadcast_message', service_id=current_service.id, broadcast_message_id=item.id) }}">{{ item.template_name }}</a>
<span class="file-list-hint-large">
<span class="file-list-hint-large govuk-!-margin-bottom-1">
{{ item.content }}
</span>
<span class="file-list-hint-large">
To {{ item.initial_area_names|formatted_list(before_each='', after_each='') }}
</span>
<ul class="area-list">
{% for area in item.areas %}
<li class="area-list-item area-list-item--unremoveable">{{ area.name }}</li>
{% endfor %}
</ul>
</div>
{% endcall %}
{% call field(align='right') %}

View File

@@ -302,7 +302,7 @@ def test_broadcast_dashboard(
assert [
normalize_spaces(row.text) for row in page.select('table')[0].select('tbody tr')
] == [
'Example template This is a test To England and Scotland Live until tomorrow at 2:20am',
'Example template This is a test England Scotland Live until tomorrow at 2:20am',
]
assert normalize_spaces(page.select('main h2')[1].text) == (
@@ -311,7 +311,7 @@ def test_broadcast_dashboard(
assert [
normalize_spaces(row.text) for row in page.select('table')[1].select('tbody tr')
] == [
'Example template This is a test To England and Scotland Prepared by Test User',
'Example template This is a test England Scotland Prepared by Test User',
]
@@ -361,8 +361,8 @@ def test_previous_broadcasts_page(
assert [
normalize_spaces(row.text) for row in page.select('table')[0].select('tbody tr')
] == [
'Example template This is a test To England and Scotland Stopped 10 February at 2:20am',
'Example template This is a test To England and Scotland Finished yesterday at 8:20pm',
'Example template This is a test England Scotland Stopped 10 February at 2:20am',
'Example template This is a test England Scotland Finished yesterday at 8:20pm',
]