[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/circ branc...
paul poulain
paul at koha-fr.org
Tue Apr 17 10:46:05 CEST 2007
CVSROOT: /sources/koha
Module name: koha
Changes by: paul poulain <tipaul> 07/04/17 08:46:05
Modified files:
koha-tmpl/intranet-tmpl/prog/en/circ: branchreserves.tmpl
currenttransfers.tmpl
returns.tmpl
waitingreservestransfers.tmpl
Log message:
circulation cleaning continued: bufixing
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/currenttransfers.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl?cvsroot=koha&r1=1.4&r2=1.5
Patches:
Index: branchreserves.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- branchreserves.tmpl 11 Mar 2007 21:08:12 -0000 1.4
+++ branchreserves.tmpl 17 Apr 2007 08:46:05 -0000 1.5
@@ -48,7 +48,7 @@
<td><p><!-- TMPL_VAR NAME="waitingdate" --></p> <!-- TMPL_IF NAME="messcompa" --> Reserve Over <!-- /TMPL_IF --></td>
<td>
<p>
- <a href="/cgi-bin/koha/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
+ <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
(<b><!-- TMPL_VAR NAME="itemtype" --></b>)
<br />Barcode : <!-- TMPL_VAR NAME="barcode" -->
</p>
Index: currenttransfers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/currenttransfers.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- currenttransfers.tmpl 11 Mar 2007 21:08:12 -0000 1.3
+++ currenttransfers.tmpl 17 Apr 2007 08:46:05 -0000 1.4
@@ -5,18 +5,19 @@
<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
<div id="mainbloc">
- <h1 class="circulation">Transfers in wait for your library the : <!-- TMPL_VAR NAME="show_date" --></h1>
+ <h1 class="circulation">Transfers made TO your library the : <!-- TMPL_VAR NAME="show_date" --></h1>
+ <p>You are the destination of this transfer</p>
<div id="resultlist">
<!-- TMPL_LOOP NAME="branchesloop" -->
<!-- TMPL_IF NAME="branchcode" -->
<table>
<tr>
- <th class="circulation" colspan="5">current transfers from the library : <!-- TMPL_VAR NAME="branchname" --> </th>
+ <th class="circulation" colspan="5">Coming from <!-- TMPL_VAR NAME="branchname" --> </th>
</tr>
<tr>
<th class="circulation">Date of transfer</th>
<th class="circulation">Title</th>
- <th class="circulation">Borrower</th>
+ <th class="circulation">Reserved by </th>
<th class="circulation">Localisation</th>
<th class="circulation">Action</th>
</tr>
@@ -37,9 +38,9 @@
<!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
</p>
<!-- TMPL_ELSE -->
- <P>
- Transfer without reserv linked
- </P>
+ <p>
+ None
+ </p>
<!-- /TMPL_IF -->
</td>
<td><p><!-- TMPL_VAR NAME="homebranch" --> <!-- TMPL_VAR NAME="itemcallnumber" --></p></td>
Index: returns.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- returns.tmpl 11 Mar 2007 21:08:12 -0000 1.9
+++ returns.tmpl 17 Apr 2007 08:46:05 -0000 1.10
@@ -1,20 +1,18 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha › Circulation › Returns<!-- TMPL_IF Name="returned" -->: <!-- TMPL_VAR Name="itemtitle" --><!-- /TMPL_IF --></title>
+<title>Koha › Circulation › Returns <!-- TMPL_VAR Name="title" --></title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
<!-- case of a mistake in transfert loop -->
-
- <!-- TMPL_IF Name="WrongTransfer" -->
+<!-- TMPL_IF Name="WrongTransfer" -->
<h3 class="problem">This item was not transfered initialy to this library !</h3>
-
<table>
<tr>
<th>Title : </th>
<td>
- <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="witemtitle" --></a>
+ <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a>
</td>
</tr>
<tr><th>Reserved for: </th>
@@ -44,51 +42,61 @@
<input type="hidden" name="WT-From" value="<!-- TMPL_VAR Name="wtransfertFrom" -->" />
<input type="submit" value="Send this document" />
</form>
-
<!-- /TMPL_IF -->
<!-- TMPL_IF Name="found" -->
<!-- case of a reservation found, and display info -->
-
<!-- TMPL_IF Name="waiting" -->
<h3>Waiting Reserve Found in your library</h3>
<table>
- <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
- <tr><th>Patron: </th><td>
+ <caption><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a></caption>
+ <tr>
+ <th>Patron: </th>
+ <td>
<ul>
<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
<li><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> </li>
<li><!-- TMPL_VAR Name="borstraddress" --><br />
<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
<li><!-- TMPL_VAR Name="borphone" --></li>
- </ul></td></tr>
- </table><form method="post" action="returns.pl" name="mainform" id="mainform">
- <input type="submit" value="Confirm" /><!-- TMPL_LOOP Name="inputloop" -->
+ </ul>
+ </td>
+ </tr>
+ </table>
+ <form method="post" action="returns.pl" name="mainform" id="mainform">
+ <input type="submit" value="Confirm" />
+ <!-- TMPL_LOOP Name="inputloop" -->
<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
<input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
<!-- /TMPL_LOOP -->
<input type="hidden" name="barcode" value="0" />
</form>
-<!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
<!-- TMPL_IF Name="diffbranch" -->
- <h3>Reserve With necesary transfert Found</h3>
+ <h3>Reserve needing transfert found</h3>
<table>
- <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
- <tr><th>Patron: </th><td>
+ <caption><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a></caption>
+ <tr>
+ <th>Patron: </th>
+ <td>
<ul>
<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
<li><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> </li>
<li><!-- TMPL_VAR Name="borstraddress" --><br />
<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
<li><!-- TMPL_VAR Name="borphone" --></li>
- </ul></td></tr>
+ </ul>
+ </td>
+ </tr>
<!-- TMPL_IF name="transfertodo" -->
<tr><th>Transfer to:</th><td><!-- TMPL_VAR Name="destbranchname" --></td></tr>
<!-- /TMPL_IF -->
- </table><form method="post" action="returns.pl" name="mainform" id="mainform">
- <input type="submit" value="Confirm" /><!-- TMPL_LOOP Name="inputloop" -->
+ </table>
+ <form method="post" action="returns.pl" name="mainform" id="mainform">
+ <input type="submit" value="Confirm" />
+ <!-- TMPL_LOOP Name="inputloop" -->
<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
<input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
@@ -98,10 +106,10 @@
</form>
<!-- /TMPL_IF -->
-<!-- case of a return of item, but with no reservation after, if the document must return to his homebranch -->
+ <!-- case of a return of item, but with no reservation after, if the document must return to his homebranch -->
<!-- TMPL_IF Name="transfer" -->
<h2>This item must return to his homebranch :</h2>
- <p><span class="problem">The document <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) Must be returned to his homebranch(<b><!-- TMPL_VAR NAME="itemhomebranch" --></b>)</span></p>
+ <p><span class="problem">The document <!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) Must be returned to his homebranch(<b><!-- TMPL_VAR NAME="homebranch" --></b>)</span></p>
<form method="post" action="returns.pl">
<!-- TMPL_LOOP Name="inputloop" -->
<input type="hidden" name="ri-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
@@ -113,14 +121,16 @@
</form>
<!-- /TMPL_IF -->
-
<!-- TMPL_IF Name="diffbranch" -->
<h3>Item Consigned:</h3>
-
<table>
- <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
- <tr><th>Patron:</th><td><!-- TMPL_VAR Name="name" --></td></tr>
- </table><form method="post" action="returns.pl" name="mainform" id="mainform"><input type="submit" value="OK" />
+ <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a></caption>
+ <tr>
+ <th>Patron:</th>
+ <td><!-- TMPL_VAR Name="name" --></td>
+ </tr>
+ </table>
+ <form method="post" action="returns.pl" name="mainform" id="mainform"><input type="submit" value="OK" />
<!-- TMPL_LOOP Name="inputloop" -->
<!-- TMPL_UNLESS Name="first" -->
<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
@@ -129,33 +139,34 @@
<!-- /TMPL_UNLESS -->
<!-- /TMPL_LOOP -->
<input type="hidden" name="barcode" value="0" />
-
</form>
<!-- /TMPL_IF -->
-<!-- case of simple return no issue or transfer but with a reservation -->
+ <!-- case of simple return no issue or transfer but with a reservation -->
<!-- TMPL_IF Name="reserved" -->
<!-- TMPL_IF Name="transfertodo"-->
<h3>Reserve With necesary transfert Found</h3>
<!-- TMPL_ELSE -->
<h3>Waiting Reserve Found in your library</h3>
<!-- /TMPL_IF -->
-
<table>
- <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
- <tr><th>Patron: </th><td>
+ <caption><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="title" --></a></caption>
+ <tr>
+ <th>Patron: </th>
+ <td>
<ul>
<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
<li><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> </li>
<li><!-- TMPL_VAR Name="borstraddress" --><br />
<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
<li><!-- TMPL_VAR Name="borphone" --></li>
- </ul></td></tr>
+ </ul>
+ </td>
+ </tr>
<!-- TMPL_IF name="transfertodo" -->
<tr><th>Transfer to:</th><td><!-- TMPL_VAR Name="destbranchname" --></td></tr>
<!-- /TMPL_IF -->
-
</table>
<form method="post" action="returns.pl" name="mainform" id="mainform">
<input type="submit" value="Confirm" />
@@ -172,8 +183,7 @@
<!-- /TMPL_IF -->
<!-- TMPL_ELSE -->
-<h1>Circulation › Returns</h1>
-
+ <h1>Circulation › Returns</h1>
<form method="post" action="/cgi-bin/koha/circ/returns.pl" name="mainform" id="mainform">
<fieldset>
<legend>Enter item barcode</legend>
@@ -213,23 +223,21 @@
<!-- /TMPL_IF -->
<!-- TMPL_IF Name="returned" -->
-<table>
+ <table>
<tr><th>Item Information</th><th>Patron Information</th></tr>
- <tr><td><!-- TMPL_VAR Name="itemtitle" -->
- </td><td>
-<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR Name="riborrowernumber" -->"><!-- TMPL_VAR Name="riborcnum" --></a>
+ <tr>
+ <td><!-- TMPL_VAR Name="title" --></td>
+ <td>
+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR Name="riborrowernumber" -->"><!-- TMPL_VAR Name="riborcnum" --></a>
<!-- TMPL_VAR Name="riborsurname" -->, <!-- TMPL_VAR Name="ribortitle" --> <!-- TMPL_VAR Name="riborfirstname" -->
-
-<!-- TMPL_IF Name="flagset" -->
-(<!-- TMPL_LOOP Name="flagloop" -->
-<!-- TMPL_VAR Name="flag" -->,
-<!-- /TMPL_LOOP -->)<!-- /TMPL_IF -->
-</td></tr></table>
-
+ <!-- TMPL_IF Name="flagset" -->
+ (<!-- TMPL_LOOP Name="flagloop" -->
+ <!-- TMPL_VAR Name="flag" -->,
+ <!-- /TMPL_LOOP -->)<!-- /TMPL_IF -->
+ </td>
+ </tr>
+ </table>
<!-- /TMPL_IF -->
-
-
-
<!-- TMPL_IF Name="riloop" -->
<h2>Returned Items</h2>
<table>
@@ -247,7 +255,7 @@
<!-- TMPL_VAR Name="itemtitle" --></a>
<br /><!-- TMPL_VAR Name="itemauthor" -->
</td>
- <td><!-- TMPL_VAR Name="ccode" --></td>
+ <td><!-- TMPL_VAR Name="itemtype" --> <!-- TMPL_VAR Name="ccode" --></td>
<td>
<!-- TMPL_IF Name="duedate" -->
<!-- TMPL_IF Name="early" --><!-- /TMPL_IF --><!-- TMPL_VAR Name="month" -->/<!-- TMPL_VAR Name="day" -->/<!-- TMPL_VAR Name="year" --><!-- TMPL_IF Name="early" --></span><!-- /TMPL_IF -->
@@ -269,7 +277,6 @@
</td></tr>
<!-- /TMPL_LOOP -->
</table>
-
<!-- /TMPL_IF -->
<script type="text/JavaScript" language="JavaScript">
Index: waitingreservestransfers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- waitingreservestransfers.tmpl 11 Mar 2007 21:08:12 -0000 1.4
+++ waitingreservestransfers.tmpl 17 Apr 2007 08:46:05 -0000 1.5
@@ -30,7 +30,7 @@
<td><p><!-- TMPL_VAR NAME="reservedate" --></p> <!-- TMPL_IF NAME="messcompa" --> Reserve over <!-- /TMPL_IF --></td>
<td>
<p>
- <a href="/cgi-bin/koha/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
(<b><!-- TMPL_VAR NAME="itemtype" --> </b>)
<br />Barcode : <!-- TMPL_VAR NAME="barcode" -->
</p>
More information about the Koha-cvs
mailing list