From 7b11d2a2816f351e411c4f5fcd247603a1cfa855 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 5 May 2010 10:09:40 -0400
Subject: [PATCH] Fix for Bug 4453, Improve formatting of batch item operations

- includes fix for Bug 4443
- includes some string changes, could resubmit without if these
  changes block inclusion in 3.2

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
---
 .../prog/en/modules/tools/batchMod-del.tmpl   |  53 +++---
 .../prog/en/modules/tools/batchMod-edit.tmpl  | 152 +++++++++---------
 .../prog/en/modules/tools/batchMod.tmpl       |  21 +--
 3 files changed, 114 insertions(+), 112 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
index a7240a721d..47ea42c6a6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Tools &rsaquo; Batch Deletion of Items</title>
+<title>Koha &rsaquo; Tools &rsaquo; Batch item deletion</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="background-job.inc" -->
 <style type="text/css">
@@ -11,7 +11,9 @@
 <script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
          $(document).ready(function() {
-	    $("#itemst").tablesorter();
+	    $("#itemst").tablesorter({
+            widgets : ['zebra']
+    });
 	    $("#selectallbutton").click(function() {
 		$("#itemst").find("input:checkbox").each(function() {
 		    $(this).attr("checked", true);
@@ -34,14 +36,14 @@
 <div id="breadcrumbs">
 	<a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
 	<a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
-	<a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Delete batches of items</a>
+	<a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Batch item deletion</a>
 </div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc3" class="yui-t7">
     <div id="bd">
         <div id="yui-main">
             <div class="yui-b">
-                <h1>Batch deletion</h1>
+                <!-- TMPL_IF NAME="show" --><h1>Batch item deletion</h1><!-- TMPL_ELSE --><h1>Batch item deletion results</h1><!-- /TMPL_IF -->
 	    <!-- TMPL_IF NAME="barcode_not_unique" --><div class="dialog alert"><strong>Error saving item</strong>: Barcode must be unique.</div><!-- /TMPL_IF -->
 	    <!-- TMPL_IF NAME="no_next_barcode" --><div class="dialog alert"><strong>Error saving items</strong>: Unable to automatically determine values for barcodes. No item has been inserted.</div><!-- /TMPL_IF -->
 	    <!-- TMPL_IF NAME="book_on_loan" --><div class="dialog alert"><strong>Cannot Delete</strong>: item is checked out.</div><!-- /TMPL_IF -->
@@ -50,8 +52,8 @@
     <!-- TMPL_UNLESS name="action" -->
 
     <!-- TMPL_IF name="notfoundbarcodes" -->
-	    <div class="error"><p>Warning, the following barcodes were not found :</p>
-	    <table>
+	    <div class="dialog alert"><p>Warning, the following barcodes were not found :</p></div>
+	    <table style="margin:auto;">
 		<thead>
 		    <tr>
 			<th>Barcode</th>
@@ -62,9 +64,9 @@
 			<tr><td><!-- TMPL_VAR name="barcode" --></td></tr>
 		    <!-- /TMPL_LOOP -->
 		</tbody>
-	    </table></div>
+	    </table>
 	    <!-- TMPL_UNLESS name="too_many_items" -->
-	    <p>The following barcodes were found : </p>
+	    <h4>The following barcodes were found: </h4>
 	    <!-- /TMPL_UNLESS -->
 	<!-- /TMPL_IF -->
 
@@ -75,20 +77,20 @@
      <input type="hidden" name="completedJobID" id="completedJobID" value="" />
 
 <!-- TMPL_IF name="item_loop" -->
+	<!-- TMPL_IF NAME="show" --><div id="toolbar"><a id="selectallbutton" href="#">Select All</a> | <a id="clearallbutton" href="#">Clear All</a></div><!-- TMPL_ELSE --><!-- /TMPL_IF -->
 	<div id="cataloguing_additem_itemlist">
 		<div style="overflow:auto">
-		<div id="toolbar"><a id="selectallbutton" href="#">Select All</a> | <a id="clearallbutton" href="#">Clear All</a></div>
 		<table id="itemst">
 		    <thead>
 			<tr>
-			    <th>&nbsp;</th>
+			    <!-- TMPL_IF NAME="show" --><th>&nbsp;</th><!-- /TMPL_IF -->
 			    <!-- TMPL_LOOP NAME="item_header_loop" --> 
 			    <th> <!-- TMPL_VAR NAME="header_value" --> </th>
 			    <!-- /TMPL_LOOP --> 
 			</tr>
 		    </thead>
 		    <tbody>
-		    <!-- TMPL_LOOP NAME="item_loop" --> <tr> <!-- TMPL_IF Name="nomod"--> <td class="error">Cannot Edit</td><!--TMPL_ELSE--><td><input type="checkbox" name="itemnumber" value="<!--TMPL_VAR Name="itemnumber"-->" id="row<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" /></td><!--/TMPL_IF-->
+		    <!-- TMPL_LOOP NAME="item_loop" --> <tr> <!-- TMPL_IF NAME="show" --><!-- TMPL_IF Name="nomod"--> <td class="error">Cannot Edit</td><!--TMPL_ELSE--><td><input type="checkbox" name="itemnumber" value="<!--TMPL_VAR Name="itemnumber"-->" id="row<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" /></td><!--/TMPL_IF--><!--/TMPL_IF-->
 			<!-- TMPL_LOOP NAME="item_value" --> <td><!-- TMPL_VAR ESCAPE="HTML" NAME="field" --></td> 
 					<!-- /TMPL_LOOP --> </tr>
 		    <!-- /TMPL_LOOP -->
@@ -115,7 +117,7 @@
 <!-- TMPL_IF name="too_many_items" -->
     <p>Too many items (<!-- TMPL_VAR NAME="too_many_items" -->): not displaying each one individually.</p>
     <!-- TMPL_LOOP name="itemnumbers_hashref" -->
-        <input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
+  <input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
     <!-- /TMPL_LOOP -->
 <!-- /TMPL_IF -->   
 
@@ -129,18 +131,22 @@
 		    <div id="jobstatus">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
 		    <div id="jobfailed"></div>
 		</div>
-		<input type="submit" name="mainformsubmit" value="Go" onclick="return submitBackgroundJob(this.form);" />
-		<input type="button" value="Cancel" onclick="javascript:history.back();" />
+		<input type="submit" name="mainformsubmit" value="Delete selected items" onclick="return submitBackgroundJob(this.form);" />
+		<a href="/cgi-bin/koha/tools/batchMod.pl?del=1" class="cancel">Cancel</a>
 	    </fieldset>
 	</div>
 	<!-- /TMPL_IF -->
     <!-- /TMPL_UNLESS -->
 
+<!-- TMPL_ELSE -->
+    <p>No items found</p>
+<!-- /TMPL_IF -->
+
 <!-- TMPL_IF name="action" -->
-	<p><!-- TMPL_VAR NAME="deleted_items" --> item(s) deleted.</p>
+	<div class="dialog message"><p><!-- TMPL_VAR NAME="deleted_items" --> item(s) deleted.</p></div>
 	<!-- TMPL_IF NAME="not_deleted_items" -->
-	    <p><!-- TMPL_VAR NAME="not_deleted_items" --> item(s) could not be deleted : <!-- TMPL_LOOP NAME="not_deleted_itemnumbers" --><!-- TMPL_VAR NAME="itemnumber" --><!-- /TMPL_LOOP --></p>
-	<!-- /TMPL_IF -->
+	<div style="width:55%;margin:auto;">
+	    <p><!-- TMPL_VAR NAME="not_deleted_items" --> item(s) could not be deleted: <!-- TMPL_LOOP NAME="not_deleted_itemnumbers" --><!-- TMPL_VAR NAME="itemnumber" --><!-- /TMPL_LOOP --></p>
 	<!-- TMPL_IF NAME="not_deleted_loop" -->
 	<table id="itemst">
 		<thead>
@@ -154,23 +160,20 @@
 		    <!-- TMPL_LOOP name="not_deleted_loop" -->
 			<tr>
 			    <td><!-- TMPL_VAR name="itemnumber" --></td>
-			    <td><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR name="barcode" --></a></td>
+			    <td><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR name="barcode" --></a></td>
 			    <td><!-- TMPL_IF name="book_on_loan" -->Item is checked out<!-- TMPL_ELSIF name="book_reserved" -->Item has a waiting hold<!-- /TMPL_IF --></td>
 			</tr>
 		    <!-- /TMPL_LOOP -->
 		</tbody>
 	    </table>
-
+	<!-- /TMPL_IF -->
+	</div>
 	<!-- /TMPL_IF -->
 
-	<p><a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Back</a></p>
+	<p><a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Return to batch item deletion</a></p>
 <!-- /TMPL_IF -->
 
 </div>
-</div>
-        <div class="yui-b">
-            <!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
-        </div>
     </div>
 </div>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl
index 99fcbaa94c..7793f04431 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Tools &rsaquo; Batch Modification of Items</title>
+<title>Koha &rsaquo; Tools &rsaquo; Batch item modification</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="background-job.inc" -->
 <style type="text/css">
@@ -11,19 +11,21 @@
 <script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
          $(document).ready(function() {
-	    $("#itemst").tablesorter();
-	    $("#selectallbutton").click(function() {
-		$("#itemst").find("input:checkbox").each(function() {
-		    $(this).attr("checked", true);
-		});
-	    });
-	    $("#clearallbutton").click(function() {
-		$("#itemst").find("input:checkbox").each(function() {
-		    $(this).attr("checked", false);
-		});
-	    });
-
-	 });
+      $("#itemst").tablesorter({
+            widgets : ['zebra'],
+        headers: {0:{sorter: false}}
+    });
+      $("#selectallbutton").click(function() {
+    $("#itemst").find("input:checkbox").each(function() {
+        $(this).attr("checked", true);
+    });
+      });
+      $("#clearallbutton").click(function() {
+    $("#itemst").find("input:checkbox").each(function() {
+        $(this).attr("checked", false);
+    });
+      });
+   });
 //]]>
 </script>
 </head>
@@ -32,39 +34,36 @@
 <!-- TMPL_INCLUDE NAME="cat-search.inc"-->
 
 <div id="breadcrumbs">
-	<a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
-	<a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
-	<a href="/cgi-bin/koha/tools/batchMod.pl">Modify batches of items</a>
+  <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
+  <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
+  <a href="/cgi-bin/koha/tools/batchMod.pl">Batch item modification</a>
 </div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc3" class="yui-t7">
     <div id="bd">
         <div id="yui-main">
-            <div class="yui-b">
-                <h1>Batch modification</h1>
+            <!-- TMPL_IF NAME="show" --><h1>Batch item modification</h1><!-- TMPL_ELSE --><h1>Batch item modification results</h1><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="barcode_not_unique" --><div class="dialog alert"><strong>Error saving item</strong>: Barcode must be unique.</div><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="no_next_barcode" --><div class="dialog alert"><strong>Error saving items</strong>: Unable to automatically determine values for barcodes. No item has been inserted.</div><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="book_on_loan" --><div class="dialog alert"><strong>Cannot Delete</strong>: item is checked out.</div><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="book_reserved" --><div class="dialogalert"><strong>Cannot Delete</strong>: item has a waiting hold.</div><!-- /TMPL_IF -->
 
     <!-- TMPL_IF name="notfoundbarcodes" -->
-	    <div class="error"><p>Warning, the following barcodes were not found :</p>
-	    <table>
-		<thead>
-		    <tr>
-			<th>Barcode</th>
-		    </tr>
-		</thead>
-		<tbody>
-		    <!-- TMPL_LOOP name="notfoundbarcodes" -->
-			<tr><td><!-- TMPL_VAR name="barcode" --></td></td>
-		    <!-- /TMPL_LOOP -->
-		</tbody>
-	    </table></div>
-	    <!-- TMPL_UNLESS name="too_many_items" -->
-	    <p>The following barcodes were found : </p>
-	    <!-- /TMPL_UNLESS -->
-	<!-- /TMPL_IF -->
+      <div class="dialog alert"><p>Warning, the following barcodes were not found:</p></div>
+      <table style="margin:auto;">
+    <thead>
+        <tr><th>Barcodes not found</th></tr>
+    </thead>
+    <tbody>
+        <!-- TMPL_LOOP name="notfoundbarcodes" -->
+      <tr><td><!-- TMPL_VAR name="barcode" --></td></td>
+        <!-- /TMPL_LOOP -->
+    </tbody>
+      </table>
+      <!-- TMPL_UNLESS name="too_many_items" -->
+      <h4>The following barcodes were found: </h4>
+      <!-- /TMPL_UNLESS -->
+  <!-- /TMPL_IF --> <!-- /notfoundbarcodes -->
 
 <form name="f" action="batchMod.pl" method="post">
      <input type="hidden" name="op" value="<!-- TMPL_VAR NAME="op" -->" />
@@ -73,62 +72,62 @@
      <input type="hidden" name="completedJobID" id="completedJobID" value="" />
 
 <!-- TMPL_IF name="item_loop" -->
+  <!-- TMPL_IF NAME="show" --><div id="toolbar"><a id="selectallbutton" href="#">Select All</a> | <a id="clearallbutton" href="#">Clear All</a></div><!-- TMPL_ELSE --><!-- /TMPL_IF -->
 <div id="cataloguing_additem_itemlist">
         <div style="overflow:auto">
-	<div id="toolbar"><a id="selectallbutton" href="#">Select All</a> | <a id="clearallbutton" href="#">Clear All</a></div>
         <table id="itemst">
-	    <thead>
-		<tr>
-		    <th>&nbsp;</th>
-		    <th>&nbsp;</th>
-		    <!-- TMPL_LOOP NAME="item_header_loop" --> 
-		    <th> <!-- TMPL_VAR NAME="header_value" --> </th>
-		    <!-- /TMPL_LOOP --> 
-		</tr>
-	    </thead>
-	    <tbody>
-            <!-- TMPL_LOOP NAME="item_loop" --> <tr> <!-- TMPL_IF Name="nomod"--> <td class="error">Cannot Edit</td><!--TMPL_ELSE--><td><input type="checkbox" name="itemnumber" value="<!--TMPL_VAR Name="itemnumber"-->" id="row<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" /></td><!--/TMPL_IF-->
+      <thead>
+    <tr>
+        <!-- TMPL_IF NAME="show" --><th>&nbsp;</th><!-- /TMPL_IF -->
+        <th>Title</th>
+        <!-- TMPL_LOOP NAME="item_header_loop" --> 
+        <th> <!-- TMPL_VAR NAME="header_value" --> </th>
+        <!-- /TMPL_LOOP --> 
+    </tr>
+      </thead>
+      <tbody>
+            <!-- TMPL_LOOP NAME="item_loop" --> <tr> <!-- TMPL_IF NAME="show" --><!-- TMPL_IF Name="nomod"--> <td class="error">Cannot Edit</td><!--TMPL_ELSE--><td><input type="checkbox" name="itemnumber" value="<!--TMPL_VAR Name="itemnumber"-->" id="row<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" /></td><!--/TMPL_IF--><!-- /TMPL_IF -->
                 <td><!-- TMPL_VAR ESCAPE="HTML" NAME="bibinfo" --></td>
                 <!-- TMPL_LOOP NAME="item_value" --> <td><!-- TMPL_VAR ESCAPE="HTML" NAME="field" --></td> 
-				<!-- /TMPL_LOOP --> </tr>
+        <!-- /TMPL_LOOP --> </tr>
             <!-- /TMPL_LOOP -->
-	    </tbody>
+      </tbody>
         </table>
         </div>
 </div>
-<!-- /TMPL_IF -->
+<!-- /TMPL_IF --><!-- /item_loop -->
 
 <!-- TMPL_IF NAME="simple_items_display" -->
     <p>The following items were modified:</p>
     <ul>
     <!-- TMPL_LOOP NAME="simple_items_display" -->
-	<li>
-	    <a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a>
-	</li>
+  <li>
+      <a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a>
+  </li>
     <!-- /TMPL_LOOP -->
     </ul>
-<!-- /TMPL_IF -->
+<!-- /TMPL_IF --><!-- /simple_items_display -->
 
 <!-- TMPL_IF name="show" -->
 
 <!-- TMPL_IF name="too_many_items" -->
     <p>Too many items (<!-- TMPL_VAR NAME="too_many_items" -->): not displaying each one individually.</p>
     <!-- TMPL_LOOP name="itemnumbers_hashref" -->
-	<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
+  <input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
     <!-- /TMPL_LOOP -->
-<!-- /TMPL_IF -->
+<!-- /TMPL_IF --><!-- /too_many_items -->
 
 <div id="cataloguing_additem_newitem">
         <h2>Edit Items</h2>
-	<fieldset class="rows">
-	<ol>
+  <fieldset class="rows">
+  <ol>
         <!-- TMPL_LOOP NAME="item" -->
                <li><div class="subfield_line" style="<!-- TMPL_VAR NAME='visibility' -->" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->">
                <label><!-- TMPL_VAR NAME="subfield" --> - 
-		      <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
-		      <!-- TMPL_VAR NAME="marc_lib" -->
-		      <!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
-	       </label>
+          <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
+          <!-- TMPL_VAR NAME="marc_lib" -->
+          <!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
+         </label>
                 <!-- TMPL_VAR NAME="marc_value" -->
                 <input type="hidden" name="tag"       value="<!-- TMPL_VAR NAME="tag" -->" />
                 <input type="hidden" name="subfield"       value="<!-- TMPL_VAR NAME="subfield" -->" />
@@ -142,23 +141,22 @@
     </ol>
     </fieldset>
     <fieldset class="action">    
-	 <div id="jobpanel">
-	     <div id="jobstatus">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
-	     <div id="jobfailed"></div>
-	 </div>
-	 <input type="submit" name="mainformsubmit" value="Go" onclick="return submitBackgroundJob(this.form);" />
-         <input type="button" value="Cancel" onclick="javascript:history.back();" />
+   <div id="jobpanel">
+       <div id="jobstatus">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
+       <div id="jobfailed"></div>
+   </div>
+   <input type="submit" name="mainformsubmit" value="Save" onclick="return submitBackgroundJob(this.form);" />
+         <a href="/cgi-bin/koha/tools/batchMod.pl" class="cancel" onclick="history.back();return false;">Cancel</a>
     </fieldset>
 </div>
-<!-- TMPL_ELSE --> <!-- // ACTION -->
-         <a href="javascript:window.history.back()">Go back</a>
+<!-- TMPL_ELSE --> <!-- // show -->
+<fieldset class="action">
+  <input type="button" value="&lt;&lt; Back" onclick="window.history.back();return false;">
+  &nbsp; <a href="/cgi-bin/koha/tools/batchMod.pl">Done</a>
+</fieldset>
+         
 <!-- /TMPL_IF -->
-
 </div>
-</div>
-        <div class="yui-b">
-            <!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
-        </div>
     </div>
 </div>
 </body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tmpl
index 4c34675c9f..874153feee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Tools &rsaquo; Batch Modification of Items</title>
+<title>Koha &rsaquo; Tools &rsaquo; <!-- TMPL_IF NAME="del" -->Batch item deletion<!-- TMPL_ELSE -->Batch item modification<!-- /TMPL_IF --> </title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/JavaScript" language="JavaScript">
@@ -19,9 +19,9 @@
 	<a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
 	<a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
 	<!-- TMPL_IF name="del" -->
-	<a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Delete batches of items</a>
+	<a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Batch item deletion</a>
 	<!-- TMPL_ELSE -->
-	<a href="/cgi-bin/koha/tools/batchMod.pl">Modify batches of items</a>
+	<a href="/cgi-bin/koha/tools/batchMod.pl">Batch item modification</a>
 	<!-- /TMPL_IF -->
 </div>
 
@@ -29,23 +29,24 @@
     <div id="bd">
         <div id="yui-main">
             <div class="yui-b">
-                <h1>Batch <!-- TMPL_IF name="del" -->deletion<!-- TMPL_ELSE -->modification<!-- /TMPL_IF --></h1>
+                <h1>Batch item <!-- TMPL_IF name="del" -->deletion<!-- TMPL_ELSE -->modification<!-- /TMPL_IF --></h1>
                         <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/batchMod.pl">
                             <fieldset class="rows">
                                 <legend>Use a file</legend>
                 	              <ol>
 				      <li>
-					<label for="barcode_file">Barcodes file</label><input type="radio" name="filecontent" value="barcode_file" id="barcode_file" checked="checked" /><br />
-					<label for="itemid_file">Item Id's file</label><input type="radio" name="filecontent" value="itemid_file" id="itemid_file" />
+					<label for="barcode_file">Barcode file</label><input type="radio" name="filecontent" value="barcode_file" id="barcode_file" checked="checked" /></li>
+                    <li>
+					<label for="itemid_file">Item number file</label><input type="radio" name="filecontent" value="itemid_file" id="itemid_file" />
 				      </li>
-                                    <li><label for="uploadfile">File: </label> <input type="file" id="uploadfile" name="uploadfile"></input></li>
+                                    <li><label for="uploadfile">File: </label> <input type="file" id="uploadfile" name="uploadfile" /></li>
                                 </ol>
                             </fieldset>
                             <fieldset class="rows">
-                                <legend>Or scan items one-by-one</legend>
+                                <legend>Or scan items one by one</legend>
                                 <ol>
                                     <li>
-                                      <label for="barcodelist">Barcodes list (one barcode per line): </label>
+                                      <label for="barcodelist">Barcode list (one barcode per line): </label>
                                       <textarea rows="10" cols="30" id="barcodelist" name="barcodelist"></textarea>
                                     </li>
                                 </ol>
@@ -54,7 +55,7 @@
                             <!-- TMPL_IF name="del" --><input type="hidden" name="del" value="1" /><!-- /TMPL_IF -->
                             <fieldset class="action">
                                 <input type="submit" value="Continue" class="button" />
-				<input type="button" value="Cancel" onclick="document.location = '/cgi-bin/koha/tools/tools-home.pl'" />
+				<a class="cancel" href="/cgi-bin/koha/tools/tools-home.pl">Cancel</a>
                             </fieldset>
                         </form>
                     </div>
-- 
2.39.2