From b01eb81b7a0f244441139f1df3ca23c6303bef21 Mon Sep 17 00:00:00 2001
From: Galen Charlton <galen.charlton@liblime.com>
Date: Wed, 13 Feb 2008 13:03:14 -0600
Subject: [PATCH] XHTML corrections: tools and reports

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/includes/background-job.inc             |  2 +-
 .../intranet-tmpl/prog/en/includes/file-upload.inc  |  2 +-
 .../prog/en/modules/labels/label-home.tmpl          |  4 ++--
 .../en/modules/reports/guided_reports_start.tmpl    | 13 ++++++-------
 .../prog/en/modules/tools/holidays.tmpl             |  2 +-
 .../prog/en/modules/tools/inventory.tmpl            |  2 +-
 .../intranet-tmpl/prog/en/modules/tools/letter.tmpl |  2 +-
 .../prog/en/modules/tools/manage-marc-import.tmpl   | 13 +++++++------
 .../prog/en/modules/tools/stage-marc-import.tmpl    | 10 +++++-----
 9 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc
index fe626ba202..10104cee47 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc
@@ -1,6 +1,6 @@
 <!-- Background job progress indicator -->
 <script type="text/javascript">
-    //<![CDATA
+    //<![CDATA[
     var jobID = '';
     var savedForm;
     function updateJobProgress() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/file-upload.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/file-upload.inc
index 206b7c76d6..b1dc970be8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/file-upload.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/file-upload.inc
@@ -1,7 +1,7 @@
 <!-- AJAX file upload stuff -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/ajaxfileupload.js"></script>
 <script type="text/javascript">
