From 3934850a81ba6fedca3fb6d03618f0153fb79b25 Mon Sep 17 00:00:00 2001
From: oleonard <oleonard>
Date: Sat, 3 Sep 2005 13:48:55 +0000
Subject: [PATCH] Overhaul of barcodes generation interface for NPL.  Not it
 should actually work.

---
 .../npl/en/barcodes/barcodes.tmpl             | 137 +++++++-----------
 .../npl/en/barcodes/printerConfig.tmpl        |   6 +-
 .../en/includes/doc-head-barcodes-close.inc   |  56 ++++---
 3 files changed, 82 insertions(+), 117 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/npl/en/barcodes/barcodes.tmpl b/koha-tmpl/intranet-tmpl/npl/en/barcodes/barcodes.tmpl
index d44fcae1fb..b2b24f99b1 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/barcodes/barcodes.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/barcodes/barcodes.tmpl
@@ -1,111 +1,80 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Advanced Search<!-- TMPL_INCLUDE NAME="doc-head-barcodes-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Barcodes Generator<!-- TMPL_INCLUDE NAME="doc-head-barcodes-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 <div id="main">
 
-<!-- ******************************************************************************************************** -->
-<!-- ******                              END OF ADD COUNTRY CODE PANEL                                 ****** -->
-<!-- ******************************************************************************************************** -->
+<!--   START OF ADD COUNTRY CODE PANEL  -->
+<div class="countryPanel" id="addCountryCode">
+ 	<form action="/cgi-bin/koha/barcodes/barcodes.pl" method="post" style="display:inline">
+		<input type="hidden" name="addCode" value="1" />
+<h4>Add a new Country Code</h4>
+<ul>
+	<li><label for="countryName">Country Name:</label> <input type="text" size="10" id="countryName" name="countryName" /></li>
+	<li><label for="countryCode">Country Code:</label> <input type="text" size="3" id="countryCode" name="countryCode" /></li>
+</ul>
+<p><input type="submit" name="submit" id="submit" class="submit" value="Save Code"/>
+<input type="button" name="cancel" id="cancel" class="cancel" value="Cancel" onclick="document.getElementById('addCountryCode').style.display = 'none'" /></p>
+	</form>
+</div>
+
+<!--   END OF ADD COUNTRY CODE PANEL  -->
 
-<div class="data">
 	<h1>Barcodes Generator</h1>
-	<ul>
+	<h3>Generate barcodes from inventory codes</h3>
+	<div class="help"><ul class="notes">
 		<li>Select a range of inventary codes. You can choose a continuous range or individual inventory codes</li>
 		<li>Select the standard type to generate barcodes.</li>
 		<li>Define the page size for output the PDF.</li>
 		<li>Depending on page size, Koha will show you how the page is arranged
-		    for each barcode. You can define wich point to start printing the page.
+		    for each barcode. You can define which point to start printing the page.
 		</li>
-	</ul>
+	</ul></div>
+	
+<!-- TMPL_IF NAME="ERROR" -->Can't find inventory codes in that range. Please try again.<!-- /TMPL_IF -->
 
 	<form id="formulario" method="POST" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" name="form1" onsubmit="return checkFields(this);" target="_blank">
