[Bromley] Refactor templates into separate files.

11 files changed, 214 insertions, 249 deletions

diff --git a/templates/web/bromley/report/new/form_user.html b/templates/web/bromley/report/new/form_user.html
index cce985c95..20f522dcd 100644
--- a/templates/web/bromley/report/new/form_user.html
+++ b/templates/web/bromley/report/new/form_user.html
@@ -5,130 +5,18 @@
     title, first name, and last name separately.
 %]
 
-<h2 class="form-section-heading form-section-heading--private">Private details</h2>
-<p class="form-section-description">
-  [% tprintf(
-    loc('These will be sent to the council, but will never be shown online. <a href="%s">(See our privacy policy.)</a>')
-    '/faq#privacy'
-  ); %]
+<h2 class="form-section-heading form-section-heading--private">[% loc('Private details') %]</h2>
+<p class="form-section-description" id="js-councils_text_private">
+  [% IF js %]
+    [% loc('These will be sent to the council, but will never be shown online.') %]
+    (<a href="/faq#privacy">[% loc('See our privacy policy') %]</a>.)
+  [% ELSE %]
+    [% PROCESS 'report/new/councils_text_private.html' %]
+  [% END %]
 </p>
 
 [% IF c.user_exists %]
-    <div class="form-box">
-        [% INCLUDE 'report/new/extra_name.html' %]
-
-        [% names = c.user.split_name %]
-        <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="form-control js-form-name" type="text" value="[% ( first_name || names.first ) | 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="form-control js-form-name" type="text" value="[% ( last_name || names.last ) | html %]" name="last_name" id="form_last_name" placeholder="[% loc('Your last name') %]">
-
-
-        [%# if there is nothing in the name field then set check box as default on form %]
-        <div class="checkbox-group">
-            <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF !report.anonymous %]>
-            <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label>
-        </div>
-
-        <label for="form_phone">[% loc('Phone number (optional)') %]</label>
-        <input class="form-control" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
-
-            <div class="general-notes">
-                <p>[% loc('We never show your email address or phone number.') %]</p>
-            </div>
-
-        <div class="form-txt-submit-box">
-            <input class="green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]">
-        </div>
-    </div>
+  [% PROCESS "report/new/form_user_loggedin.html" %]
 [% ELSE %]
-
-    <label for="form_username">[% loc('Your email') %]</label>
-    [% IF field_errors.username %]
-        <p class='form-error'>[% field_errors.username %]</p>
-    [% END %]
-    <input class="form-control" type="email" value="[% report.user.email | html %]" name="username" id="form_username" placeholder="[% loc('Please enter your email address') %]" required>
-
-    <div id="form_sign_in">
-
-        <p>To submit your report you now need to confirm it either by email or by using a  FixMyStreet password.</p>
-
-        <div id="form_sign_in_no" class="form-box">
-            <h5>Confirm my report by email</h5>
-
-            [% INCLUDE 'report/new/extra_name.html' %]
-
-            <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 type="text" class="form-control form-focus-trigger js-form-name" value="[% 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 type="text" class="form-control form-focus-trigger js-form-name" value="[% last_name | html %]" name="last_name" id="form_last_name" placeholder="[% loc('Your last name') %]">
-
-            [%# if there is nothing in the name field then set check box as default on form %]
-            <div class="checkbox-group">
-                <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF !report.anonymous %]>
-                <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label>
-            </div>
-
-            <label class="form-focus-hidden" for="form_phone">[% loc('Phone number (optional)') %]</label>
-            <input class="form-control form-focus-hidden" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
-
-            <div class="general-notes form-focus-hidden">
-                <p>[% loc('We never show your email address or phone number.') %]</p>
-            </div>
-
-            <label class="form-focus-hidden" for="password_register">[% loc('Password (optional)') %]</label>
-          [% IF field_errors.password_register %]
-            <p class='form-error'>[% field_errors.password_register %]</p>
-          [% END %]
-
-            <div class="general-notes form-focus-hidden">
-                <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports.') %]</p>
-            </div>
-
-            <div class="form-txt-submit-box form-focus-hidden">
-                <input class="form-control js-password-validate" type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
-                <input class="green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]">
-            </div>
-
-            <div class="general-notes">
-                <p>[% tprintf(loc('Your password should include %d or more characters.'), c.cobrand.password_minimum_length) %]</p>
-            </div>
-
-        </div>
-
-        <div id="form_sign_in_yes" class="form-box">
-
-            <h5>Confirm my report with my FixMyStreet password</h5>
-
-            <label class="hidden-js n" for="password_sign_in">[% loc('Yes I have a password') %]</label>
-            <div class="form-txt-submit-box">
-                [% IF field_errors.password %]
-                    <p class='form-error'>[% field_errors.password %]</p>
-                [% END %]
-                <input class="form-control" type="password" name="password_sign_in" id="password_sign_in" placeholder="[% loc('Your password') %]" value="">
-                <input class="green-btn js-submit_sign_in" type="submit" name="submit_sign_in" value="[% loc('Submit') %]">
-            </div>
-
-            <div class="checkbox-group">
-                <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]>
-                <label class="n inline" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
-            </div>
-        </div>
-
-    </div>
-
+  [% PROCESS "report/new/form_user_loggedout.html" %]
 [% END %]
