[Koha-cvs] koha/koha-tmpl/intranet-tmpl/ccfls/en circ/circ... [dev_week]

Kyle Hall kyle.m.hall at gmail.com
Tue Aug 28 13:56:26 CEST 2007


CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Kyle Hall <kylemhall>	07/08/28 11:56:26

Modified files:
	koha-tmpl/intranet-tmpl/ccfls/en/circ: circulation.tmpl 
	koha-tmpl/intranet-tmpl/ccfls/en/includes: intranet.css 

Log message:
	Added a bit of code to make items that are overdue but within grace period (firstremind) 'yellow' instead of red. Overdues past grace are still red. The changes to the templates do not affect Koha installations running standard circulation.pl

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/circ/circulation.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.19&r2=1.1.2.1.2.20
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/includes/intranet.css?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.2&r2=1.1.2.1.2.3

Patches:
Index: circ/circulation.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/circ/Attic/circulation.tmpl,v
retrieving revision 1.1.2.1.2.19
retrieving revision 1.1.2.1.2.20
diff -u -b -r1.1.2.1.2.19 -r1.1.2.1.2.20
--- circ/circulation.tmpl	16 Aug 2007 16:22:10 -0000	1.1.2.1.2.19
+++ circ/circulation.tmpl	28 Aug 2007 11:56:26 -0000	1.1.2.1.2.20
@@ -85,6 +85,11 @@
 		<!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->
 		<div class="error">
 		<h3>Please Confirm Checkout:</h3>
+<!-- TEMPORY RESERVES HACK FOR CCFLS -->
+			<!-- TMPL_IF NAME="FAKE_RESERVE" -->
+				<p>This item has a note attached, it may be a reserve: <i><!-- TMPL_VAR name="FAKE_RESERVE" --></i></p>
+			<!-- /TMPL_IF -->
+<!-- END OF HACK FOR CCFLS -->
 			<!-- TMPL_IF NAME="DEBT" -->
 				<p>The patron has a debt of $<!-- TMPL_VAR name="DEBT" --></p>
 			<!-- /TMPL_IF -->
@@ -180,21 +185,26 @@
 
 
 <!-- TMPL_IF NAME="flagged" -->
-</div><div class="details">
-<ul>
-<!-- TMPL_LOOP NAME="issued_itemtypes_count_loop" -->
-<!-- TMPL_IF NAME="flag" --><li>Patron has reached the <span class="error"><!-- TMPL_VAR NAME="description" --> checkout limit</span></li><!-- /TMPL_IF -->
-<!-- /TMPL_LOOP -->
-<!--TMPL_IF Name="warndeparture"--><li><span class="error">Patron Expiration:</span> Patron Expires on <!-- TMPL_VAR NAME="expiry" --> <form class="inline compact" action="/cgi-bin/koha/members/setstatus.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" value="circ" name="destination" /><input type="hidden" name="renewaldate" value="<!-- TMPL_VAR NAME="renewaldate" -->" /><input type="submit" class="cancel" value="Renew" ></form> <form class="inline compact" action="/cgi-bin/koha/members/memberentry.pl" method="get"><input type="hidden" name="modify" value="edit" /><input type="hidden" name="destination" value="circ" /><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="submit" class="cancel" value="Edit Details" /></form></li><!--/TMPL_IF-->
-<!-- TMPL_IF NAME="gna" -->
-<li><span class="error">Address:</span> Patron's address in doubt</li>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="lost" -->
-<li><span class="error">Lost:</span> Patron's card is lost</li>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="dbarred" -->
-<li><span class="error">Debarred:</span> Patron is restricted <form class="inline compact" action="/cgi-bin/koha/members/setstatus.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" value="circ" name="destination" /><input type="hidden" name="status" value="0" /><input type="submit" class="submit" value="Lift Restriction" /></form></li>
-<!-- /TMPL_IF -->
+  </div>
+  <div class="details">
+    <ul>
+      <!-- TMPL_LOOP NAME="issued_itemtypes_count_loop" -->
+        <!-- TMPL_IF NAME="flag" --><li>Patron has reached the <span class="error"><!-- TMPL_VAR NAME="description" --> checkout limit</span></li><!-- /TMPL_IF -->
+      <!-- /TMPL_LOOP -->
+
+  <!--TMPL_IF Name="warndeparture"--><li><span class="error">Patron Expiration:</span> Patron Expires on <!-- TMPL_VAR NAME="expiry" --> <form class="inline compact" action="/cgi-bin/koha/members/setstatus.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" value="circ" name="destination" /><input type="hidden" name="renewaldate" value="<!-- TMPL_VAR NAME="renewaldate" -->" /><input type="submit" class="cancel" value="Renew" ></form> <form class="inline compact" action="/cgi-bin/koha/members/memberentry.pl" method="get"><input type="hidden" name="modify" value="edit" /><input type="hidden" name="destination" value="circ" /><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="submit" class="cancel" value="Edit Details" /></form></li><!--/TMPL_IF-->
+
+  <!-- TMPL_IF NAME="gna" -->
+    <li><span class="error">Address:</span> Patron's address in doubt</li>
+  <!-- /TMPL_IF -->
+
+  <!-- TMPL_IF NAME="lost" -->
+    <li><span class="error">Lost:</span> Patron's card is lost</li>
+  <!-- /TMPL_IF -->
+
+  <!-- TMPL_IF NAME="dbarred" -->
+    <li><span class="error">Debarred:</span> Patron is restricted <form class="inline compact" action="/cgi-bin/koha/members/setstatus.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" value="circ" name="destination" /><input type="hidden" name="status" value="0" /><input type="submit" class="submit" value="Lift Restriction" /></form></li>
+  <!-- /TMPL_IF -->
 
 <!-- Hide for the CCFLS
   <!-- TMPL_IF name="odues" -->
