From 3ca97f8c153de78310657470e153bcaf7577a092 Mon Sep 17 00:00:00 2001
From: alaurin <alaurin>
Date: Tue, 6 Jun 2006 12:30:43 +0000
Subject: [PATCH] new color alerts for the differents kind of reserves
 (available,on transfer, on loan ......) + warning color .... + minor changes
 of templates

---
 circ/waitingreservestransfers.pl              |  2 +-
 .../prog/en/circ/branchreserves.tmpl          | 14 ++++-----
 .../en/circ/waitingreservestransfers.tmpl     |  8 ++---
 .../prog/en/includes/intranet.css             | 29 +++++++++++++++++++
 4 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/circ/waitingreservestransfers.pl b/circ/waitingreservestransfers.pl
index c5fcaf16ad..ba94a9857c 100755
--- a/circ/waitingreservestransfers.pl
+++ b/circ/waitingreservestransfers.pl
@@ -78,7 +78,7 @@ foreach my $br (keys %$branches) {
 			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;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl
index 030d0435a2..08393251d9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl
@@ -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>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl
index 0587fefba2..3d4443c5b3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl
@@ -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>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css
index b14951dbc7..18f7fb6e9c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css
@@ -64,3 +64,32 @@ legend {
 	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 */
+
-- 
2.20.1