From 55bc6939ad68958026a4077337e55d0c6a4e2e6d Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 11 Sep 2007 15:03:04 -0500
Subject: [PATCH] Corrections for XHTML compliance

Signed-off-by: Chris Cormack <crc@liblime.com>
---
 cataloguing/additem.pl                                    | 8 ++++----
 cataloguing/value_builder/barcode.pl                      | 5 ++++-
 cataloguing/value_builder/labs_theses.pl                  | 5 ++++-
 cataloguing/value_builder/macles.pl                       | 5 ++++-
 cataloguing/value_builder/marc21_field_003.pl             | 5 ++++-
 cataloguing/value_builder/marc21_field_005.pl             | 5 ++++-
 cataloguing/value_builder/marc21_field_006.pl             | 5 ++++-
 cataloguing/value_builder/marc21_field_007.pl             | 5 ++++-
 cataloguing/value_builder/marc21_field_008.pl             | 5 ++++-
 cataloguing/value_builder/marc21_field_008_authorities.pl | 5 ++++-
 cataloguing/value_builder/marc21_field_040c.pl            | 5 ++++-
 cataloguing/value_builder/marc21_field_040d.pl            | 5 ++++-
 cataloguing/value_builder/marc21_leader.pl                | 5 ++++-
 cataloguing/value_builder/marc21_leader_authorities.pl    | 5 ++++-
 cataloguing/value_builder/marc21_leader_book.pl           | 5 ++++-
 cataloguing/value_builder/marc21_leader_computerfile.pl   | 5 ++++-
 cataloguing/value_builder/marc21_leader_video.pl          | 5 ++++-
 .../prog/en/modules/cataloguing/additem.tmpl              | 8 ++++----
 18 files changed, 72 insertions(+), 24 deletions(-)

diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
index 98ee702e68..e1f07431f9 100755
--- a/cataloguing/additem.pl
+++ b/cataloguing/additem.pl
@@ -315,20 +315,20 @@ foreach my $tag (sort keys %{$tagslib}) {
                                                                   -default=>"$value",
                                                                   -labels => \%authorised_lib,
                                                                   -size=>1,
-                                                                    -tabindex=>'',
+                                                                  -tabindex=>'',
                                                                   -multiple=>0,
                                                                   );
     } elsif ($tagslib->{$tag}->{$subfield}->{thesaurus_category}) {
-      $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\"  size=47 maxlength=255> <a href=\"javascript:Dopop('cataloguing/thesaurus_popup.pl?category=$tagslib->{$tag}->{$subfield}->{thesaurus_category}&index=$i',$i)\">...</a>";
+      $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\"  size=\"47\" maxlength=\"255\" /> <a href=\"javascript:Dopop('cataloguing/thesaurus_popup.pl?category=$tagslib->{$tag}->{$subfield}->{thesaurus_category}&index=$i',$i)\">...</a>";
           #"
     } elsif ($tagslib->{$tag}->{$subfield}->{'value_builder'}) {
       my $plugin="value_builder/".$tagslib->{$tag}->{$subfield}->{'value_builder'};
       require $plugin;
       my $extended_param = plugin_parameters($dbh,$record,$tagslib,$i,0);
       my ($function_name,$javascript) = plugin_javascript($dbh,$record,$tagslib,$i,0);
-      $subfield_data{marc_value}="<input type=\"text\" value=\"$value\" name=\"field_value\"  size=47 maxlength=255 OnFocus=\"javascript:Focus$function_name($i)\" OnBlur=\"javascript:Blur$function_name($i)\"> <a href=\"javascript:Clic$function_name($i)\">...</a> $javascript";
+      $subfield_data{marc_value}="<input type=\"text\" value=\"$value\" name=\"field_value\"  size=\"47\" maxlength=\"255\" onfocus=\"javascript:Focus$function_name($i)\" onblur=\"javascript:Blur$function_name($i)\" /> <a href=\"javascript:Clic$function_name($i)\">...</a> $javascript";
     } else {
-      $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" value=\"$value\" size=50 maxlength=255>";
+      $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" value=\"$value\" size=\"50\" maxlength=\"255\" />";
     }
 #        $subfield_data{marc_value}="<input type=\"text\" name=\"field_value\">";
         push(@loop_data, \%subfield_data);
