diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-12-06 19:34:34 +0000 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-12-06 19:34:34 +0000 |
| commit | 32af4e21192ad50eaf6c2e650ce3830235445b5c (patch) | |
| tree | 717f2e1b0d160e92d15de14dd3ee89fb390c0b19 | |
| parent | 34b60dcfd710e536810401729c94bbb78322df9a (diff) | |
move validation rules out to a template so cobrands can override them
| -rwxr-xr-x | perllib/FixMyStreet/App/Controller/JS.pm | 2 | ||||
| -rw-r--r-- | templates/web/default/common_header_tags.html | 1 | ||||
| -rw-r--r-- | templates/web/default/js/validation_rules.html | 7 | ||||
| -rw-r--r-- | web/js/fixmystreet.js | 8 |
4 files changed, 11 insertions, 7 deletions
diff --git a/perllib/FixMyStreet/App/Controller/JS.pm b/perllib/FixMyStreet/App/Controller/JS.pm index ae2f06605..d7847af75 100755 --- a/perllib/FixMyStreet/App/Controller/JS.pm +++ b/perllib/FixMyStreet/App/Controller/JS.pm @@ -24,6 +24,8 @@ sub validation_strings : LocalRegex('^validation_strings\.(.*?)\.js$') : Args(0) $c->res->content_type( 'application/javascript' ); } +sub validation_rules : Path('validation_rules.js') : Args(0) { } + __PACKAGE__->meta->make_immutable; 1; diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html index 9d32164f7..4839249ac 100644 --- a/templates/web/default/common_header_tags.html +++ b/templates/web/default/common_header_tags.html @@ -1,6 +1,7 @@ [% USE date %][% USE Math %] <meta http-equiv="content-type" content="text/html; charset=utf-8"> +<script type="text/javascript" src="/js/validation_rules.js?[% Math.int( date.now / 3600 ) %]"></script> <script type="text/javascript" src="/js/validation_strings.[% lang_code %].js?[% Math.int( date.now / 3600 ) %]"></script> <script type="text/javascript" src="/jslib/jquery-1.7.2.min.js"></script> diff --git a/templates/web/default/js/validation_rules.html b/templates/web/default/js/validation_rules.html new file mode 100644 index 000000000..409d0971f --- /dev/null +++ b/templates/web/default/js/validation_rules.html @@ -0,0 +1,7 @@ + validation_rules = { + title: { required: true }, + detail: { required: true }, + email: { required: true }, + update: { required: true }, + rznvy: { required: true } + }; diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index 6ae4ed92d..b86d5f49c 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -53,13 +53,7 @@ $(function(){ var submitted = false; $("form.validate").validate({ - rules: { - title: { required: true }, - detail: { required: true }, - email: { required: true }, - update: { required: true }, - rznvy: { required: true } - }, + rules: validation_rules, messages: validation_strings, onkeyup: false, onfocusout: false, |