artfully_ose 1.2.0.beta.1 → 1.2.0.pre

data/app/assets/javascripts/custom/inline-people-search.js

@@ -6,10 +6,10 @@
  *  company_name
  */
 function cleanJsonPerson(jsonPerson) {
-  jsonPerson.first_name = ( jsonPerson.first_name == null ? "" : jsonPerson.first_name )
-  jsonPerson.last_name = ( jsonPerson.last_name == null ? "" : jsonPerson.last_name )
-  jsonPerson.email = ( jsonPerson.email == null ? "" : jsonPerson.email )
-  jsonPerson.company_name = ( jsonPerson.company_name == null ? "" : jsonPerson.company_name )
+  jsonPerson.first_name = ( jsonPerson.first_name == null ? "" : jsonPerson.first_name )  
+  jsonPerson.last_name = ( jsonPerson.last_name == null ? "" : jsonPerson.last_name )  
+  jsonPerson.email = ( jsonPerson.email == null ? "" : jsonPerson.email )  
+  jsonPerson.company_name = ( jsonPerson.company_name == null ? "" : jsonPerson.company_name )  
   return jsonPerson
 }
 
@@ -21,65 +21,65 @@ function updateModal() {
 }
 
 function updateSelectedPerson(personId, personFirstName, personLastName, personEmail) {
-  $("input#person_id").val(personId)
-  $("input#person_first_name").val(personFirstName)
-  $("input#person_last_name").val(personLastName)
-  $("input#person_email").val(personEmail)
+	$("input#person_id").val(personId)
+  $("input#person_first_name").val(personFirstName)  
+  $("input#person_last_name").val(personLastName)  
+  $("input#person_email").val(personEmail)  
   updateModal()
 }
 
 function clearNewPersonForm() {
   $("input#person_id").val("")
-  $("input#person_first_name").val("")
-  $("input#person_last_name").val("")
-  $("input#person_email").val("")
+  $("input#person_first_name").val("")  
+  $("input#person_last_name").val("")  
+  $("input#person_email").val("")  
 }
 
 $("document").ready(function(){
-
+	
   $("#new_person").bind("ajax:success", function(xhr, person){
     $(this).removeClass('loading')
     $(this).find("input:submit").removeAttr('disabled');
     person = cleanJsonPerson(person)
-    updateSelectedPerson(person.id, person.first_name, person.last_name, person.email)
-    clearNewPersonForm()
+		updateSelectedPerson(person.id, person.first_name, person.last_name, person.email)
+		clearNewPersonForm()
   });
 
   $("#new_person").bind("ajax:error", function(xhr, status, error){
     $(this).find("input:submit").removeAttr('disabled');
     data = eval("(" + status.responseText + ")");
     $(this).removeClass('loading')
-  });
-
-  $("input", "#the-details").autocomplete({
+	});
+	
+	$("input", "#the-details").autocomplete({
     html: true,
-    minLength: 3,
-    focus: function(event, person) {
-      event.preventDefault()
-    },
+		minLength: 3,
+		focus: function(event, person) { 
+			event.preventDefault()
+		},
     source: function(request, response) {
-      $.getJSON("/people?utf8=%E2%9C%93&commit=Search", { search: request.term }, function(people) {
-        responsePeople = new Array();
-
-        $.each(people, function (i, person) {
-          person = cleanJsonPerson(person)
-          responsePeople[i] =  "<div id='search-result-full-name'><span id='search-result-first-name'>"+ person.first_name +"</span> <span id='search-result-last-name'>"+ person.last_name +"</span></div>"
-          responsePeople[i] += "<div id='search-result-email' class='search-result-details'>"+ person.email +"</div>"
-          responsePeople[i] += "<div class='clear'></div>"
-          responsePeople[i] += "<div id='search-result-company-name' class='search-result-details'>"+ person.company_name +"</div>"
-          responsePeople[i] +=  "<div id='search-result-id'>"+person.id+"</div>"
-        });
-        response(responsePeople)
-      });
-    },
-    select: function(event, person) {
+    	$.getJSON("/people?utf8=%E2%9C%93&commit=Search", { search: request.term }, function(people) {
+				responsePeople = new Array();
+		  
+				$.each(people, function (i, person) {
+				  person = cleanJsonPerson(person)
+					responsePeople[i] =  "<div id='search-result-full-name'><span id='search-result-first-name'>"+ person.first_name +"</span> <span id='search-result-last-name'>"+ person.last_name +"</span></div>"
+					responsePeople[i] += "<div id='search-result-email' class='search-result-details'>"+ person.email +"</div>"
+					responsePeople[i] += "<div class='clear'></div>"
+					responsePeople[i] += "<div id='search-result-company-name' class='search-result-details'>"+ person.company_name +"</div>"	
+					responsePeople[i] +=  "<div id='search-result-id'>"+person.id+"</div>"				        
+	      });
+				response(responsePeople)
+			});
+  	},
+    select: function(event, person) { 
       event.preventDefault()
-      var personId         = $(person.item.value).filter("#search-result-id").html()
-      var personFirstName  = $("#search-result-first-name", person.item.value).html()
+			var personId         = $(person.item.value).filter("#search-result-id").html()
+			var personFirstName  = $("#search-result-first-name", person.item.value).html()
       var personLastName   = $("#search-result-last-name", person.item.value).html()
-      var personEmail      = $(person.item.value).filter("#search-result-email").html()
+			var personEmail      = $(person.item.value).filter("#search-result-email").html()
 
       updateSelectedPerson(personId, personFirstName, personLastName, personEmail)
     }
   });
-});
+});

data/app/assets/javascripts/custom/people.js

