diff --git a/lib/mpog_software_plugin.rb b/lib/mpog_software_plugin.rb index 8ce419d..d45b6a8 100644 --- a/lib/mpog_software_plugin.rb +++ b/lib/mpog_software_plugin.rb @@ -44,6 +44,7 @@ class MpogSoftwarePlugin < Noosfero::Plugin link_to(_("Create new institution"), "#", :id=>"create_institution_link", :class=>'button with-text icon-add')+ hidden_field_tag("user[institution_ids][]", "", :class => 'user_institutions')+ hidden_field_tag("institution_selected", "")+ + hidden_field_tag("full_name_error", _("Should begin with a capital letter and no special characters"))+ content_tag("ul", "",:class=>"institutions_added")+ content_tag(:div, "", :id=>"institution_dialog") ), diff --git a/public/mpog-user-validations.js b/public/mpog-user-validations.js index e9135fc..e3eac02 100644 --- a/public/mpog-user-validations.js +++ b/public/mpog-user-validations.js @@ -81,7 +81,6 @@ if( last.length == 3 ) { var move = jQuery(this).val().substr( jQuery(this).val().indexOf("-") - 1, 1 ); var lastfour = move + last; - var first = jQuery(this).val().substr( 0, 9 ); jQuery(this).val( first + '-' + lastfour ); @@ -91,17 +90,10 @@ function set_full_name_validation() { function is_invalid_formated(text) { - slices = text.split(" "); - - var reg = /(^|\s)([a-z]|[0-9]|([&\/\\#,+()$~%.'":*?<>{}!@\-\[\]]))/g; - - for(var i = 0; i < slices.length; i++) { - if( reg.test(slices[i]) ) { - return true; - } - } + var reg_firsts_char = /(^|\s)([a-z]|[0-9])/g; + var reg_special_char = /[^\w\*\s*]/g; - return false; + return reg_firsts_char.test(text) || reg_special_char.test(text); } jQuery("#profile_data_name").blur(function(){ @@ -110,8 +102,16 @@ if( this.value.length > 0 ) { if( is_invalid_formated(this.value) ) { jQuery(this).removeClass("validated").addClass("invalid"); + + if(!jQuery(".full_name_error")[0]) { + var message = jQuery("#full_name_error").val(); + jQuery(this).parent().append(""+message+""); + } else { + jQuery(".full_name_error").show(); + } } else { jQuery(this).removeClass("invalid").addClass("validated"); + jQuery(".full_name_error").hide(); } } }); @@ -146,4 +146,4 @@ set_full_name_validation(); }, 2000); }); -})(); \ No newline at end of file +})(); -- libgit2 0.21.2