brutish application of patches from default skin grey screen work
authorsenator <lebbeous@esilibrary.com>
Thu, 3 Mar 2011 15:36:26 +0000 (10:36 -0500)
committersenator <lebbeous@esilibrary.com>
Thu, 3 Mar 2011 15:36:26 +0000 (10:36 -0500)
30 files changed:
Open-ILS/web/opac/skin/kcls/js/advanced.js
Open-ILS/web/opac/skin/kcls/js/password_reset.js
Open-ILS/web/opac/skin/kcls/js/result_common.js
Open-ILS/web/opac/skin/kcls/xml/advanced/advanced_global.xml
Open-ILS/web/opac/skin/kcls/xml/body.xml
Open-ILS/web/opac/skin/kcls/xml/common/fonts.xml
Open-ILS/web/opac/skin/kcls/xml/common/holds.xml
Open-ILS/web/opac/skin/kcls/xml/common/js_common.xml
Open-ILS/web/opac/skin/kcls/xml/common/js_common_postbody.xml
Open-ILS/web/opac/skin/kcls/xml/common/libselect.xml
Open-ILS/web/opac/skin/kcls/xml/common/login.xml
Open-ILS/web/opac/skin/kcls/xml/common/searchbar.xml
Open-ILS/web/opac/skin/kcls/xml/common/sidebar.xml
Open-ILS/web/opac/skin/kcls/xml/home/homesearch.xml
Open-ILS/web/opac/skin/kcls/xml/myopac/myopac_bookbags.xml
Open-ILS/web/opac/skin/kcls/xml/myopac/myopac_checked.xml
Open-ILS/web/opac/skin/kcls/xml/myopac/myopac_holds.xml
Open-ILS/web/opac/skin/kcls/xml/page_advanced.xml
Open-ILS/web/opac/skin/kcls/xml/page_cnbrowse.xml
Open-ILS/web/opac/skin/kcls/xml/page_mresult.xml
Open-ILS/web/opac/skin/kcls/xml/page_myopac.xml
Open-ILS/web/opac/skin/kcls/xml/page_rdetail.xml
Open-ILS/web/opac/skin/kcls/xml/page_rresult.xml
Open-ILS/web/opac/skin/kcls/xml/rdetail/rdetail_altcanvas.xml
Open-ILS/web/opac/skin/kcls/xml/rdetail/rdetail_cn_details.xml
Open-ILS/web/opac/skin/kcls/xml/rdetail/rdetail_copyinfo.xml
Open-ILS/web/opac/skin/kcls/xml/rdetail/rdetail_extras.xml
Open-ILS/web/opac/skin/kcls/xml/rdetail/rdetail_summary.xml
Open-ILS/web/opac/skin/kcls/xml/result/result_common.xml
Open-ILS/web/opac/skin/kcls/xml/result/result_table.xml

index 00df6fd..14322da 100644 (file)
@@ -184,5 +184,12 @@ function advDrawBarcode(r) {
     location.href = buildOPACLink(args);\r
 }\r
 \r
+function __setsortsel() {\r
+    var sel = $('adv_global_sort_by');\r
+    if (sel.selectedIndex == 0) {\r
+        $("adv_global_sort_dir").disabled = true;\r
+        $("adv_global_sort_dir").selectedIndex = 0;\r
+    } else $("adv_global_sort_dir").disabled = false;\r
+}\r
 \r
