[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ branchtrans
|
From: |
Paul POULAIN |
|
Subject: |
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ branchtransfers.tmpl,1.12,1.13 circulation.tmpl,1.37,1.38 selectbranchprinter.tmpl,1.6,1.7 |
|
Date: |
Mon, 20 Jun 2005 07:18:44 -0700 |
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6439/koha-tmpl/intranet-tmpl/default/en/circ
Modified Files:
branchtransfers.tmpl circulation.tmpl selectbranchprinter.tmpl
Log Message:
synch'ing 2.2 and head
Index: branchtransfers.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** branchtransfers.tmpl 5 Nov 2004 10:18:24 -0000 1.12
--- branchtransfers.tmpl 20 Jun 2005 14:18:41 -0000 1.13
***************
*** 1,15 ****
<!-- TMPL_INCLUDE Name="circulation-top.inc" -->
<div id="mainbloc">
- <div class="bloc25">
- <a class="button" href="circulation.pl">
- Next Borrower</a>
- <a class="button" href="returns.pl">
- Returns</a>
- </div>
! <h1>Circulation: Transfers</h1>
<b>Branch:</b> <!-- TMPL_VAR NAME="genbrname" -->
<b>Printer:</b> <!-- TMPL_VAR NAME="genprname" -->
! <a href="selectbranchprinter.pl" class="button">Change Settings</a>
<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
--- 1,9 ----
<!-- TMPL_INCLUDE Name="circulation-top.inc" -->
<div id="mainbloc">
! <h1 class="circulation">Circulation: Transfers</h1>
<b>Branch:</b> <!-- TMPL_VAR NAME="genbrname" -->
<b>Printer:</b> <!-- TMPL_VAR NAME="genprname" -->
! <a href="selectbranchprinter.pl" class="button circulation">Change
Settings</a>
<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
***************
*** 17,21 ****
<!-- TMPL_IF Name="found" -->
<table>
! <tr><th>Reserve Found</th></tr>
<tr><td>
<!-- TMPL_IF Name="reserved" -->
--- 11,15 ----
<!-- TMPL_IF Name="found" -->
<table>
! <tr><th class="circulation">Reserve Found</th></tr>
<tr><td>
<!-- TMPL_IF Name="reserved" -->
***************
*** 38,45 ****
<!-- TMPL_IF Name="waiting" --><input
type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
<input type="hidden" name="request"
value="KillWaiting">
! <input type="submit" value="Cancel"
class="button">
<!-- /TMPL_IF -->
<!-- TMPL_IF Name="reserved" --><input
type="hidden" name="request" value="SetWaiting">
! <input type="submit" value="Waiting"
class="button"><!-- /TMPL_IF -->
</form></p>
--- 32,39 ----
<!-- TMPL_IF Name="waiting" --><input
type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
<input type="hidden" name="request"
value="KillWaiting">
! <input type="submit" value="Cancel"
class="button circulation">
<!-- /TMPL_IF -->
<!-- TMPL_IF Name="reserved" --><input
type="hidden" name="request" value="SetWaiting">
! <input type="submit" value="Waiting"
class="button circulation"><!-- /TMPL_IF -->
</form></p>
***************
*** 58,62 ****
<input type="hidden" name="barcode" value="<!--
TMPL_VAR NAME="barcode" -->">
<input type="hidden" name="request"
value="KillReserved">
! <input type="submit" value="Cancel" class="button">
</form></p>
<!-- /TMPL_IF -->
--- 52,56 ----
<input type="hidden" name="barcode" value="<!--
TMPL_VAR NAME="barcode" -->">
<input type="hidden" name="request"
value="KillReserved">
! <input type="submit" value="Cancel" class="button
circulation">
</form></p>
<!-- /TMPL_IF -->
***************
*** 70,74 ****
<input type="hidden" name="tb-<!-- TMPL_VAR
NAME="counter" -->" value="<!-- TMPL_VAR NAME="tobrcd" -->">
<!-- /TMPL_LOOP -->
! <input type="submit" value="Ignore" class="button">
</form></p>
--- 64,68 ----
<input type="hidden" name="tb-<!-- TMPL_VAR
NAME="counter" -->" value="<!-- TMPL_VAR NAME="tobrcd" -->">
<!-- /TMPL_LOOP -->
! <input type="submit" value="Ignore" class="button
circulation">
</form></p>
***************
*** 77,81 ****
<!-- TMPL_ELSE -->
<table>
! <tr><th>Messages</th></tr>
<tr><td>
<!-- TMPL_IF Name="reqmessage" -->
--- 71,75 ----
<!-- TMPL_ELSE -->
<table>
! <tr><th class="circulation">Messages</th></tr>
<tr><td>
<!-- TMPL_IF Name="reqmessage" -->
***************
*** 125,130 ****
<p>
<table border="1" cellpadding="5" cellspacing="0"
bgcolor="#dddddd">
! <tr><th colspan="6">Transfered Items</th></tr>
!
<tr><th>Barcode</th><th>Title</th><th>Author</th><th>Type</th><th>From</th><th>To</th></tr>
<!-- TMPL_LOOP Name="trsfitemloop" -->
<tr><td align="center" bgcolor="<!-- TMPL_VAR
NAME="color" -->">
--- 119,124 ----
<p>
<table border="1" cellpadding="5" cellspacing="0"
bgcolor="#dddddd">
! <tr><th colspan="6" class="circulation">Transfered
Items</th></tr>
! <tr><th class="circulation">Barcode</th><th
class="circulation">Title</th><th class="circulation">Author</th><th
class="circulation">Type</th><th class="circulation">From</th><th
class="circulation">To</th></tr>
<!-- TMPL_LOOP Name="trsfitemloop" -->
<tr><td align="center" bgcolor="<!-- TMPL_VAR
NAME="color" -->">
***************
*** 140,143 ****
--- 134,143 ----
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
+ <div class="bloc25">
+ <a class="button circulation" href="circulation.pl">
+ Next Borrower</a>
+ <a class="button circulation" href="returns.pl">
+ Returns</a>
+ </div>
</div>
Index: circulation.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** circulation.tmpl 4 May 2005 08:52:53 -0000 1.37
--- circulation.tmpl 20 Jun 2005 14:18:41 -0000 1.38
***************
*** 184,187 ****
--- 184,190 ----
<p class="problem">No more renewals possible</p>
<!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="EXPIRED" -->
+ <p class="problem">Borrower card expired</p>
+ <!-- /TMPL_IF -->
<br/>
<!-- /TMPL_IF -->
Index: selectbranchprinter.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** selectbranchprinter.tmpl 19 Jul 2004 19:58:38 -0000 1.6
--- selectbranchprinter.tmpl 20 Jun 2005 14:18:41 -0000 1.7
***************
*** 2,6 ****
<div id="mainbloc">
! <h1>Circulation: Select Printer and Branch Settings</h1>
<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
--- 2,6 ----
<div id="mainbloc">
! <h1 class="circulation">Circulation: Select Printer and Branch Settings</h1>
<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
***************
*** 30,34 ****
<!-- /TMPL_IF --></p>
<p><input type="hidden" name="setcookies" value="1">
! <input type="submit" value="Submit" type="changesettings" class="button"></p>
</form>
--- 30,34 ----
<!-- /TMPL_IF --></p>
<p><input type="hidden" name="setcookies" value="1">
! <input type="submit" value="Submit" type="changesettings" class="button
circulation"></p>
</form>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ branchtransfers.tmpl,1.12,1.13 circulation.tmpl,1.37,1.38 selectbranchprinter.tmpl,1.6,1.7,
Paul POULAIN <=
- Prev by Date:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue detail.tmpl,1.19,1.20 MARCdetail.tmpl,1.34,1.35 searchresults.tmpl,1.16,1.17
- Next by Date:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/circ circulation.tmpl,1.1,1.2 returns.tmpl,1.1,1.2
- Previous by thread:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue detail.tmpl,1.19,1.20 MARCdetail.tmpl,1.34,1.35 searchresults.tmpl,1.16,1.17
- Next by thread:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/circ circulation.tmpl,1.1,1.2 returns.tmpl,1.1,1.2
- Index(es):