diff --git a/templates/web/bromley/report/new/form_user_loggedout.html b/templates/web/bromley/report/new/form_user_loggedout.html
new file mode 100644
index 000000000..8d46e7b60
--- /dev/null
+++ b/templates/web/bromley/report/new/form_user_loggedout.html
@@ -0,0 +1,7 @@
+[% PROCESS 'report/new/form_user_loggedout_email.html' required = 1 %]
+
+<div id="form_sign_in">
+    <p>To submit your report you now need to confirm it either by email or by using a  FixMyStreet password.</p>
+    [% PROCESS 'report/new/form_user_loggedout_by_email.html' %]
+    [% PROCESS 'report/new/form_user_loggedout_password.html' %]
+</div>
diff --git a/templates/web/bromley/report/new/form_user_loggedout_by_email.html b/templates/web/bromley/report/new/form_user_loggedout_by_email.html
new file mode 100644
index 000000000..aea672483
--- /dev/null
+++ b/templates/web/bromley/report/new/form_user_loggedout_by_email.html
@@ -0,0 +1,37 @@
+<div id="form_sign_in_no" class="form-box">
+    <h5>Confirm my report by email</h5>
+
+    [% INCLUDE 'report/new/extra_name.html' %]
+    [% PROCESS 'user/_anonymity.html' anonymous = report.anonymous %]
+    [% INCLUDE 'report/new/form_user_name.html' extra_class='form-focus-trigger' %]
+    [% INCLUDE 'report/_show_name_label.html' %]
+
+    [% UNLESS c.cobrand.call_hook('disable_phone_number_entry') %]
+        <div id="js-hide-if-username-phone">
+            <label class="form-focus-hidden" for="form_phone">[% loc('Phone number (optional)') %]</label>
+            <input class="form-control form-focus-hidden" type="text" value="[% report.user.phone_display | html %]" name="phone" id="form_phone">
+        </div>
+    [% END %]
+    <div id="js-hide-if-username-email">
+        <label class="form-focus-hidden" for="form_email">[% loc('Email address (optional)') %]</label>
+        <input class="form-control form-focus-hidden" type="text" value="[% report.user.email | html %]" name="email" id="form_email">
+    </div>
+
+    <label class="form-focus-hidden" for="password_register">[% loc('Password (optional)') %]</label>
+  [% IF field_errors.password_register %]
+    <p class='form-error'>[% field_errors.password_register %]</p>
+  [% END %]
+    <div class="general-notes form-focus-hidden">
+        <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports.') %]</p>
+    </div>
+
+    <div class="form-txt-submit-box form-focus-hidden">
+        <input class="form-control js-password-validate" type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
+        <input class="green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]">
+    </div>
+
+    <div class="general-notes">
+        <p>[% tprintf(loc('Your password should include %d or more characters.'), c.cobrand.password_minimum_length) %]</p>
+    </div>
+
+</div>
diff --git a/templates/web/bromley/report/new/form_user_loggedout_password.html b/templates/web/bromley/report/new/form_user_loggedout_password.html
new file mode 100644
index 000000000..a4255f647
--- /dev/null
+++ b/templates/web/bromley/report/new/form_user_loggedout_password.html
@@ -0,0 +1,18 @@
+<div id="form_sign_in_yes" class="form-box">
+
+    <h5>Confirm my report with my FixMyStreet password</h5>
+
+    <label class="hidden-js n" for="password_sign_in">[% loc('Yes I have a password') %]</label>
+    [% IF field_errors.password %]
+        <p class='form-error'>[% field_errors.password %]</p>
+    [% END %]
+    <div class="form-txt-submit-box">
+        <input class="form-control" type="password" name="password_sign_in" id="password_sign_in" placeholder="[% loc('Your password') %]" value="">
+        <input class="green-btn js-submit_sign_in" type="submit" name="submit_sign_in" value="[% loc('Submit') %]">
+    </div>
+
+    <div class="checkbox-group">
+        <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]>
+        <label class="n inline" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
+    </div>
+</div>
diff --git a/templates/web/bromley/report/new/form_user_name.html b/templates/web/bromley/report/new/form_user_name.html
new file mode 100644
index 000000000..8102c0ea7
--- /dev/null
+++ b/templates/web/bromley/report/new/form_user_name.html
@@ -0,0 +1,12 @@
+[% names = c.user.split_name %]
+<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="form-control js-form-name [% extra_class %]" type="text" value="[% ( first_name || names.first ) | 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="form-control js-form-name [% extra_class %]" type="text" value="[% ( last_name || names.last ) | html %]" name="last_name" id="form_last_name" placeholder="[% loc('Your last name') %]">
diff --git a/templates/web/bromley/report/update-form.html b/templates/web/bromley/report/update-form.html
index 9778a0db3..bdabe12c5 100644
--- a/templates/web/bromley/report/update-form.html
+++ b/templates/web/bromley/report/update-form.html
@@ -5,140 +5,33 @@
 
     [% INCLUDE 'errors.html' %]
 
