[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en acqui.simpl... [dev_week]

Owen Leonard oleonard at athenscounty.lib.oh.us
Tue Sep 19 15:22:12 CEST 2006


CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Owen Leonard <oleonard>	06/09/19 13:22:12

Modified files:
	koha-tmpl/intranet-tmpl/npl/en/acqui.simple: addbooks.tmpl 
	koha-tmpl/intranet-tmpl/npl/en/acqui: acquire.tmpl basket.tmpl 
	koha-tmpl/intranet-tmpl/npl/en/circ: circulation.tmpl 
	                                     returns.tmpl 
	koha-tmpl/intranet-tmpl/npl/en/includes: intranet.css 
	koha-tmpl/intranet-tmpl/npl/en: intranet-main.tmpl request.tmpl 
	koha-tmpl/intranet-tmpl/npl/en/members: moremember-print.tmpl 
	                                        moremember.tmpl 
	koha-tmpl/intranet-tmpl/npl/en/parameters: itemtypes.tmpl 
	koha-tmpl/intranet-tmpl/npl/en/search.marc: result.tmpl 

Log message:
	

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbooks.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.4.2.5&r2=1.4.2.5.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acquire.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3&r2=1.1.2.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.4.2.1&r2=1.2.2.4.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.6.2.17.2.2&r2=1.6.2.17.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/circ/returns.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.4&r2=1.2.2.4.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/includes/intranet.css?cvsroot=koha&only_with_tag=dev_week&r1=1.5.2.17.2.1&r2=1.5.2.17.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/intranet-main.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.4.2.4.2.2&r2=1.4.2.4.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/request.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.2&r2=1.3.2.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/members/moremember-print.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2&r2=1.1.2.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.5.2.10.2.3&r2=1.5.2.10.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/itemtypes.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.4.2.5&r2=1.4.2.5.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc/result.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.5.2.4.2.1&r2=1.5.2.4.2.2

Patches:
Index: acqui.simple/addbooks.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/Attic/addbooks.tmpl,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.5.2.1
diff -u -b -r1.4.2.5 -r1.4.2.5.2.1
--- acqui.simple/addbooks.tmpl	25 Aug 2005 18:28:32 -0000	1.4.2.5
+++ acqui.simple/addbooks.tmpl	19 Sep 2006 13:22:11 -0000	1.4.2.5.2.1
@@ -47,11 +47,6 @@
 			
 		<!-- /TMPL_IF -->
 
-<!-- Display for NPL //
-<form action="/intranet-bcd.php" method="post">
-	<div class="data"><table><caption>Cataloging Item Search by Barcode</caption><tr><th><label for="barcode"><span class="accesskey">B</span>arcode: </label></th><td><input type="text" size="14" maxlength="14" name="barcode" id="barcode" accesskey="b" /> <input type="submit" class="submit" value="Submit" /></td></tr></table></div>
-</form>
-//Display for NPL -->
 </div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: acqui/acquire.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/acquire.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -u -b -r1.1.2.3 -r1.1.2.3.2.1
--- acqui/acquire.tmpl	26 Jan 2006 21:47:09 -0000	1.1.2.3
+++ acqui/acquire.tmpl	19 Sep 2006 13:22:11 -0000	1.1.2.3.2.1
@@ -27,6 +27,7 @@
 	</script>
 	<form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post">
 	<h1><!-- TMPL_VAR NAME="ordernumber" --> - Receive Order</h1>
+	<div class="data">
 	<ul><li>Shopping Basket For: <!-- TMPL_VAR NAME="name" --></li>
 		<li>Order placed: <!-- TMPL_VAR NAME="date" --></li>
 	</ul>
@@ -34,98 +35,95 @@
 	<table>
 	<caption>Catalogue Details</caption>
 		<tr>
-			<td><b>Title *</b></td>
-			<td><input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
+			<th scope="row"><label for="title" class="required">Title</label></th>
+			<td><input type="text" size="20" name="title" id="title" value="<!-- TMPL_VAR NAME="title" -->" />
 			</td>
 		</tr>
 		<tr>
-			<td>Author</td>
-			<td><input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" />
+			<th scope="row"><label for="author">Author</label></th>
+			<td><input type="text" size="20" name="author" id="author" value="<!-- TMPL_VAR NAME="author" -->" />
 			</td>
 		</tr>
 		<tr>
-			<td>Copyright Date</td>
-			<td><input type="text" size="20" name="copyright" value="<!-- TMPL_VAR NAME="copyrightdate" -->" />
+			<th scope="row"><label for="copyright">Copyright Date</label></th>
+			<td><input type="text" size="20" name="copyright" id="copyright" value="<!-- TMPL_VAR NAME="copyrightdate" -->" />
 			</td>
 		</tr>
 		<tr>
-			<td>Format</td>
+			<th scope="row"><label for="">Format</label></th>
 			<td><!-- TMPL_VAR NAME="CGIitemtype" --></td>
 		</tr>
 		<tr>
-			<td>ISBN</td>
-			<td><input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /></td>
+			<th scope="row"><label for="ISBN">ISBN</label></th>
+			<td><input type="text" size="20" name="ISBN" id="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /></td>
 		</tr>
 		<tr>
-			<td>Series</td>
-			<td><input type="text" size="20" name="Series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /></td>
+			<th scope="row"><label for="Series">Series</label></th>
+			<td><input type="text" size="20" name="Series" id="Series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /></td>
 		</tr>
 		<tr>
-			<td>Branch</td>
+			<th scope="row"><label for="branch">Branch</label></th>
 			<td><!-- TMPL_VAR NAME="CGIbranch" --></td>
 		</tr>
 		<tr>
-			<td><b>Item Barcode *</b></td>
-			<td><input type="text" size="20" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" /></td>
+			<th scope="row"><label for="barcode" class="required">Item Barcode </label></th>
+			<td><input type="text" size="20" name="barcode" id="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" /></td>
 		</tr>
 		<tr>
-			<td><b>Volume Info (for serials) *</b></td>
-			<td><input type="text" size="20" name="volinf" /></td>
+			<th scope="row"><label for="volinf" class="required">Volume Info (for serials) </label></th>
+			<td><input type="text" size="20" name="volinf" id="volinf" /></td>
 		</tr>
-		<tr>
-			<td colspan=2 align="center">
-				<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-				<input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordernumber" -->" />
-				<input type="hidden" name="biblioitemnum" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />
-				<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="booksellerid" -->" />
-				<input type="hidden" name="freight" value="<!-- TMPL_VAR NAME="freight" -->" />
-				<input type="hidden" name="gst" value="<!-- TMPL_VAR NAME="gst" -->" />
+</table>
+		<p>		<input type="hidden" name="biblio" id="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+				<input type="hidden" name="ordnum" id="ordnum" value="<!-- TMPL_VAR NAME="ordernumber" -->" />
+				<input type="hidden" name="biblioitemnum" id="biblioitemnum" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />
+				<input type="hidden" name="id" id="id" value="<!-- TMPL_VAR NAME="booksellerid" -->" />
+				<input type="hidden" name="freight" id="freight" value="<!-- TMPL_VAR NAME="freight" -->" />
+				<input type="hidden" name="gst" id="gst" value="<!-- TMPL_VAR NAME="gst" -->" />
 				<!-- TMPL_IF name="catview" -->
 					<input type="submit" class="submit"  name="submit" value="Save" />
 				<!-- TMPL_ELSE -->
 					<a href="/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;id=<!-- TMPL_VAR NAME="booksellerid" -->">Edit</a>
-				<!-- /TMPL_IF -->
-			</td>
-		</tr>
-	</table>
+				<!-- /TMPL_IF --></p>
+		
 	<table>
 	<caption>Accounting Details</caption>
 		<tr>
-			<td><b>Bookfund *</b></td>
+			<th scope="row"><label for="bookfund" class="required">Bookfund </label></th>
 			<td><!-- TMPL_VAR NAME="CGIbookfund" -->
 		</tr>
 		<tr>
-			<td>Quantity Ordered</td>
-			<td><input type="text" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" />
+			<th scope="row"><label for="quantity">Quantity Ordered</label></th>
+			<td><input type="text" size="20" name="quantity" id="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" />
 			</td>
 		</tr>
 		<tr>
-			<td><b>Quantity Received *</b></td>
-			<td><input type="text" size="20" name="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->" />
+			<th scope="row"><label for="quantityrec" class="required">Quantity Received </label></th>
+			<td><input type="text" size="20" name="quantityrec" id="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->" />
 			</td>
 		</tr>
 		<tr>
-			<td>Replacement Cost</td>
-			<td><input type="text" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" />
+			<th scope="row"><label for="rrp">Replacement Cost</label></th>
+			<td><input type="text" size="20" name="rrp" id="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" />
 		</tr>
 		<tr>
-			<td>Budgeted Cost </td>
-			<td><input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" /></td>
+			<th scope="row"><label for="ecost">Budgeted Cost</label> </td>
+			<td><input type="text" size="20" name="ecost" id="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" /></td>
 		</tr>
 		<tr>
-			<td><b>Actual Cost *</b></td>
-			<td><input type="text" size="20" name="cost" value="<!-- TMPL_IF name="unitprice"--><!-- TMPL_VAR NAME="unitprice" --><!-- TMPL_ELSE --><!-- TMPL_VAR name="rrp" --><!-- /TMPL_IF -->" /></td>
+			<th scope="row"><label for="cost" class="required">Actual Cost </label></th>
+			<td><input type="text" size="20" name="cost" id="cost" value="<!-- TMPL_IF name="unitprice"--><!-- TMPL_VAR NAME="unitprice" --><!-- TMPL_ELSE --><!-- TMPL_VAR name="rrp" --><!-- /TMPL_IF -->" /></td>
 		</tr>
 		<tr>
-			<td>Invoice Number</td>
+			<th scope="row"><label for="invoice">Invoice Number</label></th>
 			<td>
 				<!-- TMPL_VAR NAME="invoice" -->
-				<input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->" />
+				<input type="hidden" name="invoice" id="invoice" value="<!-- TMPL_VAR NAME="invoice" -->" />
 			</td>
 		</tr>
 		<tr>
-			<td>Notes</td>
-			<td><input type="text" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" /></td>
+			<th scope="row"><label for="aqnotes">Notes</label></th>
+			<td><input type="text" size="20" name="notes" id="aqnotes" value="<!-- TMPL_VAR NAME="notes" -->" /></td>
 		</tr>
 	</table>
 	</form>
@@ -154,4 +152,5 @@
 	</table>
 <!-- /TMPL_IF -->
 </div>
+</div>
 <!-- TMPL_INCLUDE name="intranet-bottom.inc" -->

Index: acqui/basket.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/basket.tmpl,v
retrieving revision 1.2.2.4.2.1
retrieving revision 1.2.2.4.2.2
diff -u -b -r1.2.2.4.2.1 -r1.2.2.4.2.2
--- acqui/basket.tmpl	3 Aug 2006 18:09:39 -0000	1.2.2.4.2.1
+++ acqui/basket.tmpl	19 Sep 2006 13:22:11 -0000	1.2.2.4.2.2
@@ -4,9 +4,9 @@
 
 <div id="main">
 	<h1><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket <b><!-- TMPL_VAR NAME="basketno" --> </b>for <a href="supplier.pl?id=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1><br />
-	<!-- TMPL_UNLESS name="closedate" -->
+	
+		<div class="data"><!-- TMPL_UNLESS name="closedate" -->
 	<!-- TMPL_IF name="basketno" -->
-		<div class="data">
 			<table>
 			<caption>Basket Details</caption>
 			<tr><th>Managed By:</th><td><!-- TMPL_VAR NAME="authorisedbyname" --></td></tr>

Index: circ/circulation.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/Attic/circulation.tmpl,v
retrieving revision 1.6.2.17.2.2
retrieving revision 1.6.2.17.2.3
diff -u -b -r1.6.2.17.2.2 -r1.6.2.17.2.3
--- circ/circulation.tmpl	13 Jul 2006 21:09:25 -0000	1.6.2.17.2.2
+++ circ/circulation.tmpl	19 Sep 2006 13:22:11 -0000	1.6.2.17.2.3
@@ -193,7 +193,8 @@
 <!-- TMPL_IF NAME="borrowernumber" -->
 	<div class="details">
 	<form method="post" action="/cgi-bin/koha/circ/circulation.pl" name="mainform">
-<label for="barcode">Enter Item Barcode: </label><input name="barcode" size="14" maxlength="14" class="unfocus" onfocus="this.className='focus'" onblur="this.className='unfocus'" /> <input type="submit" value="Issue" class="submit" />	<!-- TMPL_IF name="SpecifyDueDate"	--><p class="date-select">
+<label for="barcode">Enter Item Barcode: </label><input name="barcode" size="14" maxlength="14" class="unfocus" onfocus="this.className='focus'" onblur="this.className='unfocus'" /> <input type="submit" value="Issue" class="submit" />
+<!-- TMPL_IF NAME="SpecifyDueDate" --><p class="date-select">
 			<label for="month">Specify Due Date: </label>
 			<select name="month" id="month">
 				<option value="0">Month</option>
@@ -252,16 +253,15 @@
 				<option value="2007"<!-- TMPL_IF NAME="year2007" --> selected="selected"<!-- /TMPL_IF -->>2007</option>
 				<option value="2008"<!-- TMPL_IF NAME="year2008" --> selected="selected"<!-- /TMPL_IF -->>2008</option>
 			</select>
-<label for="stickyduedate">Remember for Session:</label><input type="checkbox" id="stickyduedate" name="stickyduedate" <!-- TMPL_VAR NAME="selected" --> />   <!-- TMPL_ELSE --><input type="hidden" name="day" value="0" /><input type="hidden" name="month" value="0" /><input type="hidden" name="year" value="0" /><!-- /TMPL_IF -->
-		<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+<label for="stickyduedate">Remember for Session:</label><input type="checkbox" id="stickyduedate" name="stickyduedate" <!-- TMPL_VAR NAME="selected" --> />
+		</p><input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
 		<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
 		<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
 		<input type="hidden" name="print" value="maybe" />
 		<!-- TMPL_IF NAME="CHARGES" -->
 			<input type="hidden" name="charges" value="yes" />
 			<input type="hidden" name="oldamount" value="<!-- TMPL_VAR NAME="amountold" -->" />
-		<!-- /TMPL_IF -->
-		</p>
+		<!-- /TMPL_IF --><!-- TMPL_ELSE --><input type="hidden" name="day" value="0" /><input type="hidden" name="month" value="0" /><input type="hidden" name="year" value="0" /><!-- /TMPL_IF -->
 	</form>
 	</div>
 

Index: circ/returns.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/Attic/returns.tmpl,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.4.2.1
diff -u -b -r1.2.2.4 -r1.2.2.4.2.1
--- circ/returns.tmpl	9 Mar 2006 18:04:19 -0000	1.2.2.4
+++ circ/returns.tmpl	19 Sep 2006 13:22:11 -0000	1.2.2.4.2.1
@@ -17,8 +17,7 @@
 			<li><!-- TMPL_VAR Name="borstraddress" --><br />
 			<!-- TMPL_VAR Name="borcity" -->  <!-- TMPL_VAR NAME="borzip" --></li>
 			<li><!-- TMPL_VAR Name="borphone" --></li>
-			<!-- Display for NPL <!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_UNLESS NAME="intransit" --><a href="/intranet-intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->" onclick="window.open('/intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->','notify','width=650,height=450,location=no,menubar=no,toolbar=no,scrollbars=yes'); return false;"><!-- /TMPL_UNLESS --><!-- TMPL_VAR Name="boremail" --><!-- TMPL_UNLESS NAME="intransit" --></a><!-- /TMPL_UNLESS --></li><!-- /TMPL_IF -->  // Display for NPL -->
-<!-- Hide from NPL --><!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_UNLESS NAME="intransit" --><a href="mailto:<!-- TMPL_VAR Name="boremail" -->"><!-- /TMPL_UNLESS --><!-- TMPL_VAR Name="boremail" --><!-- TMPL_UNLESS NAME="intransit" --></a><!-- /TMPL_UNLESS --></li><!-- /TMPL_IF --><!-- /Hide from NPL -->
+<!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_UNLESS NAME="intransit" --><a href="mailto:<!-- TMPL_VAR Name="boremail" -->"><!-- /TMPL_UNLESS --><!-- TMPL_VAR Name="boremail" --><!-- TMPL_UNLESS NAME="intransit" --></a><!-- /TMPL_UNLESS --></li><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="debarred" --><li class="error">Patron is DEBARRED</li><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="gonenoaddress" --><li class="error">Patron's address is in doubt</li><!-- /TMPL_IF -->
 			</ul></td></tr>
@@ -65,8 +64,7 @@
 			<li><!-- TMPL_VAR Name="borstraddress" --><br />
 			<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
 			<li><!-- TMPL_VAR Name="borphone" --></li>
-			<!-- Display for NPL <!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_UNLESS NAME="intransit" --><a href="/intranet-intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->" onclick="window.open('/intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->','notify','width=650,height=450,location=no,menubar=no,toolbar=no,scrollbars=yes'); return false;"><!-- /TMPL_UNLESS --><!-- TMPL_VAR Name="boremail" --><!-- TMPL_UNLESS NAME="intransit" --></a><!-- /TMPL_UNLESS --></li><!-- /TMPL_IF --> // Display for NPL -->
-<!-- Hide from NPL --><!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_UNLESS NAME="intransit" --><a href="mailto:<!-- TMPL_VAR Name="boremail" -->"><!-- /TMPL_UNLESS --><!-- TMPL_VAR Name="boremail" --><!-- TMPL_UNLESS NAME="intransit" --></a><!-- /TMPL_UNLESS --></li><!-- /TMPL_IF --><!-- /Hide from NPL -->
+<!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_UNLESS NAME="intransit" --><a href="mailto:<!-- TMPL_VAR Name="boremail" -->"><!-- /TMPL_UNLESS --><!-- TMPL_VAR Name="boremail" --><!-- TMPL_UNLESS NAME="intransit" --></a><!-- /TMPL_UNLESS --></li><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="debarred" --><li class="error">Patron is DEBARRED</li><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="gonenoaddress" --><li class="error">Patron's address is in doubt</li><!-- /TMPL_IF -->
 			</ul></td></tr>

Index: includes/intranet.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/Attic/intranet.css,v
retrieving revision 1.5.2.17.2.1
retrieving revision 1.5.2.17.2.2
diff -u -b -r1.5.2.17.2.1 -r1.5.2.17.2.2
--- includes/intranet.css	11 Jul 2006 14:03:24 -0000	1.5.2.17.2.1
+++ includes/intranet.css	19 Sep 2006 13:22:11 -0000	1.5.2.17.2.2
@@ -677,6 +677,10 @@
 	display: inline;
 }
 
