[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/parameters aqbookfund.tmpl,1.2,1.3 aqbudget.tmpl,1.2,1.3

Paul POULAIN tipaul at users.sourceforge.net
Fri Jun 13 15:46:04 CEST 2003


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

Modified Files:
	aqbookfund.tmpl aqbudget.tmpl 
Log Message:
fixes for bookfunds & budget. Should work now. I fix #223, #424

Index: aqbookfund.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbookfund.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** aqbookfund.tmpl	4 Apr 2003 08:39:40 -0000	1.2
--- aqbookfund.tmpl	13 Jun 2003 13:46:01 -0000	1.3
***************
*** 11,30 ****
  	<p><br>
  </TMPL_IF>
! <table border=0 cellspacing=0 cellpadding=5>
  <tr valign=top bgcolor=#99cc33>
!     <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Fonds documentaire</b></td>
!     <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Nom</b></td>
!     <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Groupe</b></td>
!     <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Budget</b></td><td background="<TMPL_VAR name="themelang">/images/background-mem.gif">&nbsp;</td><td background="<TMPL_VAR name="themelang">/images/background-mem.gif">&nbsp;  </td><td background="<TMPL_VAR name="themelang">/images/background-mem.gif">&nbsp;  </td></tr>
  <TMPL_LOOP name="bookfund">
! <tr valign=top bgcolor="<TMPL_VAR name="toggle">">
! 	<td><TMPL_VAR name="bookfundid"></td>
! 	<td><TMPL_VAR name="bookfundname"></td>
! 	<td><TMPL_VAR name="bookfundgroup"> &nbsp;</td>
! 	<td><a href="aqbudget.pl?op=add_form&bookfundid=<TMPL_VAR name="bookfundid"> ">Budget</a></td>
! 	<td><a href="<TMPL_VAR name="action">?op=add_form&bookfundid=<TMPL_VAR name="bookfundid"> "><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png" border="0"></a></td>
! 	<td><a href="<TMPL_VAR name="action">?op=delete_confirm&bookfundid=<TMPL_VAR name="bookfundid">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png" border="0"></a></td>
! 	<td>&nbsp;  </td>
! </tr>
  </TMPL_LOOP>
  </table>
--- 11,45 ----
  	<p><br>
  </TMPL_IF>
! <table border=0 cellspacing=0 cellpadding=2 width="80%">
  <tr valign=top bgcolor=#99cc33>
! 	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Fonds documentaire</b></td>
! 	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Nom</b></td>
! 	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Modif</b></td>
! 	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Suppr</b></td>
! 	</tr>
  <TMPL_LOOP name="bookfund">
! 	<tr valign=top bgcolor="ffffcc">
! 		<td><TMPL_VAR name="bookfundid"></td>
! 		<td><TMPL_VAR name="bookfundname"></td>
! 		<td><a href="<TMPL_VAR name="action">?op=add_form&bookfundid=<TMPL_VAR name="bookfundid"> "><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
! 		<td><a href="<TMPL_VAR name="action">?op=delete_confirm&bookfundid=<TMPL_VAR name="bookfundid">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
! 	</tr>
! 	<tr valign=top bgcolor=#99cc33>
! 		<td bgcolor="#FFFFFF">&nbsp;</td>
! 		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Budget</b></td>
! 		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"></td>
! 		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><a href="aqbudget.pl?op=add_form&bookfundid=<TMPL_VAR name="bookfundid">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png" ALT="Add budget" border=0></a></td>
! 	</tr>
! 	<TMPL_LOOP name="budget">
! 		<tr valign=top>
! 			<td>&nbsp;</td>
! 			<td>
! 				<TMPL_VAR name="startdate"> - <TMPL_VAR name="enddate"> : <b><TMPL_VAR name="budgetamount"></b>
! 			</td>
! 			<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&aqbudgetid=<TMPL_VAR name="aqbudgetid">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
! 			<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&aqbudgetid=<TMPL_VAR name="aqbudgetid">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
! 
! 		</tr>
! 	</TMPL_LOOP>
  </TMPL_LOOP>
  </table>

Index: aqbudget.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbudget.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** aqbudget.tmpl	4 Apr 2003 08:39:40 -0000	1.2
--- aqbudget.tmpl	13 Jun 2003 13:46:01 -0000	1.3
***************
*** 21,30 ****
  		<TMPL_LOOP name="budget">
  		<tr valign=top bgcolor="<TMPL_VAR name="toggle">">
! 			<td><TMPL_VAR name="bookfundid"> (<TMPL_VAR name="bookfundname">)</td>
  			<td><TMPL_VAR name="startdate"></td>
  			<td><TMPL_VAR name="enddate"></td>
  			<td><TMPL_VAR name="budgetamount"></td>
! 			<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&bookfundid=<TMPL_VAR name="bookfundid">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png" border="0"></a></td>
! 			<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&bookfundid=<TMPL_VAR name="bookfundid">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png" border="0"></a></td>
  		</tr>
  		</TMPL_LOOP>
--- 21,30 ----
  		<TMPL_LOOP name="budget">
  		<tr valign=top bgcolor="<TMPL_VAR name="toggle">">
! 			<td><TMPL_VAR name="aqbudgetid"> (<TMPL_VAR name="bookfundname">)</td>
  			<td><TMPL_VAR name="startdate"></td>
  			<td><TMPL_VAR name="enddate"></td>
  			<td><TMPL_VAR name="budgetamount"></td>
! 			<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&aqbudgetdid=<TMPL_VAR name="aqbudgetid">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png" border="0"></a></td>
! 			<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&aqbudgetid=<TMPL_VAR name="aqbudgetid">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png" border="0"></a></td>
  		</tr>
  		</TMPL_LOOP>
***************
*** 71,76 ****
  		var _alertString="";
  		var alertString2;
! 		if (f.bookfundid.value.length==0) {
! 			_alertString += "- bookfundid missing\n";
  		}
  		if (!(isNotNull(window.document.Aform.budgetamount,1))) {
--- 71,76 ----
  		var _alertString="";
  		var alertString2;
! 		if (f.aqbudgetid.value.length==0) {
! 			_alertString += "- aqbudgetid missing\n";
  		}
  		if (!(isNotNull(window.document.Aform.budgetamount,1))) {
***************
*** 95,99 ****
  <tr>
        <td>Fonds documentaire</td>
!       <td><input type=hidden name=bookfundid value=<TMPL_VAR name=bookfundid>><TMPL_VAR name="bookfundid"></td></tr>
  <tr>
        <td>Fonds documentaire</td>
--- 95,100 ----
  <tr>
        <td>Fonds documentaire</td>
!       <td><input type=hidden name=bookfundid value=<TMPL_VAR name=bookfundid>><TMPL_VAR name="aqbudgetid"></td>
! </tr>
  <tr>
        <td>Fonds documentaire</td>
***************
*** 101,117 ****
  </TMPL_IF>
  <TMPL_IF name="adding">
! <tr>
!       <td>Fonds documentaire</td>
!       <td><input type=text name=bookfundid size=5 maxlength=5 onBlur=toUC(this)></td></tr>
  </TMPL_IF>
  <tr>
!       <td>Date de d&eacute;but</td>
!       <td><input type=text name=startdate size=40 maxlength=80 value='<TMPL_VAR name="startdate">'>&nbsp;</td></tr>
  <tr>
!       <td>Date de fin</td>
!       <td><input type=text name=enddate value='<TMPL_VAR name="enddate">'></td></tr>
  <tr>
        <td>Montant du budget</td>
!       <td><input type=text name=budgetamount value='<TMPL_VAR name="budgetamount">'></td></tr>
  <tr><td>&nbsp;</td><td><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>
  </table>
--- 102,116 ----
  </TMPL_IF>
  <TMPL_IF name="adding">
! 	<tr><td>fonds</td><td><input type=hidden name=bookfundid size=5 maxlength=5 value="<TMPL_VAR name="bookfundid">"><TMPL_VAR name="bookfundid"></td></tr>
  </TMPL_IF>
  <tr>
!       <td>Date de d&eacute;but (<TMPL_VAR NAME=dateformat>)</td>
!       <td><input type=text name=startdate size=20 maxlength=14 value='<TMPL_VAR name="startdate">'>&nbsp;</td></tr>
  <tr>
!       <td>Date de fin (<TMPL_VAR NAME=dateformat>)</td>
!       <td><input type=text name=enddate size=20 maxlength=14 value='<TMPL_VAR name="enddate">'></td></tr>
  <tr>
        <td>Montant du budget</td>
!       <td><input type="hidden" name="aqbudgetid" value="<TMPL_VAR name="aqbudgetid">"><input type=text name=budgetamount value='<TMPL_VAR name="budgetamount">'></td></tr>
  <tr><td>&nbsp;</td><td><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>
  </table>
***************
*** 128,136 ****
  <table border=0 cellspacing=0 cellpadding=5>
  <tr valign=top bgcolor=#99cc33>
!     <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Fonds documentaire</b></td>
!     <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b><TMPL_VAR name="bookfundid"></b></td></tr>
  <form action='<TMPL_VAR name="action">' method=post>
  	<input type="hidden" name="op" value="delete_confirmed">
! 	<input type="hidden" name="bookfundid" value='<TMPL_VAR name="bookfundid">'>
  <tr>
        <td>Date de d&eacute;but</td>
--- 127,135 ----
  <table border=0 cellspacing=0 cellpadding=5>
  <tr valign=top bgcolor=#99cc33>
!     <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Budget</b></td>
!     <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b><TMPL_VAR name="aqbudgetid"></b></td></tr>
  <form action='<TMPL_VAR name="action">' method=post>
  	<input type="hidden" name="op" value="delete_confirmed">
! 	<input type="hidden" name="aqbudgetid" value='<TMPL_VAR name="aqbudgetid">'>
  <tr>
        <td>Date de d&eacute;but</td>





More information about the Koha-cvs mailing list