-		
-		<table class="myTable" border="1">
-		<caption>Generate barcodes from inventory codes</caption>
-			<!-- TMPL_IF NAME="ERROR" -->
-			<tr>
-				<td colspan="2">
-					<p class="error">Can't find inventory codes in that range. Please try again.</p>
-				</td>
-			</tr>
-			<!-- /TMPL_IF -->
-  			<tr>
-				<td><label for="rangeType">Type of Interval:</label> <!-- TMPL_VAR NAME="RANGE_TYPE" --></td>
-				<td> 
-					<div id="continuous" class="panel" style="display:inline">
-						<table class="ranges">
-							<tr>
-					   			<td>From:</td> 
-								<td><input id="from" type="text" name="from" size="20"></td>
-							</tr>
-							<tr>
-					   			<td>To:</td>
-								<td><input id="to" type="text" name="to" size="20"></td>
-							</tr>
-						</table>
-					</div> 
- 				    <div id="individuals" class="panel" style="display:none">
-						<table class="ranges">
-							<tr>
-								<td width="5%">
-									Inventory Code <BR>
-									<input id="inventaryCode" type="text" name="inventaryCode" size="20">
-								<td>
-								<td>	
-									<a href="#" onclick="addItem(); return false;">&lt;&lt;</a><br>
-									<a href="#" onclick="removeItem(); return false;">&gt;&gt;</a>
-								</td>
-								<td width="95%">		   
-									<select id="inventaryList" size="5" style="width:150px">
-									</select>
-									<input type="hidden" id="individualCodes" name="individualCodes">																						
-								</td>
-							</tr>
-						</table>	
-					</div>						
-				</td> <!-- Fin Rangos -->
-			</tr>
-			<tr> 
-				<td><label for="numbersystem">Country Code:</label> <div style="display:inline">
-									<a href="#" onclick="addCountryCode(); return false;">+</a>
-									<!-- TMPL_VAR NAME="NUMBER_SYSTEM" -->
-									<div class="countryPanel" style="position:absolute" id="addCountryCode">
- 	<form action="/cgi-bin/koha/barcodes/barcodes.pl" method="post" style="display:inline">
-		<input type="hidden" name="addCode" value="1">
-		<table>
-			<tr><th colspan="2">Add a new Country Code</th></tr>
-			<tr><td><label for="countryName">Country Name:</label></td><td><input type="text" size="10" id="countryName" name="countryName" /></td></tr>
-			<tr><td><label for="countryCode">Country Code:</label></td><td><input type="text" size="3" id="countryCode" name="countryCode" /></td></tr>
-			<tr>
-				<td><input type="submit" name="submit" id="submit" value="Save Code" class="submit" /></td>
-	<td><input type="button" name="cancel" id="cancel" value="Cancel" onclick="document.getElementById('addCountryCode').style.display = 'none'" class="cancel" /></td></tr>
-		</table>
-	</form>
+
+<div class="data">
+<table>
+	<tr><th><label for="rangeType">Type of Interval: </label></th><td><!-- TMPL_VAR NAME="RANGE_TYPE" --><div id="continuous" class="panel" style="display:block">
+	<ul>
+		<li><label for="from">From:</label><input id="from" type="text" name="from" size="20" /></li>
+		<li><label for="to">To:</label><input id="to" type="text" name="to" size="20" /></li>
+	</ul>
 </div>
-								</div>
-				</td>
-				<td><label for="pageType">Page Size</label> <input type="text" name="pageType" id="pageType" readonly value="<!-- TMPL_VAR NAME="PAGES" -->" size="10"> <a href="/cgi-bin/koha/barcodes/printerConfig.pl">[Go to Printer Configuration]</a></td>
-			</tr>
-			<tr> 
-				<td colspan="2"><label for="text_under_label">Text under label: </label>	<input type="text" name="text_under_label" id="text_under_label" size="40" value="<!-- TMPL_VAR name="text_under_label -->"> <p>If this field is empty, author and title will be used instead</p></td>
-			</tr></table>
 
-						    	<table style="width:50%">
+					 
+ <div id="individuals" class="panel" style="display:none;">
+<label for="inventaryCode">Inventory Code: </label><input id="inventaryCode" type="text" name="inventaryCode" size="20" />
+<a href="#" onclick="addItem(); return false;">[+]</a>	
+<a href="#" onclick="removeItem(); return false;">[-]</a>
+<select id="inventaryList" size="5" style="width:150px">
+</select>
+<input type="hidden" id="individualCodes" name="individualCodes">																						
+</div></td></tr>		
+	<tr><th><label for="numbersystem">Country Code: </label></th><td><!-- TMPL_VAR NAME="NUMBER_SYSTEM" --><a href="#" onClick="addCountryCode(); return false;">[+]</a></td></tr>		
+	<tr><th><label for="pageType">Page Size: </label></th><td><input type="text" id="pageType" name="pageType" readonly="readonly" disabled="disabled" value="<!-- TMPL_VAR NAME="PAGES" -->"  size="10" /><a href="/cgi-bin/koha/barcodes/printerConfig.pl">[Go to Printer Configuration]</a></td></tr>		
+	<tr><th><label for="text_under_label">Text under label: </label></th><td><input type="text" id="text_under_label" name="text_under_label" size="40" value="<!-- TMPL_VAR name="text_under_label -->" /> If this field is empty, author and title will be used instead</td></tr>		
+		
+</table></div>
+
+			    	<table>
 						<tr>
 							<th colspan="<!-- TMPL_VAR NAME="COL_SPAN" -->">Label number to start printing</th>
 						</tr>
 						<!-- TMPL_LOOP NAME="LABEL_TABLE" -->
 							<tr>
 								<!-- TMPL_LOOP NAME="columns" -->
