remove unwanted code, whitespace, alerts

diff --git a/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml b/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml
index 3ff1fd4..1eba732 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml
@@ -1,5 +1,4 @@
 <script type="text/javascript">
-    alert("hERE");
     dojo.require('openils.Util');
 
     var idlPath = '/IDL2js?mvr,bre,aou,aout,pgt,lasso,cmf,cmc,cmsa,cam,cifm,clfm,citm,cblvl,ccs';
@@ -159,6 +158,7 @@
         <!--#endif-->
 
         <!--#if expr="$OILS_PAGE='rdetail.xml'"-->
+        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');

diff --git a/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml b/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml
index b0b086d..4300946 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml
@@ -143,40 +143,4 @@
                        <a style='margin-left: 4px;' class='classic_link' href='javascript:advMARCRun();'>&common.submit;</a>
                </div>
        </div>
-
-
-
-
-       <!-- ============================================================================= -->
-       <!-- Our javascript -->
-
-       <script language='javascript' type='text/javascript'>
-        /*
-               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';
-        */
-       </script>
-
 </div>
-