more js_common imports; started work on body.xml
authorBill Erickson <erickson@esilibrary.com>
Wed, 15 Dec 2010 15:28:50 +0000 (10:28 -0500)
committerBill Erickson <erickson@esilibrary.com>
Wed, 15 Dec 2010 15:28:50 +0000 (10:28 -0500)
Open-ILS/web/opac/skin/kcls/xml/body.xml
Open-ILS/web/opac/skin/kcls/xml/common/js_common.xml
Open-ILS/web/opac/skin/kcls/xml/common/js_common_postbody.xml

index 505ba5e..1b761aa 100644 (file)
@@ -1,93 +1,4 @@
-
 <body class="tundra">
-<script language='javascript' type='text/javascript'>
-//central config space
-
-       config.ids.login = {};
-       config.ids.searchbar = {};
-       config.ids.sidebar = {};
-       config.css.login = {};
-       config.css.searchbar = {};
-       config.css.sidebar = {};
-       config.css.sidebar.item = {};
-       config.names.sidebar = {};
-       config.ids.result.offset_start  = "offset_start";
-       config.ids.result.offset_end            = "offset_end";
-       config.ids.result.result_count  = "result_count";
-       config.ids.result.next_link             = 'next_link';
-       config.ids.result.prev_link             = 'prev_link';
-       config.ids.result.home_link             = 'search_home_link';
-       config.ids.result.end_link                      = 'end_link';
-       config.ids.result.main_table            = 'result_table';
-       config.ids.result.row_template  = 'result_table_template';
-       config.ids.result.num_pages             = 'num_pages';
-       config.ids.result.current_page  = 'current_page';
-       config.css.result.nav_active            = "nav_link_active";
-       config.ids.result.top_div                       = "result_table_div";
-       config.ids.result.nav_links             = "search_nav_links";
-       config.ids.result.info                          = "result_info_div";
-       config.css.result.cc_cell_even  = "copy_count_cell_even";
-       config.names.result.item_jacket = "item_jacket";
-       config.names.result.item_title  = "item_title";
-       config.names.result.item_author = "item_author";
-       config.names.result.counts_row  = "counts_row";
-       config.names.result.count_cell  = "copy_count_cell";
-       config.ids.common.top_logo = "top_left_logo";
-       config.ids.altcanvas.myopac_reload = 'myopac_reloading';
-       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.altcanvas.cnbrowse           = 'cn_browse';
-       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.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.logged_in_as = 'logged_in_as_div';
-       config.ids.sidebar.username_dest        = 'username_dest';
-       config.ids.sidebar.subject                      = 'subject_sidebar';
-       config.ids.sidebar.subject_item = 'subject_item';
-       config.ids.sidebar.author                       = 'author_sidebar';
-       config.ids.sidebar.author_item  = 'author_item';
-       config.ids.sidebar.series                       = 'series_sidebar';
-       config.ids.sidebar.series_item  = 'series_item';
-       config.ids.sidebar.home_link            = 'home_link'
-       config.ids.sidebar.advanced_link        = 'advanced_link'
-       config.ids.sidebar.myopac_link  = 'myopac_link'
-       config.names.sidebar.subject_item       = 'subject_item';
-       config.names.sidebar.author_item                = 'author_item';
-       config.names.sidebar.series_item                = 'series_item';
-       config.css.encircled                            = 'encircled';
-       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.depth_sel_span     = 'depth_selector_span';
-       config.ids.login.box            = "login_box";
-       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.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.common.now_searching = 'now_searching_location';
-</script>
-
 <noscript>
        <style type="text/css">#toptable { display: none; }</style>
        <p style="font-size: 1.3em; padding: 3em; text-align: center;">
 
 <div id="search-wrapper">
   <div style="margin:auto;width:694px;padding-left:17px;height:0px;">
