"clean-up" har

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 5a86bad..2d69634 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
@@ -1,4 +1,4 @@
-<script language='javascript' type="text/javascript">
+<script language='javascript' type="text/javascript"><![CDATA[
     var locale = location.href.replace( /.+opac\/([^\/]+)\/skin.+/, '$1' );
     if (!locale) locale = '<!--#echo var="locale"-->';
 
@@ -8,19 +8,116 @@
         isDebug: false
     };
     var lang, bidi;
-</script>
 
-<script language='javascript' src='/js/dojo/dojo/dojo.js'></script>
+    <!--#if expr="$OILS_PAGE='index.xml'"-->
+    isFrontPage = true;
+    <!--#endif-->
+
+    function config_setup() {
+        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';
+        config.ids.common.top_logo = "top_left_logo";
+        config.ids.sidebar = {};
+        config.css.sidebar = {};
+        config.names.sidebar = {};
+        config.css.sidebar.item = {};
+        config.ids.sidebar.home                = 'home_link_div';
+        config.ids.sidebar.advanced        = 'advanced_link_div';
+        config.ids.sidebar.myopac            = 'myopac_link_div';
+        config.ids.sidebar.prefs            = 'prefs_link_div';
+        config.ids.sidebar.mresult            = 'mresult_link_div';
+        config.ids.sidebar.rresult            = 'result_link_div';
+        config.ids.sidebar.rdetail            = "rdetail_link_div";
+        config.ids.sidebar.login            = 'login_link';
+        config.ids.sidebar.logout            = 'logout_link';
+        config.ids.sidebar.logoutbox        = 'logout_link_div';
+        config.ids.sidebar.loginbox        = 'login_link_div';
+        config.ids.sidebar.logged_in_as    = 'logged_in_as_div';
+        config.ids.sidebar.username_dest    = 'username_dest';
+
+        config.ids.sidebar.home_link        = 'home_link'
+        config.ids.sidebar.advanced_link    = 'advanced_link'
+        config.ids.sidebar.myopac_link    = 'myopac_link'
+
+        config.css.encircled                = 'encircled';
+
+        config.ids.login = {};
+        config.css.login = {};
+        config.ids.login.form            = "login_form";
+        config.ids.login.box            = "login_box";
+        config.ids.login.tbody            = "login_tbody";
+        config.ids.login.username    = "login_username";
+        config.ids.login.password    = "login_password";
+        config.ids.login.button        = "login_button";
+        config.ids.login.cancel        = "login_cancel_button";
+        config.ids.altcanvas.login            = config.ids.login.box;
+
+        config.ids.altcanvas.myopac_reload = 'myopac_reloading';
+        config.ids.myopac = {};
+        config.css.myopac = {};
+        config.names.myopac = {};
+
+        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';
+
+        <!--#if expr="$OILS_PAGE='rdetail.xml'"-->
+        config.ids.rdetail              = {};
+        config.ids.rdetail.view_marc    = "rdetail_view_marc";
+        config.ids.rdetail.details_body = 'rdetail_details_body';
+        config.ids.rdetail.title        = 'rdetail_title';
+        config.ids.rdetail.author       = 'rdetail_author';
+        config.ids.rdetail.isbn         = 'rdetail_isbn';
+        config.ids.rdetail.edition      = 'rdetail_edition';
+        config.ids.rdetail.pubdate      = 'rdetail_pubdate';
+        config.ids.rdetail.publisher    = 'rdetail_publisher';
+        config.ids.rdetail.tor          = 'rdetail_tor';
+        config.ids.rdetail.abstr        = 'rdetail_abstract';
+        config.ids.rdetail.image        = 'rdetail_image';
+        config.ids.rdetail.tor_pic      = 'rdetail_tor_pic';
+
+        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";
+        config.ids.rdetail.cp_info_local    = "copy_info_local_link";
+        config.ids.rdetail.cp_info_all      = "copy_info_all_link";
+        config.ids.rdetail.cp_info_none     = "rdetail_copy_info_none";
+        config.names.rdetail.lib_cell       = "rdetail_library_cell";
+        config.names.rdetail.cn_cell        = "rdetail_callnumber_cell";
+        config.names.rdetail.cp_count_cell  = "rdetail_copy_count_cell";
+        config.names.rdetail.cp_status      = 'rdetail_status_cell';
+
+        <!--#endif-->
+    }
+]]></script>
+
+<script type='text/javascript' src='/js/dojo/dojo/dojo.js'></script>
 
 <!--#if expr="$OILS_PAGE='myopac.xml'"-->
 <!-- my acccount uses a lot more classes -->
