diff --git a/hub/static/css/_explore.scss b/hub/static/css/_explore.scss index ac76303c0..df017119f 100644 --- a/hub/static/css/_explore.scss +++ b/hub/static/css/_explore.scss @@ -48,13 +48,16 @@ $osm-sea-blue: rgb(168, 212, 243); background: $osm-sea-blue; } -.explore-modal { +.dataset-modal { // Full-width modal, even on large screens. .modal-dialog { margin: var(--#{$prefix}modal-margin); max-width: none; } +} +.dataset-modal, +.area-type-modal { .list-group { --#{$prefix}list-group-item-padding-y: 0.75em; } diff --git a/hub/static/js/explore.esm.js b/hub/static/js/explore.esm.js index 64918516a..0b2ad244d 100644 --- a/hub/static/js/explore.esm.js +++ b/hub/static/js/explore.esm.js @@ -26,21 +26,24 @@ const app = createApp({ area_types: [{ slug: "WMC", label: "Current constituencies", - description: "This is the constituency currently represented by an MP in UK Parliament." + short_label: "constituencies", + description: "These are the constituencies currently represented by MPs in UK Parliament." }, { slug: "WMC23", label: "Future constituencies", - description: "This is the constituency in which parliamentary candidates will soon be standing for election." + short_label: "constituencies", + description: "These are the constituencies in which parliamentary candidates will soon be standing for election." }, { slug: "STC", label: "Single Tier councils", - description: "The local authority has powers over local services like education, planning, and transport." + short_label: "councils", + description: "Includes county councils, London boroughs, unitary authorities, and metropolitain districts." }, { slug: "DIS", label: "District councils", - description: "A district council has certain exclusive responsibilities (e.g. housing and local planning) and shares others (e.g. recreation, town and country planning) with the council of the county to which the district belongs" + short_label: "councils", + description: "Some places are served by both a county council, and one of these district councils, which handle local services like rubbish collection and planning applications." }], - area_header_label: "constituencies", filters_applied: false, // were filters applied on the last Update? area_count: 0, // number of areas returned on last Update @@ -494,11 +497,6 @@ const app = createApp({ }); this.area_count = Object.keys(features).length - if (["DIS", "STC"].includes(this.area_type)) { - this.area_header_label = "councils" - } else { - this.area_header_label = "constituencies" - } window.geojson.eachLayer(function (layer) { if ( features[layer.feature.properties.PCON13CD] ) { diff --git a/hub/templates/hub/explore.html b/hub/templates/hub/explore.html index 69c6b9b0e..514da481b 100644 --- a/hub/templates/hub/explore.html +++ b/hub/templates/hub/explore.html @@ -33,15 +33,15 @@

Select an output format
-

Select an area type

+

Select an area type

-

Filter constituencies

+

Filter ${ getAreaType(area_type)["short_label"] }

diff --git a/hub/templates/hub/includes/add-data-modal.html b/hub/templates/hub/includes/add-data-modal.html index 6ddb7ab3a..5d8d627fc 100644 --- a/hub/templates/hub/includes/add-data-modal.html +++ b/hub/templates/hub/includes/add-data-modal.html @@ -1,4 +1,4 @@ -