@@ -2,15 +2,11 @@ String.prototype.startsWith = function(str)
 {return (this.match("^"+str)==str)}
 
 $(document).ready(function() {
-  $("#communication-preference input[type=checkbox]").on("click", function(event) {
-    $("#communication-preference input[type=submit]").removeClass("hidden");
+  $("#email-subscription input[type=checkbox]").on("click", function(event) {
+    $("#email-subscription input[type=submit]").removeClass("hidden");
   });
-
-  $("#subscription-listing input[type=checkbox]").on("click", function(event) {
-    $("#subscription-listing input[type=submit]").removeClass("hidden");
-  });
-
-  $("#person_do_not_call").on("click", function(event) {
+  
+  $("#person_do_not_email").on("click", function(event) {
     $lists = $(".mail-chimp-list");
     if ($(this).attr("checked") != "checked") {
       $lists.attr("disabled", false);
@@ -160,64 +156,5 @@ $(document).ready(function() {
     $("#create-mailing-address, #update-mailing-address").show();
     return false;
   });
-  
-  $('#edit_link').click(function(){
-    dayDropDownValue.call(this);
-    yearDropDownValue.call(this);
-    dayValueForSelect.call(this);
-    yearValueForSelect.call(this);
-  });
-  
-  $('#birth_month').change(function(){
-    dayDropDownValue.call(this);
-  });
-});
 
-function yearDropDownValue(){
-  var year_now = getYear();
-  var yearsAsString = "";
-  
-  for(var i = 1920; i <= year_now; i++) {
-    yearsAsString += "<option value='" + i + "'>" + i + "</option>";
-  }
-  
-  $('#birth_year').html("<option value=''></option>");
-  $('#birth_year').append(yearsAsString);
-}
-
-function dayDropDownValue(){
-  var month = $('#birth_month').val();
-  var year = $('#birth_year').val();
-  var num_days = daysInMonth(month, 2012);
-  var days_range = range(1,num_days + 1);
-  var daysAsString = "";
-  
-  for(var i = 1; i < days_range.length; i++) {
-    daysAsString += "<option value='" + days_range[i] + "'>" + days_range[i] + "</option>";
-  }
-  
-  $('#birth_day').html("<option value=''></option>");
-  $('#birth_day').append(daysAsString);
-}
-
-function yearValueForSelect(){
-  var birth_year = $('div.year').data('person-birth_year');
-  $('#birth_year').val(birth_year);
-}
-
-function dayValueForSelect(){
-  var birth_day = $('div.day').data('person-birth_day');
-  $('#birth_day').val(birth_day);
-}
-
-function daysInMonth(month,year) {
-  return new Date(year, month, 0).getDate();
-}
-
-function getYear(){
-  return new Date().getFullYear();
-}
-
-function range(start,num){
-  return Array.apply(start, Array(num)).map(function (_, i) {return i;});
-}
+});

data/app/assets/javascripts/custom/prices.js

@@ -7,5 +7,4 @@
     var new_id = new Date().getTime();
     var regexp = new RegExp("new_" + association, "g")
     $(link).parents('.control-group').before(content.replace(regexp, new_id));
-    bindMemberTickets();
   }

data/app/assets/javascripts/custom/show.js

@@ -2,12 +2,12 @@ $(document).ready(function () {
 
   /***** Calendar for existing shows *****/
 
-  var showCal = $('#show-calendar')
-  showCal.fullCalendar({
+  var cal = $('#show-calendar')
+  cal.fullCalendar({
     height: 500
     ,eventSources: [ 
       { 
-        url: '/events/'+showCal.attr('data-event-id')+'.json', color: "#adadad"
+        url: '/events/'+cal.attr('data-event-id')+'.json', color: "#adadad"
         ,success: function(data) { 
           $.each(data, function (index, obj) {
             if(obj.state == "unpublished") {
@@ -31,7 +31,7 @@ $(document).ready(function () {
   var cal = $('#new-show-calendar')
   cal.fullCalendar({
       height: 400
-      ,eventSources: [ { url: '/'+cal.attr('data-event-type')+'/'+cal.attr('data-event-id')+'.json', color: "#adadad" } ]
+      ,eventSources: [ { url: '/events/'+cal.attr('data-event-id')+'.json', color: "#adadad" } ]
       ,events: eventArray
       ,dayClick: function(date, allDay, jsEvent, view) {
         var validShow = true
@@ -39,12 +39,7 @@ $(document).ready(function () {
         var hour = $('#show-time-hour').val()
         var minute = $('#show-time-minute').val()
         var meridian = $('#show-time-meridian').val()
-
         var hour24 = hour
-        if (hour24 == "12") {
-          hour24 = "0"
-        }
-
         if (meridian == "p") {
           hour24 = (+hour24 + 12).toString()
         }
@@ -147,15 +142,10 @@ $(document).ready(function () {
   });
 
   $(".sprited").on("ajax:success", function(xhr, show){
-    var container = $(this).parents(".sprited-container");
-    var sprited = $(".sprited-element", container)
-    sprited.push(container)
-
-    $.each(sprited, function () {
-      $(this).find(":submit").removeAttr('disabled');
-      $(this).removeClass("pending built published unpublished")
-      $(this).addClass(show.state);
-    }) 
+    var $row = $(this).closest(".sprited-container");
+    $(this).find(":submit").removeAttr('disabled');
+    $row.removeClass("pending built published unpublished")
+    $row.addClass(show.state);
     $('.show-state').html(show.state)
   });
 

data/app/assets/javascripts/jquery-lib/jquery.mask-money.js

@@ -179,7 +179,6 @@
 						} else if (settings.symbolStay && input.val() == settings.symbol){
 							input.val(setSymbol(getDefaultMask()));
 						}
-            input.change();
 					}
 				}
 

data/app/assets/javascripts/locationselector.js

@@ -43,7 +43,7 @@
       "Canada": new Array('Alberta','British Columbia','Manitoba','New Brunswick','Newfoundland and Labrador','Northwest Territories','Nova Scotia','Nunavut','Ontario','Prince Edward Island','Quebec','Saskatchewan','Yukon'),
       "France": new Array('Alsace','Aquitaine','Auvergne','Basse-Normandie','Bourgogne','Bretagne','Centre','Champagne-Ardenne','Corse','Franche-Comté','Guadeloupe','Guyanne','Haute-Normandie','Île-de-France','Languedoc-Rousillon','Limousin','Lorraine','Martinique','Midi-Pyrénées','Nord-Pas-de-Calais','Pays de la Loire','Picardie','Poitou-Charentes','Provence-Alpes-Côte d\'Azur','Réunion','Rhône-Alpes'),
       "United Kingdom": new Array('Aberdeen City','Aberdeenshire','Angus','Antrim','Argyll and Bute','Armagh','Avon','Bedfordshire','Berkshire','Blaenau Gwent','Borders','Bridgend','Bristol','Buckinghamshire','Caerphilly','Cambridgeshire','Cardiff','Carmarthenshire','Ceredigion','Channel Islands','Cheshire','Clackmannan','Cleveland','Conwy','Cornwall','Cumbria','Denbighshire','Derbyshire','Devon','Dorset','Down','Dumfries and Galloway','Dundee (City of)','Durham','East Ayrshire','East Dunbartonshire','East Lothian','East Renfrewshire','East Riding of Yorkshire','East Sussex','Edinburgh (City of)','Essex','Falkirk','Fermanagh','Fife Glasgow (City of)','Flintshire','Gloucestershire','Greater Manchester','Gwynedd','Hampshire','Herefordshire','Hertfordshire','Highland','Humberside','Humberside','Inverclyde','Isle of Anglesey','Isle of Man','Isle of Wight','Isles of Scilly','Kent','Lancashire','Leicestershire','Lincolnshire','London','Londonderry','Merseyside','Merthyr Tydfil','Middlesex','Midlothian','Monmouthshire','Moray','Neath Port Talbot','Newport','Norfolk','North Ayrshire','North Lanarkshire','North Yorkshire','Northamptonshire','Northumberland','Nottinghamshire','Orkney','Oxfordshire','Pembrokeshire','Perthshire and Kinross','Powys','Renfrewshire','Rhondda Cynon Taff','Rutland','Shetland','Shropshire','Somerset','South Ayrshire','South Lanarkshire','South Yorkshire','Staffordshire','Stirling','Suffolk','Surrey','Swansea','The Vale of Glamorgan','Torfaen','Tyne and Wear','Tyrone','Warwickshire','West Dunbartonshire','West Lothian','West Midlands','West Sussex','West Yorkshire','Western Isles','Wiltshire','Worcestershire','Wrexham'),
-      "United States": new Array('Alaska','Alabama','American Samoa','Arkansas','Armed Forces Africa','Armed Forces Europe','Armed Forces Pacific','Arizona','California','Colorado','Connecticut','District of Columbia','Delaware','Federated States of Micronesia','Florida','Georgia','Guam','Hawaii','Iowa','Idaho','Illinois','Indiana','Kansas','Kentucky','Louisiana','Massachusetts','Northern Mariana Islands','Marshall Islands','Maryland','Maine','Michigan','Minnesota','Missouri','Mississippi','Montana','North Carolina','North Dakota','Nebraska','New Hampshire','New Jersey','New Mexico','Nevada','New York','Ohio','Oklahoma','Oregon','Pennsylvania','Palau','Puerto Rico','Rhode Island','South Carolina','South Dakota','Tennessee','Texas','Utah','Virginia','Virgin Islands','Vermont','Washington','Wisconsin','West Virginia','Wyoming')
+      "United States": new Array('Alaska','Alabama','American Samoa','Arkansas','Armed Forces Africa','Armed Forces Europe','Armed Forces Pacific','Arizona','California','Colorado','Connecticut','District of Columbia','Delaware','Federated States of Micronesia','Florida','Georgia','Guam','Hawaii','Iowa','Idaho','Illinois','Indiana','Kansas','Kentucky','Louisiana','Massachusetts','Northern Mariana Islands','Marshall Islands','Maryland','Maine','Michigan','Minnesota','Missouri','Mississippi','Montana','North Carolina','North Dakota','Nebraska','New Hampshire','New Jersey','New Mexico','Nevada','New York','Ohio','Oklahoma','Oregon','Pennsylvania','Palau','Puerto Rico','Rhode Island','South Carolina','South Dakota','Tennessee','Texas','Utah','Virginia','Virgin Islands','Vermont','Washington','Wisconsin','West Virgina','Wyoming')
     }
   
     return this.each(function() {

data/app/assets/javascripts/store/jquery.validate.additional-methods.js

@@ -1,12 +1,14 @@
-/*!
- * jQuery Validation Plugin 1.11.1
+/**
+ * jQuery Validation Plugin 1.9.0
  *
  * http://bassistance.de/jquery-plugins/jquery-plugin-validation/
  * http://docs.jquery.com/Plugins/Validation
  *
- * Copyright 2013 Jörn Zaefferer
- * Released under the MIT license:
+ * Copyright (c) 2006 - 2011 Jörn Zaefferer
+ *
+ * Dual licensed under the MIT and GPL licenses:
  *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
  */
 
 (function() {
@@ -14,32 +16,30 @@
 	function stripHtml(value) {
 		// remove html tags and space chars
 		return value.replace(/<.[^<>]*?>/g, ' ').replace(/&nbsp;|&#160;/gi, ' ')
-		// remove punctuation
-		.replace(/[.(),;:!?%#$'"_+=\/\-]*/g,'');
+		// remove numbers and punctuation
+		.replace(/[0-9.(),;:!?%#$'"_+=\/-]*/g,'');
 	}
 	jQuery.validator.addMethod("maxWords", function(value, element, params) {
-		return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length <= params;
+	    return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length < params;
 	}, jQuery.validator.format("Please enter {0} words or less."));
 
 	jQuery.validator.addMethod("minWords", function(value, element, params) {
-		return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length >= params;
+	    return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length >= params;
 	}, jQuery.validator.format("Please enter at least {0} words."));
 
 	jQuery.validator.addMethod("rangeWords", function(value, element, params) {
-		var valueStripped = stripHtml(value);
-		var regex = /\b\w+\b/g;
-		return this.optional(element) || valueStripped.match(regex).length >= params[0] && valueStripped.match(regex).length <= params[1];
+	    return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length >= params[0] && value.match(/bw+b/g).length < params[1];
 	}, jQuery.validator.format("Please enter between {0} and {1} words."));
 
-}());
+})();
 
 jQuery.validator.addMethod("letterswithbasicpunc", function(value, element) {
-	return this.optional(element) || /^[a-z\-.,()'"\s]+$/i.test(value);
+	return this.optional(element) || /^[a-z-.,()'\"\s]+$/i.test(value);
 }, "Letters or punctuation only please");
 
 jQuery.validator.addMethod("alphanumeric", function(value, element) {
 	return this.optional(element) || /^\w+$/i.test(value);
-}, "Letters, numbers, and underscores only please");
+}, "Letters, numbers, spaces or underscores only please");
 
 jQuery.validator.addMethod("lettersonly", function(value, element) {
 	return this.optional(element) || /^[a-z]+$/i.test(value);
@@ -50,296 +50,118 @@ jQuery.validator.addMethod("nowhitespace", function(value, element) {
 }, "No white space please");
 
 jQuery.validator.addMethod("ziprange", function(value, element) {
-	return this.optional(element) || /^90[2-5]\d\{2\}-\d{4}$/.test(value);
+	return this.optional(element) || /^90[2-5]\d\{2}-\d{4}$/.test(value);
 }, "Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx");
 
-jQuery.validator.addMethod("zipcodeUS", function(value, element) {
-	return this.optional(element) || /\d{5}-\d{4}$|^\d{5}$/.test(value);
-}, "The specified US ZIP Code is invalid");
-
 jQuery.validator.addMethod("integer", function(value, element) {
 	return this.optional(element) || /^-?\d+$/.test(value);
 }, "A positive or negative non-decimal number please");
 
 /**
- * Return true, if the value is a valid vehicle identification number (VIN).
- *
- * Works with all kind of text inputs.
- *
- * @example <input type="text" size="20" name="VehicleID" class="{required:true,vinUS:true}" />
- * @desc Declares a required input element whose value must be a valid vehicle identification number.
- *
- * @name jQuery.validator.methods.vinUS
- * @type Boolean
- * @cat Plugins/Validate/Methods
- */
-jQuery.validator.addMethod("vinUS", function(v) {
-	if (v.length !== 17) {
-		return false;
-	}
-	var i, n, d, f, cd, cdv;
-	var LL = ["A","B","C","D","E","F","G","H","J","K","L","M","N","P","R","S","T","U","V","W","X","Y","Z"];
-	var VL = [1,2,3,4,5,6,7,8,1,2,3,4,5,7,9,2,3,4,5,6,7,8,9];
-	var FL = [8,7,6,5,4,3,2,10,0,9,8,7,6,5,4,3,2];
-	var rs = 0;
-	for(i = 0; i < 17; i++){
-		f = FL[i];
-		d = v.slice(i,i+1);
-		if (i === 8) {
-			cdv = d;
-		}
-		if (!isNaN(d)) {
-			d *= f;
-		} else {
-			for (n = 0; n < LL.length; n++) {
-				if (d.toUpperCase() === LL[n]) {
-					d = VL[n];
-					d *= f;
-					if (isNaN(cdv) && n === 8) {
-						cdv = LL[n];
-					}
-					break;
-				}
-			}
+* Return true, if the value is a valid vehicle identification number (VIN).
+*
+* Works with all kind of text inputs.
+*
+* @example <input type="text" size="20" name="VehicleID" class="{required:true,vinUS:true}" />
+* @desc Declares a required input element whose value must be a valid vehicle identification number.
+*
+* @name jQuery.validator.methods.vinUS
+* @type Boolean
+* @cat Plugins/Validate/Methods
+*/
+jQuery.validator.addMethod(
+	"vinUS",
+	function(v){
+		if (v.length != 17)
+			return false;
+		var i, n, d, f, cd, cdv;
+		var LL    = ["A","B","C","D","E","F","G","H","J","K","L","M","N","P","R","S","T","U","V","W","X","Y","Z"];
+		var VL    = [1,2,3,4,5,6,7,8,1,2,3,4,5,7,9,2,3,4,5,6,7,8,9];
+		var FL    = [8,7,6,5,4,3,2,10,0,9,8,7,6,5,4,3,2];
+		var rs    = 0;
+		for(i = 0; i < 17; i++){
+		    f = FL[i];
+		    d = v.slice(i,i+1);
+		    if(i == 8){
+		        cdv = d;
+		    }
+		    if(!isNaN(d)){
+		        d *= f;
+		    }
+		    else{
+		        for(n = 0; n < LL.length; n++){
+		            if(d.toUpperCase() === LL[n]){
+		                d = VL[n];
+		                d *= f;
+		                if(isNaN(cdv) && n == 8){
+		                    cdv = LL[n];
+		                }
+		                break;
+		            }
+		        }
+		    }
+		    rs += d;
 		}
-		rs += d;
-	}
-	cd = rs % 11;
-	if (cd === 10) {
-		cd = "X";
-	}
-	if (cd === cdv) {
-		return true;
-	}
-	return false;
-}, "The specified vehicle identification number (VIN) is invalid.");
+		cd = rs % 11;
+		if(cd == 10){cd = "X";}
+		if(cd == cdv){return true;}
+		return false;
+	},
+	"The specified vehicle identification number (VIN) is invalid."
+);
 
 /**
- * Return true, if the value is a valid date, also making this formal check dd/mm/yyyy.
- *
- * @example jQuery.validator.methods.date("01/01/1900")
- * @result true
- *
- * @example jQuery.validator.methods.date("01/13/1990")
- * @result false
- *
- * @example jQuery.validator.methods.date("01.01.1900")
- * @result false
- *
- * @example <input name="pippo" class="{dateITA:true}" />
- * @desc Declares an optional input element whose value must be a valid date.
- *
- * @name jQuery.validator.methods.dateITA
- * @type Boolean
- * @cat Plugins/Validate/Methods
- */
-jQuery.validator.addMethod("dateITA", function(value, element) {
-	var check = false;
-	var re = /^\d{1,2}\/\d{1,2}\/\d{4}$/;
-	if( re.test(value)) {
-		var adata = value.split('/');
-		var gg = parseInt(adata[0],10);
-		var mm = parseInt(adata[1],10);
-		var aaaa = parseInt(adata[2],10);
-		var xdata = new Date(aaaa,mm-1,gg);
-		if ( ( xdata.getFullYear() === aaaa ) && ( xdata.getMonth() === mm - 1 ) && ( xdata.getDate() === gg ) ){
-			check = true;
-		} else {
+  * Return true, if the value is a valid date, also making this formal check dd/mm/yyyy.
+  *
+  * @example jQuery.validator.methods.date("01/01/1900")
+  * @result true
+  *
+  * @example jQuery.validator.methods.date("01/13/1990")
+  * @result false
+  *
+  * @example jQuery.validator.methods.date("01.01.1900")
+  * @result false
+  *
+  * @example <input name="pippo" class="{dateITA:true}" />
+  * @desc Declares an optional input element whose value must be a valid date.
+  *
+  * @name jQuery.validator.methods.dateITA
+  * @type Boolean
+  * @cat Plugins/Validate/Methods
+  */
+jQuery.validator.addMethod(
+	"dateITA",
+	function(value, element) {
+		var check = false;
+		var re = /^\d{1,2}\/\d{1,2}\/\d{4}$/;
+		if( re.test(value)){
+			var adata = value.split('/');
+			var gg = parseInt(adata[0],10);
+			var mm = parseInt(adata[1],10);
+			var aaaa = parseInt(adata[2],10);
+			var xdata = new Date(aaaa,mm-1,gg);
+			if ( ( xdata.getFullYear() == aaaa ) && ( xdata.getMonth () == mm - 1 ) && ( xdata.getDate() == gg ) )
+				check = true;
+			else
+				check = false;
+		} else
 			check = false;
-		}
-	} else {
-		check = false;
-	}
-	return this.optional(element) || check;
-}, "Please enter a correct date");
-
-/**
- * IBAN is the international bank account number.
- * It has a country - specific format, that is checked here too
- */
-jQuery.validator.addMethod("iban", function(value, element) {
-	// some quick simple tests to prevent needless work
-	if (this.optional(element)) {
-		return true;
-	}
-	if (!(/^([a-zA-Z0-9]{4} ){2,8}[a-zA-Z0-9]{1,4}|[a-zA-Z0-9]{12,34}$/.test(value))) {
-		return false;
-	}
-
-	// check the country code and find the country specific format
-	var iban = value.replace(/ /g,'').toUpperCase(); // remove spaces and to upper case
-	var countrycode = iban.substring(0,2);
-	var bbancountrypatterns = {
-		'AL': "\\d{8}[\\dA-Z]{16}",
-		'AD': "\\d{8}[\\dA-Z]{12}",
-		'AT': "\\d{16}",
-		'AZ': "[\\dA-Z]{4}\\d{20}",
-		'BE': "\\d{12}",
-		'BH': "[A-Z]{4}[\\dA-Z]{14}",
-		'BA': "\\d{16}",
-		'BR': "\\d{23}[A-Z][\\dA-Z]",
-		'BG': "[A-Z]{4}\\d{6}[\\dA-Z]{8}",
-		'CR': "\\d{17}",
-		'HR': "\\d{17}",
-		'CY': "\\d{8}[\\dA-Z]{16}",
-		'CZ': "\\d{20}",
-		'DK': "\\d{14}",
-		'DO': "[A-Z]{4}\\d{20}",
-		'EE': "\\d{16}",
-		'FO': "\\d{14}",
-		'FI': "\\d{14}",
-		'FR': "\\d{10}[\\dA-Z]{11}\\d{2}",
-		'GE': "[\\dA-Z]{2}\\d{16}",
-		'DE': "\\d{18}",
-		'GI': "[A-Z]{4}[\\dA-Z]{15}",
-		'GR': "\\d{7}[\\dA-Z]{16}",
-		'GL': "\\d{14}",
-		'GT': "[\\dA-Z]{4}[\\dA-Z]{20}",
-		'HU': "\\d{24}",
-		'IS': "\\d{22}",
-		'IE': "[\\dA-Z]{4}\\d{14}",
-		'IL': "\\d{19}",
-		'IT': "[A-Z]\\d{10}[\\dA-Z]{12}",
-		'KZ': "\\d{3}[\\dA-Z]{13}",
-		'KW': "[A-Z]{4}[\\dA-Z]{22}",
-		'LV': "[A-Z]{4}[\\dA-Z]{13}",
-		'LB': "\\d{4}[\\dA-Z]{20}",
-		'LI': "\\d{5}[\\dA-Z]{12}",
-		'LT': "\\d{16}",
-		'LU': "\\d{3}[\\dA-Z]{13}",
-		'MK': "\\d{3}[\\dA-Z]{10}\\d{2}",
-		'MT': "[A-Z]{4}\\d{5}[\\dA-Z]{18}",
-		'MR': "\\d{23}",
-		'MU': "[A-Z]{4}\\d{19}[A-Z]{3}",
-		'MC': "\\d{10}[\\dA-Z]{11}\\d{2}",
-		'MD': "[\\dA-Z]{2}\\d{18}",
-		'ME': "\\d{18}",
-		'NL': "[A-Z]{4}\\d{10}",
-		'NO': "\\d{11}",
-		'PK': "[\\dA-Z]{4}\\d{16}",
-		'PS': "[\\dA-Z]{4}\\d{21}",
-		'PL': "\\d{24}",
-		'PT': "\\d{21}",
-		'RO': "[A-Z]{4}[\\dA-Z]{16}",
-		'SM': "[A-Z]\\d{10}[\\dA-Z]{12}",
-		'SA': "\\d{2}[\\dA-Z]{18}",
-		'RS': "\\d{18}",
-		'SK': "\\d{20}",
-		'SI': "\\d{15}",
-		'ES': "\\d{20}",
-		'SE': "\\d{20}",
-		'CH': "\\d{5}[\\dA-Z]{12}",
-		'TN': "\\d{20}",
-		'TR': "\\d{5}[\\dA-Z]{17}",
-		'AE': "\\d{3}\\d{16}",
-		'GB': "[A-Z]{4}\\d{14}",
-		'VG': "[\\dA-Z]{4}\\d{16}"
-	};
-	var bbanpattern = bbancountrypatterns[countrycode];
-	// As new countries will start using IBAN in the
-	// future, we only check if the countrycode is known.
-	// This prevents false negatives, while almost all
-	// false positives introduced by this, will be caught
-	// by the checksum validation below anyway.
-	// Strict checking should return FALSE for unknown
-	// countries.
-	if (typeof bbanpattern !== 'undefined') {
-		var ibanregexp = new RegExp("^[A-Z]{2}\\d{2}" + bbanpattern + "$", "");
-		if (!(ibanregexp.test(iban))) {
-			return false; // invalid country specific format
-		}
-	}
-
-	// now check the checksum, first convert to digits
-	var ibancheck = iban.substring(4,iban.length) + iban.substring(0,4);
-	var ibancheckdigits = "";
-	var leadingZeroes = true;
-	var charAt;
-	for (var i =0; i<ibancheck.length; i++) {
-		charAt = ibancheck.charAt(i);
-		if (charAt !== "0") {
-			leadingZeroes = false;
-		}
-		if (!leadingZeroes) {
-			ibancheckdigits += "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ".indexOf(charAt);
-		}
-	}
-
-	// calculate the result of: ibancheckdigits % 97
-    var cRest = '';
-    var cOperator = '';
-	for (var p=0; p<ibancheckdigits.length; p++) {
-		var cChar = ibancheckdigits.charAt(p);
-		cOperator = '' + cRest + '' + cChar;
-		cRest = cOperator % 97;
-    }
-	return cRest === 1;
-}, "Please specify a valid IBAN");
+		return this.optional(element) || check;
+	},
+	"Please enter a correct date"
+);
 
 jQuery.validator.addMethod("dateNL", function(value, element) {
-	return this.optional(element) || /^(0?[1-9]|[12]\d|3[01])[\.\/\-](0?[1-9]|1[012])[\.\/\-]([12]\d)?(\d\d)$/.test(value);
-}, "Please enter a correct date");
-
-/**
- * Dutch phone numbers have 10 digits (or 11 and start with +31).
- */
-jQuery.validator.addMethod("phoneNL", function(value, element) {
-	return this.optional(element) || /^((\+|00(\s|\s?\-\s?)?)31(\s|\s?\-\s?)?(\(0\)[\-\s]?)?|0)[1-9]((\s|\s?\-\s?)?[0-9]){8}$/.test(value);
-}, "Please specify a valid phone number.");
-
-jQuery.validator.addMethod("mobileNL", function(value, element) {
-	return this.optional(element) || /^((\+|00(\s|\s?\-\s?)?)31(\s|\s?\-\s?)?(\(0\)[\-\s]?)?|0)6((\s|\s?\-\s?)?[0-9]){8}$/.test(value);
-}, "Please specify a valid mobile number");
-
-jQuery.validator.addMethod("postalcodeNL", function(value, element) {
-	return this.optional(element) || /^[1-9][0-9]{3}\s?[a-zA-Z]{2}$/.test(value);
-}, "Please specify a valid postal code");
-
-/*
- * Dutch bank account numbers (not 'giro' numbers) have 9 digits
- * and pass the '11 check'.
- * We accept the notation with spaces, as that is common.
- * acceptable: 123456789 or 12 34 56 789
- */
-jQuery.validator.addMethod("bankaccountNL", function(value, element) {
-	if (this.optional(element)) {
-		return true;
-	}
-	if (!(/^[0-9]{9}|([0-9]{2} ){3}[0-9]{3}$/.test(value))) {
-		return false;
-	}
-	// now '11 check'
-	var account = value.replace(/ /g,''); // remove spaces
-	var sum = 0;
-	var len = account.length;
-	for (var pos=0; pos<len; pos++) {
-		var factor = len - pos;
-		var digit = account.substring(pos, pos+1);
-		sum = sum + factor * digit;
-	}
-	return sum % 11 === 0;
-}, "Please specify a valid bank account number");
-
-/**
- * Dutch giro account numbers (not bank numbers) have max 7 digits
- */
-jQuery.validator.addMethod("giroaccountNL", function(value, element) {
-	return this.optional(element) || /^[0-9]{1,7}$/.test(value);
-}, "Please specify a valid giro account number");
-
-jQuery.validator.addMethod("bankorgiroaccountNL", function(value, element) {
-	return this.optional(element) ||
-			($.validator.methods["bankaccountNL"].call(this, value, element)) ||
-			($.validator.methods["giroaccountNL"].call(this, value, element));
-}, "Please specify a valid bank or giro account number");
-
+		return this.optional(element) || /^\d\d?[\.\/-]\d\d?[\.\/-]\d\d\d?\d?$/.test(value);
+	}, "Vul hier een geldige datum in."
+);
 
 jQuery.validator.addMethod("time", function(value, element) {
-	return this.optional(element) || /^([01]\d|2[0-3])(:[0-5]\d){1,2}$/.test(value);
+	return this.optional(element) || /^([01]\d|2[0-3])(:[0-5]\d){0,2}$/.test(value);
 }, "Please enter a valid time, between 00:00 and 23:59");
 jQuery.validator.addMethod("time12h", function(value, element) {
-	return this.optional(element) || /^((0?[1-9]|1[012])(:[0-5]\d){1,2}(\ ?[AP]M))$/i.test(value);
-}, "Please enter a valid time in 12-hour am/pm format");
+	return this.optional(element) || /^((0?[1-9]|1[012])(:[0-5]\d){0,2}(\ [AP]M))$/i.test(value);
+}, "Please enter a valid time, between 00:00 am and 12:00 pm");
 
 /**
  * matches US phone number format
@@ -348,8 +170,10 @@ jQuery.validator.addMethod("time12h", function(value, element) {
  * allows '-' or ' ' as a separator and allows parens around area code
  * some people may want to put a '1' in front of their number
  *
- * 1(212)-999-2345 or
- * 212 999 2344 or
+ * 1(212)-999-2345
+ * or
+ * 212 999 2344
+ * or
  * 212-999-0983
  *
  * but not
@@ -358,42 +182,21 @@ jQuery.validator.addMethod("time12h", function(value, element) {
  * 212 123 4567
  */
 jQuery.validator.addMethod("phoneUS", function(phone_number, element) {
-	phone_number = phone_number.replace(/\s+/g, "");
+    phone_number = phone_number.replace(/\s+/g, "");
 	return this.optional(element) || phone_number.length > 9 &&
-		phone_number.match(/^(\+?1-?)?(\([2-9]\d{2}\)|[2-9]\d{2})-?[2-9]\d{2}-?\d{4}$/);
+		phone_number.match(/^(1-?)?(\([2-9]\d{2}\)|[2-9]\d{2})-?[2-9]\d{2}-?\d{4}$/);
 }, "Please specify a valid phone number");
 
 jQuery.validator.addMethod('phoneUK', function(phone_number, element) {
-	phone_number = phone_number.replace(/\(|\)|\s+|-/g,'');
-	return this.optional(element) || phone_number.length > 9 &&
-		phone_number.match(/^(?:(?:(?:00\s?|\+)44\s?)|(?:\(?0))(?:\d{2}\)?\s?\d{4}\s?\d{4}|\d{3}\)?\s?\d{3}\s?\d{3,4}|\d{4}\)?\s?(?:\d{5}|\d{3}\s?\d{3})|\d{5}\)?\s?\d{4,5})$/);
+return this.optional(element) || phone_number.length > 9 &&
+phone_number.match(/^(\(?(0|\+44)[1-9]{1}\d{1,4}?\)?\s?\d{3,4}\s?\d{3,4})$/);
 }, 'Please specify a valid phone number');
 
 jQuery.validator.addMethod('mobileUK', function(phone_number, element) {
-	phone_number = phone_number.replace(/\(|\)|\s+|-/g,'');
-	return this.optional(element) || phone_number.length > 9 &&
-		phone_number.match(/^(?:(?:(?:00\s?|\+)44\s?|0)7(?:[45789]\d{2}|624)\s?\d{3}\s?\d{3})$/);
+return this.optional(element) || phone_number.length > 9 &&
+phone_number.match(/^((0|\+44)7(5|6|7|8|9){1}\d{2}\s?\d{6})$/);
 }, 'Please specify a valid mobile number');
 
-//Matches UK landline + mobile, accepting only 01-3 for landline or 07 for mobile to exclude many premium numbers
-jQuery.validator.addMethod('phonesUK', function(phone_number, element) {
-	phone_number = phone_number.replace(/\(|\)|\s+|-/g,'');
-	return this.optional(element) || phone_number.length > 9 &&
-		phone_number.match(/^(?:(?:(?:00\s?|\+)44\s?|0)(?:1\d{8,9}|[23]\d{9}|7(?:[45789]\d{8}|624\d{6})))$/);
-}, 'Please specify a valid uk phone number');
-// On the above three UK functions, do the following server side processing:
-//  Compare original input with this RegEx pattern:
-//   ^\(?(?:(?:00\)?[\s\-]?\(?|\+)(44)\)?[\s\-]?\(?(?:0\)?[\s\-]?\(?)?|0)([1-9]\d{1,4}\)?[\s\d\-]+)$
-//  Extract $1 and set $prefix to '+44<space>' if $1 is '44', otherwise set $prefix to '0'
-//  Extract $2 and remove hyphens, spaces and parentheses. Phone number is combined $prefix and $2.
-// A number of very detailed GB telephone number RegEx patterns can also be found at:
-// http://www.aa-asterisk.org.uk/index.php/Regular_Expressions_for_Validating_and_Formatting_GB_Telephone_Numbers
-
-// Matches UK postcode. Does not match to UK Channel Islands that have their own postcodes (non standard UK)
-jQuery.validator.addMethod('postcodeUK', function(value, element) {
-	return this.optional(element) || /^((([A-PR-UWYZ][0-9])|([A-PR-UWYZ][0-9][0-9])|([A-PR-UWYZ][A-HK-Y][0-9])|([A-PR-UWYZ][A-HK-Y][0-9][0-9])|([A-PR-UWYZ][0-9][A-HJKSTUW])|([A-PR-UWYZ][A-HK-Y][0-9][ABEHMNPRVWXY]))\s?([0-9][ABD-HJLNP-UW-Z]{2})|(GIR)\s?(0AA))$/i.test(value);
-}, 'Please specify a valid UK postcode');
-
 // TODO check if value starts with <, otherwise don't try stripping anything
 jQuery.validator.addMethod("strippedminlength", function(value, element, param) {
 	return jQuery(value).text().length >= param;
@@ -406,71 +209,63 @@ jQuery.validator.addMethod("email2", function(value, element, param) {
 
 // same as url, but TLD is optional
 jQuery.validator.addMethod("url2", function(value, element, param) {
-	return this.optional(element) || /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value);
+	return this.optional(element) || /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value);
 }, jQuery.validator.messages.url);
 
 // NOTICE: Modified version of Castle.Components.Validator.CreditCardValidator
 // Redistributed under the the Apache License 2.0 at http://www.apache.org/licenses/LICENSE-2.0
 // Valid Types: mastercard, visa, amex, dinersclub, enroute, discover, jcb, unknown, all (overrides all other settings)
 jQuery.validator.addMethod("creditcardtypes", function(value, element, param) {
-	if (/[^0-9\-]+/.test(value)) {
+
+	if (/[^0-9-]+/.test(value))
 		return false;
-	}
 
 	value = value.replace(/\D/g, "");
 
 	var validTypes = 0x0000;
 
-	if (param.mastercard) {
+	if (param.mastercard)
 		validTypes |= 0x0001;
-	}
-	if (param.visa) {
+	if (param.visa)
 		validTypes |= 0x0002;
-	}
-	if (param.amex) {
+	if (param.amex)
 		validTypes |= 0x0004;
-	}
-	if (param.dinersclub) {
+	if (param.dinersclub)
 		validTypes |= 0x0008;
-	}
-	if (param.enroute) {
+	if (param.enroute)
 		validTypes |= 0x0010;
-	}
-	if (param.discover) {
+	if (param.discover)
 		validTypes |= 0x0020;
-	}
-	if (param.jcb) {
+	if (param.jcb)
 		validTypes |= 0x0040;
-	}
-	if (param.unknown) {
+	if (param.unknown)
 		validTypes |= 0x0080;
-	}
-	if (param.all) {
+	if (param.all)
 		validTypes = 0x0001 | 0x0002 | 0x0004 | 0x0008 | 0x0010 | 0x0020 | 0x0040 | 0x0080;
-	}
-	if (validTypes & 0x0001 && /^(5[12345])/.test(value)) { //mastercard
-		return value.length === 16;
+
+	if (validTypes & 0x0001 && /^(51|52|53|54|55)/.test(value)) { //mastercard
+		return value.length == 16;
 	}
 	if (validTypes & 0x0002 && /^(4)/.test(value)) { //visa
-		return value.length === 16;
+		return value.length == 16;
 	}
-	if (validTypes & 0x0004 && /^(3[47])/.test(value)) { //amex
-		return value.length === 15;
+	if (validTypes & 0x0004 && /^(34|37)/.test(value)) { //amex
+		return value.length == 15;
 	}
-	if (validTypes & 0x0008 && /^(3(0[012345]|[68]))/.test(value)) { //dinersclub
-		return value.length === 14;
+	if (validTypes & 0x0008 && /^(300|301|302|303|304|305|36|38)/.test(value)) { //dinersclub
+		return value.length == 14;
 	}
-	if (validTypes & 0x0010 && /^(2(014|149))/.test(value)) { //enroute
-		return value.length === 15;
+	if (validTypes & 0x0010 && /^(2014|2149)/.test(value)) { //enroute
+		return value.length == 15;
 	}
 	if (validTypes & 0x0020 && /^(6011)/.test(value)) { //discover
-		return value.length === 16;
+		return value.length == 16;
 	}
 	if (validTypes & 0x0040 && /^(3)/.test(value)) { //jcb
-		return value.length === 16;
+		return value.length == 16;
 	}
 	if (validTypes & 0x0040 && /^(2131|1800)/.test(value)) { //jcb
-		return value.length === 15;
+		return value.length == 15;
 	}
 	if (validTypes & 0x0080) { //unknown
 		return true;
@@ -479,139 +274,27 @@ jQuery.validator.addMethod("creditcardtypes", function(value, element, param) {
 }, "Please enter a valid credit card number.");
 
 jQuery.validator.addMethod("ipv4", function(value, element, param) {
-	return this.optional(element) || /^(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)$/i.test(value);
+    return this.optional(element) || /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/i.test(value);
 }, "Please enter a valid IP v4 address.");
 
 jQuery.validator.addMethod("ipv6", function(value, element, param) {
-	return this.optional(element) || /^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i.test(value);
+    return this.optional(element) || /^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i.test(value);
 }, "Please enter a valid IP v6 address.");
 
 /**
-* Return true if the field value matches the given format RegExp
-*
-* @example jQuery.validator.methods.pattern("AR1004",element,/^AR\d{4}$/)
-* @result true
-*
-* @example jQuery.validator.methods.pattern("BR1004",element,/^AR\d{4}$/)
-* @result false
-*
-* @name jQuery.validator.methods.pattern
-* @type Boolean
-* @cat Plugins/Validate/Methods
-*/
+  * Return true if the field value matches the given format RegExp
+  *
+  * @example jQuery.validator.methods.pattern("AR1004",element,/^AR\d{4}$/)
+  * @result true
+  *
+  * @example jQuery.validator.methods.pattern("BR1004",element,/^AR\d{4}$/)
+  * @result false
+  *
+  * @name jQuery.validator.methods.pattern
+  * @type Boolean
+  * @cat Plugins/Validate/Methods
+  */
 jQuery.validator.addMethod("pattern", function(value, element, param) {
-	if (this.optional(element)) {
-		return true;
-	}
-	if (typeof param === 'string') {
-		param = new RegExp('^(?:' + param + ')$');
-	}
-	return param.test(value);
+    return this.optional(element) || param.test(value);
 }, "Invalid format.");
 
-
-/*
- * Lets you say "at least X inputs that match selector Y must be filled."
- *
- * The end result is that neither of these inputs:
- *
- *  <input class="productinfo" name="partnumber">
- *  <input class="productinfo" name="description">
- *
- *  ...will validate unless at least one of them is filled.
- *
- * partnumber:  {require_from_group: [1,".productinfo"]},
- * description: {require_from_group: [1,".productinfo"]}
- *
- */
-jQuery.validator.addMethod("require_from_group", function(value, element, options) {
-	var validator = this;
-	var selector = options[1];
-	var validOrNot = $(selector, element.form).filter(function() {
-		return validator.elementValue(this);
-	}).length >= options[0];
-
-	if(!$(element).data('being_validated')) {
-		var fields = $(selector, element.form);
-		fields.data('being_validated', true);
-		fields.valid();
-		fields.data('being_validated', false);
-	}
-	return validOrNot;
-}, jQuery.format("Please fill at least {0} of these fields."));
-
-/*
- * Lets you say "either at least X inputs that match selector Y must be filled,
- * OR they must all be skipped (left blank)."
- *
- * The end result, is that none of these inputs:
- *
- *  <input class="productinfo" name="partnumber">
- *  <input class="productinfo" name="description">
- *  <input class="productinfo" name="color">
- *
- *  ...will validate unless either at least two of them are filled,
- *  OR none of them are.
- *
- * partnumber:  {skip_or_fill_minimum: [2,".productinfo"]},
- *  description: {skip_or_fill_minimum: [2,".productinfo"]},
- * color:       {skip_or_fill_minimum: [2,".productinfo"]}
- *
- */
-jQuery.validator.addMethod("skip_or_fill_minimum", function(value, element, options) {
-	var validator = this,
-		numberRequired = options[0],
-		selector = options[1];
-	var numberFilled = $(selector, element.form).filter(function() {
-		return validator.elementValue(this);
-	}).length;
-	var valid = numberFilled >= numberRequired || numberFilled === 0;
-
-	if(!$(element).data('being_validated')) {
-		var fields = $(selector, element.form);
-		fields.data('being_validated', true);
-		fields.valid();
-		fields.data('being_validated', false);
-	}
-	return valid;
-}, jQuery.format("Please either skip these fields or fill at least {0} of them."));
-
-// Accept a value from a file input based on a required mimetype
-jQuery.validator.addMethod("accept", function(value, element, param) {
-	// Split mime on commas in case we have multiple types we can accept
-	var typeParam = typeof param === "string" ? param.replace(/\s/g, '').replace(/,/g, '|') : "image/*",
-	optionalValue = this.optional(element),
-	i, file;
-
-	// Element is optional
-	if (optionalValue) {
-		return optionalValue;
-	}
-
-	if ($(element).attr("type") === "file") {
-		// If we are using a wildcard, make it regex friendly
-		typeParam = typeParam.replace(/\*/g, ".*");
-
-		// Check if the element has a FileList before checking each file
-		if (element.files && element.files.length) {
-			for (i = 0; i < element.files.length; i++) {
-				file = element.files[i];
-
-				// Grab the mimetype from the loaded file, verify it matches
-				if (!file.type.match(new RegExp( ".?(" + typeParam + ")$", "i"))) {
-					return false;
-				}
-			}
-		}
-	}
-
-	// Either return true because we've validated each file, or because the
-	// browser does not support element.files and the FileList feature
-	return true;
-}, jQuery.format("Please enter a value with a valid mimetype."));
-
-// Older "accept" file extension method. Old docs: http://docs.jquery.com/Plugins/Validation/Methods/accept
-jQuery.validator.addMethod("extension", function(value, element, param) {
-	param = typeof param === "string" ? param.replace(/,/g, '|') : "png|jpe?g|gif";
-	return this.optional(element) || value.match(new RegExp(".(" + param + ")$", "i"));
-}, jQuery.format("Please enter a value with a valid extension."));