Merge pull request #7 from digital-land/syncPagesToPrototype

updated start and errors pages
digital-land · Nov 9, 2023 · 07bece2 · 07bece2
2 parents b9f36ff + 2012a14
commit 07bece2
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 92 deletions.
diff --git a/changelog.md b/changelog.md
@@ -0,0 +1,21 @@
+<!--
+    # Template
+    ## [Version(optional)] - [Date]
+    ### What's new
+    - [Feature]
+    - [BugFix]
+    - ...
+    ### Why was this change made?
+    - [explanation]
+
+    <br />
+-->
+
+# ChangeLog
+<br>
+
+## 09-11-2023
+    ### What's new
+    - Updated the errors and start pages to match the prototoype
+
+    <br />
diff --git a/src/views/errors.html b/src/views/errors.html
@@ -5,7 +5,7 @@
 {% from 'govuk/components/radios/macro.njk' import govukRadios %}
 {% from 'govuk/components/inset-text/macro.njk' import govukInsetText %}
 
-{% set pageName = 'There’s a problem with your data' %}
+{% set pageName = 'There’s a problem' %}
 
 {% block beforeContent %}
   {{ govukBackLink({
@@ -30,6 +30,13 @@ <h1 class="govuk-heading-l">
       </h1>
 
       <ul class="govuk-list govuk-list--bullet">
+        {# <li>We could not find a ‘Geometry’ column that contains your polygons</li> #}
+        <li>There’s no column for the name of the conservation area</li>
+        <li>There are no references</li>
+        {# <li>{{referenceErrorCount}} references are missing</li> #}
+        <li>{{locationErrorCount}} locations are not in England</li>
+        <li>{{startDateErrorCount}} start dates are in the future</li>
+        {# <li> Entry date is missing - what do we do in this case? </li> #}
         {% for issue, count in options.issueCounts %}
           <li>{{count}} issue, relating to {{issue}}</li>
         {% endfor %}
@@ -40,7 +47,7 @@ <h1 class="govuk-heading-l">
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-full">
     <h2 class="govuk-heading-m">
-      Records with errors
+      Errors
     </h2>
 
     <div class="app-scrollable-container">
@@ -108,33 +115,10 @@ <h2 class="govuk-heading-m">
 
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-      <form novalidate method="post">
-
-        {{ govukRadios({
-          name: "check[fixErrors]",
-          fieldset: {
-            legend: {
-              text: "Do you want to fix the errors before you publish the data?",
-              classes: "govuk-fieldset__legend--m"
-            }
-          },
-          value: data.check.fixErrors,
-          items: [
-            {
-              value: "Yes",
-              text: "Yes"
-            },
-            {
-              value: "No",
-              text: "No, publish the valid data and I’ll fix the invalid data later"
-            }
-          ]
-        }) }}
-
-        {{ govukButton({
-          text: "Continue"
-        }) }}
-      </form>
+      {{ govukButton({
+        text: "Upload a new version",
+        href: "/upload"
+      }) }}
 
     </div>
   </div>

diff --git a/src/views/start.html b/src/views/start.html
@@ -1,86 +1,36 @@
-{% extends "layouts/main.html" %}
 {% from "govuk/components/button/macro.njk" import govukButton %}
 {% from "govuk/components/details/macro.njk" import govukDetails %}
 {% from "x-govuk/components/related-navigation/macro.njk" import xGovukRelatedNavigation %}
 
+{% extends "layouts/main.html" %}
 
 {% set pageName = serviceName %}
 
 {% block content %}
 
-{% set example %}
-
-  ## About the data
-
-  This dataset shows the locations of conservation areas. Conservation areas are designated to safeguard areas of special architectural and historic interest, the character and appearance of which it is desirable to preserve or enhance. Within these areas special planning controls operate which need to be considered when undertaking development.
-
-  ## Data
 
-  [Southwark conservations areas (CSV, 188KB)](#)
-
-  ## Licensing
-
-  The data is provided under the [Open Government Licence](#).
-
-  ## Last updated
+{% set content %}
 
-  The data was last updated on 14 July 2023 at 9am.
+  Use this service to check and publish your:
 
-{% endset %}
+  - article 4 direction data
+  - conservation area data
+  - listed building data
+  - tree preservation order data
 
-{% set content %}
+  ## Before you start
 
-  Use this service to:
+  You need to make sure your data:
 
-  - check your data follows the standard
-  - get your data published
+  - follows the [data specification](https://www.planning.data.gov.uk/guidance/specifications/)
+  - is a CSV, GeoJSON, GML or GeoPackage file
 
   <form method="POST">
     {{ govukButton({
       text: "Start now"
     }) }}
   </form>
 
-  ## Before you check your data
-
-  You need to prepare your:
-
-  - conservation area data
-  - listed building data
-  - article 4 direction data
-  - tree preservation order data
-
-  You may need to create more than one set of data for each subject. You'll find what to include in the [data specifications](https://www.planning.data.gov.uk/guidance/specifications/).
-
-  We will accept data supplied as either:
-
-  - CSV
-  - GeoJSON
-  - GML
-  - GeoPackage
-
-  {# These may be uploaded to a single URL, or served via an OGC WFS or ArcGIS API. #}
-
-  ## Before you can publish your data
-
-  You must be able to create or edit a webpage on your local planning authority’s (LPA) website. This will probably have a URL ending in .gov.uk or .org.
-
-  If you’re not able to do this, you’ll need to ask the person who updates your website.
-
-  The webpage needs to include:
-
-  - a summary of what the data is about
-  - a confirmation that the data is provided under the Open Government License
-  - the date you created or updated the webpage
-  - links to your data on this page, for example a CSV
-
-  {{ govukDetails({
-    summaryText: "Example webpage",
-    text: example | govukMarkdown(headingsStartWith="m")
-  }) }}
-
-  This webpage URL must not change, so we can keep collecting the data. If the URL does change, send an email to [[email protected]](mailto:[email protected]).
-
 {% endset %}
 
   <div class="govuk-grid-row">
@@ -93,13 +43,13 @@ <h1 class="govuk-heading-xl">
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-      {{content | govukMarkdown |safe}}
+      {{content | govukMarkdown | safe}}
     </div>
     <div class="govuk-grid-column-one-third">
       {{ xGovukRelatedNavigation({
         sections: [{
           items: [{
-            text: "Data specifications",
+            text: "Data specification",
             href: "/"
           }],
           subsections: [{