help templates and includes - cleanup for XHTML validation, error display

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/help-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/help-bottom.inc
index 8a0f48e..5b96baa 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/help-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/help-bottom.inc
@@ -1,8 +1,11 @@
-<div class="action"><form action="help.pl" method="get"><input type="button" class="submit" onclick="window.close(); return false;" value="Close Help Window" /></form>
+<div class="action">
+<form action="help.pl" method="get">
+  <input type="button" class="submit" onclick="window.close(); return false;" value="Close Help Window" />
+</form>
 <form action="/cgi-bin/koha/edithelp.pl" method="post">
-<input type="hidden" name="type" value="modify">
-<input type="hidden" name="referer" value="<!-- TMPL_VAR NAME="referer" -->">
-<input type="submit" class="submit" value="Edit help">
+  <input type="hidden" name="type" value="modify" />
+  <input type="hidden" name="referer" value="<!-- TMPL_VAR NAME="referer" -->" />
+  <input type="submit" class="submit" value="Edit help" />
 </form>
 </div></div>
 </body>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
index 0e6e634..066166e 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc
@@ -1 +1,3 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Online Help</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tmpl
index e6e7fda..d0a7d95 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/edithelp.tmpl
@@ -25,14 +25,14 @@ tinyMCE.init({
        <h1>Online Help</h1>
 <!-- TMPL_IF NAME="error" -->
 <h5><!-- TMPL_VAR NAME="error" --></h5>
-<!-- TMPL_ELSE -->
+<!-- /TMPL_IF -->
 <form action="/cgi-bin/koha/edithelp.pl" method=post>
-<input type="hidden" name="referer" value="<!-- TMPL_VAR NAME="referer" -->">
-<input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->">
+<input type="hidden" name="referer" value="<!-- TMPL_VAR NAME='referer' -->" />
+<input type="hidden" name="type" value="<!-- TMPL_VAR NAME='type' -->" />
 <textarea name="help" cols="60" rows="20"><!-- TMPL_VAR NAME="help" --></textarea>
-<input type="submit" name="submit" value="Submit">
+<input type="submit" name="submit" value="Submit" />
 </form>
-<!-- /TMPL_IF -->
        </div>
        
 <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
+

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reports-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reports-home.tmpl
index 6ab9b81..3538d9e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reports-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/reports-home.tmpl
@@ -1,3 +1,3 @@
 <!-- TMPL_INCLUDE name="help-top.inc" -->
-<div class="main"> <h1>Reports</h1><h2>What Reports are there in Koha? </h2><p>Koha comes with a number of pre defined (or &quot;canned&quot;) reports, along with two report builder engines. </p><p><strong>Pre-defined Reports</strong></p><p>There are number of predefined reports in Koha. Check the the Circulation module for Circulation specifc reports</p><p><strong>Statistics Wizards</strong></p><p>The statistics wizards provide a way to build simple reports for each module. The reports produced can either be viewed on screen or downloaded for opening in a spreadsheet program or text editor. </p><p><strong>Guided Reports Wizard</strong></p><p>The Guided Reports Wizard helps you build reports using all the fields in the database for each module. The reports can then be saved and run using the scheduler. <strong>Note this feature is under active development. </strong></p><h2> </h2> </div> 
+<div class="main"> <h1>Reports</h1><h2>What Reports are there in Koha? </h2><p>Koha comes with a number of predefined (or &quot;canned&quot;) reports, along with two report builder engines. </p><p><strong>Pre-defined Reports</strong></p><p>There are number of predefined reports in Koha. Check the the Circulation module for Circulation specific reports.</p><p><strong>Statistics Wizards</strong></p><p>The statistics wizards provide a way to build simple reports for each module. The reports produced can either be viewed on screen or downloaded for opening in a spreadsheet program or text editor. </p><p><strong>Guided Reports Wizard</strong></p><p>The Guided Reports Wizard helps you build reports using all the fields in the database for each module. The reports can then be saved and run using the scheduler. <strong>Note this feature is under active development. </strong></p><h2> </h2> </div>   
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->