-									<td style="white-space: nowrap;">
-										<input type="radio" id="label" value="<!-- TMPL_VAR NAME="tagname" -->" name="label" <!-- TMPL_VAR NAME="check" -->>  Label  <!-- TMPL_VAR NAME="labelname" --></td>
+									<td>
+										<input type="radio" id="label" value="<!-- TMPL_VAR NAME="tagname" -->" name="label" <!-- TMPL_VAR NAME="check" --> />  Label  <!-- TMPL_VAR NAME="labelname" --></td>
 								<!-- /TMPL_LOOP -->
 							</tr>
 						<!-- /TMPL_LOOP -->  			    
 					</table>
-					
-<p><input type="submit" value="Generate Barcodes" name="B1" class="submit"></p>
-	</form>
-</div>
+
+<input type="submit" value="Generate Barcodes" class="submit" name="B1" />
+<input type="reset" value="Clear Fields" class="cancel" name="B2" />
+</form>
 </div>
+
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/barcodes/printerConfig.tmpl b/koha-tmpl/intranet-tmpl/npl/en/barcodes/printerConfig.tmpl
index 6ad8af26f3..787c87efe2 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/barcodes/printerConfig.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/barcodes/printerConfig.tmpl
@@ -6,17 +6,17 @@
 
 	<h1>Printer Configuration</h1>
 	<h3>Set the printer configuration corresponding to your environment</h3>
-	<ul>
+	<div class="help"><ul class="notes">
 		<li>Set width and height of the label that you are going to work with.</li>
 		<li>Set your system's default DPI.</li>
 		<li>Set the page size.</li>
 		<li>Select how many columns and rows are in your page size.</li>
 		<li>Set the left margin bottom margin the page that you are going to use. This parameters will help to center the barcodes into the labels.</li>
-	</ul>
+	</ul></div>
 
 	<form id="formulario" method="POST" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" name="form1">
 		<input type="hidden" name="saveSettings" value="1">
-		<div class="table"><table border="1" class="myTable">
+		<div class="data"><table border="1" class="myTable">
 			<tr>
 				<th>Label width (in mm)</th>
 				<th>Label height (in mm)</th>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-barcodes-close.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-barcodes-close.inc
index 3b79ea5ece..812bfc299f 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-barcodes-close.inc
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-barcodes-close.inc
@@ -4,39 +4,35 @@
 <style type="text/css"> 
 	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
 </style>
-<style>
-.parameters {
-	background-color: #86c268;
-	color: #FFFFFF;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-a.parameters:hover {
-	background-color: #86c268;
-	color: #FFFFFF;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-.ranges {
-	border:0;
+<style type="text/css">
+.panel { 
+	position:relative;
 }
 
-.myTable TD{
-  border-width: 0px;
-  border-color: navy;
-  border-style: solid;
+.countryPanel {
+	background-color : #D8DEB8;
+	z-index : 1;
+	width : 300px;
+	display : none;
+	border-top : 2px outset #FFFFCC;
+	border-left : 2px outset #FFFFCC;
+	border-right : 2px outset #000000;
+	border-bottom : 2px outset #000000;
+	padding : 0;
+	position : absolute;
+	font-size : 80%;
 }
 
-.panel { 
-	position:relative;
+.countryPanel h4 {
+	background-color : #EFF1D8;
+	color : #000066;
+	margin : 0;
+	padding : 3px;
+	text-align : center;
 }
 
-.countryPanel {
-	z-index:1;
-	width:300px;
-	display:none;
-	border:1px solid #000000;
-	padding:0px;
+.countryPanel p {
+	text-align : center;
 }
 </style>
 
@@ -193,9 +189,9 @@ function removeItem() {
 	function addCountryCode() {
 		var panel = document.getElementById('addCountryCode');
 		panel.style.display = 'inline';
-		panel.style.top = mouseY;
-		panel.style.left = mouseX;
+		panel.style.top = mouseY+'px';
+		panel.style.left = mouseX+'px';
 	}
 </script>
 </head>
-<body onload="javascript: changeRange(document.getElementById('rangeType'))">
\ No newline at end of file
+<body onload="changeRange(document.getElementById('rangeType'))">
\ No newline at end of file
-- 
2.39.5