[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull order.tmpl,1.2,1.3 result.tmpl,1.2,1.3 subscription-add.tmpl,1.2,1.3 subscription-detail.tmpl,1.2,1.3
Paul POULAIN
tipaul at users.sourceforge.net
Fri Aug 6 18:38:44 CEST 2004
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32276/koha-tmpl/intranet-tmpl/default/en/bull
Modified Files:
order.tmpl result.tmpl subscription-add.tmpl
subscription-detail.tmpl
Log Message:
changing DB structure to calculate next issue number.
Seems to work fine.
Still misses the date calculation & the test of end of subscription (maybe for monday ?)
Index: order.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/order.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** order.tmpl 5 Aug 2004 16:35:43 -0000 1.2
--- order.tmpl 6 Aug 2004 16:38:42 -0000 1.3
***************
*** 15,19 ****
</td>
<td>
! <a href="#" onClick="GetIdInOpener('<!-- TMPL_VAR name=id -->')">
<img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/arrow.gif" title="select this supplier" BORDER=0 height=40 width=40>
</a>
--- 15,19 ----
</td>
<td>
! <a href="#" onClick="GetIdInOpener('<!-- TMPL_VAR name=id -->','<!-- TMPL_VAR name="name" -->')">
<img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/arrow.gif" title="select this supplier" BORDER=0 height=40 width=40>
</a>
***************
*** 29,35 ****
<script language="javascript">
! function GetIdInOpener(value)
{
opener.document.f.aqbooksellerid.value = value;
self.close();
}
--- 29,36 ----
<script language="javascript">
! function GetIdInOpener(value,name)
{
opener.document.f.aqbooksellerid.value = value;
+ opener.document.f.aqbooksellername.value= name;
self.close();
}
Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** result.tmpl 5 Aug 2004 16:35:43 -0000 1.2
--- result.tmpl 6 Aug 2004 16:38:42 -0000 1.3
***************
*** 1,5 ****
<!-- TMPL_INCLUDE NAME="neutral-top.inc" -->
<div id="mainbloc">
! <h1 class="catalogue">MARC search results</h1>
<div id="resultnumber">
<p>
--- 1,5 ----
<!-- TMPL_INCLUDE NAME="neutral-top.inc" -->
<div id="mainbloc">
! <h1 class="catalogue">Search results</h1>
<div id="resultnumber">
<p>
***************
*** 32,37 ****
<tr>
<th class="catalogue">Summary</th>
- <th class="catalogue">Item Count</th>
- <th class="catalogue">Location</th>
<th class="catalogue"> </th>
</tr>
--- 32,35 ----
***************
*** 40,44 ****
<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
<p>
! <p> <b><a class="transparent" href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b></p>
<p><!-- TMPL_VAR NAME="author" -->
<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
--- 38,42 ----
<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
<p>
! <p><b><!-- TMPL_VAR NAME="title" --></b></p>
<p><!-- TMPL_VAR NAME="author" -->
<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
***************
*** 49,63 ****
</p>
</td>
- <td align="center" <!-- TMPL_IF name="even" --> class="hilighted"<!-- /TMPL_IF -->>
- <!-- TMPL_VAR name="totitem" -->
- </td>
- <td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
- <!-- TMPL_LOOP name="CN" -->
- <!-- TMPL_VAR name="holdingbranch" --> <!-- TMPL_IF name="itemcallnumber" -->(<!-- TMPL_VAR name="itemcallnumber" -->)<!-- /TMPL_IF -->
- <!-- /TMPL_LOOP -->
- </td>
<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
<!-- TMPL_UNLESS NAME="norequests" -->
! <a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->') ">Get it!</a>
<!-- TMPL_ELSE -->
Not Reservable
--- 47,53 ----
</p>
</td>
<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
<!-- TMPL_UNLESS NAME="norequests" -->
! <a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->') ">Get it!</a>
<!-- TMPL_ELSE -->
Not Reservable
***************
*** 90,96 ****
<script language="Javascript">
! function GetIt(bibno)
{
! opener.document.f.perioid.value = bibno;
self.close();
}
--- 80,87 ----
<script language="Javascript">
! function GetIt(bibno,title)
{
! opener.document.f.biblionumber.value = bibno;
! opener.document.f.title.value = title;
self.close();
}
Index: subscription-add.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** subscription-add.tmpl 5 Aug 2004 16:35:43 -0000 1.2
--- subscription-add.tmpl 6 Aug 2004 16:38:42 -0000 1.3
***************
*** 16,28 ****
<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
<p>Librarian</td><td> <!-- TMPL_VAR name="user" --></p>
! <p><label>Supplier (*):</label><input type="text" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid"-->"><a href="#" OnClick="FindAcqui()">...</a></p>
! <p><label>Cost</label><input type="text" name="cost" value="<!-- TMPL_VAR name="cost" -->"></label></p>
! <p><label>Budget</label><input type="text" name="aqbudgetid" value="<!-- TMPL_VAR name="aqbudgetid" -->"></p>
! <p><label>Biblio</label><input type="text" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"> <a href="#" onClick="Plugin(f)">...</a></p>
<p><label>Notes</label><TEXTAREA NAME="notes" COLS=30 ROWS=2><!-- TMPL_VAR name="notes" --></TEXTAREA></p>
</div>
<div id="bloc25">
<h2 class="bull">Planning</h2>
! <p><label class="label100">Beginnning date:</label> <input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->"></p>
<p><label class="label100">Frequency (*)</label>
<select name="periodicity" size="1">
--- 16,41 ----
<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
<p>Librarian</td><td> <!-- TMPL_VAR name="user" --></p>
! <p><label>Supplier (*):</label><input type="text" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid"-->" size=4> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled readonly>) <a href="#" OnClick="FindAcqui()">...</a></p>
! <p><label>Cost</label><input type="text" name="cost" value="<!-- TMPL_VAR name="cost" -->" size=4></label></p>
! <p><label>Budget</label>
! <select name="aqbudgetid">
! <!-- TMPL_LOOP name="budgets" -->
! <!-- TMPL_IF name="selected" -->
! <option value="<!-- TMPL_VAR name="aqbudgetid" -->" selected>
! <!-- TMPL_ELSE -->
! <option value="<!-- TMPL_VAR name="aqbudgetid" -->">
! <!-- /TMPL_IF -->
! <!-- TMPL_VAR name="bookfundname" --> (<!-- TMPL_VAR name="startdate" --> - <!-- TMPL_VAR name="enddate" -->)
! </option>
! <!-- /TMPL_LOOP -->
! </select>
! </p>
! <p><label>Biblio</label><input type="text" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size=4> (<input type="text" name="title" value="<!-- TMPL_VAR name="title" -->" disabled readonly>)<a href="#" onClick="Plugin(f)">...</a></p>
<p><label>Notes</label><TEXTAREA NAME="notes" COLS=30 ROWS=2><!-- TMPL_VAR name="notes" --></TEXTAREA></p>
</div>
<div id="bloc25">
<h2 class="bull">Planning</h2>
! <p><label class="label100">Beginnning date:</label> <input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size=13 maxlength=10></p>
! <p><label class="label100">Next issue (expected)</label><input type="text" name="arrivalplanified" value="<!-- TMPL_VAR name="arrivalplanified" -->" size=13 maxlength=10></p>
<p><label class="label100">Frequency (*)</label>
<select name="periodicity" size="1">
***************
*** 144,229 ****
</tr>
<tr>
! <td class="bull">Evolution</td>
<td>
! <select name="seqtype1" size="1" onChange="select(this[this.selectedIndex].value, 'X')">
! <option value="">None</option>
! <!-- TMPL_IF name="seqtype11" -->
! <option value="1" selected>Added each</option>
! <!-- TMPL_ELSE -->
! <option value="1">Added each</option>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF name="seqtype12" -->
! <option value="2" selected>Reinitialize each</option>
! <!-- TMPL_ELSE -->
! <option value="2">Reinitialize each</option>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF name="seqtype13" -->
! <option value="3" selected>Constant</option>
! <!-- TMPL_ELSE -->
! <option value="3">Constant</option>
! <!-- /TMPL_IF -->
! </select>
</td>
<td>
! <select name="seqtype2" size="1" onChange="select(this[this.selectedIndex].value, 'Y')">
! <option value="" selected>None</option>
! <!-- TMPL_IF name="seqtype21" -->
! <option value="1" selected>Added each</option>
! <!-- TMPL_ELSE -->
! <option value="1">Added each</option>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF name="seqtype22" -->
! <option value="2" selected>Reinitialize each</option>
! <!-- TMPL_ELSE -->
! <option value="2">Reinitialize each</option>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF name="seqtype23" -->
! <option value="3" selected>Constant</option>
! <!-- TMPL_ELSE -->
! <option value="3">Constant</option>
! <!-- /TMPL_IF -->
! </select>
</td>
<td>
! <select name="seqtype3" size="1" onChange="select(this[this.selectedIndex].value, 'Z')">
! <option value="" selected>None</option>
! <!-- TMPL_IF name="seqtype31" -->
! <option value="1" selected>Added each</option>
! <!-- TMPL_ELSE -->
! <option value="1">Added each</option>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF name="seqtype32" -->
! <option value="2" selected>Reinitialize each</option>
! <!-- TMPL_ELSE -->
! <option value="2">Reinitialize each</option>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF name="seqtype33" -->
! <option value="3" selected>Constant</option>
! <!-- TMPL_ELSE -->
! <option value="3">Constant</option>
! <!-- /TMPL_IF -->
! </select>
</td>
</tr>
<tr>
! <td class="bull">Value</td>
! <td><input type="text" name="seqnum1" value="<!-- TMPL_VAR name="seqnum1" -->"></td>
! <td><input type="text" name="seqnum2" value="<!-- TMPL_VAR name="seqnum2" -->"></td>
! <td><input type="text" name="seqnum3" value="<!-- TMPL_VAR name="seqnum3" -->"></td>
</tr>
<tr>
! <td class="bull">Frequency</td>
! <td><input type="text" name="freq1" value="<!-- TMPL_VAR name="freq1" -->"></td>
! <td><input type="text" name="freq2" value="<!-- TMPL_VAR name="freq2" -->"></td>
! <td><input type="text" name="freq3" value="<!-- TMPL_VAR name="freq3" -->"></td>
</tr>
<tr>
! <td class="bull">Step</td>
! <td><input type="text" name="step1" value="<!-- TMPL_VAR name="step1" -->"></td>
! <td><input type="text" name="step2" value="<!-- TMPL_VAR name="step2" -->"></td>
! <td><input type="text" name="step3" value="<!-- TMPL_VAR name="step3" -->"></td>
</tr>
</table>
! <td>Arrival date : </td><td> <input type="text" name="arrivalplanified" value="<!-- TMPL_VAR name="arrivalplanified" -->">
</div>
<!-- TMPL_IF name="mod" -->
--- 157,203 ----
</tr>
<tr>
! <td class="bull">Add</td>
<td>
! <input type="text" name="add1" value="<!-- TMPL_VAR name="add1" -->">
</td>
<td>
! <input type="text" name="add2" value="<!-- TMPL_VAR name="add2" -->">
</td>
<td>
! <input type="text" name="add3" value="<!-- TMPL_VAR name="add3" -->">
</td>
</tr>
<tr>
! <td class="bull">once every</td>
! <td><input type="text" name="every1" value="<!-- TMPL_VAR name="every1" -->"></td>
! <td><input type="text" name="every2" value="<!-- TMPL_VAR name="every2" -->"></td>
! <td><input type="text" name="every3" value="<!-- TMPL_VAR name="every3" -->"></td>
! </tr>
! <tr>
! <td class="bull">When more than</td>
! <td><input type="text" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
! <td><input type="text" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
! <td><input type="text" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
</tr>
<tr>
! <td class="bull">Set back to</td>
! <td><input type="text" name="setto1" value="<!-- TMPL_VAR name="setto1" -->"></td>
! <td><input type="text" name="setto2" value="<!-- TMPL_VAR name="setto2" -->"></td>
! <td><input type="text" name="setto3" value="<!-- TMPL_VAR name="setto3" -->"></td>
</tr>
<tr>
! <td class="bull">
! <!-- TMPL_IF name="mod" -->
! Last value
! <!-- TMPL_ELSE -->
! Begins with
! <!-- /TMPL_IF -->
! </td>
! <td><input type="text" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->"></td>
! <td><input type="text" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->"></td>
! <td><input type="text" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->"></td>
</tr>
</table>
! </p>
</div>
<!-- TMPL_IF name="mod" -->
***************
*** 239,246 ****
<script language="JavaScript" type="text/javascript">
- select(<!--TMPL_VAR name="seqtype1"-->, 'X');
- select(<!--TMPL_VAR name="seqtype2"-->, 'Y');
- select(<!--TMPL_VAR name="seqtype3"-->, 'Z');
-
function Plugin(f)
{
--- 213,216 ----
Index: subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** subscription-detail.tmpl 5 Aug 2004 16:35:43 -0000 1.2
--- subscription-detail.tmpl 6 Aug 2004 16:38:42 -0000 1.3
***************
*** 87,152 ****
<p>
<p>Numbering formula: <!-- TMPL_VAR name="numberingmethod" --></p>
! <table class="small">
<tr>
<th class="bull"> </th>
! <th class="bull">X</th>
! <th class="bull">Y</th>
! <th class="bull">Z</th>
</tr>
<tr>
! <td class="bull">Evolution</td>
<td>
! <!-- TMPL_IF NAME="seqtype11" -->
! Added
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="seqtype12" -->
! Reinitialize each
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="seqtype13" -->
! Constant
! <!-- /TMPL_IF -->
</td>
<td>
! <!-- TMPL_IF NAME="seqtype21" -->
! Added
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="seqtype22" -->
! Reinitialize each
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="seqtype23" -->
! Constant
! <!-- /TMPL_IF -->
</td>
<td>
! <!-- TMPL_IF NAME="seqtype31" -->
! Added
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="seqtype32" -->
! Reinitialize each
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="seqtype33" -->
! Constant
! <!-- /TMPL_IF -->
</td>
</tr>
<tr>
! <td class="bull">Value</td>
! <td><!-- TMPL_VAR name="seqnum1" --></td>
! <td><!-- TMPL_VAR name="seqnum2" --></td>
! <td><!-- TMPL_VAR name="seqnum3" --></td>
</tr>
<tr>
! <td class="bull">Frequency</td>
! <td><!-- TMPL_VAR name="freq1" --></td>
! <td><!-- TMPL_VAR name="freq2" --></td>
! <td><!-- TMPL_VAR name="freq3" --></td>
</tr>
<tr>
! <td class="bull">Step</td>
! <td><!-- TMPL_VAR name="step1" --></td>
! <td><!-- TMPL_VAR name="step2" --></td>
! <td><!-- TMPL_VAR name="step3" --></td>
</tr>
! </table>
</div>
--- 87,135 ----
<p>
<p>Numbering formula: <!-- TMPL_VAR name="numberingmethod" --></p>
! <table class="small" width="20%">
<tr>
<th class="bull"> </th>
! <th class="bull"> X </th>
! <th class="bull"> Y </th>
! <th class="bull"> Z </th>
</tr>
<tr>
! <td class="bull">Add</td>
<td>
! <!-- TMPL_VAR name="add1" -->
</td>
<td>
! <!-- TMPL_VAR name="add2" -->
</td>
<td>
! <!-- TMPL_VAR name="add3" -->
</td>
</tr>
<tr>
! <td class="bull">once every</td>
! <td><!-- TMPL_VAR name="every1" --></td>
! <td><!-- TMPL_VAR name="every2" --></td>
! <td><!-- TMPL_VAR name="every3" --></td>
</tr>
<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>
! <td class="bull">Set back to</td>
! <td><!-- TMPL_VAR name="setto1" --></td>
! <td><!-- TMPL_VAR name="setto2" --></td>
! <td><!-- TMPL_VAR name="setto3" --></td>
</tr>
! <tr>
! <td class="bull">
! Last value
! </td>
! <td><!-- TMPL_VAR name="lastvalue1" --></td>
! <td><!-- TMPL_VAR name="lastvalue2" --></td>
! <td><!-- TMPL_VAR name="lastvalue3" --></td>
! </tr> </table>
</div>
More information about the Koha-cvs
mailing list