From: Bill Erickson <erickson@esilibrary.com>
Date: Wed, 15 Dec 2010 18:40:01 +0000 (-0500)
Subject: more work getting results, rdetails, my account working in not-ff
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=78fbb568dbafd2113b3c3a1932ea4707f51eb31d;p=evergreen%2Fequinox.git

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 ebdbfce14d..ed7986f088 100644
--- 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;
     } else $("adv_global_sort_dir").disabled = false;
 }
-setTimeout(__setsortsel, 100);
+dojo.addOnLoad(__setsortsel);
 
 function advAddMARC() {
 	var newt = $('adv_sdbar_table').cloneNode(true);
diff --git a/Open-ILS/web/opac/skin/kcls/js/holds.js b/Open-ILS/web/opac/skin/kcls/js/holds.js
index 1d6f16c21b..b261eff862 100644
--- 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() {
     };
 }
 
-setTimeout(
+dojo.addOnLoad(
     function() {
         $('holds_frozen_thaw_input').onchange = function(){holdsVerifyThawDateUI('holds_frozen_thaw_input');}
         $('holds_frozen_thaw_input').onkeyup = function(){holdsVerifyThawDateUI('holds_frozen_thaw_input');}
-    }, 100);
-
+    }
+);
 
 function _holdsHandleStaffMe() {
 	holdArgs.recipient = G.user;
diff --git a/Open-ILS/web/opac/skin/kcls/js/rdetail.js b/Open-ILS/web/opac/skin/kcls/js/rdetail.js
index 3e2051b0be..ed8bcb5b9e 100644
--- a/Open-ILS/web/opac/skin/kcls/js/rdetail.js
+++ b/Open-ILS/web/opac/skin/kcls/js/rdetail.js
@@ -1,4 +1,5 @@
 /* */
+dojo.require('openils.BibTemplate');
 
 if(findCurrentPage()==RDETAIL){
 detachAllEvt('common', 'run');
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 47b9e9446c..aa7364aea7 100644
--- 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 @@
 
+dojo.require('openils.BibTemplate');
+
 var recordsHandled = 0;
 var recordsCache = [];
 var lowHitCount = 4;
@@ -602,12 +604,11 @@ function resultDisplayRecord(rec, pos, is_mr) {
 		$n(r,'place_hold_link').onclick = function() { resultDrawHoldsWindow(rec.doc_id(), 'T'); }
 
 		/** BILL */
-		//dojo.require('openils.BibTemplate');  // -- this causes redundant requests per record - put in js_common.xml instead
 		setTimeout(
 		    function () { 
-			//new openils.BibTemplate({root : $n(r, 'bib_cn_list'), record : rec.doc_id()}).render();
-			new openils.BibTemplate({root : r, record : rec.doc_id()}).render();
-                    }, 0
+			    new openils.BibTemplate(
+                    {root : r, record : rec.doc_id()}).render();
+            }, 0
 		);
 		/** BILL */
 	}
diff --git a/Open-ILS/web/opac/skin/kcls/js/rresult.js b/Open-ILS/web/opac/skin/kcls/js/rresult.js
index c1dc5f3798..a33d23d148 100644
--- a/Open-ILS/web/opac/skin/kcls/js/rresult.js
+++ b/Open-ILS/web/opac/skin/kcls/js/rresult.js
@@ -1,3 +1,4 @@
+
 var records = new Array();
 var table;
 var rowtemplate;
diff --git a/Open-ILS/web/opac/skin/kcls/xml/body.xml b/Open-ILS/web/opac/skin/kcls/xml/body.xml
index 1b761aa677..5ad8cc8f47 100644
--- 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 e6e2886051..47d2f1a984 100644
--- 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 8b2bb39662..742c68232c 100644
--- 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() {