diff options
-rw-r--r-- | perllib/FixMyStreet/DB/Result/Problem.pm | 2 | ||||
-rw-r--r-- | templates/web/default/js_validation_msgs.html | 2 | ||||
-rw-r--r-- | templates/web/fixmystreet/report/new/fill_in_details_form.html | 11 |
3 files changed, 7 insertions, 8 deletions
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm index 7ceabf1da..d0867c5ca 100644 --- a/perllib/FixMyStreet/DB/Result/Problem.pm +++ b/perllib/FixMyStreet/DB/Result/Problem.pm @@ -329,7 +329,7 @@ sub check_for_errors { || $self->name =~ m/\ba\s*n+on+((y|o)mo?u?s)?(ly)?\b/i ) { $errors{name} = _( -'Please enter your full name, councils need this information - if you do not wish your name to be shown on the site, untick the box' +'Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below' ); } diff --git a/templates/web/default/js_validation_msgs.html b/templates/web/default/js_validation_msgs.html index 0263f75ce..f89ab4bcc 100644 --- a/templates/web/default/js_validation_msgs.html +++ b/templates/web/default/js_validation_msgs.html @@ -5,7 +5,7 @@ detail: '[% loc('Please enter some details') %]', name: { required: '[% loc('Please enter your name') %]', - validName: '[% loc('Please enter your full name, councils need this information - if you do not wish your name to be shown on the site, untick the box') %]' + validName: '[% loc('Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below') %]' }, category: '[% loc('Please choose a category') %]', rznvy: { diff --git a/templates/web/fixmystreet/report/new/fill_in_details_form.html b/templates/web/fixmystreet/report/new/fill_in_details_form.html index 61305ac80..4578deaf3 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -172,18 +172,17 @@ [% END %] <input type="text" class="form-focus-trigger validName" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]"> - <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> - </div> - - [%# 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> + <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> + </div> + <label class="hidden-js" for="form_phone">[% loc('Your phone number (optional)') %]</label> <input class="form-focus-hidden" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number (optional)') %]"> |