-    <form method="post" action="[% c.uri_for( '/report/update' ) %]" name="updateForm" class="validate"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %]>
+    <form method="post" action="[% c.uri_for( '/report/update' ) %]" id="form_update_form" name="updateForm" class="validate"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %]>
         <input type="hidden" name="token" value="[% csrf_token %]">
         <fieldset>
-            <input type="hidden" name="submit_update" value="1">
-            <input type="hidden" name="id" value="[% problem.id | html %]">
-
-        [% 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 update.  Note that you can attach a maximum of 3 to this update (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 %]
-
-            <div class="general-notes">
-                <p>Please note that new and separate occurrences of issues
-                should be logged as new reports, to avoid conflicting
-                information or updates and ensure the information is passed
-                promptly to our teams. Please log any new issue via
-                <a href="https://www.bromley.gov.uk/report">https://www.bromley.gov.uk/report</a>
-                using the map marker and description to detail where the issue
-                is located.</p>
-            </div>
-
-            <label for="form_update">[% loc( 'Update' ) %]</label>
-            [% IF field_errors.update %]
-                <div class='form-error'>[% field_errors.update %]</div>
-            [% END %]
-            <textarea class="form-control" rows="7" cols="30" name="update" id="form_update" placeholder="[% loc('Please write your update here') %]" required>[% update.text | html %]</textarea>
-
-            [% IF c.user && c.user.belongs_to_body( problem.bodies_str ) %]
-                <label for="state">[% loc( 'State' ) %]</label>
-                [% INCLUDE 'report/inspect/state_groups_select.html' %]
-            [% ELSE %]
-                [% IF problem.is_fixed AND c.user_exists AND c.user.id == problem.user_id %]
-
-                <input type="checkbox" name="reopen" id="form_reopen" value="1"[% ' checked' IF update.mark_open %]>
-                <label class="inline" for="form_reopen">[% loc('This problem has not been fixed') %]</label>
-
-                [% ELSIF !problem.is_fixed %]
-
-                <div class="checkbox-group">
-                    <input type="checkbox" name="fixed" id="form_fixed" value="1"[% ' checked' IF update.mark_fixed %]>
-                    <label class="inline" for="form_fixed">[% loc('This problem has been fixed') %]</label>
-                </div>
-
-                [% END %]
-            [% END %]
-
-        [% IF c.user_exists %]
-
+          [% IF NOT login_success AND NOT oauth_need_email %]
+            [% INCLUDE 'report/update/form_update.html' %]
+          [% END %]
+          [% IF c.user_exists %]
             [% INCLUDE 'report/update/form_name.html' %]
-
-            <input class="final-submit green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Post') %]">
-
-
-        [% ELSE %]
-
-            <label for="form_username">[% loc('Email' ) %]
-                <span class="muted">([% loc('We never show your email') %])</span>
-            </label>
-
-            [% IF field_errors.username %]
-                <p class='form-error'>[% field_errors.username %]</p>
-            [% END %]
-            <input class="form-control" type="email" name="username" id="form_username" value="[% update.user.email | html %]" placeholder="[% loc('Your email address' ) %]" required>
-
+            <div class="clearfix"><input class="final-submit green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Post') %]"></div>
+          [% ELSIF oauth_need_email %]
+            [% INCLUDE 'report/update/form_user_loggedout_email.html' required = 1 %]
             <div id="form_sign_in">
-                <p>To submit your update you now need to confirm it either by email or by using a FixMyStreet password.</p>
-
-                <div id="form_sign_in_no" class="form-box">
-                    <h5>Confirm my report by email</h5>
-
-                    [% INCLUDE 'report/update/form_name.html' %]
-
-                    <label for="password_register">[% loc('Password (optional)') %]</label>
-                  [% IF field_errors.password_register %]
-                    <p class='form-error'>[% field_errors.password_register %]</p>
-                  [% END %]
-
-                    <div class="general-notes">
-                        <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p>
-                    </div>
-
-                    <div class="form-txt-submit-box">
-                        <input type="password" class="form-control js-password-validate" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
-                        <input class="green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Post') %]">
-                    </div>
-
-                    <div class="general-notes">
-                        <p>[% tprintf(loc('Your password should include %d or more characters.'), c.cobrand.password_minimum_length) %]</p>
-                    </div>
-
-                </div>
-                <div id="form_sign_in_yes" class="form-box">
-                    <h5>Confirm my report with my FixMyStreet password</h5>
-
-                    <label class="hidden-js n" for="password_sign_in">[% loc('Yes I have a password') %]</label>
-                    [% IF field_errors.password %]
-                        <p class='form-error'>[% field_errors.password %]</p>
-                    [% END %]
-                    <div class="form-txt-submit-box">
-                        <input type="password" class="form-control" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]">
-                        <input class="green-btn js-submit_sign_in" type="submit" name="submit_sign_in" value="[% loc('Post') %]">
-                    </div>
-
-                    <div class="checkbox-group">
-                        <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]>
-                        <label class="inline n" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
-                    </div>
-                </div>
+                <h3>[% loc("Now to submit your update&hellip;") %]</h3>
+                <h2>[% tprintf(loc("Do you have a %s password?", "%s is the site name"), site_name) %]</h2>
+                [% INCLUDE 'report/update/form_user_loggedout_by_email.html' %]
+                [% INCLUDE 'report/update/form_user_loggedout_password.html' %]
+                <input type="hidden" name="oauth_need_email" value="1">
             </div>
