move login script import into main script loading block

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 78ac465..2ab945b 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
@@ -156,6 +156,10 @@
         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/default/js/sidebar_extras.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/login.xml b/Open-ILS/web/opac/skin/default/xml/common/login.xml
index faaf380..57f837f 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/common/login.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/login.xml
@@ -1,22 +1,6 @@
 
 <div id='login_box' class='hide_me canvas' style='margin-top: 6px;'>
 
-       <script language='javascript' type='text/javascript'>
-        /*
-               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;
-        */
-       </script>
-       <script type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/password_reset.js'></script>
-
        <br/>
 
        <div class='login_text color_1' style='padding: 4px; text-align: center;'>