From 31ca38a8c0e85725472a5865812b4b108203afbb Mon Sep 17 00:00:00 2001
From: Galen Charlton <galen.charlton@liblime.com>
Date: Wed, 13 Feb 2008 13:03:13 -0600
Subject: [PATCH] XHTML corrections for bib display and item add

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../intranet-tmpl/prog/en/includes/biblio-view-menu.inc    | 1 -
 .../prog/en/modules/catalogue/MARCdetail.tmpl              | 2 ++
 .../intranet-tmpl/prog/en/modules/catalogue/detail.tmpl    | 7 ++++---
 .../prog/en/modules/catalogue/issuehistory.tmpl            | 2 +-
 .../prog/en/modules/catalogue/moredetail.tmpl              | 7 ++++---
 .../intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl | 2 ++
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
index e431d3cbea..a10ac1719e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
@@ -8,7 +8,6 @@
     <a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li>
     <!-- TMPL_IF NAME="moredetailview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF -->
     <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Items</a></li>
-    <li>
     <!-- TMPL_IF NAME="CAN_user_reserveforothers" -->
     <!-- TMPL_IF NAME="holdsview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Holds</a></li>
     <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
index da50879085..d12eec85df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
@@ -374,6 +374,7 @@ function Changefwk(FwkList) {
         <!-- /TMPL_LOOP -->
     </div>
     
+     <!-- TMPL_IF name="10XX" -->
     <div id="tab10XX">
         <table>
                 <tr>
@@ -390,6 +391,7 @@ function Changefwk(FwkList) {
                 <!-- /TMPL_LOOP -->
         </table>
     </div>
+    <!-- /TMPL_IF -->
 
 </div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index 8187e15ea6..cfaee16143 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -46,7 +46,6 @@ function verify_images() {
     <div id="catalogue_detail_biblio" class="yui-u first">
         
     <h3><!-- TMPL_VAR NAME="title" --></h3> 
-        <p>
             <!-- TMPL_UNLESS NAME="item-level_itypes" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->"><!-- /TMPL_UNLESS -->
             <!-- TMPL_IF name="volume" --> <!-- TMPL_VAR name="volume" --><!-- /TMPL_IF -->
             <!-- TMPL_IF name="volumedesc" -->, <!-- TMPL_VAR name="volumedesc" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="number" --> <!-- TMPL_VAR NAME="number" --> <!-- /TMPL_IF -->
@@ -303,8 +302,10 @@ NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> by <!-- TMPL_VAR NAM
         <option value="utf8">MARC (Unicode/UTF-8)</option>    </select>
         <input type="submit" name="save" value="Download Record" /></td>
   </tr>
-  <tr><input type="hidden" name="op" value="export" /><input type="hidden" NAME="bib" VALUE="<!-- TMPL_VAR name="biblionumber" -->" />
-  </tr></table>
+  <tr><td>
+    <input type="hidden" name="op" value="export" /><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" />
+  </td></tr>
+</table>
 </form>
 </div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl
index bf7fe4895d..24aaacbf75 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl
@@ -89,7 +89,7 @@
 		</table>
     <!-- TMPL_ELSE -->
         <p>
-        <b><!-- TMPL_VAR NAME="title" -->(<!-- TMPL_VAR NAME="author" -->) <span class="problem">has never been checked out.</span></p>
+        <b><!-- TMPL_VAR NAME="title" -->(<!-- TMPL_VAR NAME="author" -->)</b> <span class="problem">has never been checked out.</span></p>
         
     <!-- /TMPL_IF -->
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
index 3304aade58..193e5224ea 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
@@ -51,7 +51,7 @@
             <!-- TMPL_IF NAME="copyvol" --><li><span class="label">Copy / Vol :</span> <!-- TMPL_VAR NAME="copyvol" -->&nbsp;</li> <!-- /TMPL_IF -->  
             <!-- TMPL_IF NAME="replacementprice" --><li><span class="label">Replacement Price:</span> <!-- TMPL_VAR NAME="replacementprice" -->&nbsp;</li> <!-- /TMPL_IF -->
             </ol></div>
-           <div class="listgroup"><h4>Statuses</span> ( 
+           <div class="listgroup"><h4>Statuses ( 
                 <!-- TMPL_IF name="notforloantext" --><!-- TMPL_VAR name="notforloantext" --> <!-- /TMPL_IF -->
                 <!-- TMPL_IF name="itemlost"-->Lost<!-- /TMPL_IF --> 
                 <!-- TMPL_IF NAME="damaged" -->Damaged<!-- /TMPL_IF -->
@@ -155,8 +155,9 @@
               <form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
                     <input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR Name="biblioitemnumber" -->" /><input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
                     <textarea name="itemnotes" rows="2" cols="30"><!-- TMPL_VAR NAME="itemnotes" --></textarea><input type="submit" name="submit" class="submit" value="Update" /> 
-                </li>
-            </ol></form>
+              </form>
+            </li>
+            </ol>
                 <!-- TMPL_ELSE -->
                     <!-- TMPL_VAR NAME="itemnotes" -->
                     &nbsp;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
index 9edab84125..fe30527c60 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
@@ -221,10 +221,10 @@ function CreateKey(){
     <input type="submit" value="Save Changes" onclick="return Check(this.form)" /> 
     <!-- /TMPL_IF -->
 
-</div>
     </form>
 </div>
 </div>
+</div>
 <div class="yui-b">
 <!-- TMPL_INCLUDE NAME="biblio-view-menu.inc" -->
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
index dd27d92f19..584f93c418 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
@@ -27,6 +27,7 @@
 		<label for="to">to</label> <input size="10" id="to" name="to" type="text" value="<!-- TMPL_VAR NAME="dateto"-->" />
 		<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="openCalendarTo" alt="Show Calendar" style="cursor: pointer;" border="0" />
 			<script type="text/javascript">
+//<![CDATA[
 				// function submit_check (from_id,to_id) {
 				//	var dateFrom = Date_from_syspref(document.getElementById(from_id).value);
 				//	var dateTo   = Date_from_syspref(document.getElementById(  to_id).value);
@@ -61,6 +62,7 @@
 					disableFunc : disable_to,
 					dateStatusFunc : disable_to
 				});
+//]]>
 		    </script>
 		</p>
 
-- 
2.20.1