From c80853ee6c3b89867decb835f020d217b87dfdd1 Mon Sep 17 00:00:00 2001
From: senator <lebbeous@esilibrary.com>
Date: Mon, 13 Dec 2010 16:37:47 -0500
Subject: [PATCH] cleanup

---
 .../web/opac/skin/default/xml/common/altcanvas.xml | 10 -------
 .../skin/default/xml/common/js_common_postbody.xml | 20 +++++++++++++
 Open-ILS/web/opac/skin/default/xml/common/logo.xml |  3 --
 .../web/opac/skin/default/xml/common/searchbar.xml | 23 ---------------
 .../web/opac/skin/default/xml/home/homesearch.xml  |  3 --
 .../web/opac/skin/default/xml/page_cnbrowse.xml    |  3 --
 .../web/opac/skin/default/xml/page_mresult.xml     |  5 ----
 .../web/opac/skin/default/xml/page_rresult.xml     |  7 -----
 .../opac/skin/default/xml/result/result_common.xml | 34 ----------------------
 9 files changed, 20 insertions(+), 88 deletions(-)

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 cbaf0ad95e..8a67377ed1 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/altcanvas.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/altcanvas.xml
@@ -14,16 +14,6 @@
 
 	<!-- ============================================================================= -->
 	<!-- Register the alternate canvases  -->
-	<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';
-		config.ids.altcanvas.xulholds		= 'xulholds_box';
-		config.ids.altcanvas.loading		= 'loading_alt';
-		//config.ids.altcanvas.cnbrowse		= 'cn_browse';
-        */
-	</script>
 
 	<!--#if expr="$FRONT_PAGE!='true'"-->
 		<!--#include virtual="holds.xml"-->
diff --git a/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml b/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml
index 2ab945bff7..ff7f4be7a6 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml
@@ -233,12 +233,32 @@
 
         <!--#endif-->
 
+        <!--#if expr="$OILS_PAGE='mresult.xml'"-->
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar_extras.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/mresult.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/result_common.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/tips.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js');
+        <!--#endif-->
+
+        <!--#if expr="$OILS_PAGE='cnbrowse.xml'"-->
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/cn_browse.js');
+        <!--#endif-->
 
         <!--#if expr="$OILS_PAGE='advanced.xml'"-->
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/advanced.js');
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/adv_global.js');
         <!--#endif-->
 
+        /* I'm not sure how to test for the situation where this block is
+           needed, but this won't hurt. */
+        try {
+            if ($('holds_frozen_chkbox').checked)
+                unHideMe($("hold_frozen_thaw_row"));
+        } catch (E) {
+            void(0);
+        }
+
         console.log('end of main script');
     }
 
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 ae188658da..7da00d91af 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/logo.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/logo.xml
@@ -1,6 +1,3 @@
 <div id='logo_div'>
-    <!--
-	<script language='javascript' type='text/javascript'>config.ids.common.top_logo = "top_left_logo";</script>
-    -->
 	<img style='margin-right: 4px; height: 48px; width: 187px;' 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 89ee173f79..970ca1d628 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml
@@ -34,29 +34,6 @@
         },0);
     ]]></script>
 
-
-	<!-- load my js -->
-	<script language='javascript' type='text/javascript'>
-        /*
-		config.ids.searchbar = {};
-		config.css.searchbar = {};
-		config.ids.searchbar.text				= 'search_box';	
-		config.ids.searchbar.facets				= 'facet_box';	
-		config.ids.searchbar.submit			= 'search_submit';	
-		config.ids.searchbar.type_selector	= 'search_type_selector';
-		config.ids.searchbar.depth_selector	= 'depth_selector';
-		config.ids.searchbar.form_selector	= 'form_selector';
-		config.ids.searchbar.extra_row		= 'searchbar_extra';
-		config.ids.searchbar.main_row			= 'searchbar_main_row';
-		config.ids.searchbar.table				= 'searchbar_table';
-		config.ids.searchbar.location_tag	= 'search_location_tag_link';
-		config.ids.searchbar.lib_sel_span	= 'lib_selector_span';
-		config.ids.searchbar.lib_sel_link	= 'lib_selector_link';
-		config.ids.searchbar.depth_sel_span	= 'depth_selector_span';
-        */
-	</script>
-
-
 	<table class='color_1 color_border1' width='100%' style='border-collapse: collapse;'>
 		<tbody>
 			<tr>
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 fef5918110..1c68a45008 100644
--- a/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml
+++ b/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml
@@ -16,9 +16,6 @@
 
 			<tr class='color_3'>
 