-       <div id="user-ql">
-<![CDATA[
-<script type="text/javascript">
-if(grabUser()) {
-       var str = '<div style="float:right;width:214px;">';
-       str += '<div style="position:absolute;"><div style="position:relative;top:-81px;">\n';
-       str += '<div id="quick-links">\n';
-       str += '</div></div></div></div>';
-       document.write(str);
-}
-</script>
-]]>
+    <div id="user-ql">
+        <div style="float:right;width:214px;" class='hide_me' id='quick-links-wrapper'>
+            <div style="position:absolute;">
+                <div style="position:relative;top:-81px;">
+                    <div id="quick-links"> </div>
+                </div>
+            </div>
+        </div>
        </div>
       <!--#include virtual="utils.xml"-->
   </div>
@@ -146,17 +53,6 @@ if(grabUser()) {
 </div>
 <!--#include virtual='footer.xml'-->
 <div>
-<script language="javascript" type='text/javascript'>
-<![CDATA[
-try { 
-  document.getElementById('toptable').style.display = 'table'; 
-} catch(e) {
-  try {
-       document.getElementById('toptable').style.display = ''; 
-  } catch(ee) {}
-}
-]]>
-</script>
 </div>
 <!-- hide unused pieces of the opac here - prevents JS from complaining -->
 <div class="hide_me">
@@ -164,44 +60,9 @@ try {
   <div id="login_cancel_button"></div>
   <div id="x"></div>
 </div>
-<script type="text/javascript">
-attachEvt("common", "unload", function(){
-       if(typeof(G)!="undefined") destroyObj(G);
-       if(typeof(HTTP)!="undefined") destroyObj(HTTP);
-       if(typeof(_c)!="undefined") destroyObj(_c);
-       if(typeof(_l)!="undefined") destroyObj(_l);
-       if(typeof(config)!="undefined") destroyObj(config);
-       if(typeof(facet_list)!="undefined") destroyObj(facet_list);
-       if(typeof(globalOrgTree)!="undefined") destroyObj(globalOrgTree);
-       if(typeof(globalOrgTypes)!="undefined") destroyObj(globalOrgTypes);
-       if(typeof(google)!="undefined") destroyObj(google);
-       if(typeof(orgArraySearcher)!="undefined") destroyObj(orgArraySearcher);
-       if(typeof(recordsCache)!="undefined") destroyObj(recordsCache);
-       if(typeof(search_list)!="undefined") destroyObj(search_list);
-       if(typeof(subjectCache)!="undefined") destroyObj(subjectCache);
-       if(typeof(xrefCacheIndex)!="undefined") destroyObj(xrefCacheIndex);
-       if(typeof(x)!="undefined") destroyObj(x);
-       if(typeof(string)!="undefined") string = "";
-       //removeChildren(document);
-       //alert(errCounter+'\n'+errCounter2);
-});
-</script>
-<div dojoType='openils.widget.ProgressDialog' jsId='progressDialog' style="width:300px;"></div>
-<![CDATA[
-        <script language='javascript' type='text/javascript'>
-                dojo.addOnLoad(init);
-                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("openils.widget.FacetSidebar"); // pulls in Searcher and I18N
-                dojo.require("dijit.form.NumberSpinner");
-                dojo.require("dijit.form.CheckBox");
-                dojo.require("openils.widget.ProgressDialog");
-                dojo.require('openils.BibTemplate');
-                dojo.addOnLoad(opac_init);
-        </script>
-]]>
+
+<!--#if expr="$HTTP_USER_AGENT = /Firefox/ || $HTTP_USER_AGENT = /Xulrunner/" -->
+<!--#include virtual='common/js_common_postbody.xml'-->
+<!--#endif-->
+
 </body>
index cc0f12e..d88358b 100644 (file)
     dojo.require("dojo.date.stamp");
     dojo.require("dojo.parser");
     dojo.require("openils.widget.FacetSidebar"); // pulls in Searcher and I18N
+    dojo.addOnLoad(opac_init)
+
+    try { 
+        document.getElementById('toptable').style.display = 'table'; 
+    } catch(e) {
+        try {
+            document.getElementById('toptable').style.display = ''; 
+        } catch(ee) {}
+    }
+
+    attachEvt("common", "unload", function(){
+        if(typeof(G)!="undefined") destroyObj(G);
+        if(typeof(HTTP)!="undefined") destroyObj(HTTP);
+        if(typeof(_c)!="undefined") destroyObj(_c);
+        if(typeof(_l)!="undefined") destroyObj(_l);
+        if(typeof(config)!="undefined") destroyObj(config);
+        if(typeof(facet_list)!="undefined") destroyObj(facet_list);
+        if(typeof(globalOrgTree)!="undefined") destroyObj(globalOrgTree);
+        if(typeof(globalOrgTypes)!="undefined") destroyObj(globalOrgTypes);
+        if(typeof(google)!="undefined") destroyObj(google);
+        if(typeof(orgArraySearcher)!="undefined") destroyObj(orgArraySearcher);
+        if(typeof(recordsCache)!="undefined") destroyObj(recordsCache);
+        if(typeof(search_list)!="undefined") destroyObj(search_list);
+        if(typeof(subjectCache)!="undefined") destroyObj(subjectCache);
+        if(typeof(xrefCacheIndex)!="undefined") destroyObj(xrefCacheIndex);
+        if(typeof(x)!="undefined") destroyObj(x);
+        if(typeof(string)!="undefined") string = "";
+        //removeChildren(document);
+        //alert(errCounter+'\n'+errCounter2);
+    });
 
 ]]> </script>
 
 <script type='text/javascript' src='<!--#echo var='OILS_NOVELIST_URL'-->'></script>
 <!--#endif-->
 