diff --git a/cataloguing/value_builder/barcode.pl b/cataloguing/value_builder/barcode.pl
index a0d6c9a4b8..8e6ccd478c 100755
--- a/cataloguing/value_builder/barcode.pl
+++ b/cataloguing/value_builder/barcode.pl
@@ -84,7 +84,9 @@ while (my ($count)= $sth->fetchrow_array) {
 }
 $nextnum++;
 my $res  = "
-<script>
+<script type=\"text/javascript\">
+//<![CDATA[
+
 function Blur$function_name(index) {
 //need this?
 }
@@ -102,6 +104,7 @@ return 0;
 
 function Clic$function_name(subfield_managed) {
 }
+//]]>
 </script>
 ";
 return ($function_name,$res);
diff --git a/cataloguing/value_builder/labs_theses.pl b/cataloguing/value_builder/labs_theses.pl
index 2fc88187a6..26968f1ba9 100755
--- a/cataloguing/value_builder/labs_theses.pl
+++ b/cataloguing/value_builder/labs_theses.pl
@@ -37,7 +37,9 @@ sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
 my $function_name= "328".(int(rand(100000))+1);
 my $res="
-<script>
+<script type=\"text/javascript\">
+//<![CDATA[
+
 function Focus$function_name(subfield_managed) {
 return 1;
 }