+.issued {
+	font-style : italic;
+}
+
 .menu input {
 	font-size: 80%;
 }

Index: intranet-main.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/Attic/intranet-main.tmpl,v
retrieving revision 1.4.2.4.2.2
retrieving revision 1.4.2.4.2.3
diff -u -b -r1.4.2.4.2.2 -r1.4.2.4.2.3
--- intranet-main.tmpl	13 Jul 2006 19:17:36 -0000	1.4.2.4.2.2
+++ intranet-main.tmpl	19 Sep 2006 13:22:11 -0000	1.4.2.4.2.3
@@ -16,7 +16,7 @@
 	<!-- TMPL_IF NAME="CAN_user_catalogue" --><dt><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">Catalog Search</a></dt>
 		<dd>Search bibilographic records
 <form name="f" method="post" action="/cgi-bin/koha/search.marc/search.pl"><input type="hidden" name="op" value="do_search" /><input type="hidden" name="type" value="intranet" /><input type="hidden" name="nbstatements" value="3" /><label for="keyword">Quick Search: </label><input type="hidden" name="marclist" value="" /><input type="hidden" name="and_or" value="and" /><input type="hidden" name="excluding" value="" /><input type="hidden" name="operator" value="contains" /><input type="text" id="keyword" name="value" size="25" /><input type="submit" value="Start search" class="submit"></form>