@@ -361,7 +371,13 @@
 		<tr><th colspan="8"><a name="previous" id="previous">Previous Checkouts</a></th></tr>
 		<!-- TMPL_LOOP NAME="previssues" -->
 			<!-- TMPL_IF NAME="togglecolor" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
-			<td><!-- TMPL_IF NAME="od" --><span class="error"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="dd" --><!-- TMPL_IF NAME="od" --></span><!-- /TMPL_IF --></td>
+			<td>
+				<!-- TMPL_IF NAME="od" --><span class="error"><!-- /TMPL_IF -->
+				<!-- TMPL_IF NAME="pastGrace" --><span class="warning"><!-- /TMPL_IF -->
+					<!-- TMPL_VAR NAME="dd" -->
+				<!-- TMPL_IF NAME="pastGrace" --></span><!-- /TMPL_IF -->
+				<!-- TMPL_IF NAME="od" --></span><!-- /TMPL_IF -->
+			</td>
 			<td><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --></a><br/><i><!-- TMPL_VAR name="itemnotes" --></i></td>
 			<td><!-- TMPL_VAR NAME="author" --></td>
 			<td><!-- TMPL_VAR NAME="itemcallnumber" --></td>

Index: includes/intranet.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/includes/Attic/intranet.css,v
retrieving revision 1.1.2.1.2.2
retrieving revision 1.1.2.1.2.3
diff -u -b -r1.1.2.1.2.2 -r1.1.2.1.2.3
--- includes/intranet.css	9 Jan 2007 13:34:42 -0000	1.1.2.1.2.2
+++ includes/intranet.css	28 Aug 2007 11:56:26 -0000	1.1.2.1.2.3
@@ -709,6 +709,12 @@
 	font-weight : bold;
 }
 
+.warning {
+	color : darkorange;
+	font-weight : bold;
+}
+
+
 .ex {
 	font-family : "Courier New", Courier, monospace;
 }
@@ -751,8 +757,8 @@
 	font-size : 80%;
 }
 
-input.focus {
-	background-color: #FFF;
+input:focus {
+	background-color: #ffff66;
 	border-bottom: 2px dashed #993300;
 }
 





More information about the Koha-cvs mailing list