diff --git a/package-lock.json b/package-lock.json index 715a8fc6..6ce4bbc0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "fmfp", - "version": "2.6.0", + "version": "2.7.0-pre.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "fmfp", - "version": "2.6.0", + "version": "2.7.0-pre.2", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index f03ebb3c..83902f47 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fmfp", - "version": "2.6.0", + "version": "2.7.0-pre.2", "dataVersion": "2.5.1", "description": "Flood map for planning", "main": "index.js", diff --git a/server/routes/confirm-location.js b/server/routes/confirm-location.js index 94a423f5..80bfc530 100644 --- a/server/routes/confirm-location.js +++ b/server/routes/confirm-location.js @@ -87,7 +87,6 @@ module.exports = [{ let { locationDetails = '' } = request.query if (locationDetails) { locationDetails = locationDetails - .replace(/, England$/, '') .replace((new RegExp(`^${placeOrPostcode}, `, 'i')), '') } const model = new ConfirmLocationViewModel( diff --git a/server/views/confirm-location.html b/server/views/confirm-location.html index ebb65b70..77ef75f6 100644 --- a/server/views/confirm-location.html +++ b/server/views/confirm-location.html @@ -17,7 +17,12 @@ <div id="confirm-location-page" class="govuk-grid-row"> <div class="govuk-grid-column-two-thirds"> - <h1 class="govuk-heading-xl">Draw the boundary of your site</h1> + <h1 class="govuk-heading-xl"> + Draw the boundary of your site + </h1> + </div> + + <div class="govuk-grid-column-two-thirds"> <div class="hide" data-journey="{{analyticsPageEvent}}"></div> {% if locationDetails %} <p class="govuk-body">Your search for '{{placeOrPostcodeUnencoded}}' has been placed in {{locationDetails}}.</p> @@ -32,7 +37,7 @@ <h1 class="govuk-heading-xl">Draw the boundary of your site</h1> <p class="govuk-body">You need to draw the boundary of your site on the map below so we can give you accurate flood risk information.</p> - <details class="govuk-details" data-module="govuk-details" data-journey-click="Confirm-Location:DETAIL-CLICK:How-to-draw-Boundary"> + <details class="govuk-details govuk-!-margin-top-4" data-module="govuk-details" data-journey-click="Confirm-Location:DETAIL-CLICK:How-to-draw-Boundary"> <summary class="govuk-details__summary"> <span class="govuk-details__summary-text"> How to draw a boundary @@ -48,11 +53,11 @@ <h1 class="govuk-heading-xl">Draw the boundary of your site</h1> <p class="govuk-body"> If you need to change the finished boundary you can: </p> - <ol class="govuk-list govuk-list--bullet"> + <ul class="govuk-list govuk-list--bullet"> <li> click and drag the points to adjust them </li> <li> add more points by clicking or tapping on a line </li> <li> delete the boundary you've drawn and start again by clicking or tapping the 'Delete boundary' button </li> - </ol> + </ul> <p class="govuk-body"> Click or tap the Continue button to get your flood risk information. </p> @@ -100,27 +105,18 @@ <h1 class="govuk-heading-xl">Draw the boundary of your site</h1> </figure> </div> - <div class="govuk-grid-column-full"> - <a href="/flood-zone-results?easting={{easting}}&northing={{northing}}&location={{location}}" role="button" draggable="false" class="govuk-button govuk-!-margin-top-7 govuk-!-margin-bottom-8 govuk-button--start" data-module="govuk-button"> + <div class="govuk-grid-column-two-thirds"> + <a id="continue-button" href="/flood-zone-results?easting={{easting}}&northing={{northing}}&location={{location}}" role="button" draggable="false" class="govuk-button govuk-!-margin-top-7 govuk-!-margin-bottom-8 govuk-button--start" data-module="govuk-button"> Continue </a> <h2 class="govuk-heading-m">If you need help drawing a boundary</h2> - <p class="govuk-body" data-pso-contact-email>Contact the Environment Agency team in {{areaName}} at <a href="mailto:{{psoEmailAddress}}">{{psoEmailAddress}}</a></p> + <p class="govuk-body" data-pso-contact-email>Contact the Environment Agency team in {{areaName}} at <a href="mailto:{{psoEmailAddress}}" class="govuk-link">{{psoEmailAddress}}</a>.</p> <p class="govuk-body">Or contact the Environment Agency:</p> - <ul class="govuk-list"> - <li> - <span>Environment Agency</span> - </li> - <li> - <span>Telephone: 03708 506 506</span> - </li> - <li> - <span>Monday to Friday, 8am to 6pm</span> - </li> - <li> - <a href="https://www.gov.uk/call-charges">Find out about call charges</a> - </li> - </ul> + <p class="govuk-body">Environment Agency<br> + Telephone: 03708 506 506 <br> + Monday to Friday, 8am to 6pm <br> + <a href="https://www.gov.uk/call-charges">Find out about call charges</a> + </p> </div> </div>