4 files changed, 81 insertions, 6 deletions
diff --git a/perllib/FixMyStreet/Cobrand/BathNES.pm b/perllib/FixMyStreet/Cobrand/BathNES.pm
index d799ad9c0..37c104ef7 100644
--- a/perllib/FixMyStreet/Cobrand/BathNES.pm
+++ b/perllib/FixMyStreet/Cobrand/BathNES.pm
@@ -149,4 +149,10 @@ sub lookup_usrn {
 
 }
 
+sub enter_postcode_text {
+    my ($self) = @_;
+    return 'Enter a location in ' . $self->council_area;
+}
+
+
 1;
diff --git a/templates/web/bathnes/around/intro.html b/templates/web/bathnes/around/intro.html
index a4c646948..14b4ce024 100644
--- a/templates/web/bathnes/around/intro.html
+++ b/templates/web/bathnes/around/intro.html
@@ -1,6 +1,5 @@
-<h1>Report a Highways or Cleansing issue in Bath &amp; North East Somerset</h1>
-<h2>
-Report issues with Roads &amp; Pavements or your Environment, such as</h2>
-<h2>
-Potholes, Faulty street lighting, Street litter, Graffiti, and Abandoned Vehicles
-</h2>
+<h1>Report problems on the highway</h1>
+
+<h2>Report problems like potholes, blocked drains, faulty street lights, and cracks in pavements.</h2>
+<h2>Report other issues or make enquiries using our <a href="https://www.bathnes.gov.uk/reportit">report it</a> forms.</h2>
+<h2>Report emergencies by calling 01225 39 40 41 (option 9).</h2>
diff --git a/templates/web/bathnes/report/new/councils_extra_text.html b/templates/web/bathnes/report/new/councils_extra_text.html
new file mode 100644
index 000000000..7896d1691
--- /dev/null
+++ b/templates/web/bathnes/report/new/councils_extra_text.html
@@ -0,0 +1,4 @@
+<p>
+Report other issues or make enquiries using our <a href="https://www.bathnes.gov.uk/reportit">report it</a> forms.
+Report emergencies by calling 01225 39 40 41 (option 9)
+</p>
+\ No newline at end of file
diff --git a/templates/web/bathnes/report/new/form_report.html b/templates/web/bathnes/report/new/form_report.html
new file mode 100644
index 000000000..495b465ab
--- /dev/null
+++ b/templates/web/bathnes/report/new/form_report.html
@@ -0,0 +1,66 @@
+[% INCLUDE 'report/new/form_heading.html' %]
+
+[% IF field_errors.bodies %]
+    <p class='form-error'>[% field_errors.bodies %]</p>
+[% END %]
+
+[% PROCESS "report/new/category_wrapper.html" %]
+[% TRY %][% PROCESS 'report/new/after_category.html' %][% CATCH file %][% END %]
+
+    <h2 class="form-section-heading">[% loc( 'Public details' ) %]</h2>
+    <div class="form-section-description" id="js-councils_text">
+      [% IF js %]
+        [% PROCESS 'report/new/councils_text_all.html' list_of_names = [ loc('the local council') ] %]
+      [% ELSE %]
+        [% PROCESS 'report/new/councils_text.html' %]
+      [% END %]
+    </div>
+
+    <label for="form_title">[% loc('Summarise the problem and location') %]</label>
+[% IF field_errors.title %]
+    <p class='form-error'>[% field_errors.title %]</p>
+[% END %]
+    <input class="form-control" type="text" value="[% report.title | html %]" name="title" id="form_title" placeholder="e.g. ‘pothole on Example St, near post box’" required>
+
+[% TRY %][% PROCESS 'report/new/after_title.html' %][% CATCH file %][% END %]
+
+[% IF c.cobrand.allow_photo_upload %]
+    <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
+    <label for="form_photo">
+        <span data-singular="[% loc('Photo') %]" data-plural="[% loc('Photos') %]">[% loc('Photo') %]</span>
+    </label>
+
+  [% IF field_errors.photo %]
+    <p class='form-error'>[% field_errors.photo %]</p>
+  [% END %]
+
+    <div id="form_photos">
+      [% IF upload_fileid %]
+        <p>[% loc('You have already attached photos to this report.  Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed).') %]</p>
+        [% FOREACH id IN upload_fileid.split(',') %]
+        <img align="right" src="/photo/temp.[% id %]" alt="">
+        [% END %]
+      [% END %]
+        <input type="file" name="photo1" id="form_photo">
+        <label for="form_photo2">[% loc('Photo') %]</label>
+        <input type="file" name="photo2" id="form_photo2">
+        <label for="form_photo3">[% loc('Photo') %]</label>
+        <input type="file" name="photo3" id="form_photo3">
+    </div>
+[% END %]
+
+[% TRY %][% PROCESS 'report/new/after_photo.html' %][% CATCH file %][% END %]
+
+    <label for="form_detail">[% loc('Explain what’s wrong') %]</label>
+[% IF field_errors.detail %]
+    <p class='form-error'>[% field_errors.detail %]</p>
+[% END %]
+    <textarea class="form-control" rows="7" cols="26" name="detail" id="form_detail" placeholder="e.g. ‘This pothole has been here for two months and…’" required>[% report.detail | html %]</textarea>
+
+[% TRY %][% PROCESS 'report/new/inline-tips.html' %][% CATCH file %][% END %]
+
+[% IF partial_token %]
+    <input type="hidden" name="partial" value="[% partial_token.token %]">
+[% END %]
+
+    <input type="hidden" name="submit_problem" value="1">