@@ -51,6 +53,7 @@ function Clic$function_name(i) {
 	newin=window.open(\"plugin_launcher.pl?plugin_name=labs_theses.pl&cat_auth=LABTHE&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 328\",'width=700,height=700,toolbar=false,scrollbars=yes');
 
 }
+//]]>
 </script>
 ";
 
diff --git a/cataloguing/value_builder/macles.pl b/cataloguing/value_builder/macles.pl
index f21a3e8216..2a6ff0109b 100755
--- a/cataloguing/value_builder/macles.pl
+++ b/cataloguing/value_builder/macles.pl
@@ -45,7 +45,9 @@ sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
 my $function_name= "macles".(int(rand(100000))+1);
 my $res="
-<script>
+<script type=\"text/javascript\">
+//<![CDATA[
+
 function Focus$function_name(subfield_managed) {
 return 1;
 }
@@ -58,6 +60,7 @@ function Clic$function_name(i) {
 	newin=window.open(\"plugin_launcher.pl?plugin_name=macles.pl&index=\"+i,\"MACLES\",',toolbar=false,scrollbars=yes');
 
 }
+//]]>
 </script>
 ";
 
diff --git a/cataloguing/value_builder/marc21_field_003.pl b/cataloguing/value_builder/marc21_field_003.pl
index 53780b8be7..5c53e1f3f1 100755
--- a/cataloguing/value_builder/marc21_field_003.pl
+++ b/cataloguing/value_builder/marc21_field_003.pl
@@ -60,7 +60,9 @@ my $function_name= $field_number;
 # find today's date
 my $org = C4::Context->preference('MARCOrgCode');
 my $res  = "
-<script>
+<script type=\"text/javascript\">
+//<![CDATA[
+
 function Blur$function_name(index) {
 //need this?
 }
@@ -77,6 +79,7 @@ return 0;
 
 function Clic$function_name(subfield_managed) {
 }
+//]]>
 </script>
 ";
 return ($function_name,$res);
diff --git a/cataloguing/value_builder/marc21_field_005.pl b/cataloguing/value_builder/marc21_field_005.pl
index a8ffbce835..1e859266dc 100755
--- a/cataloguing/value_builder/marc21_field_005.pl
+++ b/cataloguing/value_builder/marc21_field_005.pl
@@ -81,7 +81,9 @@ if (length($sec)==1) {
 
 my $date = "$year$mon$mday$hour$min$sec".".0";
 my $res  = "
-<script>
+<script type=\"text/javascript\">
+//<![CDATA[
+
 function Blur$function_name(index) {
 //need this?
 }
@@ -99,6 +101,7 @@ return 0;
 
 function Clic$function_name(subfield_managed) {
 }
+//]]>
 </script>
 ";
 return ($function_name,$res);
diff --git a/cataloguing/value_builder/marc21_field_006.pl b/cataloguing/value_builder/marc21_field_006.pl
index 307f3db458..c662d4fb6f 100755
--- a/cataloguing/value_builder/marc21_field_006.pl
+++ b/cataloguing/value_builder/marc21_field_006.pl
@@ -41,7 +41,9 @@ sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
 my $function_name= $field_number;
 my $res="
-<script>
+<script type=\"text/javascript\">
+//<![CDATA[
+
 function Focus$function_name(subfield_managed) {
 return 1;
 }
@@ -55,6 +57,7 @@ function Clic$function_name(i) {
 	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_field_006.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
+//]]>
 </script>
 ";
 
diff --git a/cataloguing/value_builder/marc21_field_007.pl b/cataloguing/value_builder/marc21_field_007.pl
index ad3ca89908..922f4ca391 100755
--- a/cataloguing/value_builder/marc21_field_007.pl
+++ b/cataloguing/value_builder/marc21_field_007.pl
@@ -43,7 +43,9 @@ sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
 my $function_name= $field_number;
 my $res="
-<script>
+<script type=\"text/javascript\">
+//<![CDATA[
+
 function Focus$function_name(subfield_managed) {
 return 1;
 }
@@ -57,6 +59,7 @@ function Clic$function_name(i) {
 	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_field_007.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
+//]]>
 </script>
 ";
 
diff --git a/cataloguing/value_builder/marc21_field_008.pl b/cataloguing/value_builder/marc21_field_008.pl
index b2705ea4f8..48419fd4af 100755
--- a/cataloguing/value_builder/marc21_field_008.pl
+++ b/cataloguing/value_builder/marc21_field_008.pl
@@ -48,7 +48,9 @@ sub plugin_javascript {
 	my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
 	my $function_name= $field_number;
 	my $res="
-<script>
+<script type=\"text/javascript\">
+//<![CDATA[
+
 function Focus$function_name(subfield_managed) {
     // TODO FIXME :: HTML code has changed
 
@@ -71,6 +73,7 @@ function Clic$function_name(i) {
 	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_field_008.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
+//]]>
 </script>
 ";
 
diff --git a/cataloguing/value_builder/marc21_field_008_authorities.pl b/cataloguing/value_builder/marc21_field_008_authorities.pl
index 0c53434c11..5ebad3d0e8 100755
--- a/cataloguing/value_builder/marc21_field_008_authorities.pl
+++ b/cataloguing/value_builder/marc21_field_008_authorities.pl
@@ -54,7 +54,9 @@ sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
 my $function_name= $field_number;
 my $res="
-<script>
+<script type=\"text/javascript\">
+//<![CDATA[
+
 function Focus$function_name(subfield_managed) {
 return 1;
 }
@@ -68,6 +70,7 @@ function Clic$function_name(i) {
 	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_field_008_authorities.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
+//]]>
 </script>
 ";
 
diff --git a/cataloguing/value_builder/marc21_field_040c.pl b/cataloguing/value_builder/marc21_field_040c.pl
index adf68fbddf..549763d1cb 100755
--- a/cataloguing/value_builder/marc21_field_040c.pl
+++ b/cataloguing/value_builder/marc21_field_040c.pl
@@ -62,7 +62,9 @@ my $function_name= $field_number;
 # find today's date
 my $org = C4::Context->preference('MARCOrgCode');
 my $res  = "
-<script>
+<script type=\"text/javascript\">
+//<![CDATA[
+
 function Blur$function_name(index) {
 //need this?
 }
@@ -80,6 +82,7 @@ return 0;
 
 function Clic$function_name(subfield_managed) {
 }
+//]]>
 </script>
 ";
 return ($function_name,$res);
diff --git a/cataloguing/value_builder/marc21_field_040d.pl b/cataloguing/value_builder/marc21_field_040d.pl
index 7dae78bf6a..b61a7d17f0 100755
--- a/cataloguing/value_builder/marc21_field_040d.pl
+++ b/cataloguing/value_builder/marc21_field_040d.pl
@@ -62,7 +62,9 @@ my $function_name= $field_number;
 # find today's date
 my $org = C4::Context->preference('MARCOrgCode');
 my $res  = "
-<script>
+<script type=\"text/javascript\">
+//<![CDATA[
+
 function Blur$function_name(index) {
 //need this?
 }
@@ -80,6 +82,7 @@ return 0;
 
 function Clic$function_name(subfield_managed) {
 }
+//]]>
 </script>
 ";
 return ($function_name,$res);
diff --git a/cataloguing/value_builder/marc21_leader.pl b/cataloguing/value_builder/marc21_leader.pl
index b10401f750..2843fd1567 100755
--- a/cataloguing/value_builder/marc21_leader.pl
+++ b/cataloguing/value_builder/marc21_leader.pl
@@ -42,7 +42,9 @@ sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
 my $function_name= $field_number;
 my $res="
-<script>
+<script type=\"text/javascript\">
+//<![CDATA[
+
 function Focus$function_name(subfield_managed) {
     if(!document.getElementById(\"$field_number\").value){
         document.getElementById(\"$field_number\").value = '     nam a22     7a 4500';
@@ -59,6 +61,7 @@ function Clic$function_name(i) {
 	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_leader.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
+//]]>
 </script>
 ";
 
diff --git a/cataloguing/value_builder/marc21_leader_authorities.pl b/cataloguing/value_builder/marc21_leader_authorities.pl
index 7784f8edf4..d178fdcee2 100755
--- a/cataloguing/value_builder/marc21_leader_authorities.pl
+++ b/cataloguing/value_builder/marc21_leader_authorities.pl
@@ -41,7 +41,9 @@ sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
 my $function_name= $field_number;
 my $res="
-<script>
+<script type=\"text/javascript\">
+//<![CDATA[
+
 function Focus$function_name(subfield_managed) {
 return 1;
 }
@@ -55,6 +57,7 @@ function Clic$function_name(i) {
 	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_leader_authorities.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
+//]]>
 </script>
 ";
 
diff --git a/cataloguing/value_builder/marc21_leader_book.pl b/cataloguing/value_builder/marc21_leader_book.pl
index 20f66491f2..aa18c8600f 100755
--- a/cataloguing/value_builder/marc21_leader_book.pl
+++ b/cataloguing/value_builder/marc21_leader_book.pl
@@ -42,7 +42,9 @@ sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
 my $function_name= $field_number;
 my $res="
-<script>
+<script type=\"text/javascript\">
+//<![CDATA[
+
 function Focus$function_name(subfield_managed) {
 return 1;
 }
@@ -56,6 +58,7 @@ function Clic$function_name(i) {
 	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_leader.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
+//]]>
 </script>
 ";
 
diff --git a/cataloguing/value_builder/marc21_leader_computerfile.pl b/cataloguing/value_builder/marc21_leader_computerfile.pl
index 81df209016..0b74e5662c 100755
--- a/cataloguing/value_builder/marc21_leader_computerfile.pl
+++ b/cataloguing/value_builder/marc21_leader_computerfile.pl
@@ -41,7 +41,9 @@ sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
 my $function_name= $field_number;
 my $res="
-<script>
+<script type=\"text/javascript\">
+//<![CDATA[
+
 function Focus$function_name(subfield_managed) {
 return 1;
 }
@@ -55,6 +57,7 @@ function Clic$function_name(i) {
 	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_leader.pl&index=$field_number&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
+//]]>
 </script>
 ";
 
diff --git a/cataloguing/value_builder/marc21_leader_video.pl b/cataloguing/value_builder/marc21_leader_video.pl
index 6be559f245..91569198a6 100755
--- a/cataloguing/value_builder/marc21_leader_video.pl
+++ b/cataloguing/value_builder/marc21_leader_video.pl
@@ -41,7 +41,9 @@ sub plugin_javascript {
 my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
 my $function_name= $field_number;
 my $res="
-<script>
+<script type=\"text/javascript\">
+//<![CDATA[
+
 function Focus$function_name(subfield_managed) {
 return 1;
 }
@@ -55,6 +57,7 @@ function Clic$function_name(i) {
 	newin=window.open(\"plugin_launcher.pl?plugin_name=marc21_leader.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
 
 }
+//]]>
 </script>
 ";
 
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 a4238f1644..deae380024 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
@@ -67,10 +67,10 @@ function confirm_deletion(biblionumber,itemnumber) {
 
 <h1>Items for <!-- TMPL_VAR name="title" --> <!-- TMPL_IF NAME="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF --> (Record #<!-- TMPL_VAR NAME="biblionumber" -->)</h1>
 
-<div id="cataloguing_additem_itemlist">
-    <form method="post" action="additem.pl" name="f">
+    <form method="post" action="/cgi-bin/koha/cataloguing/additem.pl" name="f">
     <input type="hidden" name="op" value="<!-- TMPL_VAR NAME="op" -->" />
     <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+<div id="cataloguing_additem_itemlist">
     <!-- TMPL_IF name="item_loop" -->
         <h2>Existing items</h2>
         <table>
@@ -120,9 +120,9 @@ function confirm_deletion(biblionumber,itemnumber) {
     <input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
     <input type="button" value="Save Changes" onclick="Check(this.form)" accesskey="w" />
     <!-- /TMPL_IF -->
-    </form>
-</div>
 
+</div>
+    </form>
 </div>
 </div>
 <div class="yui-b">
-- 
2.39.2