-<script language='javascript'
+<script type='text/javascript'
     src='/IDL2js?mvr,bre,aou,aout,pgt,lasso,cmf,cmc,cmsa,cam,cifm,clfm,citm,cblvl,ccs,au,accs,ahr,ahrn,acn,actscecm,cbreb,cbreb,cbrebi,acp,cust,ac,aua,mous,circ,mbts,mb,ausp,csp,acpl'>
 </script>
 <!--#else-->
-<script language='javascript'
+<script type='text/javascript'
     src='/IDL2js?mvr,bre,aou,aout,pgt,lasso,cmf,cmc,cmsa,cam,cifm,clfm,citm,cblvl,ccs,au'>
 </script>
+
 <!--#endif-->
 
 
@@ -59,7 +156,6 @@
 <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_JS_BASE"-->/Cookies.js'></script>
 <!--END COMPRESSION--> 
 <!--#endif -->
-
 <script src="<!--#echo var='OILS_SKIN_BASE'-->/kcls/js/misc.js" type='text/javascript'></script>
 
 <!--#if expr="$OILS_PAGE!='advanced.xml'"-->
@@ -87,6 +183,19 @@
 <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/container.js'></script>
 <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/copy_details.js'></script>
 <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/Date.W3CDTF.js'></script>
+<script type="text/javascript"><![CDATA[
+    attachEvt("common", "init", function() {
+        var here = findOrgUnit(getLocation());
+        if (getDepth() > 0 || getDepth === 0 ) {
+            while (getDepth() < findOrgDepth(here))
+                here = findOrgUnit( here.parent_ou() );
+        }
+
+        new openils.BibTemplate(
+            { record : new CGI().param('r'), org_unit : here.shortname() }
+        ).render();
+    });
+]]></script>
 <!--#endif-->
 
 
