diff options
7 files changed, 13 insertions, 6 deletions
diff --git a/perllib/FixMyStreet/Cobrand/TfL.pm b/perllib/FixMyStreet/Cobrand/TfL.pm index e76113b9a..9dce32d2d 100644 --- a/perllib/FixMyStreet/Cobrand/TfL.pm +++ b/perllib/FixMyStreet/Cobrand/TfL.pm @@ -41,7 +41,7 @@ sub area_check { sub enter_postcode_text { my ($self) = @_; - return 'Enter a London postcode, or street name and area'; + return 'Enter a London postcode, or street name and area, or a reference number of a problem previous reported'; } sub privacy_policy_url { 'https://tfl.gov.uk/corporate/privacy-and-cookies/reporting-street-problems' } diff --git a/templates/web/base/around/_postcode_form_examples.html b/templates/web/base/around/_postcode_form_examples.html new file mode 100644 index 000000000..975d33927 --- /dev/null +++ b/templates/web/base/around/_postcode_form_examples.html @@ -0,0 +1 @@ +<p class="form-hint" id="pc-hint">[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]</p> diff --git a/templates/web/base/around/postcode_form.html b/templates/web/base/around/postcode_form.html index 4e222471e..60fa1a703 100644 --- a/templates/web/base/around/postcode_form.html +++ b/templates/web/base/around/postcode_form.html @@ -10,7 +10,7 @@ <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm" class="js-geolocate"> <label for="pc">[% question %]:</label> - <p class="form-hint" id="pc-hint">[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]</p> + [% INCLUDE 'around/_postcode_form_examples.html' %] <div> <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200" required aria-describedby="pc-hint"> [% INCLUDE 'around/_postcode_submit_button.html' attr='id="sub"' %] diff --git a/templates/web/oxfordshire/around/_postcode_form_examples.html b/templates/web/oxfordshire/around/_postcode_form_examples.html new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/templates/web/oxfordshire/around/_postcode_form_examples.html diff --git a/templates/web/oxfordshire/around/_postcode_submit_button.html b/templates/web/oxfordshire/around/_postcode_submit_button.html new file mode 100644 index 000000000..e06579b0f --- /dev/null +++ b/templates/web/oxfordshire/around/_postcode_submit_button.html @@ -0,0 +1 @@ +<input type="submit" [% attr | safe %] value="Find"> diff --git a/templates/web/oxfordshire/around/postcode_form.html b/templates/web/oxfordshire/around/postcode_form.html index 5d061291c..9f7e9e763 100644 --- a/templates/web/oxfordshire/around/postcode_form.html +++ b/templates/web/oxfordshire/around/postcode_form.html @@ -10,19 +10,21 @@ <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm" class="js-geolocate"> <label for="pc">[% question %]:</label> + [% INCLUDE 'around/_postcode_form_examples.html' %] <div> - <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]" required> - <input type="submit" value="[% loc('Find') %]" id="sub"> + <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]" required aria-describedby="pc-hint"> + [% INCLUDE 'around/_postcode_submit_button.html' attr='id="sub"' %] </div> [% IF partial_token %] <input type="hidden" name="partial" value="[% partial_token.token %]"> [% END %] - [% IF c.get_param('filter_category') %] + [% IF c.get_param('filter_category') OR c.get_param('filter_group') %] <input type="hidden" name="filter_category" value="[% c.get_param('filter_category') | html %]"> + <input type="hidden" name="filter_group" value="[% c.get_param('filter_group') | html %]"> [% ELSIF c.user_exists AND c.user.categories.size %] - <input type="hidden" name="filter_category" value="[% c.user.categories.join(",") | html %]"> + <input type="hidden" name="filter_category" value="[% c.user.categories_string | html %]"> [% END %] </form> [%~ SET link_params = { diff --git a/templates/web/tfl/around/_postcode_form_examples.html b/templates/web/tfl/around/_postcode_form_examples.html new file mode 100644 index 000000000..57d5fce2f --- /dev/null +++ b/templates/web/tfl/around/_postcode_form_examples.html @@ -0,0 +1,3 @@ +<p class="form-hint" id="pc-hint"> +[% tprintf('e.g. ‘%s’ or ‘%s’', c.cobrand.example_places) %] +or ‘FMS1234567’</p> |