-		<ul><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">Advanced Search</a></li><!-- Display for NPL <li><a href="/item_report.php">Format Search</a></li> /Display for NPL --><li><a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual shelves</a></li></ul>
+		<ul><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">Advanced Search</a></li><li><a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual shelves</a></li></ul>
 		</dd><!-- /TMPL_IF --></dl></div>
 		<div id="submenu">
 <!-- TMPL_IF NAME="CAN_user_editcatalogue" --><dl>

Index: request.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/Attic/request.tmpl,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.2.2.1
diff -u -b -r1.3.2.2 -r1.3.2.2.2.1
--- request.tmpl	17 Feb 2005 20:56:59 -0000	1.3.2.2
+++ request.tmpl	19 Sep 2006 13:22:11 -0000	1.3.2.2.2.1
@@ -8,10 +8,10 @@
 <input type="hidden" name="type" value="str8" />
 <input type="hidden" name="title" value="<!-- TMPL_VAR Name="title" -->" />
 
-<h3>Add Reserve for
+<h2>Add Reserve for
 <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="bib" -->"><!-- TMPL_VAR Name="title" --></a>
-<!-- TMPL_VAR Name="author" --></h3>
-<div class="form">
+<!-- TMPL_VAR Name="author" --></h2>
+<div class="data">
 	<table>
 		<tr><th>Rank</th><td>
 <select name="rank-request">
