[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>	07/01/16 21:38:17

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:
	Adding XML comments to custom user script block to ensure validation (didn't I just do this?)
	Also correcting OpenSearch RSS autodiscovery link as per kados' modifications

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.5&r2=1.1.2.3.2.6
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.5&r2=1.1.2.5.2.6
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.7&r2=1.1.2.8
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.12&r2=1.1.2.11.2.13

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.5
retrieving revision 1.1.2.3.2.6
diff -u -b -r1.1.2.3.2.5 -r1.1.2.3.2.6
--- doc-head-close-basket-print.inc	1 Dec 2006 14:07:29 -0000	1.1.2.3.2.5
+++ doc-head-close-basket-print.inc	16 Jan 2007 21:38:17 -0000	1.1.2.3.2.6
@@ -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.5
retrieving revision 1.1.2.5.2.6
diff -u -b -r1.1.2.5.2.5 -r1.1.2.5.2.6
--- doc-head-close-basket.inc	1 Dec 2006 14:07:29 -0000	1.1.2.5.2.5
+++ doc-head-close-basket.inc	16 Jan 2007 21:38:17 -0000	1.1.2.5.2.6
@@ -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.7
retrieving revision 1.1.2.8
diff -u -b -r1.1.2.7 -r1.1.2.8
--- doc-head-close-results.inc	1 Dec 2006 14:07:29 -0000	1.1.2.7
+++ doc-head-close-results.inc	16 Jan 2007 21:38:17 -0000	1.1.2.8
@@ -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="search" type="application/opensearchdescription+xml" title="<!-- TMPL_VAR NAME="LibraryName" --> Catalog" href="/opensearchdescription" /><!-- /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.12
retrieving revision 1.1.2.11.2.13
diff -u -b -r1.1.2.11.2.12 -r1.1.2.11.2.13
--- doc-head-close.inc	1 Dec 2006 14:07:29 -0000	1.1.2.11.2.12
+++ doc-head-close.inc	16 Jan 2007 21:38:17 -0000	1.1.2.11.2.13
@@ -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>