making results page happy in non-ff

diff --git a/Open-ILS/web/opac/skin/kcls/js/result_common.js b/Open-ILS/web/opac/skin/kcls/js/result_common.js
index 413cac8..47b9e94 100644 (file)
--- a/Open-ILS/web/opac/skin/kcls/js/result_common.js
+++ b/Open-ILS/web/opac/skin/kcls/js/result_common.js
@@ -4,7 +4,9 @@ var recordsCache = [];
 var lowHitCount = 4;\r
 var isbnList = '';\r
 var googleBooksLink = true;\r
-buildOrgSel($('holdsCacheSel'), globalOrgTree, 0);\r
+\r
+// TODO: test\r
+dojo.addOnLoad(function(){ buildOrgSel($('holdsCacheSel'), globalOrgTree, 0);});\r
 \r
 var resultFetchAllRecords = false;\r
 var resultCompiledSearch = null;\r
@@ -34,8 +36,8 @@ config.names.result.item_author = "item_author";
 config.names.result.counts_row  = "counts_row";\r
 config.names.result.count_cell  = "copy_count_cell";\r
 config.names.result.format_cell = 'result_table_format_cell';\r
-config.names.result.format_link = 'resource_link'\r
-config.names.result.format_pic  = 'format_pic'\r
+config.names.result.format_link = 'resource_link';\r
+config.names.result.format_pic  = 'format_pic';\r
 \r
 /* set up the event handlers */\r
 if( findCurrentPage() == MRESULT || findCurrentPage() == RRESULT ) {\r

diff --git a/Open-ILS/web/opac/skin/kcls/xml/common/js_common.xml b/Open-ILS/web/opac/skin/kcls/xml/common/js_common.xml
index d88358b..e6e2886 100644 (file)
--- a/Open-ILS/web/opac/skin/kcls/xml/common/js_common.xml
+++ b/Open-ILS/web/opac/skin/kcls/xml/common/js_common.xml
@@ -62,10 +62,6 @@
 
 <script src="<!--#echo var='OILS_SKIN_BASE'-->/kcls/js/misc.js" type='text/javascript'></script>
 
-<!--#if expr="$FRONT_PAGE!='true'"-->
-<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/password_reset.js'></script>
-<!--#endif -->
-
 <!--#if expr="$OILS_PAGE!='advanced.xml'"-->
 <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/search_bar.js'></script>
 <!--#endif-->

diff --git a/Open-ILS/web/opac/skin/kcls/xml/common/js_common_postbody.xml b/Open-ILS/web/opac/skin/kcls/xml/common/js_common_postbody.xml
index 0cc7a68..8b2bb39 100644 (file)
--- a/Open-ILS/web/opac/skin/kcls/xml/common/js_common_postbody.xml
+++ b/Open-ILS/web/opac/skin/kcls/xml/common/js_common_postbody.xml
@@ -159,10 +159,6 @@
         config.css.myopac = {};
         config.names.myopac = {};
 
-        <!--#if expr="$FRONT_PAGE!='true'"-->
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/password_reset.js');
-        <!--#endif -->
-
         <!--#if expr="$OILS_PAGE='rresult.xml'"-->
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/sidebar_extras.js');
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/rresult.js');

diff --git a/Open-ILS/web/opac/skin/kcls/xml/common/sidebar.xml b/Open-ILS/web/opac/skin/kcls/xml/common/sidebar.xml
index f54fea1..b761a1e 100644 (file)
--- a/Open-ILS/web/opac/skin/kcls/xml/common/sidebar.xml
+++ b/Open-ILS/web/opac/skin/kcls/xml/common/sidebar.xml
@@ -67,17 +67,17 @@
                 var fblob = this;\r
                 setTimeout(\r
                     function() {\r
-                        attachEvt("result", "allRecordsReceived", function () {\r
-                            if(!resultFacetKey) return;                                        \r
-                            if (fblob.facetCacheKey) return; // already rendered it\r
+                        attachEvt("result", "allRecordsReceived", \r
+                            function () {\r
+                                if(!resultFacetKey) return;                                    \r
+                                if (fblob.facetCacheKey) return; // already rendered it\r
                                                \r
-                            dojo.removeClass('facetSidebarContainer','hide_me');\r
-        \r
-                            fblob.facetCacheKey = resultFacetKey;\r
-                            fblob.render();\r
-                        }\r
-                    }\r
-                );\r
+                                dojo.removeClass('facetSidebarContainer','hide_me');\r
+            \r
+                                fblob.facetCacheKey = resultFacetKey;\r
+                                fblob.render();\r
+                            }\r
+                    )}, 0);\r
             ]]></script>\r
         </div>\r
        </div>\r

diff --git a/Open-ILS/web/opac/skin/kcls/xml/result/result_table.xml b/Open-ILS/web/opac/skin/kcls/xml/result/result_table.xml
index 3c26d36..b9decaa 100644 (file)
--- a/Open-ILS/web/opac/skin/kcls/xml/result/result_table.xml
+++ b/Open-ILS/web/opac/skin/kcls/xml/result/result_table.xml
@@ -169,14 +169,14 @@
    <!-- ====================== -->\r
 \r
     <!-- ChiliFresh setup -->\r
-    <!--if expr="${OILS_CHILIFRESH_ACCOUNT} && ${OILS_CHILIFRESH_ACCOUNT}!='(none)'"-->\r
+    <!--#if expr="${OILS_CHILIFRESH_ACCOUNT} && ${OILS_CHILIFRESH_ACCOUNT}!='(none)'"-->\r
         <input type="hidden" id="chilifresh_account" name="chilifresh_account"\r
             value="<!--#echo var='OILS_CHILIFRESH_ACCOUNT'-->" />\r
         <input type="hidden" id="chilifresh_profile" name="chilifresh_profile"\r
             value="<!--#echo var='OILS_CHILIFRESH_PROFILE'-->" />\r
         <input type="hidden" id="chilifresh_version" name="chilifresh_version" value="onsite_v1" />\r
         <input type="hidden" id="chilifresh_type" name="chilifresh_type" value="search" />\r
-    <!--endif-->\r
+    <!--#endif-->\r
 </div>\r
 <![CDATA[<!-- ****************** end: result_table.xml ***************************** -->]]>\r
 \r