From 33a458e6418ec71376191a3f9cacb2965382e905 Mon Sep 17 00:00:00 2001
From: Bill Erickson <erickson@esilibrary.com>
Date: Mon, 13 Dec 2010 16:14:23 -0500
Subject: [PATCH] move login script import into main script loading block

---
 .../opac/skin/default/xml/common/js_common_postbody.xml  |  4 ++++
 Open-ILS/web/opac/skin/default/xml/common/login.xml      | 16 ----------------
 2 files changed, 4 insertions(+), 16 deletions(-)

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 78ac465bf0..2ab945bff7 100644
--- 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 faaf38073d..57f837fc81 100644
--- 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;'>
-- 
2.11.0