[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple addbiblio.tmpl,1.33.2.8,1.33.2.9 additem.tmpl,1.20.2.4,1.20.2.5

[Owen Leonard]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27120/koha-tmpl/intranet-tmpl/default/en/acqui.simple

Modified Files:
      Tag: rel_2_2
	addbiblio.tmpl additem.tmpl 
Log Message:
Fix for bug 585 (Using 'document.forms[0]' notation prevents use of other forms on page) Changing the reference from [0] to ['f'], with 'f' being the form name, seems to work fine.

Index: addbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.33.2.8
retrieving revision 1.33.2.9
diff -C2 -r1.33.2.8 -r1.33.2.9
*** addbiblio.tmpl	30 May 2005 16:08:04 -0000	1.33.2.8
--- addbiblio.tmpl	25 Aug 2005 16:36:00 -0000	1.33.2.9
***************
*** 492,500 ****
  		alert(alertString2);
  	} else {
! 		document.forms[0].submit();
  	}
  }
  function Dopop(link,i) {
! 	defaultvalue=document.forms[0].field_value[i].value;
  	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes');
  }
--- 492,500 ----
  		alert(alertString2);
  	} else {
! 		document.forms['f'].submit();
  	}
  }
  function Dopop(link,i) {
! 	defaultvalue=document.forms['f'].field_value[i].value;
  	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes');
  }
***************
*** 502,517 ****
  function PopupZ3950() {
      var strQuery="";
! 	for (i=0 ; i<document.forms[0].field_value.length ; i++) {
! 		if (document.forms[0].kohafield[i].value == "biblioitems.isbn" && document.forms[0].field_value[i].value.length>0) {
! 		    strQuery += "&isbn="+document.forms[0].field_value[i].value;
  		}
! 		if (document.forms[0].kohafield[i].value == "biblio.title" && document.forms[0].field_value[i].value.length>0) {
! 		    strQuery += "&title="+document.forms[0].field_value[i].value;
  		}
! 		if (document.forms[0].kohafield[i].value == "biblio.author" &&document.forms[0].field_value[i].value.length>0) {
! 		    strQuery += "&author="+document.forms[0].field_value[i].value;
  		}
! 		if (document.forms[0].kohafield[i].value == "biblioitems.issn" && document.forms[0].field_value[i].value.length>0) {
! 		    strQuery += "&issn="+document.forms[0].field_value[i].value;
  		}
  	}
--- 502,517 ----
  function PopupZ3950() {
      var strQuery="";
! 	for (i=0 ; i<document.forms['f'].field_value.length ; i++) {
! 		if (document.forms['f'].kohafield[i].value == "biblioitems.isbn" && document.forms['f'].field_value[i].value.length>0) {
! 		    strQuery += "&isbn="+document.forms['f'].field_value[i].value;
  		}
! 		if (document.forms['f'].kohafield[i].value == "biblio.title" && document.forms['f'].field_value[i].value.length>0) {
! 		    strQuery += "&title="+document.forms['f'].field_value[i].value;
  		}
! 		if (document.forms['f'].kohafield[i].value == "biblio.author" &&document.forms['f'].field_value[i].value.length>0) {
! 		    strQuery += "&author="+document.forms['f'].field_value[i].value;
  		}
! 		if (document.forms['f'].kohafield[i].value == "biblioitems.issn" && document.forms['f'].field_value[i].value.length>0) {
! 		    strQuery += "&issn="+document.forms['f'].field_value[i].value;
  		}
  	}
***************
*** 524,529 ****
  
  function AddField(field) {
! 	document.forms[0].op.value = "addfield";
! 	document.forms[0].addfield_field.value=field;
  	document.f.submit();
  }
--- 524,529 ----
  
  function AddField(field) {
! 	document.forms['f'].op.value = "addfield";
! 	document.forms['f'].addfield_field.value=field;
  	document.f.submit();
  }

Index: additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl,v
retrieving revision 1.20.2.4
retrieving revision 1.20.2.5
diff -C2 -r1.20.2.4 -r1.20.2.5
*** additem.tmpl	31 May 2005 12:10:52 -0000	1.20.2.4
--- additem.tmpl	25 Aug 2005 16:36:00 -0000	1.20.2.5
***************
*** 114,118 ****
  }
  function Dopop(link,i) {
! 	defaultvalue=document.forms[0].field_value[i].value;
  	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes');
  }
--- 114,118 ----
  }
  function Dopop(link,i) {
! 	defaultvalue=document.forms['f'].field_value[i].value;
  	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes');
  }