diff options
| -rw-r--r-- | templates/web/bromley/report/new/fill_in_details_form.html | 24 | ||||
| -rw-r--r-- | templates/web/fixmystreet/report/new/notes.html | 2 | ||||
| -rw-r--r-- | web/js/map-OpenLayers.js | 2 |
3 files changed, 11 insertions, 17 deletions
diff --git a/templates/web/bromley/report/new/fill_in_details_form.html b/templates/web/bromley/report/new/fill_in_details_form.html index 9b06425da..1ceb0ac10 100644 --- a/templates/web/bromley/report/new/fill_in_details_form.html +++ b/templates/web/bromley/report/new/fill_in_details_form.html @@ -23,18 +23,11 @@ <p id="unknown">[% loc('Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit.') %]</p> [% END %] <p>[% loc('You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. ') %]</p> - [% END %] - - <p> - [% IF report.used_map %] - We won’t be able to help unless you leave as much -detail as you can. Please describe the exact location of the problem (e.g. on a -wall), what it is, how long it has been there, a description (and a photo of -the problem if you have one), etc. [% ELSE %] + <p> [% loc('Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box.') %] - [% END %] </p> + [% END %] </div> </div> @@ -59,6 +52,13 @@ the problem if you have one), etc. <input type="text" value="[% report.title | html %]" name="title" id="form_title" placeholder="[% loc('Provide a title') %]" required> <label for="form_detail">[% loc('Details') %]</label> + [% IF report.used_map %] + <p> + We won’t be able to help unless you leave as much +detail as you can. Please describe the exact location of the problem (e.g. on a +wall). + </p> + [% END %] [% IF field_errors.detail %] <p class='form-error'>[% field_errors.detail %]</p> [% END %] @@ -178,7 +178,7 @@ the problem if you have one), etc. <div class="general-sidebar-notes form-focus-hidden"> <p class="dark">[% loc('We never show your email address or phone number.') %]</p> - <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> + <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> <label class="form-focus-hidden" for="form_phone">[% loc('Phone number (optional)') %]</label> @@ -220,10 +220,6 @@ the problem if you have one), etc. </div> </fieldset> - <div class="sidebar-notes"> - [% INCLUDE 'report/new/notes.html' %] - </div> - [% IF partial_token %] <input type="hidden" name="partial" value="[% partial_token.token %]"> [% END %] diff --git a/templates/web/fixmystreet/report/new/notes.html b/templates/web/fixmystreet/report/new/notes.html index eef172858..289520be3 100644 --- a/templates/web/fixmystreet/report/new/notes.html +++ b/templates/web/fixmystreet/report/new/notes.html @@ -1,9 +1,7 @@ <p>[% loc("Please note:") %]</p> <ul class="plain-list"> -[% IF c.cobrand.moniker != 'bromley' %] <li>[% loc("We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>") %]</li> -[% END %] <li>[% loc("Please be polite, concise and to the point.") %]</li> <li>[% loc("Please do not be abusive — abusing your council devalues the service for all users.") %]</li> <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li> diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index a92d02c84..ac8a7819e 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -23,7 +23,7 @@ function fixmystreet_update_pin(lonlat) { $('#side-form, #site-logo').show(); $('#councils_text').html(data.councils_text); $('#form_category_row').html(data.category); - if ( data.extra_name_info ) { + if ( data.extra_name_info && !$('#form_fms_extra_title').length ) { // there might be a first name field on some cobrands var lb = $('#form_first_name').prev() || $('#form_name').prev(); lb.before(data.extra_name_info); |