[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull subscription-add.tmpl,1.5,1.6 subscription-detail.tmpl,1.4,1.5

[Paul POULAIN]

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

Modified Files:
	subscription-add.tmpl subscription-detail.tmpl 
Log Message:
some changes in serial management :
* in subscription Add, the issue number & date is used to calculate the 1st issue (previously, a "next issue number & date" was applied, meaning you had to enter the number & date of a previous issue)
* the "inner loop" used for serials number ({XYZ}) is now shown & can be modified. The innerloop is used for numbering formulas saying "change the number once every 4 times".

Index: subscription-add.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** subscription-add.tmpl	2 Sep 2004 16:28:01 -0000	1.5
--- subscription-add.tmpl	20 Sep 2004 10:16:06 -0000	1.6
***************
*** 130,137 ****
  <div id="bloc25">
  	<h2 class="bull">Subscription length</h2>
! 	<p><label class="label100">Number of num</label><input type="text" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></p>
! 	<p><label class="label100">Number of weeks</label><input type="text" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></p>
! 	<p><label class="label100">Number of months</label><input type="text" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></p>
! 
  </div>
  <div id="bloc25">
--- 130,139 ----
  <div id="bloc25">
  	<h2 class="bull">Subscription length</h2>
! 	<p>* fill 1 from :</p>
! 	<ul>
! 		<p><label class="label100">Number of num</label><input type="text" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></p>
! 		<p><label class="label100">Number of weeks</label><input type="text" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></p>
! 		<p><label class="label100">Number of months</label><input type="text" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></p>
! 	</ul>
  </div>
  <div id="bloc25">
***************
*** 170,173 ****
--- 172,183 ----
  				<td><input type="text" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
  			</tr>
+ 			<!-- TMPL_IF name="mod" -->
+ 			<tr>
+ 				<td class="bull">The loop is for instance</td>
+ 				<td><input type="text" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->"></td>
+ 				<td><input type="text" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->"></td>
+ 				<td><input type="text" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->"></td>
+ 			</tr>
+ 			<!-- /TMPL_IF -->
  			<tr>
  				<td class="bull">Set back to</td>
***************
*** 216,225 ****
  function Check(f)
  {
!   if (f.dow.value.length != 0
! 	&& f.startdate.value.length != 0 && f.dow.value.length != 0)
! 	{
! // 		alert('subscription ok');
! 		document.f.submit();
!         }
  else
  {
--- 226,234 ----
  function Check(f)
  {
! 	if (f.startdate.value.length != 0 && 
! 			f.numberlength.value+f.weeklength.value+f.monthlength.value > 0)
! 		{
! 			document.f.submit();
! 		}
  else
  {

Index: subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** subscription-detail.tmpl	12 Aug 2004 14:37:36 -0000	1.4
--- subscription-detail.tmpl	20 Sep 2004 10:16:06 -0000	1.5
***************
*** 115,121 ****
  			<tr>
  				<td class="bull">When more than</td>
! 				<td><!-- TMPL_VAR name="whenmorethan1" --></td>
! 				<td><!-- TMPL_VAR name="whenmorethan2" --></td>
! 				<td><!-- TMPL_VAR name="whenmorethan3" --></td>
  			</tr>
  			<tr>
--- 115,124 ----
  			<tr>
  				<td class="bull">When more than</td>
! 				<td><!-- TMPL_VAR name="whenmorethan1" --> <!-- TMPL_IF name="innerloop1" --><br/>
! 					<i>(is <!-- TMPL_VAR name="innerloop1" -->)</i><!-- /TMPL_IF --></td>
! 				<td><!-- TMPL_VAR name="whenmorethan2" --> <!-- TMPL_IF name="innerloop2" --><br/>
! 					<i>(is <!-- TMPL_VAR name="innerloop2" -->)</i><!-- /TMPL_IF --></td>
! 				<td><!-- TMPL_VAR name="whenmorethan3" --> <!-- TMPL_IF name="innerloop3" --><br/>
! 					<i>(is <!-- TMPL_VAR name="innerloop3" -->)</i><!-- /TMPL_IF --></td>
  			</tr>
  			<tr>
***************
*** 132,136 ****
  				<td><!-- TMPL_VAR name="lastvalue2" --></td>
  				<td><!-- TMPL_VAR name="lastvalue3" --></td>
! 			</tr>		</table>
  </div>
  <div id="bloc25">
--- 135,140 ----
  				<td><!-- TMPL_VAR name="lastvalue2" --></td>
  				<td><!-- TMPL_VAR name="lastvalue3" --></td>
! 			</tr>
! 		</table>
  </div>
  <div id="bloc25">