@@ -23,46 +23,42 @@
 			</select>
 			</td></tr>
 
-		<!-- Hide from NPL --><tr><th><label for="notes">Notes</label></th><td><input type="text" size="20" name="notes" id="notes"></tr><!-- /Hide from NPL -->
+		<tr><th><label for="rsvnotes">Notes</label></th><td><input type="text" size="20" name="notes" id="rsvnotes"></tr>
 		<tr><th><label for="date">Date</label></th><td><!-- TMPL_VAR name="date" --></td></tr>
 		<tr><th><label for="pickup">Pickup</label></th><td><!-- TMPL_VAR name="CGIbranch" --></td></tr>
-		<tr><th><label for="request">Request</label></th><td><input type="checkbox" name="request" id="request" value="any">Next Available, (or choose from list below)</tr>
-		<tr><th><label for="member">Card Number</label> <a href="/cgi-bin/koha/members/members-home.pl?quicksearch=1" onclick="PopWin(this, 'newwin', 300, 400); return false;">(Quick Search)</a></th><td><input type="text" size="10" name="member" id="member" /></td></tr>
+		<tr><th>Request</th><td><input type="checkbox" name="request" id="request" value="any" checked="checked" /><label for="request">Next Available, (or choose from list below)</label></tr>
+		<tr><th><label for="member">Card Number</label></th><td><input type="text" size="10" name="member" id="member" /> <a href="/cgi-bin/koha/members/members-home.pl?quicksearch=1" onclick="PopWin(this, 'newwin', 300, 400); return false;">(Quick Search)</a></td></tr>
 	</table>
 </div>
 
