diff options
| -rw-r--r-- | templates/web/base/report/new/category.html | 4 | ||||
| -rw-r--r-- | templates/web/base/report/new/category_wrapper.html | 2 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 10 |
3 files changed, 6 insertions, 10 deletions
diff --git a/templates/web/base/report/new/category.html b/templates/web/base/report/new/category.html index 44ed8df71..e537c8f1f 100644 --- a/templates/web/base/report/new/category.html +++ b/templates/web/base/report/new/category.html @@ -13,12 +13,12 @@ <label for='form_category' id="form_category_label"> [%~ loc('Category') ~%] </label>[% =%] - <select class="form-control[% IF category_groups.size %] js-grouped-select[% END %]" name="category" id="form_category" + <select class="validCategory form-control[% IF category_groups.size %] js-grouped-select[% END %]" name="category" id="form_category" [%~ IF c.user.from_body =%] [%~ prefill_report = ( c.cobrand.prefill_report_fields_for_inspector && inspector ) || c.user.has_body_permission_to('report_prefill') %] data-body="[% c.user.from_body.name %]" data-prefill="[% prefill_report %]" [%~ END ~%] - > + required> [%~ IF category_groups.size ~%] [%~ FOREACH group IN category_groups ~%] [% IF group.name %]<optgroup label="[% group.name %]">[% END %] diff --git a/templates/web/base/report/new/category_wrapper.html b/templates/web/base/report/new/category_wrapper.html index da25e51df..d6cba9bb3 100644 --- a/templates/web/base/report/new/category_wrapper.html +++ b/templates/web/base/report/new/category_wrapper.html @@ -1,7 +1,7 @@ <div id="form_category_row"> [% IF js %] <label for="form_category">[% loc('Category') %]</label> - <select class="form-control" name="category" id="form_category" + <select class="validCategory form-control" name="category" id="form_category" [%~ IF c.user.from_body =%] [%~ prefill_report = c.cobrand.prefill_report_fields_for_inspector || c.user.has_body_permission_to('report_prefill') %] data-body="[% c.user.from_body.name %]" data-prefill="[% prefill_report %]" diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index e2f72be94..b26c90971 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -312,16 +312,12 @@ $.extend(fixmystreet.set_up, { }); }); - /* set correct required status depending on what we submit - * NB: need to add things to form_category as the JS updating - * of this we do after a map click removes them */ + /* set correct required status depending on what we submit */ $('.js-submit_sign_in').click( function(e) { - $('#form_category').addClass('required validCategory').removeClass('valid'); $('.js-form-name').removeClass('required'); } ); $('.js-submit_register').click( function(e) { - $('#form_category').addClass('required validCategory').removeClass('valid'); $('.js-form-name').addClass('required'); } ); @@ -469,7 +465,7 @@ $.extend(fixmystreet.set_up, { if ($category_select.length === 0) { return; } - var $group_select = $("<select></select>").addClass("form-control").attr('id', 'category_group'); + var $group_select = $("<select></select>").addClass("form-control validCategory").attr('id', 'category_group'); var $subcategory_label = $("#form_subcategory_label"); var $empty_option = $category_select.find("option").first(); @@ -509,7 +505,7 @@ $.extend(fixmystreet.set_up, { $opt.data("subcategory_id", subcategory_id); $group_select.append($opt); - var $sub_select = $("<select></select>").addClass("form-control js-subcategory"); + var $sub_select = $("<select></select>").addClass("form-control js-subcategory validCategory"); $sub_select.attr("id", subcategory_id); $sub_select.append($empty_option.clone()); $options.each(function() { |