diff --git a/templates/web/base/report/new/fill_in_details_form.html b/templates/web/base/report/new/fill_in_details_form.html index 1e687cf88e9..ec05e127ee6 100644 --- a/templates/web/base/report/new/fill_in_details_form.html +++ b/templates/web/base/report/new/fill_in_details_form.html @@ -2,10 +2,10 @@
[% loc('Wrong location? Just click again on the map.') %]
+[% END %] - [% IF partial_token %] -[% loc('Please note your report has not yet been sent. Choose a category and add further information below, then submit.') %]
- [% END %] +[% IF partial_token %] +[% loc('Please note your report has not yet been sent. Choose a category and add further information below, then submit.') %]
[% END %] [% IF js %] diff --git a/templates/web/base/report/new/fill_in_details_text.html b/templates/web/base/report/new/fill_in_details_text.html index 5d97169151e..05527bb247c 100644 --- a/templates/web/base/report/new/fill_in_details_text.html +++ b/templates/web/base/report/new/fill_in_details_text.html @@ -1,9 +1,6 @@ [% IF area_ids_to_list.size != 0; - loc('Please fill in details of the problem below. The council won\'t be able -to help unless you leave as much detail as you can, so 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.'); + loc('The council 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.'); IF category_extras; ' ' _ loc('Some categories may require additional information.'); END; diff --git a/templates/web/eastsussex/report/new/fill_in_details_text.html b/templates/web/eastsussex/report/new/fill_in_details_text.html deleted file mode 100644 index 3f967a72a9e..00000000000 --- a/templates/web/eastsussex/report/new/fill_in_details_text.html +++ /dev/null @@ -1,10 +0,0 @@ -[% - IF area_ids_to_list.size != 0; - loc('East Sussex County Council 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.'); - IF category_extras; - ' ' _ loc('Some categories may require additional information.'); - END; - ELSE; - loc('Please fill in details of the problem below.'); - END; -%] diff --git a/templates/web/fixmystreet-uk-councils/report/new/inline-tips.html b/templates/web/fixmystreet-uk-councils/report/new/inline-tips.html new file mode 100644 index 00000000000..12b60beeb2c --- /dev/null +++ b/templates/web/fixmystreet-uk-councils/report/new/inline-tips.html @@ -0,0 +1,12 @@ +[% loc('Please note your report has not yet been sent. Choose a category and add further information below, then submit.') %]
[% END %] - [% IF c.cobrand.moniker != "fixmystreet" && (c.cobrand.moniker != 'fixmybarangay' || ( c.user && c.user.from_body ) ) %] - - [% END %] + [% TRY %][% PROCESS 'report/new/sidebar.html' %][% CATCH file %][% END %] [% INCLUDE 'errors.html' %] @@ -65,20 +46,7 @@Please be aware that you can only attach one picture so ensure that +you provide a picture that clearly shows the location not just the fault. +
diff --git a/templates/web/oxfordshire/report/new/fill_in_details_text.html b/templates/web/oxfordshire/report/new/fill_in_details_text.html deleted file mode 100644 index 06500595689..00000000000 --- a/templates/web/oxfordshire/report/new/fill_in_details_text.html +++ /dev/null @@ -1,6 +0,0 @@ -Oxfordshire County Council 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. in -the carriageway), what it is, how long it has been there, a description and a -photo of the problem if you have one. Please be aware that you can only attach -one picture so ensure that you provide a picture that clearly shows the -location not just the fault. diff --git a/templates/web/oxfordshire/report/new/inline-tips.html b/templates/web/oxfordshire/report/new/inline-tips.html new file mode 100644 index 00000000000..810c0436360 --- /dev/null +++ b/templates/web/oxfordshire/report/new/inline-tips.html @@ -0,0 +1,12 @@ +