zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-18 18:29:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

Use native HTML email validation instead of "jquery validate"

Browse source
This commit is contained in:
Artur Beljajev 2017-04-04 14:58:20 +03:00
parent e72c00850b
commit 2c67ed9673
5 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/shared/jquery.validate.bootstrap.coffee
View file

@ -17,7 +17,3 @@ $.validator.setDefaults
else else
error.insertAfter element error.insertAfter element
return return
jQuery.validator.addMethod 'lax_email', ((value, element) ->
@optional(element) or (value.match(new RegExp("@", "g")) || []).length == 1
), 'Please enter a valid email address.'

2
app/views/admin/admin_users/_form.haml
View file

@ -38,7 +38,7 @@
.col-md-4.control-label .col-md-4.control-label
= f.label :email = f.label :email
.col-md-8 .col-md-8
= f.text_field(:email, class: 'form-control', lax_email: true) = f.email_field :email, class: 'form-control'
.form-group .form-group
.col-md-4.control-label .col-md-4.control-label
= f.label :country_code, t(:country) = f.label :country_code, t(:country)

6
app/views/admin/mail_templates/_form.haml
View file

@ -24,17 +24,17 @@
.col-md-4.control-label .col-md-4.control-label
= f.label :from = f.label :from
.col-md-7 .col-md-7
= f.text_field(:from, class: 'form-control', lax_email: true) = f.email_field :from, class: 'form-control'
.form-group .form-group
.col-md-4.control-label .col-md-4.control-label
= f.label :cc = f.label :cc
.col-md-7 .col-md-7
= f.text_field(:cc, class: 'form-control', lax_email: true) = f.email_field :cc, class: 'form-control'
.form-group .form-group
.col-md-4.control-label .col-md-4.control-label
= f.label :bcc = f.label :bcc
.col-md-7 .col-md-7
= f.text_field(:bcc, class: 'form-control', lax_email: true) = f.email_field :bcc, class: 'form-control'
.form-group .form-group
.col-md-12 .col-md-12
= f.label :body, t(:html_body) = f.label :body, t(:html_body)

4
app/views/admin/registrars/_form.haml
View file

@ -36,12 +36,12 @@
.col-md-4.control-label .col-md-4.control-label
= f.label :email = f.label :email
.col-md-7 .col-md-7
= f.text_field(:email, class: 'form-control', lax_email: true) = f.email_field :email, class: 'form-control'
.form-group .form-group
.col-md-4.control-label .col-md-4.control-label
= f.label :billing_email = f.label :billing_email
.col-md-7 .col-md-7
= f.text_field(:billing_email, class: 'form-control', lax_email: true) = f.email_field :billing_email, class: 'form-control'
.row .row
.col-md-8 .col-md-8

2
app/views/registrar/contacts/form/_general.haml
View file

@ -61,7 +61,7 @@
.col-md-3.control-label .col-md-3.control-label
= f.label :email, t(:email) + '*' = f.label :email, t(:email) + '*'
.col-md-7 .col-md-7
= f.text_field :email, class: 'form-control', required: true, lax_email: true = f.email_field :email, class: 'form-control', required: true
.form-group .form-group
.col-md-3.control-label .col-md-3.control-label