diff options
| -rw-r--r-- | templates/web/fixmystreet/report/display.html | 2 | ||||
| -rw-r--r-- | web/js/fixmystreet.js | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 26e041d61..84d46dc7c 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -187,7 +187,7 @@ [% IF field_errors.name %] <p class='form-error'>[% field_errors.name %]</p> [% END %] - <input type="text" name="name" id="form_name" value="[% update.name || c.user.name | html %]" placeholder="[% loc('Your name') %]"> + <input type="text" [% IF problem.council == '2482' %]class="validName" [% END %]name="name" id="form_name" value="[% update.name || c.user.name | html %]" placeholder="[% loc('Your name') %]"> <div class="checkbox-group"> <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' UNLESS update.anonymous %]> diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index 36d47b5b2..b689d501c 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -47,7 +47,7 @@ $(function(){ jQuery.validator.addMethod('validName', function(value, element) { var validNamePat = /\ba\s*n+on+((y|o)mo?u?s)?(ly)?\b/i; - return this.optional(element) || value.length > 5 && value.match( /\S/ ) && !value.match( validNamePat ); }, validation_strings.category ); + return this.optional(element) || value.length > 5 && value.match( /\S/ ) && value.match( /\s/ ) && !value.match( validNamePat ); }, validation_strings.category ); var form_submitted = 0; var submitted = false; @@ -108,7 +108,10 @@ $(function(){ $('#submit_register').click( function(e) { $('#form_category').addClass('required validCategory').removeClass('valid'); - $('#form_name').addClass('required validName'); + $('#form_name').addClass('required'); + if ( $('#mapForm').length ) { + $('#form_name').addClass('validName'); + } $('#form_first_name').addClass('required'); $('#form_last_name').addClass('required'); $('#form_fms_extra_title').addClass('required'); @@ -116,7 +119,10 @@ $(function(){ $('#problem_submit > input[type="submit"]').click( function(e) { $('#form_category').addClass('required validCategory').removeClass('valid'); - $('#form_name').addClass('required validName'); + $('#form_name').addClass('required'); + if ( $('#mapForm').length ) { + $('#form_name').addClass('validName'); + } $('#form_first_name').addClass('required'); $('#form_last_name').addClass('required'); $('#form_fms_extra_title').addClass('required'); |