-    //<![CDATA
+    //<![CDATA[
     function updateProgress() {
         $.getJSON("/cgi-bin/koha/tools/upload-file-progress.pl", function(json) {
             $("#fileuploadprogress").text(json.progress + '%');
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
index 650e44de1c..c74c940684 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
@@ -61,7 +61,7 @@
 </fieldset>
 <fieldset class="action">
      <input type="submit" value="Save" />
-        <input type="hidden" name=op value="set_active_layout" /></fieldset>
+        <input type="hidden" name="op" value="set_active_layout" /></fieldset>
 </form></div>
 <div class="yui-u">
 <!-- TMPL_INCLUDE NAME="label-status.inc" -->
@@ -77,4 +77,4 @@
 <!-- TMPL_INCLUDE NAME="labels-menu.inc" -->
 </div>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
index ed060ef688..01eb05b69f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
@@ -68,7 +68,6 @@ canned reports and writing custom SQL reports.</p>
 		<input type="hidden" name="phase" value="Create report from SQL"/>
 		<input type="submit" name="submit" value="Create report from SQL"/>
         </form>
-</form>
 <h3>Reports Dictionary</h3>
 <p>Use the reports dictionary to define custom criteria to use in your
 reports</p>
@@ -112,8 +111,8 @@ reports</p>
 </select></li></ol>
 </fieldset>
 <fieldset class="action">
-<input type="hidden" name="phase" value="Report on this Area">
-<input type="submit" name="submit" value="Next &gt;&gt;">
+<input type="hidden" name="phase" value="Report on this Area" />
+<input type="submit" name="submit" value="Next &gt;&gt;" />
 
 </fieldset>
 </form>
@@ -133,11 +132,11 @@ reports</p>
 
 <fieldset class="action">
 <input type="hidden" name="phase" value="Choose this type" />
-<input type="submit" name="submit" value="Next &gt;&gt;"></fieldset>
+<input type="submit" name="submit" value="Next &gt;&gt;" /></fieldset>
 </form>
 </div>
 <div class="yui-gb"><div class="yui-u first">Tabular:
-<img src="<!-- TMPL_VAR name="themelang" -->/../img/reports-tabular-graphic.gif" /></div>
+<img src="<!-- TMPL_VAR name="themelang" -->/../img/reports-tabular-graphic.gif" alt="" /></div>
 
 <!--- Summary and Matrix reports have not yet been implemented-->
 <!--<div class="yui-u">Summary:
@@ -157,7 +156,7 @@ reports</p>
 	<input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" />
 	<fieldset>
 <div class="yui-g">
-<div class="yui-u first">	<div style="float: left;"><select id="availableColumns" name="oldcolumns2" multiple size="25" style="width:200px;height:300px;">
+<div class="yui-u first">	<div style="float: left;"><select id="availableColumns" name="oldcolumns2" multiple="multiple" size="25" style="width:200px;height:300px;">
 <!-- TMPL_LOOP NAME="columns" -->
 <!-- TMPL_IF NAME="table" -->
 
@@ -182,7 +181,7 @@ reports</p>
 </div>
 
 <div class="yui-u">
-<select id="selectedColumns" name="columns" multiple size="25" style="width:200px;height:300px;"></select>
+<select id="selectedColumns" name="columns" multiple="multiple" size="25" style="width:200px;height:300px;"></select>
 </div>
 </div>
 </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
index 0c5940630f..29089ecfa5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
@@ -215,7 +215,7 @@ div.dmy {
 			<input type="radio" name="showOperation" id="showOperationExc" value="exception" /> <label for="showOperationExc">Generate an exception to this holiday.</label>
 			<a href="#" onclick=" additionalInformation('You can make an exception for this holiday rule. This means that you will be able to say for a repeatable holiday, that there is one of those days that is going to be an exception.')"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" border="0" alt="More information" /></a>
 		</div>
-		<input type="radio" name="showOperationDel" value="delete" checked="checked" /> <label for="showOperationDel">Delete this holiday</label>.
+		<input type="radio" name="showOperationDel" id="showOperationDel" value="delete" checked="checked" /> <label for="showOperationDel">Delete this holiday</label>.
 		<a href="#" onclick=" additionalInformation('This will delete this holiday rule. In case it is a repeatable holiday, this option checks for posible exceptions. In case those exists, this option take care of set this exceptions to regular holidays.')"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" border="0" alt="More information" /></a>
 		<p>
 			<input type="submit" name="submit" value="Save" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
index 36fc9807c0..46451b8123 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
@@ -33,7 +33,7 @@
         </li>
         <li>
         <label for="itemtype">Item type</label>
-        <select name="itemtype">
+        <select name="itemtype" id="itemtype">
             <option value="">Any</option>
         <!-- TMPL_LOOP name="itemtypeloop" -->
             <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="description" --></option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
index 88ec3698bb..7362a3467e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
@@ -136,7 +136,7 @@
 			<th>&nbsp;</th>
 		</tr>
 		<!-- TMPL_LOOP NAME="letter" -->
-			<tr bgcolor=<!-- TMPL_VAR NAME="toggle" --> >
+			<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->" >
 				<td><!-- TMPL_VAR NAME="module" --></td>
 				<td><!-- TMPL_VAR NAME="code" --></td>
 				<td><!-- TMPL_VAR NAME="name" --></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tmpl
index 9adc53ecf5..9334934667 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tmpl
@@ -44,8 +44,9 @@
 <!-- TMPL_ELSE -->
   No matching rule in effect
 <!-- /TMPL_IF -->
+</p>
 <!-- TMPL_IF name="can_commit" -->
-<p>
+<div>
   <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
     <input type="hidden" name="op" value="redo-matching" />
     <input type="hidden" name="import_batch_id" value="<!-- TMPL_VAR name="import_batch_id" -->" />
@@ -66,9 +67,9 @@
     </select>
     <input type="submit" class="button" value="Apply different matching rule" />
   </form>
-</p>
+</div>
 <!-- /TMPL_IF -->
-<p>
+<div>
   <!-- TMPL_IF name="can_commit" -->
   <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
     <input type="hidden" name="op" value="commit-batch" />
@@ -77,7 +78,7 @@
     <input type="hidden" name="import_batch_id" value="<!-- TMPL_VAR name="import_batch_id" -->" />
     <input type="submit" class="button" name="mainformsubmit" value="Complete import" onclick="return submitBackgroundJob(this.form);" />
   </form>
-  <div id="jobstatus" style="display:none">Job progress: <span id="jobprogress">0<span>%</div>
+  <div id="jobstatus" style="display:none">Job progress: <span id="jobprogress">0</span>%</div>
   <div id="jobfailed" style="display:none"></div>
   <!-- /TMPL_IF -->
   <!-- TMPL_IF name="can_revert" -->
@@ -88,10 +89,10 @@
     <input type="hidden" name="import_batch_id" value="<!-- TMPL_VAR name="import_batch_id" -->" />
     <input type="submit" class="button" name="mainformsubmit" value="Undo import" onclick="return submitBackgroundJob(this.form);" />
   </form>
-  <div id="jobstatus" style="display:none">Job progress: <span id="jobprogress">0<span>%</div>
+  <div id="jobstatus" style="display:none">Job progress: <span id="jobprogress">0</span>%</div>
   <div id="jobfailed" style="display:none"></div>
   <!-- /TMPL_IF -->
-</p>
+</div>
   <!-- TMPL_IF name="did_commit" -->
   <p><span class="problem">Completed import of records</span></p>
   <table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tmpl
index f284f33223..48ea2dfc1c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tmpl
@@ -15,7 +15,7 @@ function CheckForm(f) {
     return false;
 }
 
-//]]!>
+//]]>
 </script>
 </head>
 <body>
@@ -64,9 +64,9 @@ function CheckForm(f) {
         <form method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->" enctype="multipart/form-data">
 		<label for="fileToUpload">Select the file to stage: </label>
 		<input type="file" id="fileToUpload" name="fileToUpload" /><br />
-        <button clase="input" onclick="return ajaxFileUpload();">Upload file</button>
+        <button class="input" onclick="return ajaxFileUpload();">Upload file</button>
 		</form>
-        <div id="fileuploadstatus" style="display:none">Upload progress: <span id="fileuploadprogress">0<span>%</div>
+        <div id="fileuploadstatus" style="display:none">Upload progress: <span id="fileuploadprogress">0</span>%</div>
         <div id="fileuploadfailed" style="display:none"></div>
         </div>
 	</li>
@@ -76,7 +76,7 @@ function CheckForm(f) {
         <input type="hidden" name="uploadedfileid" id="uploadedfileid" value="" />
         <input type="hidden" name="runinbackground" id="runinbackground" value="" />
         <input type="hidden" name="completedJobID" id="completedJobID" value="" />
-	<li>
+	<ol><li>
 		<label for="comments">Notes about this file: </label>
 		<input type="text" id="comments" name="comments" />
 		
@@ -113,7 +113,7 @@ function CheckForm(f) {
     </ol>
   </fieldset>
   <fieldset class="action"><input type="button" id="mainformsubmit" onclick="return CheckForm(this.form);" value="Stage for import" /></fieldset>
-  <div id="jobstatus" style="display:none">Job progress: <span id="jobprogress">0<span>%</div>
+  <div id="jobstatus" style="display:none">Job progress: <span id="jobprogress">0</span>%</div>
   <div id="jobfailed" style="display:none"></div>
 </form>
 <!-- /TMPL_IF -->
-- 
2.39.5