-	<div class="table"><table>
+	<div class="data"><table>
 <tr>
-	<!-- Hide from NPL --><th>Reserve</th><!-- /Hide from NPL -->
-	<th>Item Type</th>
-	<th>Call Number</th>
-	<!-- Hide from NPL --><th>Volume</th><!-- /Hide from NPL -->
-	<!-- Hide from NPL --><th>Pubdate</th><!-- /Hide from NPL -->
-	<th>Copies</th>
+	<th scope="col">Reserve</th>
+	<th scope="col">Item Type</th>
+	<th scope="col">Call Number</th>
+	<th scope="col">Pubdate</th>
+	<th scope="col">Copies</th>
 </tr>
 
 <!-- TMPL_LOOP Name="bibitemloop" -->
 	<tr>
-		<!-- Hide from NPL --><td>
+		<td>
 			<!-- TMPL_IF Name="itemlost" -->
 				Cannot be selected
 			<!-- TMPL_ELSE -->
-				<input type="checkbox" name="reqbib" value=<!-- TMPL_VAR Name="biblioitemnumber" -->>
-				<input type="hidden" name="biblioitem" value=<!-- TMPL_VAR Name="biblioitemnumber" -->>
+				<input type="checkbox" name="reqbib" value="<!-- TMPL_VAR Name="biblioitemnumber" -->" checked="checked" />
+				<input type="hidden" name="biblioitem" value="<!-- TMPL_VAR Name="biblioitemnumber" -->" />
 			<!-- /TMPL_IF -->
