From e66c3279c47df93d71b28a923e24d3369148323c Mon Sep 17 00:00:00 2001
From: dbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 8 Nov 2007 04:01:27 +0000
Subject: [PATCH] Low-hanging fruit for better (X)HTML compliance:   * Add type
 and language attributes to all <script> tags   * Close empty tags (use <img
 /> instead of <img> </img>, etc)   * Use Unicode character entities for
 next/previous   * Place some elements within legal parent element

git-svn-id: svn://svn.open-ils.org/ILS/trunk@8033 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../skin/default/xml/advanced/adv_global_row.xml   |  2 +-
 .../skin/default/xml/advanced/advanced_global.xml  | 16 ++++----
 .../skin/default/xml/advanced/advanced_marc.xml    | 12 +++---
 .../skin/default/xml/advanced/advanced_quick.xml   | 12 +++---
 .../web/opac/skin/default/xml/common/altcanvas.xml |  4 +-
 .../web/opac/skin/default/xml/common/cn_browse.xml |  2 +-
 .../opac/skin/default/xml/common/css_common.xml    | 17 ++++-----
 .../web/opac/skin/default/xml/common/holds.xml     | 25 ++++++-------
 .../web/opac/skin/default/xml/common/js_common.xml | 43 +++++++++-------------
 .../web/opac/skin/default/xml/common/libselect.xml |  2 +-
 .../web/opac/skin/default/xml/common/login.xml     |  6 +--
 Open-ILS/web/opac/skin/default/xml/common/logo.xml |  4 +-
 .../web/opac/skin/default/xml/common/searchbar.xml |  4 +-
 .../web/opac/skin/default/xml/common/sidebar.xml   | 18 ++++-----
 .../web/opac/skin/default/xml/common/statusbar.xml |  2 +-
 .../web/opac/skin/default/xml/home/homesearch.xml  |  8 ++--
 .../web/opac/skin/default/xml/home/index_body.xml  |  4 +-
 .../skin/default/xml/myopac/myopac_bookbags.xml    |  6 +--
 .../skin/default/xml/myopac/myopac_checked.xml     |  2 +-
 .../opac/skin/default/xml/myopac/myopac_holds.xml  |  4 +-
 .../opac/skin/default/xml/myopac/myopac_prefs.xml  |  2 +-
 .../skin/default/xml/myopac/myopac_summary.xml     | 10 ++---
 .../web/opac/skin/default/xml/page_advanced.xml    |  2 +-
 .../web/opac/skin/default/xml/page_cnbrowse.xml    |  2 +-
 .../web/opac/skin/default/xml/page_mresult.xml     | 10 ++---
 Open-ILS/web/opac/skin/default/xml/page_myopac.xml |  8 ++--
 .../web/opac/skin/default/xml/page_rdetail.xml     | 16 ++++----
 .../web/opac/skin/default/xml/page_rresult.xml     | 10 ++---
 .../skin/default/xml/rdetail/rdetail_altcanvas.xml |  2 +-
 .../default/xml/rdetail/rdetail_cn_details.xml     |  4 +-
 .../skin/default/xml/rdetail/rdetail_copyinfo.xml  |  2 +-
 .../skin/default/xml/rdetail/rdetail_summary.xml   |  4 +-
 .../opac/skin/default/xml/result/result_common.xml |  2 +-
 .../opac/skin/default/xml/result/result_info.xml   |  4 +-
 .../opac/skin/default/xml/result/result_table.xml  | 34 +++++++++--------
 35 files changed, 148 insertions(+), 157 deletions(-)

diff --git a/Open-ILS/web/opac/skin/default/xml/advanced/adv_global_row.xml b/Open-ILS/web/opac/skin/default/xml/advanced/adv_global_row.xml
index 4a2baac87f..f5c5ca7dd9 100644
--- a/Open-ILS/web/opac/skin/default/xml/advanced/adv_global_row.xml
+++ b/Open-ILS/web/opac/skin/default/xml/advanced/adv_global_row.xml
@@ -21,7 +21,7 @@
 		</select>
 			
 		<!-- search term -->
-		<input type='text' size='18' name='term' style='margin-right: 3px;'> </input>
+		<input type='text' size='18' name='term' style='margin-right: 3px;' />
 	
 		<!-- Remove this row -->
         <button 
diff --git a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml
index 8566cc2eac..b3648a25bd 100644
--- a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml
+++ b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml
@@ -6,7 +6,7 @@
 		.adv_adv_link { font-size: 8pt; color: red; }
 	</style>
 
-	<script src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/adv_global.js'> </script>
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/adv_global.js'> </script>
 
 	<tr style='border-bottom: none;'>
 
@@ -19,7 +19,7 @@
 				</thead>
 				<tbody id='adv_global_tbody'>
 
-					<script language='javascript'>
+					<script language='javascript' type='text/javascript'>
 						config.ids.common.now_searching = 'now_searching_location';
 					</script>
 
@@ -52,7 +52,7 @@
 					<tr>
 						<td colspan='2' align='center'>
 							<span>Group Formats and Editions</span>
-							<input id='adv_group_titles' type='checkbox' checked='checked'> </input>
+							<input id='adv_group_titles' type='checkbox' checked='checked' />
 						</td>
 					</tr>
 				</thead>
@@ -204,7 +204,7 @@
 					<tr>
 						<td colspan='2' align='center'>
 							<span>Group Formats and Editions</span>
-							<input id='adv_group_titles' type='checkbox' checked='checked'> </input>
+							<input id='adv_group_titles' type='checkbox' checked='checked' />
 						</td>
 					</tr>
 				</thead>
@@ -227,7 +227,7 @@
 							<tbody>
 								<tr>
 