@@ -120,7 +229,7 @@
 
 <!-- global js -->
 <script language='javascript' type='text/javascript'><![CDATA[
-
+    config_setup();
     var cookieManager = new HTTP.Cookies(); 
 
     /*  -----------------------------------------------------------------------
@@ -155,123 +264,7 @@
         forceLoginSSL = true;
     <!--#endif -->
 
-    config.ids.searchbar = {};
-    config.css.searchbar = {};
-    config.ids.searchbar.text                = 'search_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';
-    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.common.now_searching = 'now_searching_location';
-    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';
-    config.ids.common.top_logo = "top_left_logo";
-    config.ids.sidebar = {};
-    config.css.sidebar = {};
-    config.names.sidebar = {};
-    config.css.sidebar.item = {};
-    config.ids.sidebar.home                = 'home_link_div';
-    config.ids.sidebar.advanced        = 'advanced_link_div';
-    config.ids.sidebar.myopac            = 'myopac_link_div';
-    config.ids.sidebar.prefs            = 'prefs_link_div';
-    config.ids.sidebar.mresult            = 'mresult_link_div';
-    config.ids.sidebar.rresult            = 'result_link_div';
-    config.ids.sidebar.rdetail            = "rdetail_link_div";
-    config.ids.sidebar.login            = 'login_link';
-    config.ids.sidebar.logout            = 'logout_link';
-    config.ids.sidebar.logoutbox        = 'logout_link_div';
-    config.ids.sidebar.loginbox        = 'login_link_div';
-    config.ids.sidebar.logged_in_as    = 'logged_in_as_div';
-    config.ids.sidebar.username_dest    = 'username_dest';
-
-    config.ids.sidebar.home_link        = 'home_link'
-    config.ids.sidebar.advanced_link    = 'advanced_link'
-    config.ids.sidebar.myopac_link    = 'myopac_link'
-
-    config.css.encircled                = 'encircled';
-
-    config.ids.login = {};
-    config.css.login = {};
-    config.ids.login.form            = "login_form";
-    config.ids.login.box            = "login_box";
-    config.ids.login.tbody            = "login_tbody";
-    config.ids.login.username    = "login_username";
-    config.ids.login.password    = "login_password";
-    config.ids.login.button        = "login_button";
-    config.ids.login.cancel        = "login_cancel_button";
-    config.ids.altcanvas.login            = config.ids.login.box;
-
-    config.ids.altcanvas.myopac_reload = 'myopac_reloading';
-    config.ids.myopac = {};
-    config.css.myopac = {};
-    config.names.myopac = {};
-
-
-    <!--#if expr="$OILS_PAGE='rdetail.xml'"-->
-
-    config.ids.rdetail              = {};
-    config.ids.rdetail.view_marc    = "rdetail_view_marc";
-    config.ids.rdetail.details_body = 'rdetail_details_body';
-    config.ids.rdetail.title        = 'rdetail_title';
-    config.ids.rdetail.author       = 'rdetail_author';
-    config.ids.rdetail.isbn         = 'rdetail_isbn';
-    config.ids.rdetail.edition      = 'rdetail_edition';
-    config.ids.rdetail.pubdate      = 'rdetail_pubdate';
-    config.ids.rdetail.publisher    = 'rdetail_publisher';
-    config.ids.rdetail.tor          = 'rdetail_tor';
-    config.ids.rdetail.abstr        = 'rdetail_abstract';
-    config.ids.rdetail.image        = 'rdetail_image';
-    config.ids.rdetail.tor_pic      = 'rdetail_tor_pic';
-
-    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";
-    config.ids.rdetail.cp_info_local    = "copy_info_local_link";
-    config.ids.rdetail.cp_info_all      = "copy_info_all_link";
-    config.ids.rdetail.cp_info_none     = "rdetail_copy_info_none";
-    config.names.rdetail.lib_cell       = "rdetail_library_cell";
-    config.names.rdetail.cn_cell        = "rdetail_callnumber_cell";
-    config.names.rdetail.cp_count_cell  = "rdetail_copy_count_cell";
-    config.names.rdetail.cp_status      = 'rdetail_status_cell';
-
-    attachEvt("common", "init", function() {
-        var here = findOrgUnit(getLocation());
-        if (getDepth() > 0 || getDepth === 0 ) {
-            while (getDepth() < findOrgDepth(here))
-                here = findOrgUnit( here.parent_ou() );
-        }
-
-        new openils.BibTemplate(
-            { record : new CGI().param('r'), org_unit : here.shortname() }
-        ).render();
-    });
 
-    <!--#endif--> /* if rdetail.xml */
 
     /* I'm not sure how to test for the situation where this block is
        needed, but this won't hurt. */
@@ -282,10 +275,6 @@
         void(0);
     }
 
-    <!--#if expr="$OILS_PAGE='index.xml'"-->
-    isFrontPage = true;
-    <!--#endif-->
-
     dojo.addOnLoad(init);
     dojo.require('dojo.cookie');
     dojo.require("dijit._Calendar");

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 89c6674..d851669 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
@@ -61,6 +61,8 @@
     /* END COMPRESSION */
     <!--#endif -->
 
+    config_setup(); /* defined in js_common.xml */
+
     /*  -----------------------------------------------------------------------
         KCLS suppressed orgs 
         ----------------------------------------------------------------------- */
@@ -74,12 +76,6 @@
     /* ----------------------------------------------------------------------- */ 
 
     function skin_init() {
-
-
-        <!--#if expr="$OILS_OPAC_FORCE_LOGIN_SSL"-->
-            forceLoginSSL = true;
-        <!--#endif -->
-
         openils.Util.requireLegacy('/opac/skin/kcls/js/depth_selector.js');
         openils.Util.requireLegacy('/opac/skin/kcls/js/misc.js');
 
@@ -87,82 +83,6 @@
         openils.Util.requireLegacy('/opac/skin/kcls/js/search_bar.js');
         <!--#endif -->
 
-        config.ids.searchbar = {};
-        config.css.searchbar = {};
-        config.ids.searchbar.text                = 'search_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';
-        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.common.now_searching = 'now_searching_location';
-        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';
-        config.ids.common.top_logo = "top_left_logo";
-        config.ids.sidebar = {};
-        config.css.sidebar = {};
-        config.names.sidebar = {};
-        config.css.sidebar.item = {};
-        config.ids.sidebar.home                = 'home_link_div';
-        config.ids.sidebar.advanced        = 'advanced_link_div';
-        config.ids.sidebar.myopac            = 'myopac_link_div';
-        config.ids.sidebar.prefs            = 'prefs_link_div';
-        config.ids.sidebar.mresult            = 'mresult_link_div';
-        config.ids.sidebar.rresult            = 'result_link_div';
-        config.ids.sidebar.rdetail            = "rdetail_link_div";
-        config.ids.sidebar.login            = 'login_link';
-        config.ids.sidebar.logout            = 'logout_link';
-        config.ids.sidebar.logoutbox        = 'logout_link_div';
-        config.ids.sidebar.loginbox        = 'login_link_div';
-        config.ids.sidebar.logged_in_as    = 'logged_in_as_div';
-        config.ids.sidebar.username_dest    = 'username_dest';
-
-        config.ids.sidebar.home_link        = 'home_link'
-        config.ids.sidebar.advanced_link    = 'advanced_link'
-        config.ids.sidebar.myopac_link    = 'myopac_link'
-
-        config.css.encircled                = 'encircled';
-
-        config.ids.login = {};
-        config.css.login = {};
-        config.ids.login.form            = "login_form";
-        config.ids.login.box            = "login_box";
-        config.ids.login.tbody            = "login_tbody";
-        config.ids.login.username    = "login_username";
-        config.ids.login.password    = "login_password";
-        config.ids.login.button        = "login_button";
-        config.ids.login.cancel        = "login_cancel_button";
-        config.ids.altcanvas.login            = config.ids.login.box;
-
-        config.ids.altcanvas.myopac_reload = 'myopac_reloading';
-        config.ids.myopac = {};
-        config.css.myopac = {};
-        config.names.myopac = {};
-
         <!--#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');
@@ -185,44 +105,6 @@
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/copy_details.js');
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/Date.W3CDTF.js');
 
-        config.ids.rdetail              = {};
-        config.ids.rdetail.view_marc    = "rdetail_view_marc";
-        config.ids.rdetail.details_body = 'rdetail_details_body';
-        config.ids.rdetail.title        = 'rdetail_title';
-        config.ids.rdetail.author       = 'rdetail_author';
-        config.ids.rdetail.isbn         = 'rdetail_isbn';
-        config.ids.rdetail.edition      = 'rdetail_edition';
-        config.ids.rdetail.pubdate      = 'rdetail_pubdate';
-        config.ids.rdetail.publisher    = 'rdetail_publisher';
-        config.ids.rdetail.tor          = 'rdetail_tor';
-        config.ids.rdetail.abstr        = 'rdetail_abstract';
-        config.ids.rdetail.image        = 'rdetail_image';
-        config.ids.rdetail.tor_pic      = 'rdetail_tor_pic';
-
-        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";
-        config.ids.rdetail.cp_info_local    = "copy_info_local_link";
-        config.ids.rdetail.cp_info_all      = "copy_info_all_link";
-        config.ids.rdetail.cp_info_none     = "rdetail_copy_info_none";
-        config.names.rdetail.lib_cell       = "rdetail_library_cell";
-        config.names.rdetail.cn_cell        = "rdetail_callnumber_cell";
-        config.names.rdetail.cp_count_cell  = "rdetail_copy_count_cell";
-        config.names.rdetail.cp_status      = 'rdetail_status_cell';
-
-        attachEvt("common", "init", function() {
-            var here = findOrgUnit(getLocation());
-            if (getDepth() > 0 || getDepth === 0 ) {
-                while (getDepth() < findOrgDepth(here))
-                    here = findOrgUnit( here.parent_ou() );
-            }
-
-            dojo.require('openils.BibTemplate');
-            new openils.BibTemplate(
-                { record : new CGI().param('r'), org_unit : here.shortname() }
-            ).render();
-        });
-
         <!--#endif--> /* if rdetail.xml */
 
 
@@ -304,7 +186,6 @@
     })();
 
     dojo.addOnLoad(
-
         function() {
             skin_init();
             <!--#if expr="$OILS_PAGE='index.xml'"-->