-		</td><!-- /Hide from NPL -->
+		</td>
 		<td>
 			<!-- TMPL_VAR Name="description" -->
 		</td>
 		<td>
 			<!-- TMPL_IF NAME="class" --><!-- TMPL_VAR Name="class" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
 		</td>
-		<!-- Hide from NPL --><td>
-			<!-- TMPL_IF NAME="volumedesc" --><!-- TMPL_VAR Name="volumeddesc" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
-		</td><!-- /Hide from NPL -->
-		<!-- Hide from NPL --><td>
+		<td>
 			<!-- TMPL_IF NAME="publicationyear" --><!-- TMPL_VAR Name="publicationyear" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
-		</td><!-- /Hide from NPL -->
+		</td>
 		<td><ul>
 			<!-- TMPL_LOOP Name="barcodeloop" -->
 				<li><!-- TMPL_VAR Name="barcode" --> <!-- TMPL_VAR Name="message" --></li>
@@ -85,7 +81,7 @@
 		<th>Notes</th>
 		<th>Date</th>
 		<th>Pickup Location</th>
-		<!-- Hide from NPL --><th>Request</th><!-- /Hide from NPL -->
+		<th>Request</th>
 	</tr>
 
 	<!-- TMPL_LOOP Name="reserveloop" -->