-\r
+__setsortsel();\r
index ba54469..b6658d1 100644 (file)
@@ -7,6 +7,7 @@ dojo.requireLocalization("openils.opac", "opac");
 opac_strings = dojo.i18n.getLocalization("openils.opac", "opac");
 
 dojo.addOnLoad(function() {
+    return; // XXX
 
     // Create the password reset dialog
     var pwResetFormDlg = createResetDialog();
index 8ba76d5..82a9531 100644 (file)
@@ -1,3 +1,57 @@
+config.ids.result = {};\r
+config.css.result = {};\r
+config.names.result = {};\r
+config.ids.result.offset_start = "offset_start";\r
+config.ids.result.offset_end       = "offset_end";\r
+config.ids.result.result_count = "result_count";\r
+config.ids.result.next_link        = 'next_link';\r
+config.ids.result.prev_link        = 'prev_link';\r
+config.ids.result.home_link        = 'search_home_link';\r
+config.ids.result.end_link         = 'end_link';\r
+config.ids.result.main_table       = 'result_table';\r
+config.ids.result.row_template = 'result_table_template';\r
+config.ids.result.num_pages        = 'num_pages';\r
+config.ids.result.current_page = 'current_page';\r
+config.css.result.nav_active       = "nav_link_active";\r
+config.ids.result.top_div          = "result_table_div";\r
+config.ids.result.nav_links        = "search_nav_links";\r
+config.ids.result.info             = "result_info_div";\r
+config.css.result.cc_cell_even = "copy_count_cell_even";\r
+config.names.result.item_jacket    = "item_jacket";\r
+config.names.result.item_title = "item_title";\r
+config.names.result.item_author    = "item_author";\r
+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.ids.result = {};\r
+config.css.result = {};\r
+config.names.result = {};\r
+config.ids.result.offset_start = "offset_start";\r
+config.ids.result.offset_end       = "offset_end";\r
+config.ids.result.result_count = "result_count";\r
+config.ids.result.next_link        = 'next_link';\r
+config.ids.result.prev_link        = 'prev_link';\r
+config.ids.result.home_link        = 'search_home_link';\r
+config.ids.result.end_link         = 'end_link';\r
+config.ids.result.main_table       = 'result_table';\r
+config.ids.result.row_template = 'result_table_template';\r
+config.ids.result.num_pages        = 'num_pages';\r
+config.ids.result.current_page = 'current_page';\r
+config.css.result.nav_active       = "nav_link_active";\r
+config.ids.result.top_div          = "result_table_div";\r
+config.ids.result.nav_links        = "search_nav_links";\r
+config.ids.result.info             = "result_info_div";\r
+config.css.result.cc_cell_even = "copy_count_cell_even";\r
+config.names.result.item_jacket    = "item_jacket";\r
+config.names.result.item_title = "item_title";\r
+config.names.result.item_author    = "item_author";\r
+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
 \r
 var recordsHandled = 0;\r
 var recordsCache = [];\r
index 58d612f..d442dc6 100644 (file)
@@ -8,8 +8,6 @@
                .adv_adv_link { font-size: 8pt; color: red; }\r
        </style>\r
 \r
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_SKIN_BASE"-->/kcls/js/adv_global.js'> </script>\r
-\r
        <tr style='border-bottom: none;'>\r
 \r
                <!-- Contains the user-addable(?) rows to define search class, containment and text -->\r
                                                <table class='' width='100%'>\r
                                                        <tbody>\r
                                                                <tr>\r
-\r
-                           <script language='javascript' type='text/javascript'>\r
-                              function __setsortsel() {\r
-                                 var sel = $('adv_global_sort_by')\r
-                                                                                  if(sel.selectedIndex == 0) {\r
-                                                                                          $("adv_global_sort_dir").disabled = true;\r
-                                                                                          $("adv_global_sort_dir").selectedIndex = 0;\r
-                                                                                  } else $("adv_global_sort_dir").disabled = false;\r
-                              }\r
-                           </script>\r
-\r
                                                                        <td align=''>\r
                                                                                <select id='adv_global_sort_by' onchange='__setsortsel();'>\r
                                                                                        <option value='rel'>&advanced.relevance;</option>\r
                                                                        </td>\r
 \r
                            <!-- force the enable/disable sort dir code to run -->\r
-                           <script language='javascript' type='text/javascript'>__setsortsel();</script>\r
                                                                </tr>\r
                                                                <tr>\r
                                                                        <td align='center' class="hide_me">\r
index cfe9c9b..305b66f 100644 (file)
@@ -1,93 +1,4 @@
-\r
 <body class="tundra">\r
-<script language='javascript' type='text/javascript'>\r
-//central config space\r
-\r
-       config.ids.login = {};\r
-       config.ids.searchbar = {};\r
-       config.ids.sidebar = {};\r
-       config.css.login = {};\r
-       config.css.searchbar = {};\r
-       config.css.sidebar = {};\r
-       config.css.sidebar.item = {};\r
-       config.names.sidebar = {};\r
-       config.ids.result.offset_start  = "offset_start";\r
-       config.ids.result.offset_end            = "offset_end";\r
-       config.ids.result.result_count  = "result_count";\r
-       config.ids.result.next_link             = 'next_link';\r
-       config.ids.result.prev_link             = 'prev_link';\r
-       config.ids.result.home_link             = 'search_home_link';\r
-       config.ids.result.end_link                      = 'end_link';\r
-       config.ids.result.main_table            = 'result_table';\r
-       config.ids.result.row_template  = 'result_table_template';\r
-       config.ids.result.num_pages             = 'num_pages';\r
-       config.ids.result.current_page  = 'current_page';\r
-       config.css.result.nav_active            = "nav_link_active";\r
-       config.ids.result.top_div                       = "result_table_div";\r
-       config.ids.result.nav_links             = "search_nav_links";\r
-       config.ids.result.info                          = "result_info_div";\r
-       config.css.result.cc_cell_even  = "copy_count_cell_even";\r
-       config.names.result.item_jacket = "item_jacket";\r
-       config.names.result.item_title  = "item_title";\r
-       config.names.result.item_author = "item_author";\r
-       config.names.result.counts_row  = "counts_row";\r
-       config.names.result.count_cell  = "copy_count_cell";\r
-       config.ids.common.top_logo = "top_left_logo";\r
-       config.ids.altcanvas.myopac_reload = 'myopac_reloading';\r
-       config.ids.altcanvas.org_tree           = config.ids.common.org_container;\r
-       config.ids.altcanvas.holds                      = 'holds_box';\r
-       config.ids.altcanvas.check_holds        = 'check_holds_box';\r
-       config.ids.altcanvas.xulholds           = 'xulholds_box';\r
-       config.ids.altcanvas.loading            = 'loading_alt';\r
-       config.ids.altcanvas.cnbrowse           = 'cn_browse';\r
-       config.ids.sidebar.login                        = 'login_link';\r
-       config.ids.sidebar.logout                       = 'logout_link';\r
-       config.ids.sidebar.logoutbox            = 'logout_link_div';\r
-       config.ids.sidebar.loginbox             = 'login_link_div';\r
-       config.ids.sidebar.home                         = 'home_link_div';\r
-       config.ids.sidebar.advanced             = 'advanced_link_div';\r
-       config.ids.sidebar.myopac                       = 'myopac_link_div';\r
-       config.ids.sidebar.prefs                        = 'prefs_link_div';\r
-       config.ids.sidebar.mresult                      = 'mresult_link_div';\r
-       config.ids.sidebar.rresult                      = 'result_link_div';\r
-       config.ids.sidebar.rdetail                      = "rdetail_link_div"; \r
-       config.ids.sidebar.logged_in_as = 'logged_in_as_div';\r
-       config.ids.sidebar.username_dest        = 'username_dest';\r
-       config.ids.sidebar.subject                      = 'subject_sidebar';\r
-       config.ids.sidebar.subject_item = 'subject_item';\r
-       config.ids.sidebar.author                       = 'author_sidebar';\r
-       config.ids.sidebar.author_item  = 'author_item';\r
-       config.ids.sidebar.series                       = 'series_sidebar';\r
-       config.ids.sidebar.series_item  = 'series_item';\r
-       config.ids.sidebar.home_link            = 'home_link'\r
-       config.ids.sidebar.advanced_link        = 'advanced_link'\r
-       config.ids.sidebar.myopac_link  = 'myopac_link'\r
-       config.names.sidebar.subject_item       = 'subject_item';\r
-       config.names.sidebar.author_item                = 'author_item';\r
-       config.names.sidebar.series_item                = 'series_item';\r
-       config.css.encircled                            = 'encircled';\r
-       config.ids.searchbar.text                               = 'search_box'; \r
-       config.ids.searchbar.facets                             = 'facet_box';\r
-       config.ids.searchbar.submit                     = 'search_submit';      \r
-       config.ids.searchbar.type_selector      = 'search_type_selector';\r
-       config.ids.searchbar.depth_selector     = 'depth_selector';\r
-       config.ids.searchbar.form_selector      = 'form_selector';\r
-       config.ids.searchbar.depth_sel_span     = 'depth_selector_span';\r
-       config.ids.login.box            = "login_box";\r
-       config.ids.login.username       = "login_username";\r
-       config.ids.login.password       = "login_password";\r
-       config.ids.login.button         = "login_button";\r
-       config.ids.login.cancel         = "login_cancel_button";\r
-       config.ids.altcanvas.login      = config.ids.login.box;\r
-       config.ids.searchbar.extra_row          = 'searchbar_extra';\r
-       config.ids.searchbar.main_row                   = 'searchbar_main_row';\r
-       config.ids.searchbar.table                              = 'searchbar_table';\r
-       config.ids.searchbar.location_tag       = 'search_location_tag_link';\r
-       config.ids.searchbar.lib_sel_span       = 'lib_selector_span';\r
-       config.ids.searchbar.lib_sel_link       = 'lib_selector_link';\r
-       config.ids.common.now_searching = 'now_searching_location';\r
-</script>\r
-\r
 <noscript>\r
        <style type="text/css">#toptable { display: none; }</style>\r
        <p style="font-size: 1.3em; padding: 3em; text-align: center;">\r
 <div id="search-wrapper">\r
   <div style="margin:auto;width:974px;height:0px;">\r
        <div id="user-ql">\r
-<![CDATA[\r
-<script type="text/javascript">\r
-if(grabUser()) {\r
-       var str = '<div style="float:right;width:214px;">';\r
-       str += '<div style="position:absolute;"><div style="position:relative;top:-81px;">\n';\r
-       str += '<div id="quick-links">\n';\r
-       str += '</div></div></div></div>';\r
-       document.write(str);\r
-}\r
-</script>\r
-]]>\r
        </div>\r
       <!--#include virtual="utils.xml"-->\r
   </div>\r
@@ -187,17 +87,6 @@ if(grabUser()) {
 </div>\r
 <!--#include virtual='footer.xml'-->\r
 <div>\r
-<script language="javascript" type='text/javascript'>\r
-<![CDATA[\r
-try { \r
-  document.getElementById('toptable').style.display = 'table'; \r
-} catch(e) {\r
-  try {\r
-       document.getElementById('toptable').style.display = ''; \r
-  } catch(ee) {}\r
-}\r
-]]>\r
-</script>\r
 </div>\r
 <!-- hide unused pieces of the opac here - prevents JS from complaining -->\r
 <div class="hide_me">\r
@@ -205,44 +94,5 @@ try {
   <div id="login_cancel_button"></div>\r
   <div id="x"></div>\r
 </div>\r
-<script type="text/javascript">\r
-attachEvt("common", "unload", function(){\r
-       if(typeof(G)!="undefined") destroyObj(G);\r
-       if(typeof(HTTP)!="undefined") destroyObj(HTTP);\r
-       if(typeof(_c)!="undefined") destroyObj(_c);\r
-       if(typeof(_l)!="undefined") destroyObj(_l);\r
-       if(typeof(config)!="undefined") destroyObj(config);\r
-       if(typeof(facet_list)!="undefined") destroyObj(facet_list);\r
-       if(typeof(globalOrgTree)!="undefined") destroyObj(globalOrgTree);\r
-       if(typeof(globalOrgTypes)!="undefined") destroyObj(globalOrgTypes);\r
-       if(typeof(google)!="undefined") destroyObj(google);\r
-       if(typeof(orgArraySearcher)!="undefined") destroyObj(orgArraySearcher);\r
-       if(typeof(recordsCache)!="undefined") destroyObj(recordsCache);\r
-       if(typeof(search_list)!="undefined") destroyObj(search_list);\r
-       if(typeof(subjectCache)!="undefined") destroyObj(subjectCache);\r
-       if(typeof(xrefCacheIndex)!="undefined") destroyObj(xrefCacheIndex);\r
-       if(typeof(x)!="undefined") destroyObj(x);\r
-       if(typeof(string)!="undefined") string = "";\r
-       //removeChildren(document);\r
-       //alert(errCounter+'\n'+errCounter2);\r
-});\r
-</script>\r
 <div dojoType='openils.widget.ProgressDialog' jsId='progressDialog' style="width:300px;"></div>\r
-<![CDATA[\r
-        <script language='javascript' type='text/javascript'>\r
-                dojo.addOnLoad(init);\r
-                dojo.require("dijit._Calendar");\r
-                dojo.require("dijit.form.DateTextBox");\r
-                dojo.require("dijit.form.FilteringSelect");\r
-                dojo.require("dojo.date.locale");\r
-                dojo.require("dojo.date.stamp");\r
-                dojo.require("dojo.parser");\r
-                dojo.require("openils.widget.FacetSidebar"); // pulls in Searcher and I18N\r
-                dojo.require("dijit.form.NumberSpinner");\r
-                dojo.require("dijit.form.CheckBox");\r
-                dojo.require("openils.widget.ProgressDialog");\r
-                dojo.require('openils.BibTemplate');\r
-                dojo.addOnLoad(opac_init);\r
-        </script>\r
-]]>\r
 </body>\r
index 8b3ce40..a89d95c 100644 (file)
@@ -1,5 +1,4 @@
 <div id='fonts_div'>
-
        <div id='text_size_div' style='position:absolute; top: 2px; right: 6px;'>
                <span style='vertical-align: top;'>&common.textsize.title;</span>
                <span style='vertical-align: top;'><a href="javascript:void(0);" onclick="setFontSize('regular');"> &common.textsize.regular; </a></span>
@@ -9,17 +8,15 @@
                <span style='vertical-align: top;'>&common.language;</span>
                <span id='translation_switch' dojoType="dijit.form.FilteringSelect" store="openils.I18N.localeStore"
             searchAttr="label" required="false" jsId='opacLocaleSelector'>
-            <script>
-                dojo.addOnLoad(function() {
-                    opacLocaleSelector.setValue(locale);
-                    dojo.connect(opacLocaleSelector, 'onChange', 
-                        function () {
-                            location.href = location.href.replace(/opac\/[^\/]+\/skin/, 'opac/' + this.getValue() + '/skin');
-                        }
+            <script type="dojo/connect" event="startup">
+                this.attr('value', locale);
+                dojo.connect(this, 'onChange', function() {
+                    location.href = location.href.replace(
+                        /opac\/[^\/]+\/skin/,
+                        'opac/' + this.attr('value') + '/skin'
                     );
                 });
             </script>
                </span>
        </div>
-       
 </div>
index 80f895d..b3754e3 100644 (file)
 
                 <tr id='hold_frozen_thaw_row' class='hide_me'>
                     <td class='holds_cell'>
-                        <script language='javascript' type='text/javascript'> if($('holds_frozen_chkbox').checked) unHideMe($("hold_frozen_thaw_row"));</script>
                         &opac.holds.freeze.thaw_date;
                     </td>
                     <td class='holds_cell'>
index d525406..1f1f086 100644 (file)
@@ -1,18 +1,4 @@
-\r
-    <script language='javascript'  \r
-        src='/IDL2js?mvr,bre,aou,aout,pgt,lasso,cmf,cmc,cmsa,cam,cifm,clfm,citm,cblvl,accs,au,ahr,ahrn,acn,actscecm,cbreb,cbreb,cbrebi,acp,cust,ac,aua,mous,circ,mbts,mb,ausp,csp,acpl'\r
-        type='text/javascript'></script>\r
-\r
-       <script src='<!--#echo var="OILS_JS_BASE"-->/utils.js' type='text/javascript'></script>\r
-       <script src='<!--#echo var="OILS_JS_BASE"-->/config.js' type='text/javascript'></script>\r
-       <script src='<!--#echo var="OILS_JS_BASE"-->/CGI.js' type='text/javascript'></script>\r
-       <script src='<!--#echo var="OILS_JS_BASE"-->/Cookies.js' type='text/javascript'></script>\r
-       <script src='<!--#echo var="OILS_JS_BASE"-->/md5.js' type='text/javascript'></script>\r
-       <script src='<!--#echo var="OILS_JS_BASE"-->/slimtree.js' type='text/javascript'></script>\r
-       <script src='<!--#echo var="OILS_JS_BASE"-->/JSON_v1.js' type='text/javascript'></script>\r
-\r
 <script type="text/javascript">\r
-        var cookieManager = new HTTP.Cookies(); \r
        var locale = location.href.replace( /.+opac\/([^\/]+)\/skin.+/, '$1' );\r
        if (!locale) locale = '<!--#echo var="locale"-->';\r
        var djConfig = {  \r
                modulePaths: {\r
                        "fieldmapper": '/js/dojo/fieldmapper'\r
                }\r
-    }, lang, bidi;\r
-       \r
-       \r
-               \r
-               /*config.css.color_1 = "";\r
-               config.css.color_2 = "";\r
-               config.css.color_3 = "";*/\r
-               <!-- set up some global JS config variables, read from the Apache config -->\r
-               var OILS_OPAC_IMAGES_HOST = null;<!--#if expr="$OILS_OPAC_IMAGES_HOST"-->\r
-                       OILS_OPAC_IMAGES_HOST = '<!--#echo var="OILS_OPAC_IMAGES_HOST"-->extras/ac/jacket/';<!--#endif -->\r
-               var OILS_OPAC_STATIC_PROTOCOL = null;<!--#if expr="$OILS_OPAC_STATIC_PROTOCOL"-->\r
-               OILS_OPAC_STATIC_PROTOCOL = '<!--#echo var="OILS_OPAC_STATIC_PROTOCOL"-->';<!--#endif -->\r
-       \r
-       <!--#if expr="$OILS_OPAC_FORCE_LOGIN_SSL"-->\r
-               forceLoginSSL = true;\r
-       <!--#endif -->\r
+    };\r
+    var lang, bidi;\r
 </script>\r
-\r
-       <script src='/js/dojo/dojo/dojo.js' type="text/javascript"></script>\r
-       <script src='/js/dojo/dojo/openils_dojo.js' type="text/javascript"></script>\r
-       <script src='/js/dojo/opensrf/opensrf.js' type="text/javascript"></script>\r
-       <script type="text/javascript">\r
-       //dojo.config.AutoIDL = ["mvr","bre","aou","aout","pgt","lasso","cmf","cmc","cmsa","cam","cifm","clfm","citm","cblvl","accs","au","ahr","ahrn","acn","actscecm","cbreb","cbreb","cbrebi","acp","cust","ac","aua","mous","circ","mbts","mb","ausp","csp"];\r
-       </script>\r
-       <script src='/js/dojo/fieldmapper/AutoIDL.js' type="text/javascript"></script>\r
-       \r
-       <script src='<!--#echo var="OILS_JS_BASE"-->/opac_utils.js' type='text/javascript'></script>\r
-       <script src='<!--#echo var="OILS_JS_BASE"-->/<!--#echo var="locale"-->/OrgTree.js' type='text/javascript'></script>\r
-       <script src='<!--#echo var="OILS_JS_BASE"-->/<!--#echo var="locale"-->/FacetDefs.js' type='text/javascript'></script>\r
-       <script src='<!--#echo var="OILS_JS_BASE"-->/OrgLasso.js' type='text/javascript'></script>\r
-       <script src='<!--#echo var="OILS_JS_BASE"-->/org_utils.js' type='text/javascript'></script>\r
-    <script>dojo.require('dojo.cookie')</script>\r
-       <script>\r
-       //<![CDATA[\r
-               var localSuppressedOrgs = {1500:true, 1501:true, 1558:true};  /* change to suit */   /* changed from array to object - IE fix */\r
-               for (var i in orgArraySearcher) {\r
-                  var org = orgArraySearcher[i];\r
-                   if(localSuppressedOrgs[i]) {        /* removed indexOf() - isn't supported on <= IE8 */\r
-                       org.opac_visible('f');\r
-                   }\r
-               }\r
-       //]]>\r
-       </script>\r
-       <script src='<!--#echo var="OILS_JS_BASE"-->/RemoteRequest.js' type='text/javascript'></script>\r
-       <script src='<!--#echo var="OILS_JS_BASE"-->/init.js' type='text/javascript'></script>\r
-       <script src='<!--#echo var="OILS_JS_BASE"-->/added_content.js' type='text/javascript'></script>\r
-       \r
-       <script src="<!--#echo var='OILS_SKIN_BASE'-->/kcls/js/depth_selector.js" type='text/javascript'> </script>\r
-       <!--#if expr="$OILS_PAGE!='advanced.xml'"--><script src="<!--#echo var='OILS_SKIN_BASE'-->/kcls/js/search_bar.js" type='text/javascript'> </script><!--#endif -->\r
-       <!--#if expr="$OILS_PAGE='rresult.xml' || $OILS_PAGE='myopac.xml'"--><script src="<!--#echo var='OILS_SKIN_BASE'-->/kcls/js/sidebar.js" type='text/javascript'></script><!--#endif-->\r
-       <script src="<!--#echo var='OILS_SKIN_BASE'-->/kcls/js/misc.js" type='text/javascript'></script>\r
-       <script src="<!--#echo var='OILS_SKIN_BASE'-->/kcls/js/marc.js" type='text/javascript'></script>\r
-       <!-- myopac.js-->\r
-       <script src="<!--#echo var='OILS_OPAC_JS_HOST'-->common/js/DP_DateExtensions.js" type='text/javascript'></script>\r
-       <script src="<!--#echo var='OILS_SKIN_BASE'-->/kcls/js/contentslider.js" type='text/javascript'> </script>\r
-<!-- TESTING NO ANALYTICS\r
-       <script src='https://www.google.com/jsapi' type='text/javascript' language='javascript'></script>\r
--->\r
-       \r
-\r
-       \r
+<script src='/js/dojo/dojo/dojo.js' type="text/javascript"></script>\r
+<!--#if expr="$OILS_PAGE='myopac.xml'"-->\r
+<!-- my acccount uses a lot more classes -->\r
+<script type="text/javascript"\r
+    src='/IDL2js?mvr,bre,aou,aout,pgt,lasso,cmf,cmc,cmsa,cam,cifm,clfm,citm,cblvl,ccs,accs,au,ahr,ahrn,acn,actscecm,cbreb,cbreb,cbrebi,acp,cust,ac,aua,mous,circ,mbts,mb,ausp,csp'></script>\r
+<!--#else-->\r
+<script type="text/javascript"\r
+    src='/IDL2js?mvr,bre,aou,aout,pgt,lasso,cmf,cmc,cmsa,cam,cifm,clfm,citm,cblvl,ccs'></script>\r
+<!--#endif-->\r
index 074a048..11079da 100644 (file)
     dojo.require('openils.Util');
 
     // set up some global JS config variables, read from the Apache config
+    var OILS_OPAC_IMAGES_HOST = null;
+    <!--#if expr="$OILS_OPAC_IMAGES_HOST"-->
+        OILS_OPAC_IMAGES_HOST = '<!--#echo var="OILS_OPAC_IMAGES_HOST"-->extras/ac/jacket/';
+    <!--#endif -->
+    var OILS_OPAC_STATIC_PROTOCOL = null;
+    <!--#if expr="$OILS_OPAC_STATIC_PROTOCOL"-->
+        OILS_OPAC_STATIC_PROTOCOL = '<!--#echo var="OILS_OPAC_STATIC_PROTOCOL"-->';
+    <!--#endif -->
+
+    var chilifresh = '<!--#echo var="OILS_CHILIFRESH_ACCOUNT"-->';
+    if (chilifresh == '(none)') { chilifresh = false; }
+    var novelist = '<!--#echo var="OILS_NOVELIST_URL"-->';
+    if (novelist == '(none)') { novelist = false; }
+
+    <!--#if expr="$OILS_CHILIFRESH_ACCOUNT && $OILS_CHILIFRESH_ACCOUNT != '(none)'"-->
+    openils.Util.requireLegacy('<!--#echo var='OILS_CHILIFRESH_URL'-->');
+    <!--#endif-->
+
+    <!--#if expr="${OILS_NOVELIST_URL} && ${OILS_NOVELIST_URL}!='(none)'"-->
+    openils.Util.requireLegacy('<!--#echo var='OILS_NOVELIST_URL'-->');
+    <!--#endif-->
 
     openils.Util.requireLegacy('/js/dojo/dojo/openils_dojo.js');
     openils.Util.requireLegacy('/js/dojo/fieldmapper/AutoIDL.js');
-    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/<!--#echo var="locale"-->/OrgTree.js');
-    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/<!--#echo var="locale"-->/FacetDefs.js');
-
-    <!--#if expr="$OILS_OPAC_COMBINED_JS"-->
-    openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/combined.js')
-    <!--#else -->
-    /* See js_common.xml for which files are actually combined/compressed by autogen */
-    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/OrgLasso.js');
-    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/utils.js');
-    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/config.js');
-    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/CGI.js');
-    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/md5.js');
-    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/slimtree.js');
-    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/opac_utils.js');
-    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/org_utils.js');
-    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/RemoteRequest.js');
-    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/init.js');
-    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/added_content.js');
-    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/DP_DateExtensions.js');
-    openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/Cookies.js');
-    <!--#endif -->
 
-    <!--#include virtual="js_shared.xml"-->
+    dojo.require("dijit._Calendar");
+    dojo.require("dijit.form.DateTextBox");
+    dojo.require("dijit.form.FilteringSelect");
+    dojo.require("dojo.date.locale");
+    dojo.require("dojo.date.stamp");
+    dojo.require("dojo.parser");
+    dojo.require("dojo.cookie");
+    dojo.require("openils.widget.FacetSidebar"); // pulls in Searcher and I18N
 
     function skin_init() {
-        openils.Util.requireLegacy('/opac/skin/kcls/js/depth_selector.js');
-        openils.Util.requireLegacy('/opac/skin/kcls/js/misc.js');
+        console.log('begin skin_init()');
+
+        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/<!--#echo var="locale"-->/OrgTree.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/<!--#echo var="locale"-->/FacetDefs.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/OrgLasso.js');
+
+        <!--#if expr="$OILS_OPAC_COMBINED_JS"-->
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/combined.js')
+        <!--#else -->
+        /*
+            When combined JS is enabled in the Apache config, the block
+            below defines which files are added to the final combined JS file.
+            Currently, only files in $OPAC/common/js/ are eligible for automatic combination.
+        */
+        /* START COMPRESSION */
+        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/utils.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/config.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/CGI.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/md5.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/slimtree.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/opac_utils.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/org_utils.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/RemoteRequest.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/init.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_JS_BASE"-->/added_content.js');
+        /* END COMPRESSION */
+        <!--#endif -->
 
+        console.log('middle of main script');
+
+        if(dojo.isIE) {
+            setTimeout(
+                function() {
+                    openils.Util.requireLegacy('http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js');
+                    CFInstall.check({
+                        preventPrompt: true,
+                        onmissing: function() {
+                            if (dojo.cookie("noGCF") != "true")
+                                unHideMe($('gcfPrompt'));
+                        }
+                    });
+            }, 0);
+        }
+
+
+        config.css.color_1 = "color_1";
+        config.css.color_2 = "color_2";
+        config.css.color_3 = "color_3";
+
+        <!--#if expr="$OILS_OPAC_FORCE_LOGIN_SSL"-->
+            forceLoginSSL = true;
+        <!--#endif -->
+
+        openils.Util.requireLegacy('/opac/skin/default/js/depth_selector.js');
         <!--#if expr="$OILS_PAGE!='advanced.xml'"-->
-        openils.Util.requireLegacy('/opac/skin/kcls/js/search_bar.js');
+        openils.Util.requireLegacy('/opac/skin/default/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="$FRONT_PAGE!='true'"-->
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/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');
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/result_common.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/tips.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/holds.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/sidebar.js');
+        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/rresult.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');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar.js');
         <!--#endif-->
 
         <!--#if expr="$OILS_PAGE='rdetail.xml'"-->
 
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/sidebar.js');
-        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/result_common.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/rresult.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/rdetail.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/cn_browse.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/holds.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/container.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/copy_details.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar.js');
+        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/result_common.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/rresult.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/rdetail.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/cn_browse.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/container.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/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 */
 
+
         <!--#if expr="$OILS_PAGE='myopac.xml'"-->
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/myopac.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/container.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/holds.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/sidebar.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/Date.W3CDTF.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/myopac.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/container.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar.js');
+
+        $('myopac_holds_actions_none').selected = true;
 
         <!--#endif-->
 
         <!--#if expr="$OILS_PAGE='mresult.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/mresult.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/result_common.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/tips.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/holds.js');
+        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/kcls/js/cn_browse.js');
+        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/kcls/js/advanced.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/adv_global.js');
-        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/kcls/js/sidebar.js');
+        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');
     }
 
-    dojo.addOnLoad( function() { skin_init(); init(); opac_init(); });
+    dojo.addOnLoad(
+
+        function() {
+            skin_init();
+
+            <!--#if expr="$OILS_PAGE='index.xml'"-->
+            isFrontPage = true;
+            <!--#endif-->
+
+            init();
+
+            <!--#if expr="$OILS_PAGE='index.xml'"-->
+            getId("home_adv_search_link").setAttribute("href", buildOPACLink({page:ADVANCED}));
+            getId("home_myopac_link").setAttribute("href", buildOPACLink({page:MYOPAC}, false, true));
 
+            try {
+                dojo.style(dojo.byId('toptable'), 'display', 'table');
+            } catch(e) {
+                try {
+                    dojo.style(dojo.byId('toptable'), 'display', '');
+                } catch(ee) {}
+            }
+            <!--#endif-->
+        }
+    );
 ]]></script>
index 845fbd0..716224a 100644 (file)
@@ -1,4 +1,3 @@
-
 <![CDATA[<!-- ****************** libselect.xml ***************************** -->]]>
        <span id='depth_selector_span'>
                <!--#if expr="$SHOW_DEPTHSEL_TEXT='true'"-->
index 150b548..ac2abff 100644 (file)
@@ -1,4 +1,3 @@
-
 <![CDATA[<!-- ****************** login.xml ***************************** -->]]>
 <div class="hide_me">
        <div class='login_text color_1' style='padding: 4px; text-align: center;'>
@@ -87,4 +86,4 @@
   </form>
   <div style="clear:both"></div>
 </div>
-<![CDATA[<!-- ****************** end: login.xml ***************************** -->]]>
\ No newline at end of file
+<![CDATA[<!-- ****************** end: login.xml ***************************** -->]]>
index 76c51a5..a7dbd93 100644 (file)
@@ -1,4 +1,3 @@
-
 <![CDATA[<!-- ****************** searchbar.xml ***************************** -->]]>
   <div id="search-box">    
        <table cellpadding="0" cellspacing="10" border="0" style="position:relative;left:-10px;"><tr>
index eeee865..18e86a1 100644 (file)
@@ -1,7 +1,5 @@
-
 <!-- Navigation bar -->
 <![CDATA[<!-- ****************** sidebar.xml ***************************** -->]]>
-<script src="<!--#echo var='OILS_SKIN_BASE'-->/kcls/js/sidebar.js" type='text/javascript'></script>
 <div id="sidebar_div" class="sidebar_div" xmlns:xi="http://www.w3.org/2001/XInclude">
        <div class='sidebar_chunk hide_me'>
 <!--
      <div dojoType='openils.widget.FacetSidebar' searchBox='facet_box' searchSubmit='search_submit' maxValuesPerFacet='3' facetLimit='3' classOrder='["author","subject","series","title","keyword"]'>
             <script type='dojo/method' event='populate'><![CDATA[
                 var fblob = this;
-                attachEvt("result", "allRecordsReceived", function () {
-                    if(!resultFacetKey) return;                                        
-                    if (fblob.facetCacheKey) return; // already rendered it
-                                       
-                    dojo.removeClass('facetSidebarContainer','hide_me');
-
-                    fblob.facetCacheKey = resultFacetKey;
-                    fblob.render();
-                });
+                setTimeout(
+                    function(){
+                        attachEvt("result", "allRecordsReceived", function () {
+                            if (!resultFacetKey) return;
+                            if (fblob.facetCacheKey) return; // already rendered it 
+                            dojo.removeClass('facetSidebarContainer','hide_me');
+        
+                            fblob.facetCacheKey = resultFacetKey;
+                            fblob.render();
+                        });
+                    },0
+                )
             ]]></script>
         </div>
        </div>
index f195686..94501ae 100644 (file)
 \r
 \r
   </div>\r
-<![CDATA[\r
-<script type="text/javascript">\r
-featuredcontentslider.init({\r
-id: "homebanner",\r
-contentsource: ["inline", ""],\r
-toc: "markup",\r
-nextprev: ["", ""],\r
-enablefade: [true, 0.04],\r
-onChange: function(previndex, curindex){},\r
-\r
-\r
-autorotate: [true, 3000] //pause time (in milliseconds)\r
-})\r
-</script>\r
-]]> \r
-       \r
   </div>\r
 </div>\r
 \r
index 5b2d511..4ac3e8d 100644 (file)
@@ -16,7 +16,6 @@
 </div>\r
 \r
 <div id='myopac_bookbag_div' class='hide_me' xmlns:xi="http://www.w3.org/2001/XInclude" style="padding:5px;">\r
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/container.js'> </script>\r
        \r
   <div class="header_middle"><span id="acct_holds_header" style="float:left;">My Lists</span> <span style="float:right;"><a class="hide_me" href="javascript:;">Export List</a></span></div>\r
 \r
index bb4862c..46c785a 100644 (file)
@@ -1,7 +1,6 @@
 
 <![CDATA[<!-- ****************** myopac_checked.xml ***************************** -->]]>
 <div id='myopac_checked_div' xmlns:xi="http://www.w3.org/2001/XInclude" style="padding:0px;">
-    <!-- <script language='javascript' type='text/javascript' src='<!||#echo var="OILS_JS_BASE"||>/Date.W3CDTF.js'/> -->
        
   <div id="acct_checked_tabs" style="padding-bottom: 12px;color:#666;">
        <div class="align selected" id="checked_label"><img src="<!--#echo var="OILS_SKIN_BASE"-->/kcls/graphics/sub_checked_out_on.jpg" /></div>
index 5311582..eb1a8b1 100644 (file)
@@ -2,8 +2,6 @@
 <![CDATA[<!-- ****************** myopac_holds.xml ***************************** -->]]>\r
 \r
 <div id='myopac_holds_div' xmlns:xi="http://www.w3.org/2001/XInclude">\r
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_SKIN_BASE"-->/kcls/js/holds.js'> </script>\r
-\r
   <div class="hide_me" id="acct_holds_tabs" style="padding-bottom: 12px;color:#666;">\r
        <div class="align selected" id="holds_label"><img src="/opac/skin/kcls/graphics/sub_holds_on.jpg" /></div>\r
        <div class="align hide_me" id="holds_hist_link"><a href="javascript:;" onclick="switchSubPage('holds','hist');"><img src="/opac/skin/kcls/graphics/sub_holds_hist_off.jpg" /></a></div>\r
index 83436d5..4b7b690 100644 (file)
@@ -1,16 +1,10 @@
-
 <![CDATA[<!-- ****************** page_advanced.xml ***************************** -->]]>
 <div id='canvas_main' class='canvas' style='clear:both;'>
-
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_SKIN_BASE"-->/kcls/js/advanced.js'></script>
-
        <style type='text/css'>
                .advanced_div { padding-top:15px; }
        </style>
-
        <div class='advanced_div'>
                <!--#include virtual="advanced/advanced_global.xml"-->
        </div>
 </div>
 <![CDATA[<!-- ****************** end: page_advanced.xml ***************************** -->]]>
-
index 896b1e6..59e9bab 100644 (file)
@@ -1,7 +1,5 @@
-
 <![CDATA[<!-- ****************** page_cnbrowse.xml ***************************** -->]]>
 <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>
 <![CDATA[<!-- ****************** end: page_cnbrowse.xml ***************************** -->]]>
index ad833d3..afe29f8 100644 (file)
@@ -1,11 +1,6 @@
 
 <![CDATA[<!-- ****************** page_mresult.xml ***************************** -->]]>
 <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/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>
 <![CDATA[<!-- ****************** end: page_mresult.xml ***************************** -->]]>
index a8f749a..58a3d17 100644 (file)
@@ -1,7 +1,5 @@
-
 <![CDATA[<!-- ****************** page_myopac.xml ***************************** -->]]>
 <div id='canvas_main' class='canvas hide_me'>
-<script src="<!--#echo var='OILS_SKIN_BASE'-->/kcls/js/myopac.js" type='text/javascript'></script>
        <div id='myopac_main_div'>
                <!--#include virtual="myopac/myopac_summary.xml"-->
                <!--#include virtual="myopac/myopac_checked.xml"-->
@@ -53,4 +51,3 @@
 </div>
 <div style="height:40px;" class="hide_me"><div class="hide_me" id="myopac_loading">Loading...</div></div>
 <![CDATA[<!-- ****************** end: page_myopac.xml ***************************** -->]]>
-
index efcbb5f..4ca22f7 100644 (file)
@@ -2,20 +2,6 @@
 <![CDATA[<!-- ****************** page_rdetail.xml ***************************** -->]]> \r
 \r
 <div id='canvas_main' class='canvas'>\r
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_SKIN_BASE"-->/kcls/js/sidebar_extras.js'></script>\r
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_SKIN_BASE"-->/kcls/js/result_common.js'></script>\r
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_SKIN_BASE"-->/kcls/js/rresult.js'></script>\r
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_SKIN_BASE"-->/kcls/js/rdetail.js'></script>\r
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_SKIN_BASE"-->/kcls/js/holds.js'></script>\r
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_SKIN_BASE"-->/kcls/js/cn_browse.js'></script>\r
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_SKIN_BASE"-->/kcls/js/container.js'></script>\r
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_SKIN_BASE"-->/kcls/js/sidebar.js'></script>\r
-\r
-       <script language='javascript' type='text/javascript'>\r
-               config.ids.rdetail = {};\r
-               config.ids.rdetail.view_marc = "rdetail_view_marc";\r
-       </script>\r
-\r
        <div id="rdetail_header">\r
          <div style="float:left;">\r
            Search Results<![CDATA[&nbsp;&nbsp;&nbsp;\r
index 8162639..46a7094 100644 (file)
@@ -1,13 +1,5 @@
-
 <![CDATA[<!-- ****************** page_rresult.xml ***************************** -->]]>
 <div>
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_SKIN_BASE"-->/kcls/js/sidebar_extras.js'></script>
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_SKIN_BASE"-->/kcls/js/rresult.js'></script>
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_SKIN_BASE"-->/kcls/js/result_common.js'></script>
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_SKIN_BASE"-->/kcls/js/tips.js'></script>
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_SKIN_BASE"-->/kcls/js/holds.js'></script>   
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_SKIN_BASE"-->/kcls/js/rdetail.js'></script>
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_SKIN_BASE"-->/kcls/js/container.js'></script>
        <!--#include virtual="result/result_common.xml"-->
 </div>
 <![CDATA[<!-- ****************** end: page_rresult.xml ***************************** -->]]>
index ff17d17..61cbc9c 100644 (file)
@@ -1,28 +1,3 @@
-
 <!-- record details alternate canvases -->
 <div class=''>
-
-       <!--
-       <script language='javascript' type='text/javascript'>
-               config.ids.rdetail.view_marc_div = 'view_marc_div';
-               config.ids.altcanvas.view_marc_div = config.ids.rdetail.view_marc_div; 
-               config.ids.rdetail.hide_marc = "rdetail_hide_marc";
-               config.ids.rdetail.view_marc_box = "rdetail_view_marc_box";
-       </script>
-
-       <div class='hide_me canvas' id='view_marc_div'> 
-               <div>
-                       <table width='100%'><tbody><tr>
-                               <td class='color_1' align='left' style='padding-left: 7px;text-decoration: underline;'>
-                                       <a href="javascript:void(0);" id='rdetail_hide_marc'>&rdetail.detailMain.hideMarc;</a>
-                               </td>
-                       </tr></tbody></table>
-               </div>
-               <br/>
-               <div id='rdetail_view_marc_box'> </div>
-               <br/><br/>
-       </div>
-       -->
-       
 </div>
-
index c606d07..c6020d4 100644 (file)
@@ -1,8 +1,6 @@
 
 <![CDATA[<!-- ****************** rdetail_cn_details.xml ***************************** -->]]>
 <table class='hide_me'>
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/copy_details.js'></script>
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/Date.W3CDTF.js'></script>
        <tbody>
                <tr style='border: 3px solid #E0E0E0;' id='rdetail_volume_details_row' templateRow='1'>
                        <td colspan='10'>
index 12a7a98..0bc6e30 100644 (file)
@@ -1,4 +1,3 @@
-
 <!-- This holds information for copies attached to this record -->
 <![CDATA[<!-- ****************** rdetail_copyinfo.xml ***************************** -->]]>
 <div id='rdetail_copy_info_div' class='rdetail_extras_div hide_me'>
 
        <div id='rdetail_copy_info_none' class='hide_me'>&rdetail.noneAvailable;</div>
 
-       <script language='javascript' type='text/javascript'>
-               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';
-       </script>
 </div> <!-- copy info -->
 <![CDATA[<!-- ****************** end: rdetail_copyinfo.xml ***************************** -->]]>
-
index 0ab6f8f..cd52bfb 100644 (file)
@@ -1,4 +1,3 @@
-\r
 <![CDATA[<!-- ****************** rdetail_extras.xml ***************************** -->]]>\r
 <div xmlns:xi="http://www.w3.org/2001/XInclude" id="rdetail_main_div" class="">\r
        <table class='hide_me rdetails_extra_links'>\r
 \r
     <!-- Novelist setup -->\r
     <!--if expr="${OILS_NOVELIST_URL} && ${OILS_NOVELIST_URL}!='(none)'"-->\r
-        <script type="text/javascript" id="EIT" src="<!--#echo var='OILS_NOVELIST_URL'-->"></script>\r
     <!--endif-->\r
-    <script language='javascript' type='text/javascript'>\r
-        var novelist = '<!--#echo var="OILS_NOVELIST_URL"-->';\r
-        if (novelist == '(none)') { novelist = false; }\r
-    </script>\r
 \r
 <![CDATA[<!-- ****************** end: rdetail_extras.xml ***************************** -->]]>\r
index e9005ce..dee0ef9 100644 (file)
@@ -1,4 +1,3 @@
-\r
 <![CDATA[<!-- ****************** rdetail_summary.xml ***************************** -->]]>\r
 <abbr class="unapi-id" title='tag:<!--#echo var="HTTP_HOST"-->,<!--#echo var="OILS_TIME_YEAR"-->:biblio-record_entry/<!--#echo var="OILS_OPAC_RID"-->'></abbr>\r
 <!-- This holds the record summary information -->\r
        <abbr name="unapi" class="unapi-id">\r
                <!-- unAPI URI goes here -->\r
        </abbr>\r
-\r
-       <script language='javascript' type='text/javascript'><![CDATA[\r
-\r
-               config.ids.rdetail.details_body         = 'rdetail_details_body'; \r
-               config.ids.rdetail.title                                = 'rdetail_title';\r
-               config.ids.rdetail.author                               = 'rdetail_author';\r
-               config.ids.rdetail.isbn                                 = 'rdetail_isbn';\r
-               config.ids.rdetail.edition                              = 'rdetail_edition';\r
-               config.ids.rdetail.pubdate                              = 'rdetail_pubdate';\r
-               config.ids.rdetail.publisher                    = 'rdetail_publisher';\r
-               config.ids.rdetail.tor                                  = 'rdetail_tor';\r
-               config.ids.rdetail.abstr                                = 'rdetail_abstract';\r
-               config.ids.rdetail.image                                = 'rdetail_image';\r
-               config.ids.rdetail.tor_pic                              = 'rdetail_tor_pic';\r
-\r
-         dojo.addOnLoad(function() {\r
-        setTimeout( function () {\r
-            var here = findOrgUnit(getLocation());\r
-            if (getDepth() > 0 || getDepth === 0 ) {\r
-                while (getDepth() < findOrgDepth(here))\r
-                    here = findOrgUnit( here.parent_ou() );\r
-            }\r
-\r
-            dojo.require('openils.BibTemplate');\r
-            new openils.BibTemplate({ record : new CGI().param('r'), org_unit : here.shortname() }).render();\r
-        },0);\r
-         });\r
-       ]]></script>\r
-\r
 </div> <!-- details_body -->\r
 \r
     <!-- ChiliFresh setup -->\r
-    <script language='javascript' type='text/javascript'>\r
-        var chilifresh = '<!--#echo var="OILS_CHILIFRESH_ACCOUNT"-->';\r
-        if (chilifresh == '(none)') { chilifresh = false; }\r
-    </script>\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
             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
-<![CDATA[\r
-<script type="text/javascript">\r
-var sslSwitch = (("https:" == document.location.protocol) ? "https://secure." : "http://");\r
-document.write(unescape("%3Cscript src='" + sslSwitch + "chilifresh.com/on-site/js/evergreen.js' type='text/javascript'%3E%3C/script%3E"));\r
-</script>\r
-]]>\r
     <!--endif-->\r
 <![CDATA[<!-- ****************** end: rdetail_summary.xml ***************************** -->]]>\r
index 858ebb2..8228d82 100644 (file)
@@ -1,9 +1,4 @@
-
 <div id='canvas_main' class='canvas' xmlns:xi="http://www.w3.org/2001/XInclude" >
-
        <!--#include virtual="result_table.xml"-->
        <!--#include virtual="result_lowhits.xml"-->
-
 </div>
-
-
index 0eea17b..5e2a716 100644 (file)
    <!-- ====================== -->\r
 \r
 \r
-       <script language='javascript' type='text/javascript'>\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
-       </script>\r
-\r
     <!-- ChiliFresh setup -->\r
-    <script language='javascript' type='text/javascript'>\r
-        var chilifresh = '<!--#echo var="OILS_CHILIFRESH_ACCOUNT"-->';\r
-        if (chilifresh=='(none)') { chilifresh = false; }\r
-    </script>\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
             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
-\r
-<![CDATA[\r
-<script type="text/javascript">\r
-var sslSwitch = (("https:" == document.location.protocol) ? "https://secure." : "http://");\r
-document.write(unescape("%3Cscript src='" + sslSwitch + "chilifresh.com/on-site/js/evergreen.js' type='text/javascript'%3E%3C/script%3E"));\r
-</script>\r
-]]>\r
     <!--endif-->\r
 </div>\r
 <![CDATA[<!-- ****************** end: result_table.xml ***************************** -->]]>\r
-\r