[Koha-cvs] koha circwaitingreservestransfers.pl koha-tmpl/...
LAURIN arnaud
alaurin at ouestprovence.fr
Tue Jun 6 14:30:44 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Changes by: LAURIN arnaud <alaurin> 06/06/06 12:30:43
Modified files:
circ : waitingreservestransfers.pl
koha-tmpl/intranet-tmpl/prog/en/circ: branchreserves.tmpl
waitingreservestransfers.tmpl
koha-tmpl/intranet-tmpl/prog/en/includes: intranet.css
Log message:
new color alerts for the differents kind of reserves (available,on transfer, on loan ......) + warning color ....
+ minor changes of templates
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/circ/waitingreservestransfers.pl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css?cvsroot=koha&r1=1.5&r2=1.6
Patches:
Index: circ/waitingreservestransfers.pl
===================================================================
RCS file: /sources/koha/koha/circ/waitingreservestransfers.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- circ/waitingreservestransfers.pl 30 May 2006 12:03:54 -0000 1.2
+++ circ/waitingreservestransfers.pl 6 Jun 2006 12:30:43 -0000 1.3
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: waitingreservestransfers.pl,v 1.2 2006/05/30 12:03:54 alaurin Exp $
+# $Id: waitingreservestransfers.pl,v 1.3 2006/06/06 12:30:43 alaurin Exp $
# Copyright 2000-2002 Katipo Communications
#
@@ -78,7 +78,7 @@
if ($gettitle->{'holdingbranch'} eq $default){
my $getborrower = getpatroninformation (\%env,$num->{'borrowernumber'});
$getreserv{'reservedate'} = format_date($num->{'reservedate'});
- my $calcDate=DateCalc($num->{'reservedate'},"+".C4::Context->preference('MaxDaysRecoveryReserves')." days");
+ my $calcDate=DateCalc($num->{'reservedate'},"+".C4::Context->preference('TransfersMaxDaysWarning')." days");
my $warning=Date_Cmp(ParseDate("today"),$calcDate);
if ($warning>0){
$getreserv{'messcompa'} = 1;
Index: koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl 19 May 2006 17:01:03 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl 6 Jun 2006 12:30:43 -0000 1.2
@@ -6,10 +6,10 @@
<h1>Circulation: Branch Reserves</h1>
<div id="mainbloc">
- <h1 class="circulation">Reservs of your library the : <!-- TMPL_VAR NAME="show_date" --></h1>
+ <h1 class="circulation">Reserves of your library the : <!-- TMPL_VAR NAME="show_date" --></h1>
<!-- TMPL_IF NAME="messagetransfert" -->
<div>
- <h2>Reserv find for the document(<!-- TMPL_VAR NAME="nextreservtitle" -->)must transfered</h2>
+ <h2>Reserve find for the document(<!-- TMPL_VAR NAME="nextreservtitle" -->)must transfered</h2>
<p>This documen is reserved by : <b> <!-- TMPL_VAR NAME="nextreservsurname" --> <!-- TMPL_VAR NAME="nextreservfirstname" --></b> at the library : <b> <!-- TMPL_VAR NAME="branchname" --> </b>, Please put this document in transfer .
</p>
<form name="cancelReservewithtransfert" action="branchreserves.pl" method="post">
@@ -21,7 +21,7 @@
<div id="bloc25">
<h2 class="circulation">This document is in Waiting status</h2>
<p>This document (<!-- TMPL_VAR NAME="nextreservtitle" -->) is reserved by <b> : <!-- TMPL_VAR NAME="nextreservsurname" --> <!-- TMPL_VAR NAME="nextreservfirstname" --></b>,
- Please keep this document for the next reserv .
+ Please keep this document for the next reserve .
</p>
<form name="cancelReservewithwaiting" action="branchreserves.pl" method="post">
<input type="submit">
@@ -32,7 +32,7 @@
<div id="resultlist">
<table>
<tr>
- <th class="circulation" colspan="5">Reservs of your library</th>
+ <th class="circulation" colspan="5">Reserves of your library</th>
</tr>
<tr>
<th class="circulation">Available since</th>
@@ -43,7 +43,7 @@
</tr>
<!-- TMPL_LOOP NAME="reserveloop" -->
<tr <!-- TMPL_IF NAME="messcompa" --> class="problem" <!-- /TMPL_IF -->>
- <td><p><!-- TMPL_VAR NAME="waitingdate" --></p> <!-- TMPL_IF NAME="messcompa" --> Reserv Over <!-- /TMPL_IF --></td>
+ <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?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
@@ -66,9 +66,9 @@
<input type="hidden" name="tbr" value="<!-- TMPL_VAR NAME="homebranch" -->">
<input type="submit"
<!-- TMPL_IF NAME="dotransfer" -->
- value="Cancel reserv and return this document"
+ value="Cancel reserve and return this document"
<!-- TMPL_ELSE -->
- value="Cancel reserv"
+ value="Cancel reserve"
<!-- /TMPL_IF -->
>
</form>
Index: koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl 19 May 2006 17:01:03 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl 6 Jun 2006 12:30:43 -0000 1.2
@@ -8,7 +8,7 @@
<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
-<h1>Circulation: Transfers in wait</h1>
+<h1>Circulation: Transfers To do</h1>
<div id="mainbloc">
<h1>Transfers to do <!-- TMPL_VAR NAME="show_date" --></h1>
@@ -17,10 +17,10 @@
<!-- TMPL_IF NAME="branchcode" -->
<table>
<tr>
- <th class="circulation" colspan="5">Reservs in wait to the library : <!-- TMPL_VAR NAME="branchname" --> </th>
+ <th class="circulation" colspan="5">Reserves in wait to the library : <!-- TMPL_VAR NAME="branchname" --> </th>
</tr>
<tr>
- <th class="circulation">Date of reserv</th>
+ <th class="circulation">Date of reserve</th>
<th class="circulation">Title</th>
<th class="circulation">Borrower</th>
<th class="circulation">Localisation</th>
@@ -28,7 +28,7 @@
</tr>
<!-- TMPL_LOOP NAME="reserv" -->
<tr <!-- TMPL_IF NAME="messcompa" --> class="problem" <!-- /TMPL_IF -->>
- <td><p><!-- TMPL_VAR NAME="reservedate" --></p> <!-- TMPL_IF NAME="messcompa" --> Reserv over <!-- /TMPL_IF --></td>
+ <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?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
Index: koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css 18 Apr 2006 09:57:25 -0000 1.5
+++ koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css 6 Jun 2006 12:30:43 -0000 1.6
@@ -64,3 +64,32 @@
font-size:120%;
font-weight:bold;
}
+
+.problem {
+ color: white;
+ background-color:red;
+}
+
+/* css styles for reserves color alerts */
+.onloan {
+ background-color: #FFED3D;
+}
+
+.reserved {
+ background-color: #8EBAFF;
+}
+
+.transfered {
+ background-color: #F9FF9A;
+}
+
+.inwait {
+ background-color: #33CC99;
+}
+
+.other {
+ background-color: #FF0000;
+}
+
+/* end of css styles for reserves color alerts */
+
More information about the Koha-cvs
mailing list