@@ -127,7 +123,7 @@
 					</select>
 				<!-- /TMPL_IF -->
 			</td>
-<!-- Hide from NPL --><td>
+<td>
 				<!-- TMPL_IF Name="wait" -->
 					<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name=''biblionumber" --> &amp;type=intra">
 						<!-- TMPL_VAR Name="barcode" -->
@@ -142,7 +138,7 @@
 					<!-- /TMPL_IF -->
 				<!-- /TMPL_IF -->
 
-			</td><!-- /Hide from NPL -->
+			</td>
 		</tr>
 	<!-- /TMPL_LOOP -->
 </table>

Index: members/moremember-print.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/Attic/moremember-print.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.2.1
diff -u -b -r1.1.2.2 -r1.1.2.2.2.1
--- members/moremember-print.tmpl	15 Jul 2005 20:12:04 -0000	1.1.2.2
+++ members/moremember-print.tmpl	19 Sep 2006 13:22:11 -0000	1.1.2.2.2.1
@@ -16,7 +16,7 @@
 		<th>Title</th>
 		<th>Author</th>
 		<th>Format</th>
-		<!-- Hide from NPL --><th>Charge</th><!-- /Hide from NPL -->
+		<th>Charge</th>
 		<th>Replacement Cost</th>
 		<th>Date Due</th>
 		<th>Status</th>
@@ -33,7 +33,7 @@
 		</td>
 		<td><!-- TMPL_VAR NAME="author" --></td>
 		<td><!-- TMPL_VAR NAME="itemtype" --></td>
-		<!-- Hide from NPL --><td class="credit"><!-- TMPL_VAR NAME="charge" --></td><!-- /Hide from NPL -->
+		<td class="credit"><!-- TMPL_VAR NAME="charge" --></td>
 		<td class="credit"><!-- TMPL_VAR NAME="replacementprice" --></td>
 		<td><!-- TMPL_VAR NAME="date_due" --></td>
 		<td><!-- TMPL_IF NAME="red" -->Overdue!<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>

Index: members/moremember.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/Attic/moremember.tmpl,v
retrieving revision 1.5.2.10.2.3
retrieving revision 1.5.2.10.2.4
diff -u -b -r1.5.2.10.2.3 -r1.5.2.10.2.4
--- members/moremember.tmpl	21 Jul 2006 17:46:48 -0000	1.5.2.10.2.3
+++ members/moremember.tmpl	19 Sep 2006 13:22:11 -0000	1.5.2.10.2.4
@@ -134,7 +134,7 @@
 		<th>Title</th>
 		<th>Due</th>
 		<th>Itemtype</th>
-		<!-- Hide from NPL --><th>Charge</th><!-- /Hide from NPL -->
+		<th>Charge</th>
 		<th>Price</th>
 		<!-- TMPL_UNLESS NAME="unvalidlibrarian"--><th>Renew</th><!-- /TMPL_UNLESS -->
 		<th>Return</th>
@@ -152,7 +152,7 @@
 		</td>
 		<td><!-- TMPL_VAR name="date_due" --></td>
 		<td><!-- TMPL_VAR name="itemtype" --></td>
-		<!-- Hide from NPL --><td class="credit"><!-- TMPL_VAR name="charge" --></td><!-- /Hide from NPL -->
+		<td class="credit"><!-- TMPL_VAR name="charge" --></td>
 		<td class="credit"><!-- TMPL_VAR name="replacementprice" --></td>
 		<!-- TMPL_UNLESS NAME="unvalidlibrarian"--><td>
 		<!-- TMPL_IF name="norenew" -->
