diff options
| -rw-r--r-- | templates/web/default/report/display.html | 4 | ||||
| -rw-r--r-- | templates/web/default/report/new/fill_in_details_form.html | 8 | ||||
| -rw-r--r-- | web/js/fixmystreet.js | 17 |
3 files changed, 6 insertions, 23 deletions
diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html index 433ec1545..962075433 100644 --- a/templates/web/default/report/display.html +++ b/templates/web/default/report/display.html @@ -82,7 +82,7 @@ [% END %] <div class="form-field"> <label for="form_update">[% loc( 'Update:' ) %]</label> - <textarea class="required" name="update" id="form_update" rows="7" cols="30">[% update.text | html %]</textarea> + <textarea name="update" id="form_update" rows="7" cols="30" required>[% update.text | html %]</textarea> </div> [% IF c.user && c.user.belongs_to_council( problem.council ) %] @@ -139,7 +139,7 @@ [% END %] <div class="form-field"> <label for="form_rznvy">[% loc('Your email:' ) %]</label> - <input type="email" class="required email" name="rznvy" id="form_rznvy" value="[% update.user.email | html %]" size="30"> + <input type="email" name="rznvy" id="form_rznvy" value="[% update.user.email | html %]" size="30" required> </div> <div id="form_sign_in"> diff --git a/templates/web/default/report/new/fill_in_details_form.html b/templates/web/default/report/new/fill_in_details_form.html index 58b379f54..c20a2bf16 100644 --- a/templates/web/default/report/new/fill_in_details_form.html +++ b/templates/web/default/report/new/fill_in_details_form.html @@ -50,7 +50,7 @@ <div class="form-field"> <label for="form_title">[% loc('Subject:') %]</label> - <input type="text" class="required" value="[% report.title | html %]" name="title" id="form_title" size="25" > + <input type="text" value="[% report.title | html %]" name="title" id="form_title" size="25" required> </div> [% IF field_errors.detail %] @@ -59,13 +59,13 @@ <div class="form-field"> <label for="form_detail">[% loc('Details:') %]</label> - <textarea class="required" name="detail" id="form_detail" rows="7" cols="26">[% report.detail | html %]</textarea> + <textarea name="detail" id="form_detail" rows="7" cols="26" required>[% report.detail | html %]</textarea> </div> [% IF js %] <div class="form-field" id="form_category_row"> <label for="form_category">[% loc('Category:') %]</label> - <select class="required" name="category" id="form_category"><option>[% loc('Loading...') %]</option></select> + <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> </div> [% ELSE %] [% IF category_options.size %] @@ -118,7 +118,7 @@ <div class="form-field"> <label for="form_email">[% loc('Your email:') %]</label> - <input type="email" class="required email" value="[% report.user.email | html %]" name="email" id="form_email" size="25"> + <input type="email" value="[% report.user.email | html %]" name="email" id="form_email" size="25" required> </div> [% INCLUDE 'report/new/notes.html' %] diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index 1dfdfd2bb..6064f886e 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -35,23 +35,6 @@ $(function(){ $('#email_alert_box').hide('fast'); } - // add in handling for html5 form types... - // should be removed if/when jQuery supports these by default - // NB: required alteration of validation plugin code also - jQuery.event.add(this, "keypress.specialSubmit", function( e ) { - var elem = e.target, - type = elem.type; - - if ( ( type === "email" || type === "url" ) && jQuery( elem ).closest("form").length && e.keyCode === 13 ) { - e.liveFired = undefined; - return jQuery.fn.trigger( "submit", this, arguments ); - } - }); - - jQuery.expr.filters[ 'email' ] = function( elem ) { - return "email" === elem.type; - }; - // FIXME - needs to use translated string jQuery.validator.addMethod('validCategory', function(value, element) { return this.optional(element) || value != '-- Pick a category --'; }, validation_strings['category'] ); |