+          [% ELSE %]
+            [% INCLUDE 'report/update/form_user_loggedout.html' %]
+          [% END %]
 
-        [% END %]
-
-        <p>Your information will only be used in accordance with our <a href="/faq#privacy">privacy policy</a>.</p>
+            <p>Your information will only be used in accordance with our <a href="/faq#privacy">privacy policy</a>.</p>
 
+          [% IF login_success OR oauth_need_email %]
+            [% INCLUDE 'report/update/form_update.html' %]
+          [% END %]
         </fieldset>
     </form>
 </div>
diff --git a/templates/web/bromley/report/update/form_update.html b/templates/web/bromley/report/update/form_update.html
new file mode 100644
index 000000000..06d7c455e
--- /dev/null
+++ b/templates/web/bromley/report/update/form_update.html
@@ -0,0 +1,54 @@
+<input type="hidden" name="submit_update" value="1">
+<input type="hidden" name="id" value="[% problem.id | html %]">
+
+[% 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 update.  Note that you can attach a maximum of 3 to this update (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 %]
+
+<div class="general-notes">
+    <p>Please note that new and separate occurrences of issues
+    should be logged as new reports, to avoid conflicting
+    information or updates and ensure the information is passed
+    promptly to our teams. Please log any new issue via
+    <a href="https://www.bromley.gov.uk/report">https://www.bromley.gov.uk/report</a>
+    using the map marker and description to detail where the issue
+    is located.</p>
+</div>
+
+<label for="form_update">[% loc( 'Update' ) %]</label>
+[% IF c.user && c.user.belongs_to_body( problem.bodies_str ) %]
+  [% INCLUDE 'admin/response_templates_select.html' for='form_update' %]
+[% END %]
+[% IF field_errors.update %]
+    <div class='form-error'>[% field_errors.update %]</div>
+[% END %]
+<textarea rows="7" cols="30" name="update" class="form-control" id="form_update" placeholder="[% loc('Please write your update here') %]" required>[% update.text | html %]</textarea>
+
+[% IF c.user && c.user.belongs_to_body( problem.bodies_str ) %]
+    <label for="state">[% loc( 'State' ) %]</label>
+    [% INCLUDE 'report/inspect/state_groups_select.html' %]
+[% ELSE %]
+  [% INCLUDE report/update/form_state_checkbox.html %]
+[% END %]
+
diff --git a/templates/web/bromley/report/update/form_user_loggedout.html b/templates/web/bromley/report/update/form_user_loggedout.html
new file mode 100644
index 000000000..f19238934
--- /dev/null
+++ b/templates/web/bromley/report/update/form_user_loggedout.html
@@ -0,0 +1,7 @@
+[% INCLUDE 'report/update/form_user_loggedout_email.html' required=1 %]
+
+<div id="form_sign_in">
+    <p>To submit your update you now need to confirm it either by email or by using a FixMyStreet password.</p>
+    [% INCLUDE 'report/update/form_user_loggedout_by_email.html' %]
+    [% INCLUDE 'report/update/form_user_loggedout_password.html' %]
+</div>
diff --git a/templates/web/bromley/report/update/form_user_loggedout_by_email.html b/templates/web/bromley/report/update/form_user_loggedout_by_email.html
new file mode 100644
index 000000000..393d8e4cc
--- /dev/null
+++ b/templates/web/bromley/report/update/form_user_loggedout_by_email.html
@@ -0,0 +1,23 @@
+<div id="form_sign_in_no" class="form-box">
+    <h5>Confirm my report by email</h5>
+
+    [% INCLUDE 'report/update/form_name.html' %]
+
+    <label for="password_register">[% loc('Password (optional)') %]</label>
+  [% IF field_errors.password_register %]
+    <p class='form-error'>[% field_errors.password_register %]</p>
+  [% END %]
+    <div class="general-notes">
+        <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports.') %]</p>
+    </div>
+
+    <div class="form-txt-submit-box">
+        <input class="form-control js-password-validate" type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
+        <input class="green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Post') %]">
+    </div>
+
+    <div class="general-notes">
+        <p>[% tprintf(loc('Your password should include %d or more characters.'), c.cobrand.password_minimum_length) %]</p>
+    </div>
+
+</div>
diff --git a/templates/web/bromley/report/update/form_user_loggedout_email.html b/templates/web/bromley/report/update/form_user_loggedout_email.html
new file mode 100644
index 000000000..228ca7509
--- /dev/null
+++ b/templates/web/bromley/report/update/form_user_loggedout_email.html
@@ -0,0 +1,8 @@
+<label for="form_username">[% loc('Email' ) %]
+    <span class="muted">([% loc('We never show your email') %])</span>
+</label>
+
+[% IF field_errors.username %]
+    <p class='form-error'>[% field_errors.username %]</p>
+[% END %]
+<input class="form-control" type="email" name="username" id="form_username" value="[% update.user.email | html %]" placeholder="[% loc('Your email address' ) %]" required>
diff --git a/templates/web/bromley/report/update/form_user_loggedout_password.html b/templates/web/bromley/report/update/form_user_loggedout_password.html
new file mode 100644
index 000000000..3b7adb84e
--- /dev/null
+++ b/templates/web/bromley/report/update/form_user_loggedout_password.html
@@ -0,0 +1,18 @@
+<div id="form_sign_in_yes" class="form-box">
+
+    <h5>Confirm my report with my FixMyStreet password</h5>
+
+    <label class="hidden-js n" for="password_sign_in">[% loc('Yes I have a password') %]</label>
+    [% IF field_errors.password %]
+        <p class='form-error'>[% field_errors.password %]</p>
+    [% END %]
+    <div class="form-txt-submit-box">
+        <input class="form-control" type="password" name="password_sign_in" id="password_sign_in" placeholder="[% loc('Your password') %]" value="">
+        <input class="green-btn js-submit_sign_in" type="submit" name="submit_sign_in" value="[% loc('Post') %]">
+    </div>
+
+    <div class="checkbox-group">
+        <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]>
+        <label class="n inline" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
+    </div>
+</div>