@@ -207,8 +207,8 @@
 		<!-- /TMPL_IF --></form>
 
 
-<!-- Hide from NPL --><h1>Reading Record</h1>
-<form class="inline" action="/cgi-bin/koha/readingrec.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->" /> <input type="submit" class="submit" value="View Patron's Reading Record" /></form><!-- /Hide from NPL -->
+<h1>Reading Record</h1>
+<form class="inline" action="/cgi-bin/koha/readingrec.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->" /> <input type="submit" class="submit" value="View Patron's Reading Record" /></form>
 
 </div>
 

Index: parameters/itemtypes.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/Attic/itemtypes.tmpl,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.5.2.1
diff -u -b -r1.4.2.5 -r1.4.2.5.2.1
--- parameters/itemtypes.tmpl	9 Mar 2006 20:24:55 -0000	1.4.2.5
+++ parameters/itemtypes.tmpl	19 Sep 2006 13:22:11 -0000	1.4.2.5.2.1
@@ -61,7 +61,7 @@
 	<tr><th>Description</th><td><!-- TMPL_VAR name="description" --></td></tr>
 	<tr><th>Loan length</th><td><!-- TMPL_VAR name="loanlength" --></td></tr>
 	<tr><th>Renewals</th><td><!-- TMPL_IF name="renewalsallowed" -->Allowed<!-- TMPL_ELSE -->Not allowed<!-- /TMPL_IF --></td></tr>
-<!-- Hide from NPL  --><tr><th>Rental charge</th><td><!-- TMPL_VAR name="rentalcharge" --></td></tr><!-- Hide from NPL --></table></div>
+<tr><th>Rental charge</th><td><!-- TMPL_VAR name="rentalcharge" --></td></tr></table></div>
 		<div class="tabitem"><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
 		<input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" -->" /><!-- TMPL_IF name="total" -->
 		</form><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="OK" class="submit" /></form>

Index: search.marc/result.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc/Attic/result.tmpl,v
retrieving revision 1.5.2.4.2.1
retrieving revision 1.5.2.4.2.2
diff -u -b -r1.5.2.4.2.1 -r1.5.2.4.2.2
--- search.marc/result.tmpl	11 Jul 2006 14:03:24 -0000	1.5.2.4.2.1
+++ search.marc/result.tmpl	19 Sep 2006 13:22:11 -0000	1.5.2.4.2.2
@@ -46,7 +46,7 @@
 					</p></td>
 					<td><!-- TMPL_VAR NAME="classification" --></td>
 			<td><!-- TMPL_VAR NAME="totitem" --></td>
-<td><!-- TMPL_LOOP NAME="CN" --><!-- TMPL_VAR NAME="holdingbranch" --><!-- TMPL_IF name="date_due" --> (due <!-- TMPL_VAR NAME="date_due" -->)	<!-- TMPL_ELSE --><!-- TMPL_IF NAME="itemcallnumber" -->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- TMPL_IF name="cnt" --> x <!-- TMPL_VAR name="cnt" --> <!--/TMPL_IF--><!-- /TMPL_IF --><!-- /TMPL_IF --><br /><!-- /TMPL_LOOP --></td><td><!-- TMPL_UNLESS name="norequests" --><a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">Reserves</a><!-- TMPL_ELSE -->Not Reservable<!-- /TMPL_UNLESS --></td>
+<td style="white-space : nowrap;"><!-- TMPL_LOOP NAME="CN" --><!-- TMPL_VAR NAME="holdingbranch" --><!-- TMPL_IF name="date_due" --> <span class="issued">(due <!-- TMPL_VAR NAME="date_due" -->)</span>	<!-- TMPL_ELSE --><!-- TMPL_IF NAME="itemcallnumber" --> (<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- TMPL_IF name="cnt" --> x <!-- TMPL_VAR name="cnt" --> <!--/TMPL_IF--><!-- /TMPL_IF --><!-- /TMPL_IF --><br /><!-- /TMPL_LOOP --></td><td><!-- TMPL_UNLESS name="norequests" --><a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">Reserves</a><!-- TMPL_ELSE -->Not Reservable<!-- /TMPL_UNLESS --></td>
 		</tr>
 	<!-- /TMPL_LOOP -->
 </table></div>





More information about the Koha-cvs mailing list