[Bromley] Remove override display template.

3 files changed, 31 insertions, 69 deletions

diff --git a/templates/web/bromley/report/display.html b/templates/web/bromley/report/display.html
deleted file mode 100644
index 4c1a69bca..000000000
--- a/templates/web/bromley/report/display.html
+++ /dev/null
@@ -1,67 +0,0 @@
-[%
-    PROCESS "report/photo-js.html";
-    PROCESS "maps/${map.type}.html";
-
-    problem_title = problem.title_safe _ ' - ' _ loc('Viewing a problem');
-    INCLUDE 'header.html'
-        title = problem_title
-        rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ]
-        robots = 'index, nofollow'
-        bodyclass = 'mappage'
-%]
-
-[% map_html %]
-</div>
-
-<div id="map_sidebar">
-
-[% IF login_success %]
-    <p class='form-success'>[% loc('You have successfully signed in; please check and confirm your details are accurate:') %]</p>
-[% END %]
-
-[% INCLUDE 'report/banner.html' %]
-[% INCLUDE 'report/_main.html' %]
-
-[% IF problem.duplicate_of %]
-    [% INCLUDE 'report/duplicate-no-updates.html' hide_header = 1 %]
-[% END %]
-
-[% INCLUDE 'report/display_tools.html' %]
-[% INCLUDE 'report/updates.html' %]
-
-[% IF problem.duplicate_of %]
-    [% INCLUDE 'report/duplicate-no-updates.html' %]
-[% ELSE %]
-    [% INCLUDE 'report/update-form.html' %]
-[% END %]
-</div>
-
-[% INCLUDE 'footer.html' %]
-
-[% BLOCK name %]
-    [% INCLUDE 'report/new/extra_name.html' %]
-
-    [% IF c.user_exists %]
-        [% names = c.user.split_name %]
-    [% END %]
-    <label for="form_first_name">[% loc('First Name') %]</label>
-    [% IF field_errors.first_name %]
-        <p class='form-error'>[% field_errors.first_name %]</p>
-    [% END %]
-    <input class="js-form-name form-control" type="text" value="[% names.first || first_name | html %]" name="first_name" id="form_first_name" placeholder="[% loc('Your first name') %]">
-
-    <label for="form_last_name">[% loc('Last Name') %]</label>
-    [% IF field_errors.last_name %]
-        <p class='form-error'>[% field_errors.last_name %]</p>
-    [% END %]
-    <input class="js-form-name form-control" type="text" value="[% names.last || last_name | html %]" name="last_name" id="form_last_name" placeholder="[% loc('Your last name') %]">
-
-    <div class="checkbox-group">
-        <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF update AND NOT update.anonymous %]>
-        <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label>
-    </div>
-    <div class="checkbox-group">
-        <input type="checkbox" name="add_alert" id="form_add_alert" value="1"[% ' checked' IF add_alert %]>
-        <label class="inline" for="form_add_alert">[% loc( 'Alert me to future updates' ) %]</label>
-    </div>
-[% END %]
diff --git a/templates/web/bromley/report/update-form.html b/templates/web/bromley/report/update-form.html
index 22dfb1c08..e6d0e1bc0 100644
--- a/templates/web/bromley/report/update-form.html
+++ b/templates/web/bromley/report/update-form.html
@@ -71,7 +71,7 @@
 
         [% IF c.user_exists %]
 
-            [% INCLUDE name %]
+            [% INCLUDE 'report/update/form_name.html' %]
 
             <input class="final-submit green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Post') %]">
 
@@ -93,7 +93,7 @@
                 <div id="form_sign_in_no" class="form-box">
                     <h5>Confirm my report by email</h5>
 
-                    [% INCLUDE name %]
+                    [% INCLUDE 'report/update/form_name.html' %]
 
                     <label for="password_register">[% loc('Password (optional)') %]</label>
 
diff --git a/templates/web/bromley/report/update/form_name.html b/templates/web/bromley/report/update/form_name.html
new file mode 100644
index 000000000..a33d144bd
--- /dev/null
+++ b/templates/web/bromley/report/update/form_name.html
@@ -0,0 +1,29 @@
+[% INCLUDE 'report/new/extra_name.html' %]
+
+[% PROCESS 'user/_anonymity.html' anonymous = update.anonymous %]
+
+[% IF c.user_exists %]
+    [% names = c.user.split_name %]
+[% END %]
+
+<label for="form_first_name">[% loc('First Name') %]</label>
+[% IF field_errors.first_name %]
+    <p class='form-error'>[% field_errors.first_name %]</p>
+[% END %]
+<input class="js-form-name form-control" type="text" value="[% names.first || first_name | html %]" name="first_name" id="form_first_name" placeholder="[% loc('Your first name') %]">
+
+<label for="form_last_name">[% loc('Last Name') %]</label>
+[% IF field_errors.last_name %]
+    <p class='form-error'>[% field_errors.last_name %]</p>
+[% END %]
+<input class="js-form-name form-control" type="text" value="[% names.last || last_name | html %]" name="last_name" id="form_last_name" placeholder="[% loc('Your last name') %]">
+
+<div class="checkbox-group">
+    <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF name_public %]>
+    <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label>
+</div>
+
+<div class="checkbox-group">
+    <input type="checkbox" name="add_alert" id="form_add_alert" value="1"[% ' checked' IF add_alert %]>
+    <label class="inline" for="form_add_alert">[% loc( 'Alert me to future updates' ) %]</label>
+</div>