more work getting results, rdetails, my account working in not-ff

diff --git a/Open-ILS/web/opac/skin/kcls/js/advanced.js b/Open-ILS/web/opac/skin/kcls/js/advanced.js
index ebdbfce..ed7986f 100644 (file)
--- a/Open-ILS/web/opac/skin/kcls/js/advanced.js
+++ b/Open-ILS/web/opac/skin/kcls/js/advanced.js
@@ -26,7 +26,7 @@ function __setsortsel() {
         $("adv_global_sort_dir").selectedIndex = 0;\r
     } else $("adv_global_sort_dir").disabled = false;\r
 }\r
-setTimeout(__setsortsel, 100);\r
+dojo.addOnLoad(__setsortsel);\r
 \r
 function advAddMARC() {\r
        var newt = $('adv_sdbar_table').cloneNode(true);\r

diff --git a/Open-ILS/web/opac/skin/kcls/js/holds.js b/Open-ILS/web/opac/skin/kcls/js/holds.js
index 1d6f16c..b261eff 100644 (file)
--- a/Open-ILS/web/opac/skin/kcls/js/holds.js
+++ b/Open-ILS/web/opac/skin/kcls/js/holds.js
@@ -54,12 +54,12 @@ function holdsHandleStaff() {
     };\r
 }\r
 \r
-setTimeout(\r
+dojo.addOnLoad(\r
     function() {\r
         $('holds_frozen_thaw_input').onchange = function(){holdsVerifyThawDateUI('holds_frozen_thaw_input');}\r
         $('holds_frozen_thaw_input').onkeyup = function(){holdsVerifyThawDateUI('holds_frozen_thaw_input');}\r
-    }, 100);\r
-\r
+    }\r
+);\r
 \r
 function _holdsHandleStaffMe() {\r
        holdArgs.recipient = G.user;\r

diff --git a/Open-ILS/web/opac/skin/kcls/js/rdetail.js b/Open-ILS/web/opac/skin/kcls/js/rdetail.js
index 3e2051b..ed8bcb5 100644 (file)
--- a/Open-ILS/web/opac/skin/kcls/js/rdetail.js
+++ b/Open-ILS/web/opac/skin/kcls/js/rdetail.js
@@ -1,4 +1,5 @@
 /* */\r
+dojo.require('openils.BibTemplate');\r
 \r
 if(findCurrentPage()==RDETAIL){\r
 detachAllEvt('common', 'run');\r

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 47b9e94..aa7364a 100644 (file)
--- a/Open-ILS/web/opac/skin/kcls/js/result_common.js
+++ b/Open-ILS/web/opac/skin/kcls/js/result_common.js
@@ -1,4 +1,6 @@
 \r
+dojo.require('openils.BibTemplate');\r
+\r
 var recordsHandled = 0;\r
 var recordsCache = [];\r
 var lowHitCount = 4;\r
@@ -602,12 +604,11 @@ function resultDisplayRecord(rec, pos, is_mr) {
                $n(r,'place_hold_link').onclick = function() { resultDrawHoldsWindow(rec.doc_id(), 'T'); }\r
 \r
                /** BILL */\r
-               //dojo.require('openils.BibTemplate');  // -- this causes redundant requests per record - put in js_common.xml instead\r
                setTimeout(\r
                    function () { \r
-                       //new openils.BibTemplate({root : $n(r, 'bib_cn_list'), record : rec.doc_id()}).render();\r
-                       new openils.BibTemplate({root : r, record : rec.doc_id()}).render();\r
-                    }, 0\r
+                           new openils.BibTemplate(\r
+                    {root : r, record : rec.doc_id()}).render();\r
+            }, 0\r
                );\r
                /** BILL */\r
        }\r

diff --git a/Open-ILS/web/opac/skin/kcls/js/rresult.js b/Open-ILS/web/opac/skin/kcls/js/rresult.js
index c1dc5f3..a33d23d 100644 (file)
--- a/Open-ILS/web/opac/skin/kcls/js/rresult.js
+++ b/Open-ILS/web/opac/skin/kcls/js/rresult.js
@@ -1,3 +1,4 @@
+\r
 var records = new Array();\r
 var table;\r
 var rowtemplate;\r

diff --git a/Open-ILS/web/opac/skin/kcls/xml/body.xml b/Open-ILS/web/opac/skin/kcls/xml/body.xml
index 1b761aa..5ad8cc8 100644 (file)
--- a/Open-ILS/web/opac/skin/kcls/xml/body.xml
+++ b/Open-ILS/web/opac/skin/kcls/xml/body.xml
@@ -61,6 +61,8 @@
   <div id="x"></div>
 </div>
 
+<div dojoType='openils.widget.ProgressDialog' jsId='progressDialog' style="width:300px;"></div>
+
 <!--#if expr="$HTTP_USER_AGENT = /Firefox/ || $HTTP_USER_AGENT = /Xulrunner/" -->
 <!--#include virtual='common/js_common_postbody.xml'-->
 <!--#endif-->

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 e6e2886..47d2f1a 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
@@ -266,7 +266,6 @@
                 here = findOrgUnit( here.parent_ou() );
         }
 
-        dojo.require('openils.BibTemplate');
         new openils.BibTemplate(
             { record : new CGI().param('r'), org_unit : here.shortname() }
         ).render();
@@ -296,6 +295,8 @@
     dojo.require("dojo.date.stamp");
     dojo.require("dojo.parser");
     dojo.require("openils.widget.FacetSidebar"); // pulls in Searcher and I18N
+    dojo.require("dijit.form.CheckBox");
+    dojo.require("openils.widget.ProgressDialog");
     dojo.addOnLoad(opac_init)
 
     try { 

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 8b2bb39..742c682 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
@@ -29,6 +29,8 @@
     dojo.require("dojo.date.stamp");
     dojo.require("dojo.parser");
     dojo.require("dojo.cookie");
+    dojo.require("dijit.form.CheckBox");
+    dojo.require("openils.widget.ProgressDialog");
     dojo.require("openils.widget.FacetSidebar"); // pulls in Searcher and I18N
 
     function skin_init() {