-				<script language='javascript' type='text/javascript'>
-					//config.ids.common.now_searching = 'now_searching_location';
-				</script>
 
 				<td style='padding: 6px;' class='border_5' align='center'>
 					<span>&opac.search.nowSearching;</span>
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 cc2c4a4dcd..f5c3ae7245 100644
--- a/Open-ILS/web/opac/skin/default/xml/page_cnbrowse.xml
+++ b/Open-ILS/web/opac/skin/default/xml/page_cnbrowse.xml
@@ -1,6 +1,3 @@
 <div id='canvas_main' class='canvas' style='margin-top: 20px;'>
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/cn_browse.js'></script>
 	<!--#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 b507d425ae..8965a6d728 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,4 @@
 <div>
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar_extras.js'></script>
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/mresult.js'></script>
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/result_common.js'></script>
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/tips.js'></script>
-	<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js'></script>   
 	<!--#include virtual="result/result_common.xml"-->
 </div>
 
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 81467721a4..8965a6d728 100644
--- a/Open-ILS/web/opac/skin/default/xml/page_rresult.xml
+++ b/Open-ILS/web/opac/skin/default/xml/page_rresult.xml
@@ -1,11 +1,4 @@
 <div>
-    <!--
-	<script language='javascript' type='text/javascript' src='<!==#echo var="OILS_OPAC_JS_HOST"==>/skin/default/js/sidebar_extras.js'></script>
-	<script language='javascript' type='text/javascript' src='<!==#echo var="OILS_OPAC_JS_HOST"==>/skin/default/js/rresult.js'></script>
-	<script language='javascript' type='text/javascript' src='<!==#echo var="OILS_OPAC_JS_HOST"==>/skin/default/js/result_common.js'></script>
-	<script language='javascript' type='text/javascript' src='<!==#echo var="OILS_OPAC_JS_HOST"==>/skin/default/js/tips.js'></script>
-	<script language='javascript' type='text/javascript' src='<!==#echo var="OILS_OPAC_JS_HOST"==>/skin/default/js/holds.js'></script>   
-    -->
 	<!--#include virtual="result/result_common.xml"-->
 </div>
 
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 07cc8b7f60..8228d82833 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,38 +1,4 @@
-
 <div id='canvas_main' class='canvas' xmlns:xi="http://www.w3.org/2001/XInclude" >
-
-	<script language='javascript' type='text/javascript'>
-        /*
-		config.ids.result = {};
-		config.css.result = {};
-		config.names.result = {};
-		config.ids.result.offset_start	= "offset_start";
-		config.ids.result.offset_end		= "offset_end";
-		config.ids.result.result_count	= "result_count";
-		config.ids.result.next_link		= 'next_link';
-		config.ids.result.prev_link		= 'prev_link';
-		config.ids.result.home_link		= 'search_home_link';
-		config.ids.result.end_link			= 'end_link';
-		config.ids.result.main_table		= 'result_table';
-		config.ids.result.row_template	= 'result_table_template';
-		config.ids.result.num_pages		= 'num_pages';
-		config.ids.result.current_page	= 'current_page';
-		config.css.result.nav_active		= "nav_link_active";
-		config.ids.result.top_div			= "result_table_div";
-		config.ids.result.nav_links		= "search_nav_links";
-		config.ids.result.info				= "result_info_div";
-		config.css.result.cc_cell_even	= "copy_count_cell_even";
-		config.names.result.item_jacket	= "item_jacket";
-		config.names.result.item_title	= "item_title";
-		config.names.result.item_author	= "item_author";
-		config.names.result.counts_row	= "counts_row";
-		config.names.result.count_cell	= "copy_count_cell";
-        */
-	</script>
-
 	<!--#include virtual="result_table.xml"-->
 	<!--#include virtual="result_lowhits.xml"-->
-
 </div>
-
-
-- 
2.11.0