[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters categorie.tmpl,1.6,1.7 categoryitem.tmpl,1.3,1.4 itemtypes.tmpl,1.7,1.8 marctagstructure.tmpl,1.13,1.14 printers.tmpl,1.5,1.6 stopwords.tmpl,1.7,1.8 systempreferences.tmpl,1.13,1.14 z3950servers.tmpl,1.6,1.7

Mike Hansen wolfpac444 at users.sourceforge.net
Wed Apr 23 01:09:50 CEST 2003


Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1:/tmp/cvs-serv31879/koha/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
	categorie.tmpl categoryitem.tmpl itemtypes.tmpl 
	marctagstructure.tmpl printers.tmpl stopwords.tmpl 
	systempreferences.tmpl z3950servers.tmpl 
Log Message:
Fixed problems with Javascript and newlines


Index: categorie.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** categorie.tmpl	13 Apr 2003 05:54:19 -0000	1.6
--- categorie.tmpl	22 Apr 2003 23:09:46 -0000	1.7
***************
*** 40,57 ****
  		var alertString2;
  		if (f.categorycode.value.length==0) {
! 			_alertString += "- categorycode missing\\n";
  		}
  //		alert(window.document.Aform.description.value);
  		if (!(isNotNull(window.document.Aform.description,1))) {
! 			_alertString += "- description missing\\n";
  		}
  		if (!isNum(f.upperagelimit,0)) {
! 			_alertString += "- upperagelimit is not a number\\n";
  		}
  		if (_alertString.length==0) {
  			document.Aform.submit();
  		} else {
! 			alertString2 = "Form not submitted because of the following problem(s)\\n";
! 			alertString2 += "------------------------------------------------------------------------------------\\n\\n";
  			alertString2 += _alertString;
  			alert(alertString2);
--- 40,57 ----
  		var alertString2;
  		if (f.categorycode.value.length==0) {
! 			_alertString += "- categorycode missing\n";
  		}
  //		alert(window.document.Aform.description.value);
  		if (!(isNotNull(window.document.Aform.description,1))) {
! 			_alertString += "- description missing\n";
  		}
  		if (!isNum(f.upperagelimit,0)) {
! 			_alertString += "- upperagelimit is not a number\n";
  		}
  		if (_alertString.length==0) {
  			document.Aform.submit();
  		} else {
! 			alertString2 = "Form not submitted because of the following problem(s)\n";
! 			alertString2 += "------------------------------------------------------------------------------------\n\n";
  			alertString2 += _alertString;
  			alert(alertString2);

Index: categoryitem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** categoryitem.tmpl	13 Apr 2003 05:54:19 -0000	1.3
--- categoryitem.tmpl	22 Apr 2003 23:09:46 -0000	1.4
***************
*** 40,57 ****
                  var alertString2;
                  if (f.categorycode.value.length==0) {
!                         _alertString += "- categorycode missing\\n";
                  }
  //              alert(window.document.Aform.description.value);
                  if (!(isNotNull(window.document.Aform.description,1))) {
!                         _alertString += "- description missing\\n";
                  }
                  if (!isNum(f.upperagelimit,0)) {
!                         _alertString += "- upperagelimit is not a number\\n";
                  }
                  if (_alertString.length==0) {
                          document.Aform.submit();
                  } else {
!                         alertString2 = "Form not submitted because of the following problem(s)\\n";
!                         alertString2 += "------------------------------------------------------------------------------------\\n\\n";
                          alertString2 += _alertString;
                  }
--- 40,57 ----
                  var alertString2;
                  if (f.categorycode.value.length==0) {
!                         _alertString += "- categorycode missing\n";
                  }
  //              alert(window.document.Aform.description.value);
                  if (!(isNotNull(window.document.Aform.description,1))) {
!                         _alertString += "- description missing\n";
                  }
                  if (!isNum(f.upperagelimit,0)) {
!                         _alertString += "- upperagelimit is not a number\n";
                  }
                  if (_alertString.length==0) {
                          document.Aform.submit();
                  } else {
!                         alertString2 = "Form not submitted because of the following problem(s)\n";
!                         alertString2 += "------------------------------------------------------------------------------------\n\n";
                          alertString2 += _alertString;
                  }

Index: itemtypes.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** itemtypes.tmpl	13 Apr 2003 04:39:16 -0000	1.7
--- itemtypes.tmpl	22 Apr 2003 23:09:46 -0000	1.8
***************
*** 39,58 ****
  	var alertString2;
  	if (f.itemtype.value.length==0) {
! 		_alertString += "- itemtype missing\\n";
  	}
  	if (!(isNotNull(window.document.Aform.description,1))) {
! 		_alertString += "- description missing\\n";
  	}
  	if ((!isNum(f.loanlength,0)) && f.loanlength.value.length > 0) {
! 		_alertString += "- loan length is not a number\\n";
  	}
  	if ((!isNum(f.rentalcharge,0)) && f.rentalcharge.value.length > 0) {
! 		_alertString += "- rental charge is not a number\\n";
  	}
  	if (_alertString.length==0) {
  		document.Aform.submit();
  	} else {
! 		alertString2 = "Form not submitted because of the following problem(s)\\n";
! 		alertString2 += "------------------------------------------------------------------------------------\\n\\n";
  		alertString2 += _alertString;
  		alert(alertString2);
--- 39,58 ----
  	var alertString2;
  	if (f.itemtype.value.length==0) {
! 		_alertString += "- itemtype missing\n";
  	}
  	if (!(isNotNull(window.document.Aform.description,1))) {
! 		_alertString += "- description missing\n";
  	}
  	if ((!isNum(f.loanlength,0)) && f.loanlength.value.length > 0) {
! 		_alertString += "- loan length is not a number\n";
  	}
  	if ((!isNum(f.rentalcharge,0)) && f.rentalcharge.value.length > 0) {
! 		_alertString += "- rental charge is not a number\n";
  	}
  	if (_alertString.length==0) {
  		document.Aform.submit();
  	} else {
! 		alertString2 = "Form not submitted because of the following problem(s)\n";
! 		alertString2 += "------------------------------------------------------------------------------------\n\n";
  		alertString2 += _alertString;
  		alert(alertString2);

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** marctagstructure.tmpl	13 Apr 2003 05:54:19 -0000	1.13
--- marctagstructure.tmpl	22 Apr 2003 23:09:46 -0000	1.14
***************
*** 39,49 ****
  		var alertString2;
  		if (f.tagfield.value.length==0) {
! 			_alertString += "- tag number missing\\n";
  		}
  		if (_alertString.length==0) {
  			document.Aform.submit();
  		} else {
! 			alertString2 = "Form not submitted because of the following problem(s)\\n";
! 			alertString2 += "------------------------------------------------------------------------------------\\n\\n";
  			alertString2 += _alertString;
  			alert(alertString2);
--- 39,49 ----
  		var alertString2;
  		if (f.tagfield.value.length==0) {
! 			_alertString += "- tag number missing\n";
  		}
  		if (_alertString.length==0) {
  			document.Aform.submit();
  		} else {
! 			alertString2 = "Form not submitted because of the following problem(s)\n";
! 			alertString2 += "------------------------------------------------------------------------------------\n\n";
  			alertString2 += _alertString;
  			alert(alertString2);

Index: printers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** printers.tmpl	13 Apr 2003 05:54:19 -0000	1.5
--- printers.tmpl	22 Apr 2003 23:09:47 -0000	1.6
***************
*** 40,53 ****
                  var alertString2;
                  if (f.printername.value.length==0) {
!                         _alertString += "- printer name missing\\n";
                  }
                  if (f.printqueue.value.length==0) {
!                         _alertString += "- Queue missing\\n";
                  }
                  if (_alertString.length==0) {
                          document.Aform.submit();
                  } else {
!                         alertString2 = "Form not submitted because of the following problem(s)\\n";
!                         alertString2 += "------------------------------------------------------------------------------------\\n\\n";
                          alertString2 += _alertString;
                          alert(alertString2);
--- 40,53 ----
                  var alertString2;
                  if (f.printername.value.length==0) {
!                         _alertString += "- printer name missing\n";
                  }
                  if (f.printqueue.value.length==0) {
!                         _alertString += "- Queue missing\n";
                  }
                  if (_alertString.length==0) {
                          document.Aform.submit();
                  } else {
!                         alertString2 = "Form not submitted because of the following problem(s)\n";
!                         alertString2 += "------------------------------------------------------------------------------------\n\n";
                          alertString2 += _alertString;
                          alert(alertString2);

Index: stopwords.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** stopwords.tmpl	13 Apr 2003 05:54:19 -0000	1.7
--- stopwords.tmpl	22 Apr 2003 23:09:47 -0000	1.8
***************
*** 40,50 ****
                  var alertString2;
                  if (f.word.value.length==0) {
!                         _alertString += "- word missing\\n";
                  }
                  if (_alertString.length==0) {
                          document.Aform.submit();
                  } else {
!                         alertString2 = "Form not submitted because of the following problem(s)\\n";
!                         alertString2 += "------------------------------------------------------------------------------------\\n\\n";
                          alertString2 += _alertString;
                          alert(alertString2);
--- 40,50 ----
                  var alertString2;
                  if (f.word.value.length==0) {
!                         _alertString += "- word missing\n";
                  }
                  if (_alertString.length==0) {
                          document.Aform.submit();
                  } else {
!                         alertString2 = "Form not submitted because of the following problem(s)\n";
!                         alertString2 += "------------------------------------------------------------------------------------\n\n";
                          alertString2 += _alertString;
                          alert(alertString2);

Index: systempreferences.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** systempreferences.tmpl	17 Apr 2003 04:14:39 -0000	1.13
--- systempreferences.tmpl	22 Apr 2003 23:09:47 -0000	1.14
***************
*** 39,52 ****
  		var alertString2;
  		if (f.variable.value.length==0) {
! 			_alertString += "- variable missing\\n";
  		}
  		if (f.value.value.length==0) {
! 			_alertString += "- value missing\\n";
  		}
  		if (_alertString.length==0) {
  			document.Aform.submit();
  		} else {
! 			alertString2 = "Form not submitted because of the following problem(s)\\n";
! 			alertString2 += "------------------------------------------------------------------------------------\\n\\n";
  			alertString2 += _alertString;
  			alert(alertString2);
--- 39,52 ----
  		var alertString2;
  		if (f.variable.value.length==0) {
! 			_alertString += "- variable missing\n";
  		}
  		if (f.value.value.length==0) {
! 			_alertString += "- value missing\n";
  		}
  		if (_alertString.length==0) {
  			document.Aform.submit();
  		} else {
! 			alertString2 = "Form not submitted because of the following problem(s)\n";
! 			alertString2 += "------------------------------------------------------------------------------------\n\n";
  			alertString2 += _alertString;
  			alert(alertString2);

Index: z3950servers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** z3950servers.tmpl	13 Apr 2003 05:54:19 -0000	1.6
--- z3950servers.tmpl	22 Apr 2003 23:09:47 -0000	1.7
***************
*** 40,68 ****
                  var alertString2;
                  if (f.searchfield.value.length==0) {
!                         _alertString += "- site name missing\\n";
                  }
                  if (f.host.value.length==0) {
!                         _alertString += "- host missing\\n";
                  }
                  if (f.port.value.length==0) {
!                         _alertString += "- port missing\\n";
                  }
                  if (f.db.value.length==0) {
!                         _alertString += "- database missing\\n";
                  }
                  if (isNaN(f.port.value)) {
!                         _alertString += "- port must be a number\\n";
                  }
                  if (isNaN(f.rank.value)) {
!                         _alertString += "- rank must be a number\\n";
                  }
                  if (isNaN(f.checked.value) || f.checked.value<0 || f.checked.value>1) {
!                         _alertString += "- checked must be 0 or 1\\n";
                  }
                  if (_alertString.length==0) {
                          document.Aform.submit();
                  } else {
!                         alertString2 = "Form not submitted because of the following problem(s)\\n";
!                         alertString2 += "------------------------------------------------------------------------------------\\n\\n";
                          alertString2 += _alertString;
                          alert(alertString2);
--- 40,68 ----
                  var alertString2;
                  if (f.searchfield.value.length==0) {
!                         _alertString += "- site name missing\n";
                  }
                  if (f.host.value.length==0) {
!                         _alertString += "- host missing\n";
                  }
                  if (f.port.value.length==0) {
!                         _alertString += "- port missing\n";
                  }
                  if (f.db.value.length==0) {
!                         _alertString += "- database missing\n";
                  }
                  if (isNaN(f.port.value)) {
!                         _alertString += "- port must be a number\n";
                  }
                  if (isNaN(f.rank.value)) {
!                         _alertString += "- rank must be a number\n";
                  }
                  if (isNaN(f.checked.value) || f.checked.value<0 || f.checked.value>1) {
!                         _alertString += "- checked must be 0 or 1\n";
                  }
                  if (_alertString.length==0) {
                          document.Aform.submit();
                  } else {
!                         alertString2 = "Form not submitted because of the following problem(s)\n";
!                         alertString2 += "------------------------------------------------------------------------------------\n\n";
                          alertString2 += _alertString;
                          alert(alertString2);





More information about the Koha-cvs mailing list