[Cheshire East] Allow reporting only on road.

4 files changed, 16 insertions, 18 deletions

diff --git a/perllib/FixMyStreet/Cobrand/CheshireEast.pm b/perllib/FixMyStreet/Cobrand/CheshireEast.pm
index de64f0863..3ac81ab95 100644
--- a/perllib/FixMyStreet/Cobrand/CheshireEast.pm
+++ b/perllib/FixMyStreet/Cobrand/CheshireEast.pm
@@ -32,7 +32,7 @@ sub disambiguate_location {
 }
 
 sub enter_postcode_text {
-    'Enter a postcode or street name and area in Cheshire East';
+    'Enter a postcode, or a road and place name';
 }
 
 sub admin_user_domain { 'cheshireeast.gov.uk' }
diff --git a/templates/web/cheshireeast/report/new/_form_labels.html b/templates/web/cheshireeast/report/new/_form_labels.html
new file mode 100644
index 000000000..1897a5ff2
--- /dev/null
+++ b/templates/web/cheshireeast/report/new/_form_labels.html
@@ -0,0 +1,4 @@
+[%
+SET form_title = 'Location of the problem';
+SET form_title_placeholder = 'Exact location, including any landmarks';
+%]
diff --git a/templates/web/cheshireeast/report/new/roads_message.html b/templates/web/cheshireeast/report/new/roads_message.html
index 3a62e052c..71fa3332d 100644
--- a/templates/web/cheshireeast/report/new/roads_message.html
+++ b/templates/web/cheshireeast/report/new/roads_message.html
@@ -1,8 +1,8 @@
 <div id="js-roads-responsibility" class="box-warning hidden">
     <strong>Not maintained by Cheshire East Council</strong>
-    <div id="js-not-council-road" class="hidden js-responsibility-message">
-        <p>The selected road is not maintained by Cheshire East Council;
-        to find out who owns this land/road please contact the Land Registry at
+    <div id="js-not-a-road" class="hidden js-responsibility-message">
+        <p>Cheshire East Council is not responsible for this location;
+        to find out who is responsible visit
         <a href="https://www.gov.uk/search-property-information-land-registry">https://www.gov.uk/search-property-information-land-registry</a>.
         </p>
     </div>
diff --git a/web/cobrands/cheshireeast/assets.js b/web/cobrands/cheshireeast/assets.js
index 720b02936..435576408 100644
--- a/web/cobrands/cheshireeast/assets.js
+++ b/web/cobrands/cheshireeast/assets.js
@@ -65,29 +65,23 @@ fixmystreet.assets.add(labeled_defaults, {
     asset_item_message: 'You can pick a <b class="asset-spot">street light</b> from the map &raquo;'
 });
 
-var road_defaults = $.extend(true, {}, defaults, {
+fixmystreet.assets.add(defaults, {
     stylemap: fixmystreet.assets.stylemap_invisible,
     always_visible: true,
-    non_interactive: true
-});
-
-fixmystreet.assets.add(road_defaults, {
+    non_interactive: true,
     wfs_feature: 'AdoptedRoads',
     usrn: {
         attribute: 'site_code',
         field: 'site_code'
-    }
-});
-
-fixmystreet.assets.add(road_defaults, {
-    wfs_feature: 'UnAdoptedRoads',
+    },
     road: true,
+    no_asset_msg_id: '#js-not-a-road',
+    asset_item: 'road',
+    asset_type: 'road',
     all_categories: true,
-    no_asset_msg_id: '#js-not-council-road',
-    // The functions assume allow when found, disallow when not found, so we want the reverse
     actions: {
-        found: fixmystreet.message_controller.road_not_found,
-        not_found: fixmystreet.message_controller.road_found
+        found: fixmystreet.message_controller.road_found,
+        not_found: fixmystreet.message_controller.road_not_found
     }
 });