-
-<!--#if expr="$HTTP_USER_AGENT = /MSIE/"-->
-<script language='javascript' type='text/javascript' 
-    src='<!--#echo var="OILS_PROTOCOL"-->://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js'></script>
-<script><![CDATA[
-    dojo.addOnLoad(
-        function() {
-            CFInstall.check({
-                preventPrompt: true,
-                onmissing: function() {
-                    if (dojo.cookie("noGCF") != "true")
-                        unHideMe($('gcfPrompt'));
-                }
-            });
-        }
-    );
-]]></script>
-<!--#endif-->
-
 <!--#endif--> <!-- != Firefox/Xulrunner -->
index a90b39c..0cc7a68 100644 (file)
         } catch (E) {
             void(0);
         }
+
+        try { 
+            document.getElementById('toptable').style.display = 'table'; 
+        } catch(e) {
+            try {
+                document.getElementById('toptable').style.display = ''; 
+            } catch(ee) {}
+        }
+
+        attachEvt("common", "unload", function(){
+            if(typeof(G)!="undefined") destroyObj(G);
+            if(typeof(HTTP)!="undefined") destroyObj(HTTP);
+            if(typeof(_c)!="undefined") destroyObj(_c);
+            if(typeof(_l)!="undefined") destroyObj(_l);
+            if(typeof(config)!="undefined") destroyObj(config);
+            if(typeof(facet_list)!="undefined") destroyObj(facet_list);
+            if(typeof(globalOrgTree)!="undefined") destroyObj(globalOrgTree);
+            if(typeof(globalOrgTypes)!="undefined") destroyObj(globalOrgTypes);
+            if(typeof(google)!="undefined") destroyObj(google);
+            if(typeof(orgArraySearcher)!="undefined") destroyObj(orgArraySearcher);
+            if(typeof(recordsCache)!="undefined") destroyObj(recordsCache);
+            if(typeof(search_list)!="undefined") destroyObj(search_list);
+            if(typeof(subjectCache)!="undefined") destroyObj(subjectCache);
+            if(typeof(xrefCacheIndex)!="undefined") destroyObj(xrefCacheIndex);
+            if(typeof(x)!="undefined") destroyObj(x);
+            if(typeof(string)!="undefined") string = "";
+            //removeChildren(document);
+            //alert(errCounter+'\n'+errCounter2);
+        });
     }
 
     dojo.addOnLoad(
 
         function() {
             skin_init();
-
             <!--#if expr="$OILS_PAGE='index.xml'"-->
             isFrontPage = true;
             <!--#endif-->
-
             init();
+            opac_init();
         }
     );
 ]]></script>