[Koha-cvs] koha/koha-tmpl/opac-tmpl/npl/en/includes doc-he... [dev_week]

[Owen Leonard]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Owen Leonard <oleonard>	06/11/09 16:03:26

Modified files:
	koha-tmpl/opac-tmpl/npl/en/includes: 
	                                     doc-head-close-basket-print.inc 
	                                     doc-head-close-basket.inc 
	                                     doc-head-close-results.inc 
	                                     doc-head-close.inc 

Log message:
	Using XML commenting to mark inline javascript and prevent validation errors.  Also commenting out RSS autodiscovery link for search results until that functionality can be perfected.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close-basket-print.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3.2.3&r2=1.1.2.3.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close-basket.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.5.2.3&r2=1.1.2.5.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close-results.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.5&r2=1.1.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.11.2.10&r2=1.1.2.11.2.11

Patches:
Index: doc-head-close-basket-print.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close-basket-print.inc,v
retrieving revision 1.1.2.3.2.3
retrieving revision 1.1.2.3.2.4
diff -u -b -r1.1.2.3.2.3 -r1.1.2.3.2.4
--- doc-head-close-basket-print.inc	5 Oct 2006 14:40:22 -0000	1.1.2.3.2.3
+++ doc-head-close-basket-print.inc	9 Nov 2006 16:03:26 -0000	1.1.2.3.2.4
@@ -20,7 +20,9 @@
 	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/main.js"></script>
 	<!-- TMPL_IF NAME="opacuserjs" -->
 <script language="JavaScript" type="text/javascript">
+	//<![CDATA[
 	<!-- TMPL_VAR NAME="opacuserjs" -->
+	//]]>
 </script>	
 <!-- /TMPL_IF -->
 </head>
\ No newline at end of file

Index: doc-head-close-basket.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close-basket.inc,v
retrieving revision 1.1.2.5.2.3
retrieving revision 1.1.2.5.2.4
diff -u -b -r1.1.2.5.2.3 -r1.1.2.5.2.4
--- doc-head-close-basket.inc	5 Oct 2006 14:40:22 -0000	1.1.2.5.2.3
+++ doc-head-close-basket.inc	9 Nov 2006 16:03:26 -0000	1.1.2.5.2.4
@@ -26,7 +26,9 @@
 	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/main.js"></script>
 	<!-- TMPL_IF NAME="opacuserjs" -->
 <script language="JavaScript" type="text/javascript">
+	//<![CDATA[
 	<!-- TMPL_VAR NAME="opacuserjs" -->
+	//]]>
 </script>	
 <!-- /TMPL_IF -->
 </head>
\ No newline at end of file

Index: doc-head-close-results.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/doc-head-close-results.inc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
--- doc-head-close-results.inc	5 Oct 2006 14:40:22 -0000	1.1.2.5
+++ doc-head-close-results.inc	9 Nov 2006 16:03:26 -0000	1.1.2.6
@@ -2,7 +2,7 @@
 <!-- TMPL_IF NAME="TemplateEncoding" --><meta http-equiv="Content-Type" content="text/html; charset=<!-- TMPL_VAR NAME='TemplateEncoding' -->" /><!-- TMPL_ELSE --><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><!-- /TMPL_IF -->
 <meta http-equiv="Content-Language" content="en-us" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang">/includes/favicon.ico" type="image/x-icon" />
-<!-- TMPL_IF NAME="searchdesc" --><!-- TMPL_IF name="total" --><link rel="alternate" type="application/rss+xml" title="RSS" href="http://a9.com/-/opensearch/search/B0007WF826/<!-- TMPL_VAR NAME="searchdesc" -->?count=10&amp;startPage=1" /><!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!--<!-- TMPL_IF NAME="searchdesc" --><!-- TMPL_IF name="total" --><link rel="alternate" type="application/rss+xml" title="RSS" href="http://a9.com/-/opensearch/search/B0007WF826/<!-- TMPL_VAR NAME="searchdesc" -->?count=10&amp;startPage=1" /><!-- /TMPL_IF --><!-- /TMPL_IF -->-->
 <!-- TMPL_IF name="opacstylesheet" --><style type="text/css">
     @import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="opacstylesheet" -->);
 </style><!-- TMPL_ELSE --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/<!-- TMPL_VAR NAME="opaccolorstylesheet" -->" />
@@ -25,7 +25,9 @@
 <script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/main.js"></script>
 <!-- TMPL_IF NAME="opacuserjs" -->
 <script language="JavaScript" type="text/javascript">
+	//<![CDATA[
 	<!-- TMPL_VAR NAME="opacuserjs" -->
+	//]]>
 </script>	
 <!-- /TMPL_IF -->
 </head>

Index: doc-head-close.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close.inc,v
retrieving revision 1.1.2.11.2.10
retrieving revision 1.1.2.11.2.11
diff -u -b -r1.1.2.11.2.10 -r1.1.2.11.2.11
--- doc-head-close.inc	5 Oct 2006 14:40:22 -0000	1.1.2.11.2.10
+++ doc-head-close.inc	9 Nov 2006 16:03:26 -0000	1.1.2.11.2.11
@@ -35,7 +35,9 @@
 	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/main.js"></script>
 <!-- TMPL_IF NAME="opacuserjs" -->
 <script language="JavaScript" type="text/javascript">
+	//<![CDATA[
 	<!-- TMPL_VAR NAME="opacuserjs" -->
+	//]]>
 </script>	
 <!-- /TMPL_IF -->
 </head>