-                           <script>
+                           <script language='javascript' type='text/javascript'>
                               function __setsortsel() {
                                  var sel = $('adv_global_sort_by')
 										   if(sel.selectedIndex == 0) {
@@ -263,7 +263,7 @@
 									</td>
 
                            <!-- force the enable/disable sort dir code to run -->
-                           <script>__setsortsel();</script>
+                           <script language='javascript' type='text/javascript'>__setsortsel();</script>
 
 									<td align='center'>
 										<!--#include virtual="../common/libselect.xml"-->
@@ -274,9 +274,9 @@
 									<td colspan='2' align='center'>
 										<span>&advanced.frbrize;</span>
 										<!--
-										<input id='adv_group_titles' type='checkbox' checked='checked'> </input>
+										<input id='adv_group_titles' type='checkbox' checked='checked' />
 										-->
-										<input id='adv_group_titles' type='checkbox'> </input>
+										<input id='adv_group_titles' type='checkbox' />
 									</td>
 								</tr>
 							</tbody>
diff --git a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_marc.xml b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_marc.xml
index 8819e6b3f9..46fe2879ed 100644
--- a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_marc.xml
+++ b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_marc.xml
@@ -12,15 +12,15 @@ XXX Deprecate me
 		<tr id='advanced.marc.template'>
 			<td>
 				<span>&opac.advanced.marc.tag;: </span>
-				<input name='advanced.marc.tag' maxlength='3' size='3'> </input>
+				<input name='advanced.marc.tag' maxlength='3' size='3' />
 			</td>
 			<td>
 				<span>&opac.advanced.marc.subfield;: </span>
-				<input name='advanced.marc.subfield' maxlength='1' size='1'> </input>
+				<input name='advanced.marc.subfield' maxlength='1' size='1' />
 			</td>
 			<td>
 				<span>&opac.advanced.marc.value;: </span>
-				<input name='advanced.marc.value' size='36'> </input>
+				<input name='advanced.marc.value' size='36' />
 			</td>
 
 			<td>
@@ -29,17 +29,17 @@ XXX Deprecate me
 					var tbody = row.parentNode;
 					if(tbody.getElementsByTagName("tr").length > 2)
 						tbody.removeChild(row);
-					'> </input>
+					' />
 			</td>
 		</tr>
 		<tr id='advanced.marc.submit.row'>
 			<td colspan='4' align='center'>
 
 				<input name='advanced.marc.addrow' type='submit' onclick='advAddMARC();'
-					value='&opac.advanced.marc.addrow;'> </input>
+					value='&opac.advanced.marc.addrow;' />
 
 				<input style='margin-left: 10px;' 
-					onclick='advMARCRun();' type='submit' value='&common.submit;'> </input>
+					onclick='advMARCRun();' type='submit' value='&common.submit;' />
 			</td>
 		</tr>
 	</tbody>
diff --git a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_quick.xml b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_quick.xml
index 3746da14d0..3f7da6ff5e 100644
--- a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_quick.xml
+++ b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_quick.xml
@@ -12,18 +12,18 @@ XXX Deprecate me
 		<tr>
 			<td>
 				<span style='padding-right: 0px;'>&common.call.number.label;</span>
-				<input id='opac.advanced.quick.cn' style='margin: 2px;' type='text' size='12'> </input>
-				<input type='submit' onclick='advCNRun();' value='&advanced.go;'> </input>
+				<input id='opac.advanced.quick.cn' style='margin: 2px;' type='text' size='12' />
+				<input type='submit' onclick='advCNRun();' value='&advanced.go;' />
 			</td>
 			<td>
 				<span style='padding-right: 0px;'>&common.isbn.label;</span>
-				<input id='opac.advanced.quick.isbn' style='margin: 2px;' type='text' size='13' maxlength='13'> </input>
-				<input type='submit' onclick='advISBNRun();' value='&advanced.go;'> </input>
+				<input id='opac.advanced.quick.isbn' style='margin: 2px;' type='text' size='13' maxlength='13' />
+				<input type='submit' onclick='advISBNRun();' value='&advanced.go;' />
 			</td>
 			<td>
 				<span style='padding-right: 0px;'>&common.issn.label;</span>
-				<input id='opac.advanced.quick.issn' style='margin: 2px;' type='text' size='9' maxlength='9'> </input>
-				<input type='submit' onclick='advISSNRun();' value='&advanced.go;'> </input>
+				<input id='opac.advanced.quick.issn' style='margin: 2px;' type='text' size='9' maxlength='9' />
+				<input type='submit' onclick='advISSNRun();' value='&advanced.go;' />
 			</td>
 		</tr>
 	</tbody>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/altcanvas.xml b/Open-ILS/web/opac/skin/default/xml/common/altcanvas.xml
index a9bf957535..d0934512e5 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/altcanvas.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/altcanvas.xml
@@ -14,7 +14,7 @@
 
 	<!-- ============================================================================= -->
 	<!-- Register the alternate canvases  -->
-	<script language='javascript'>
+	<script language='javascript' type='text/javascript'>
 		config.ids.altcanvas.org_tree		= config.ids.common.org_container;
 		config.ids.altcanvas.holds			= 'holds_box';
 		config.ids.altcanvas.check_holds	= 'check_holds_box';
@@ -30,7 +30,7 @@
 
 	<div id='loading_alt' class='hide_me canvas' style='margin-top: 6px;'>
 		<div style='margin-top: 30px; margin-bottom: 30px; text-align: center; font-weight: 700;' class='color_3'>
-			<img src='../../../../images/progressbar_green.gif' style='margin: 5px;'> </img>
+			<img src='../../../../images/progressbar_green.gif' style='margin: 5px;' />
 		</div>
 	</div>
 
diff --git a/Open-ILS/web/opac/skin/default/xml/common/cn_browse.xml b/Open-ILS/web/opac/skin/default/xml/common/cn_browse.xml
index 2d0692a2ee..aea7fa171f 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/cn_browse.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/cn_browse.xml
@@ -21,7 +21,7 @@
 				<tr id='cn_browse_row'>
 					<td id='cn_browse_td' class='cn_browse_item' width='25%' valign='top'>
 						<a><img height='60' width='50' 
-							class='cn_browse_info' name='cn_browse_pic' border='0'> </img></a>
+							class='cn_browse_info' name='cn_browse_pic' border='0' /></a>
 						<div style='font-weight: bold;' class='cn_browse_info' name='cn_browse_cn'>  </div>
 						<div class='cn_browse_info'><a name='cn_browse_title' class='classic_link'> </a></div>
 						<div class='cn_browse_info'><a name='cn_browse_author' class='classic_link'>  </a></div>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/css_common.xml b/Open-ILS/web/opac/skin/default/xml/common/css_common.xml
index adee673e9f..17bd7326fc 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/css_common.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/css_common.xml
@@ -4,19 +4,16 @@
 <link type='text/css' rel='stylesheet' href="<!--#echo var='OILS_SKIN_BASE'-->/default/css/layout.css"/>
 
 <!-- Our font CSS's -->
-<link type='text/css' rel='stylesheet'					
-	href='<!--#echo var="OILS_CSS_BASE"-->/mediumfont.css' name='meduim_fonts' csstype='font'/>
+<link type='text/css' rel='stylesheet' href='<!--#echo var="OILS_CSS_BASE"-->/mediumfont.css' />
 
 <!-- Our colors -->
-<link type='text/css' rel="stylesheet" href="<!--#echo var='OILS_THEME_BASE'-->/default/css/colors.css"  
-	name='Default' csstype='color'/>
+<link type='text/css' rel="stylesheet" href="<!--#echo var='OILS_THEME_BASE'-->/default/css/colors.css" />
 
-<link type='text/css' rel="alternate stylesheet" title='&opac.style.reddish;' href="<!--#echo var='OILS_THEME_BASE'-->/reddish/css/colors.css"  
-	name='Default' csstype='color'/>
+<!-- An alternate stylesheet -->
+<link type='text/css' rel="alternate stylesheet" title='&opac.style.reddish;' href="<!--#echo var='OILS_THEME_BASE'-->/reddish/css/colors.css" />
 
 <!-- OpenSearch auto discovery -->
-<link rel='search' 
-	 type="application/opensearchdescription+xml"
-    title="Evergreen"
-    href="http://<!--#echo var='SERVER_NAME'-->/opac/extras/opensearch/1.1/-/osd.xml"> </link>
+<link type="application/opensearchdescription+xml"
+	rel='search' title="Evergreen"
+	href="http://<!--#echo var='SERVER_NAME'-->/opac/extras/opensearch/1.1/-/osd.xml" />
 
diff --git a/Open-ILS/web/opac/skin/default/xml/common/holds.xml b/Open-ILS/web/opac/skin/default/xml/common/holds.xml
index 2153384d44..00a883ca02 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/holds.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/holds.xml
@@ -1,8 +1,8 @@
 <link rel="stylesheet" type="text/css"
     href='<!--#echo var="OILS_JS_BASE"-->/jscalendar/calendar-brown.css' title="win2k-cold-1" />
-<script src='<!--#echo var="OILS_JS_BASE"-->/jscalendar/calendar.js'></script>
-<script src='<!--#echo var="OILS_JS_BASE"-->/jscalendar/lang/calendar-en.js'></script>
-<script src='<!--#echo var="OILS_JS_BASE"-->/jscalendar/calendar-setup.js'></script>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/jscalendar/calendar.js' />
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/jscalendar/lang/calendar-en.js' />
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/jscalendar/calendar-setup.js' />
 
 <div>
 	<div id='xulholds_box' class='hide_me canvas' style='margin-top: 6px;'>
@@ -11,12 +11,12 @@
 				<tbody>
 					<tr>
 						<td>&opac.holds.xulRecipient;:</td>
-						<td><input type='text' id='xul_recipient_barcode'> </input></td>
+						<td><input type='text' id='xul_recipient_barcode' /></td>
 						<td><input type='submit' value='&common.submit;' 
-							id='xul_recipient_barcode_submit'> </input></td>
+							id='xul_recipient_barcode_submit' /></td>
 						<td><input type='submit' value='&common.hold.place;' 
-							id='xul_recipient_me'> </input></td>
-						<td><input type='submit' value='&common.cancel;' onclick='showCanvas();'></input></td>
+							id='xul_recipient_me' /></td>
+						<td><input type='submit' value='&common.cancel;' onclick='showCanvas();' /></td>
 					</tr>
 
 				</tbody>
@@ -139,18 +139,17 @@
                                     unHideMe($("hold_frozen_thaw_row"));
                                 else
                                     hideMe($("hold_frozen_thaw_row"));
-                            '> 
-                        </input>
+                            ' /> 
                     </td>
                 </tr>
 
                 <tr id='hold_frozen_thaw_row' class='hide_me'>
-                    <script> if($('holds_frozen_chkbox').checked) unHideMe($("hold_frozen_thaw_row"));</script>
                     <td class='holds_cell'>
+                        <script language='javascript' type='text/javascript'> if($('holds_frozen_chkbox').checked) unHideMe($("hold_frozen_thaw_row"));</script>
                         &opac.holds.freeze.thaw_date;
                     </td>
                     <td class='holds_cell'>
-                        <input size='10' maxlength='10' id='holds_frozen_thaw_input'> </input>
+                        <input size='10' maxlength='10' id='holds_frozen_thaw_input' />
                         <button style='padding: 0px;' id='holds_frozen_thaw_date_button'>
                             <img src='<!--#echo var="OILS_JS_BASE"-->/jscalendar/img.gif'
                                 style="cursor: pointer; border: 1px solid red; padding: 0px; margin: -3px;"
@@ -160,7 +159,7 @@
                         </button>
                         &nbsp;(&opac.holds.freeze.thaw_date.format;)
 
-                        <script type="text/javascript">
+                        <script language='javascript' type="text/javascript">
                             Calendar.setup({
                                 inputField  : "holds_frozen_thaw_input",
                                 ifFormat    : "%Y-%m-%d",
@@ -194,7 +193,7 @@
 					</td>
 
 					<td class='holds_cell'>
-						<select id='hold_alt_form_selector' multiple='true' style='width: 14em;'>
+						<select id='hold_alt_form_selector' multiple='multiple' style='width: 14em;'>
 							<option value='at'	class='hide_me'>&opac.search.books;</option>
 							<option value='at-d' class='hide_me'>&opac.search.largePrint;</option>
 							<option value='i'		class='hide_me'>&opac.search.audioBooks;</option>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml b/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
index 7c670e85da..12a577d19a 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
@@ -1,26 +1,23 @@
-<div>
-	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/utils.js'> </script>
-
-	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/utils.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/config.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/CGI.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/Cookies.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/md5.js'> </script>
-
-	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/slimtree.js'> </script>
-
-	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/JSON_v1.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/fmcore.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/fmgen.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/opac_utils.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/OrgTree.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/org_utils.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/RemoteRequest.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/init.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/added_content.js'> </script>
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/utils.js' type='text/javascript' />
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/config.js' type='text/javascript' />
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/CGI.js' type='text/javascript' />
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/Cookies.js' type='text/javascript' />
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/md5.js' type='text/javascript' />
+
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/slimtree.js' type='text/javascript' />
+
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/JSON_v1.js' type='text/javascript' />
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/fmcore.js' type='text/javascript' />
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/fmgen.js' type='text/javascript' />
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/opac_utils.js' type='text/javascript' />
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/OrgTree.js' type='text/javascript' />
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/org_utils.js' type='text/javascript' />
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/RemoteRequest.js' type='text/javascript' />
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/init.js' type='text/javascript' />
+	<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/added_content.js' type='text/javascript' />
 
 	<!-- Some global js -->
-	<script language='javascript'>
+	<script language='javascript' type='text/javascript'>
 
 		config.css.color_1 = "color_1";
 		config.css.color_2 = "color_2";
@@ -34,7 +31,3 @@
 		<!--#endif -->
 
 	</script>
-
-</div>
-
-
diff --git a/Open-ILS/web/opac/skin/default/xml/common/libselect.xml b/Open-ILS/web/opac/skin/default/xml/common/libselect.xml
index 8935d327d3..e5228fe4ff 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/libselect.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/libselect.xml
@@ -1,5 +1,5 @@
 <span>
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/depth_selector.js'> </script>
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/depth_selector.js' />
 	<span class='hide_me' id='depth_selector_span'>
 		<!--#if expr="$SHOW_DEPTHSEL_TEXT='true'"-->
 		<span>&library.select; </span>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/login.xml b/Open-ILS/web/opac/skin/default/xml/common/login.xml
index 197166f944..81720896ff 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/login.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/login.xml
@@ -1,7 +1,7 @@
 
 <div id='login_box' class='hide_me canvas' style='margin-top: 6px;'>
 
-	<script language='javascript'>
+	<script language='javascript' type='text/javascript'>
 		config.ids.login = {};
 		config.css.login = {};
 		config.ids.login.box			= "login_box";
@@ -26,7 +26,7 @@
 				<td><span class='login_text'>&login.username;</span></td>
 				<td>
 					<span class='login_text'>
-						<input id='login_username' type='text' size='16'> </input>
+						<input id='login_username' type='text' size='16' />
 					</span>
 				</td>
 			</tr>
@@ -36,7 +36,7 @@
 				</td>
 				<td>
 					<span class='login_text'>
-						<input id='login_password' type='password' size='16'> </input>
+						<input id='login_password' type='password' size='16' />
 					</span>
 				</td>
 			</tr>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/logo.xml b/Open-ILS/web/opac/skin/default/xml/common/logo.xml
index 37fa5384cd..0b40740205 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/logo.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/logo.xml
@@ -1,4 +1,4 @@
 <div id='logo_div'>
-	<script language='javascript'>config.ids.common.top_logo = "top_left_logo";</script>
-	<img style='margin-right: 4px;' src='<!--#echo var="OILS_BASE"-->/images/small_logo.jpg' id='top_left_logo' border='0' class='logo'> </img>
+	<script language='javascript' type='text/javascript'>config.ids.common.top_logo = "top_left_logo";</script>
+	<img style='margin-right: 4px;' src='<!--#echo var="OILS_BASE"-->/images/small_logo.jpg' id='top_left_logo' border='0' class='logo' />
 </div>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml b/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml
index beb83218ec..aa2ccb3e5b 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml
@@ -4,7 +4,7 @@
 <div id='searchbar'>
 
 	<!-- load my js -->
-	<script language='javascript'>
+	<script language='javascript' type='text/javascript'>
 		config.ids.searchbar = {};
 		config.css.searchbar = {};
 		config.ids.searchbar.text				= 'search_box';	
@@ -54,7 +54,7 @@
 			</tr>
 		</tbody>
 	</table>
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/search_bar.js'> </script>
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/search_bar.js' />
 </div>
 
 
diff --git a/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml b/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml
index 6e39a17993..1ea784a4b9 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml
@@ -57,7 +57,7 @@
 
 	<div id='subject_tree_sidebar' class='sidebar_chunk hide_me' style='margin-top: 12px;'> 
 		<div id='subject_sidebar_tree_div'> </div>
-		<script language='javascript'>
+		<script language='javascript' type='text/javascript'>
 			removeChildren($('subject_sidebar_tree_div'));
 			var subjectSidebarTree = new SlimTree(
 				document.getElementById('subject_sidebar_tree_div'),
@@ -72,7 +72,7 @@
 	<div id='author_tree_sidebar' class='sidebar_chunk hide_me'> 
 		<hr/>
 		<div id='author_sidebar_tree_div'> </div>
-		<script language='javascript'>
+		<script language='javascript' type='text/javascript'>
 			removeChildren($('author_sidebar_tree_div'));
 			var authorSidebarTree = new SlimTree(
 				document.getElementById('author_sidebar_tree_div'),
@@ -87,7 +87,7 @@
 	<div id='series_tree_sidebar' class='sidebar_chunk hide_me'> 
 		<hr/>
 		<div id='series_sidebar_tree_div'> </div>
-		<script language='javascript'>
+		<script language='javascript' type='text/javascript'>
 			removeChildren($('series_sidebar_tree_div'));
 			var seriesSidebarTree = new SlimTree(
 				document.getElementById('series_sidebar_tree_div'),
@@ -117,7 +117,7 @@
 							<option value='barcode'>&opac.advanced.quick.barcode;</option>
 						</select>
 					</td><td>
-						<input type='text' id='adv_quick_text' size='16'> </input>
+						<input type='text' id='adv_quick_text' size='16' />
 					</td>
 				</tr></tbody></table>
 			</div>
@@ -137,13 +137,13 @@
 			<tbody>
 				<tr>
 					<td>&search.marc.tag;</td>
-					<td><input name='advanced.marc.tag' maxlength='3' size='3'> </input></td>
+					<td><input name='advanced.marc.tag' maxlength='3' size='3' /></td>
 					<td>&search.marc.subfield;</td>
-					<td><input name='advanced.marc.subfield' maxlength='1' size='1'> </input></td>
+					<td><input name='advanced.marc.subfield' maxlength='1' size='1' /></td>
 				</tr>
 				<tr>
 					<td>&search.marc.value;</td>
-					<td colspan='3'><input name='advanced.marc.value' size='18'> </input></td>
+					<td colspan='3'><input name='advanced.marc.value' size='18' /></td>
 				</tr>
 				<tr name='crow' class='hide_me'>
 					<td colspan='4' align='center'>
@@ -168,9 +168,9 @@
 
 	<!-- ============================================================================= -->
 	<!-- Our javascript -->
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar.js'> </script>
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar.js' />
 
-	<script language='javascript'>
+	<script language='javascript' type='text/javascript'>
 		config.ids.sidebar = {};
 		config.css.sidebar = {};
 		config.names.sidebar = {};
diff --git a/Open-ILS/web/opac/skin/default/xml/common/statusbar.xml b/Open-ILS/web/opac/skin/default/xml/common/statusbar.xml
index a787268c34..d67b8749e0 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/statusbar.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/statusbar.xml
@@ -16,7 +16,7 @@
 		</tbody>
 	</table>
 
-	<script language='javascript'>
+	<script language='javascript' type='text/javascript'>
 		config.ids.common.now_searching = 'now_searching_location';
 	</script>
 
diff --git a/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml b/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml
index ff5cb916e7..95a99a281a 100644
--- a/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml
+++ b/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml
@@ -4,12 +4,12 @@
 	xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
 	<!-- load my js -->
-	<script language='javascript' 
+	<script language='javascript' type='text/javascript'
 		src="<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/depth_selector.js"> </script>
-	<script language='javascript' 
+	<script language='javascript' type='text/javascript'
 		src="<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/search_bar.js"> </script>
 
-	<script language='javascript'>
+	<script language='javascript' type='text/javascript'>
 		config.ids.searchbar = {};
 		config.css.searchbar = {};
 		config.ids.searchbar.text				= 'search_box';	
@@ -40,7 +40,7 @@
 
 			<tr class='color_3'>
 
-				<script language='javascript'>
+				<script language='javascript' type='text/javascript'>
 					config.ids.common.now_searching = 'now_searching_location';
 				</script>
 
diff --git a/Open-ILS/web/opac/skin/default/xml/home/index_body.xml b/Open-ILS/web/opac/skin/default/xml/home/index_body.xml
index f9a3e23d4e..ebddddfb0a 100644
--- a/Open-ILS/web/opac/skin/default/xml/home/index_body.xml
+++ b/Open-ILS/web/opac/skin/default/xml/home/index_body.xml
@@ -21,8 +21,8 @@
 			</tr>
 		</tbody>
 	</table>
-	<script language='javascript'>isFrontPage = true;</script>
-	<script language="javascript">
+	<script language='javascript' type='text/javascript'>isFrontPage = true;</script>
+	<script language="javascript" type='text/javascript'>
         try { 
             document.getElementById('toptable').style.display = 'table'; 
         } catch(e) {
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_bookbags.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_bookbags.xml
index 6b1acaebc0..e0d691cba2 100644
--- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_bookbags.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_bookbags.xml
@@ -1,7 +1,7 @@
 
 <div id='myopac_bookbag_div' class='hide_me' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/container.js'> </script>
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/container.js'> </script>
 
 	<div id='myopac_delete_bookbag_warn' class='hide_me'>
 		&myopac.delete.bookbag;
@@ -57,7 +57,7 @@
 			<tr>
 				<td> 
 					<span style='padding-right: 5px;'>&myopac.bookbag.naming;</span>
-					<input id='myopac_bookbag_new_name' type='text'> </input> 
+					<input id='myopac_bookbag_new_name' type='text' /> 
 				</td>
 			</tr>
 			<tr>
@@ -67,7 +67,7 @@
 					<span>&common.yes;</span> <input type='radio' name='bb_public' id='bb_public_yes'/>
 					<span>&common.no;</span> <input type='radio' name='bb_public' id='bb_public_no' checked='checked'/>
 					<input style='padding-left: 10px;' onclick='myOPACCreateBookbag();' 
-						type='submit' value='&common.submit;'> </input>
+						type='submit' value='&common.submit;' />
 				</td>
 			</tr>
 		</tbody>
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_checked.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_checked.xml
index 039a51fb19..5d00be1aab 100644
--- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_checked.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_checked.xml
@@ -2,7 +2,7 @@
 <div id='myopac_checked_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
     <!--
-	<script language='javascript' src='<!||#echo var="OILS_JS_BASE"||>/Date.W3CDTF.js'/>
+	<script language='javascript' type='text/javascript' src='<!||#echo var="OILS_JS_BASE"||>/Date.W3CDTF.js'/>
     -->
 
    <table width='100%'><tbody>
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
index 16513c736a..2d2210687c 100644
--- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
@@ -1,7 +1,7 @@
 
 <div id='myopac_holds_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js'> </script>
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js'> </script>
 
 	<table width='100%'>
         <tbody><tr><td width='100%' align='right'>
@@ -13,7 +13,7 @@
                 <option value='cancel'>&myopac.holds.cancel_selected;</option>
             </select>
         </td></tr></tbody>
-        <script>$('myopac_holds_actions_none').selected = true;</script>
+        <script language='javascript' type='text/javascript'>$('myopac_holds_actions_none').selected = true;</script>
     </table>
 
     <span id='myopac.holds.cancel.confirm' class='hide_me'>&myopac.holds.cancel.confirm;</span>
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_prefs.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_prefs.xml
index f360c8ea79..99ffb88e7c 100644
--- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_prefs.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_prefs.xml
@@ -64,7 +64,7 @@
 							onclick='
 								if( this.checked ) $("prefs_def_location").disabled = true;
 								else $("prefs_def_location").disabled = false;
-							'> </input> &myopac.prefs.search.home; 
+							' /> &myopac.prefs.search.home; 
 					</div>
 					<select id='prefs_def_location'>
 					</select>
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml
index 02235a7b03..91d77f0f04 100644
--- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml
@@ -67,7 +67,7 @@
 				<td class='myopac_update_cell' colspan='3'>
 					<span class='myopac_update_span'>&myopac.summary.username.enter; </span>
 					<input type='text' size='24' id='myopac_new_username'
-						onkeydown='if(userPressedEnter(event)) myOPACUpdateUsername();'> </input>
+						onkeydown='if(userPressedEnter(event)) myOPACUpdateUsername();' />
 					<span class='myopac_update_span'>
 						<button onclick='myOPACUpdateUsername();'>&common.submit;</button>
 					</span>
@@ -93,17 +93,17 @@
 						<tr>
 							<td><span class='myopac_update_span'>&myopac.summary.password.current; </span></td>
 							<td><input type='password' size='24' id='myopac_current_password'
-								onkeydown='if(userPressedEnter(event)) myOPACUpdatePassword();'> </input></td>
+								onkeydown='if(userPressedEnter(event)) myOPACUpdatePassword();' /></td>
 						</tr>
 						<tr>
 							<td><span class='myopac_update_span'>&myopac.summary.password.new; </span></td>
 							<td><input type='password' size='24' id='myopac_new_password'
-								onkeydown='if(userPressedEnter(event)) myOPACUpdatePassword();'> </input></td>
+								onkeydown='if(userPressedEnter(event)) myOPACUpdatePassword();' /></td>
 						</tr>
 						<tr>
 							<td><span class='myopac_update_span'>&myopac.summary.password.reenter; </span></td>
 							<td><input type='password' size='24' id='myopac_new_password2'
-								onkeydown='if(userPressedEnter(event)) myOPACUpdatePassword();'> </input></td>
+								onkeydown='if(userPressedEnter(event)) myOPACUpdatePassword();' /></td>
 						</tr>
 					</tbody></table>
 
@@ -128,7 +128,7 @@
 				<td class='myopac_update_cell' colspan='3'>
 					<span class='myopac_update_span'>&myopac.summary.email.new; </span>
 					<input type='text' size='24' id='myopac_new_email'
-						onkeydown='if(userPressedEnter(event)) myOPACUpdateEmail();'> </input>
+						onkeydown='if(userPressedEnter(event)) myOPACUpdateEmail();' />
 					<span class='myopac_update_span'>
 						<button onclick='myOPACUpdateEmail();'>&common.submit;</button>
 					</span>
diff --git a/Open-ILS/web/opac/skin/default/xml/page_advanced.xml b/Open-ILS/web/opac/skin/default/xml/page_advanced.xml
index 2bcefedf58..aba0f5a9c6 100644
--- a/Open-ILS/web/opac/skin/default/xml/page_advanced.xml
+++ b/Open-ILS/web/opac/skin/default/xml/page_advanced.xml
@@ -1,6 +1,6 @@
 <div id='canvas_main' class='canvas' style='margin-top: 20px;'>
 
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/advanced.js'> </script>
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/advanced.js' />
 
 	<style type='text/css'>
 		.advanced_div { text-align: center; margin: 8px; margin-left: 2px; width: 95%; padding: 5px; }
diff --git a/Open-ILS/web/opac/skin/default/xml/page_cnbrowse.xml b/Open-ILS/web/opac/skin/default/xml/page_cnbrowse.xml
index e04670907e..6561b08e11 100644
--- a/Open-ILS/web/opac/skin/default/xml/page_cnbrowse.xml
+++ b/Open-ILS/web/opac/skin/default/xml/page_cnbrowse.xml
@@ -1,5 +1,5 @@
 <div id='canvas_main' class='canvas' style='margin-top: 20px;'>
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/cn_browse.js'> </script>
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/cn_browse.js' />
 	<!--#include virtual="common/cn_browse.xml"-->
 </div>
 
diff --git a/Open-ILS/web/opac/skin/default/xml/page_mresult.xml b/Open-ILS/web/opac/skin/default/xml/page_mresult.xml
index 335c1014af..bc04fad4fa 100644
--- a/Open-ILS/web/opac/skin/default/xml/page_mresult.xml
+++ b/Open-ILS/web/opac/skin/default/xml/page_mresult.xml
@@ -1,9 +1,9 @@
 <div>
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar_extras.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/mresult.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/result_common.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/tips.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js'> </script>   
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar_extras.js' />
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/mresult.js' />
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/result_common.js' />
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/tips.js' />
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js' />   
 	<!--#include virtual="result/result_common.xml"-->
 </div>
 
diff --git a/Open-ILS/web/opac/skin/default/xml/page_myopac.xml b/Open-ILS/web/opac/skin/default/xml/page_myopac.xml
index b004f32eeb..5c16b55c98 100644
--- a/Open-ILS/web/opac/skin/default/xml/page_myopac.xml
+++ b/Open-ILS/web/opac/skin/default/xml/page_myopac.xml
@@ -1,12 +1,12 @@
 <div id='canvas_main' class='canvas hide_me'>
 
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/myopac.js'> </script>
-    <script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/DP_DateExtensions.js'/>
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/myopac.js' />
+    <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/DP_DateExtensions.js'/>
 
-	<script> config.ids.altcanvas.myopac_reload = 'myopac_reloading'; </script>
+	<script language='javascript' type='text/javascript'> config.ids.altcanvas.myopac_reload = 'myopac_reloading'; </script>
 	<div id='myopac_reloading' class='hide_me canvas'> &common.loading; </div>
 
-	<script language='javascript'>
+	<script language='javascript' type='text/javascript'>
 		config.ids.myopac = {};
 		config.css.myopac = {};
 		config.names.myopac = {};
diff --git a/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml b/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
index f4dc87cc0f..291476777c 100644
--- a/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
+++ b/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
@@ -1,14 +1,14 @@
 <div id='canvas_main' class='canvas'>
 
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar_extras.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/result_common.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/rresult.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/rdetail.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/cn_browse.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/container.js'> </script>
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar_extras.js' />
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/result_common.js' />
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/rresult.js' />
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/rdetail.js' />
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js' />
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/cn_browse.js' />
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/container.js' />
 
-	<script language='javascript'>
+	<script language='javascript' type='text/javascript'>
 		config.ids.rdetail = {};
 		config.ids.rdetail.view_marc = "rdetail_view_marc";
 	</script>
diff --git a/Open-ILS/web/opac/skin/default/xml/page_rresult.xml b/Open-ILS/web/opac/skin/default/xml/page_rresult.xml
index 85b475fde0..2a6590f43b 100644
--- a/Open-ILS/web/opac/skin/default/xml/page_rresult.xml
+++ b/Open-ILS/web/opac/skin/default/xml/page_rresult.xml
@@ -1,9 +1,9 @@
 <div>
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar_extras.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/rresult.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/result_common.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/tips.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js'> </script>   
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar_extras.js' />
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/rresult.js' />
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/result_common.js' />
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/tips.js' />
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js' />   
 	<!--#include virtual="result/result_common.xml"-->
 </div>
 
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_altcanvas.xml b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_altcanvas.xml
index 79babf847a..ff17d172c3 100644
--- a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_altcanvas.xml
+++ b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_altcanvas.xml
@@ -3,7 +3,7 @@
 <div class=''>
 
 	<!--
-	<script language='javascript'>
+	<script language='javascript' type='text/javascript'>
 		config.ids.rdetail.view_marc_div = 'view_marc_div';
 		config.ids.altcanvas.view_marc_div = config.ids.rdetail.view_marc_div; 
 		config.ids.rdetail.hide_marc = "rdetail_hide_marc";
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_cn_details.xml b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_cn_details.xml
index c34411dd37..2d77be448a 100644
--- a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_cn_details.xml
+++ b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_cn_details.xml
@@ -1,6 +1,6 @@
 <table class='hide_me'>
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/copy_details.js'> </script>
-	<script language='javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/Date.W3CDTF.js'>  </script>
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/copy_details.js' />
+	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/Date.W3CDTF.js' />
 	<tbody>
 		<tr style='border: 3px solid #E0E0E0;' id='rdetail_volume_details_row' templateRow='1'>
 			<td colspan='10'>
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_copyinfo.xml b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_copyinfo.xml
index 6716f0eca3..9edc825fd2 100644
--- a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_copyinfo.xml
+++ b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_copyinfo.xml
@@ -73,7 +73,7 @@
 
 	<div id='rdetail_copy_info_none' class='hide_me'>&rdetail.noneAvailable;</div>
 
-	<script language='javascript'>
+	<script language='javascript' type='text/javascript'>
 		config.ids.rdetail.cp_status			= "rdetail_copy_info_status";
 		config.ids.rdetail.cp_info_row		= "rdetail_copy_info_row";
 		config.ids.rdetail.cp_info_loading	= "rdetail_copy_info_loading";
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml
index 42af1fc007..5b31d6e7d5 100644
--- a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml
+++ b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml
@@ -59,7 +59,7 @@
 			<tr>
 				<td nowrap='nowrap' class='rdetail_desc'>&common.format;</td>			
 				<td class='rdetail_item'>
-					<img id='rdetail_tor_pic' class='tor_pic'> </img>
+					<img id='rdetail_tor_pic' class='tor_pic' />
 					<span id='rdetail_tor' style='padding-left: 5px;'> </span>
 				</td>
 			</tr>
@@ -82,7 +82,7 @@
 		<!-- unAPI URI goes here -->
 	</abbr>
 
-	<script language='javascript'>
+	<script language='javascript' type='text/javascript'>
 		config.ids.rdetail.details_body		= 'rdetail_details_body'; 
 		config.ids.rdetail.title				= 'rdetail_title';
 		config.ids.rdetail.author				= 'rdetail_author';
diff --git a/Open-ILS/web/opac/skin/default/xml/result/result_common.xml b/Open-ILS/web/opac/skin/default/xml/result/result_common.xml
index e1ac2e24b8..86848ab51f 100644
--- a/Open-ILS/web/opac/skin/default/xml/result/result_common.xml
+++ b/Open-ILS/web/opac/skin/default/xml/result/result_common.xml
@@ -1,7 +1,7 @@
 
 <div id='canvas_main' class='canvas' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
-	<script language='javascript'>
+	<script language='javascript' type='text/javascript'>
 		config.ids.result = {};
 		config.css.result = {};
 		config.names.result = {};
diff --git a/Open-ILS/web/opac/skin/default/xml/result/result_info.xml b/Open-ILS/web/opac/skin/default/xml/result/result_info.xml
index 24c5219845..fd1201eec3 100644
--- a/Open-ILS/web/opac/skin/default/xml/result/result_info.xml
+++ b/Open-ILS/web/opac/skin/default/xml/result/result_info.xml
@@ -22,12 +22,12 @@
 						style='padding-left: 40px;' >
 					<a class='search_page_nav_link' id='search_home_link' 
 						title="&rdetail.page.results;">&rdetail.start;</a><a class='search_page_nav_link' 
-							id='prev_link' title='&rdetail.page.previous;'>&lt;&lt;</a>
+							id='prev_link' title='&rdetail.page.previous;'>&#171;</a>
 
 					<span class='search_page_nav_link' id='page_numbers'> </span>
 
 					<a  class='search_page_nav_link' id='next_link' 
-						title='&rdetail.page.next;'>&gt;&gt;</a><a class='search_page_nav_link' 
+						title='&rdetail.page.next;'>&#187;</a><a class='search_page_nav_link' 
 							id='end_link' title="&rdetail.page.last;">&rdetail.end;</a>
 				</span>
 
diff --git a/Open-ILS/web/opac/skin/default/xml/result/result_table.xml b/Open-ILS/web/opac/skin/default/xml/result/result_table.xml
index 28d437627e..cd1137bcd0 100644
--- a/Open-ILS/web/opac/skin/default/xml/result/result_table.xml
+++ b/Open-ILS/web/opac/skin/default/xml/result/result_table.xml
@@ -6,8 +6,10 @@
 
 		<!-- for some reason, this is the only way i can force the cell widths -->
 		<thead id='result_thead'>
-			<td class='result_table_pic_header'></td>
-			<td> </td>
+			<tr>
+				<td class='result_table_pic_header'></td>
+				<td> </td>
+			</tr>
 		</thead>
 
 		<tbody id='result_table'>
@@ -69,47 +71,47 @@
 								<td name='result_table_format_cell' class='result_table_format_cell'>
 
 									<a name='text_link' class='search_link'> 
-										<img src='../../../../images/tor/text.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/text.jpg' class='dim tor_pic' />
 									</a>
 
 									<a name='sound recording-nonmusical_link' class='search_link'> 
-										<img src='../../../../images/tor/sound recording-nonmusical.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/sound recording-nonmusical.jpg' class='dim tor_pic' />
 									</a>
 
 									<a name='moving image_link' class='search_link'> 
-										<img src='../../../../images/tor/moving image.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/moving image.jpg' class='dim tor_pic' />
 									</a>
 
 									<a name='software, multimedia_link' class='search_link'> 
-										<img src='../../../../images/tor/software, multimedia.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/software, multimedia.jpg' class='dim tor_pic' />
 									</a>
 
 									<a name='sound recording-musical_link' class='search_link'> 
-										<img src='../../../../images/tor/sound recording-musical.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/sound recording-musical.jpg' class='dim tor_pic' />
 									</a>
 
 									<a name='cartographic_link' class='search_link'> 
-										<img src='../../../../images/tor/cartographic.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/cartographic.jpg' class='dim tor_pic' />
 									</a>
 
 									<a name='mixed material_link' class='search_link'> 
-										<img src='../../../../images/tor/mixed material.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/mixed material.jpg' class='dim tor_pic' />
 									</a>
 
 									<a name='notated music_link' class='search_link'> 
-										<img src='../../../../images/tor/notated music.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/notated music.jpg' class='dim tor_pic' />
 									</a>
 
 									<a name='sound recording_link' class='search_link'> 
-										<img src='../../../../images/tor/sound recording.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/sound recording.jpg' class='dim tor_pic' />
 									</a>
 
 									<a name='still image_link' class='search_link'> 
-										<img src='../../../../images/tor/still images.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/still images.jpg' class='dim tor_pic' />
 									</a>
 
 									<a name='three dimensional object_link' class='search_link'> 
-										<img src='../../../../images/tor/three dimensional object.jpg' class='dim tor_pic'> </img>
+										<img src='../../../../images/tor/three dimensional object.jpg' class='dim tor_pic' />
 									</a>
 
 									<span class='hide_me' 
@@ -163,11 +165,11 @@
 	               style='padding-left: 40px;' >
 	            <a class='search_page_nav_link' id='search_home_link2' 
 	               title="&rdetail.page.results;">&rdetail.start;</a><a class='search_page_nav_link' 
-	               id='prev_link2' title='&rdetail.page.previous;'>&lt;&lt;</a>
+	               id='prev_link2' title='&rdetail.page.previous;'>&#171;</a>
             
 	            <span class='search_page_nav_link' id='page_numbers2'> </span>
 	               <a  class='search_page_nav_link' id='next_link2' 
-	                  title='&rdetail.page.next;'>&gt;&gt;</a><a class='search_page_nav_link' 
+	                  title='&rdetail.page.next;'>&#187;</a><a class='search_page_nav_link' 
 	                  id='end_link2' title="&rdetail.page.last;">&rdetail.end;</a>
 	            </span>
                         
@@ -187,7 +189,7 @@
    <!-- ====================== -->
 
 
-	<script language='javascript'>
+	<script language='javascript' type='text/javascript'>
 		config.names.result.format_cell = 'result_table_format_cell';
 		config.names.result.format_link = 'resource_link'
 		config.names.result.format_pic = 'format_pic'
-- 
2.11.0