From c9dacca3246bb4dfe8f2457f822203b86ca9df43 Mon Sep 17 00:00:00 2001 From: dbs Date: Tue, 27 Apr 2010 22:00:28 +0000 Subject: [PATCH] Bring the password reset interface to the Craftsman skin Along the way, we make the placement slightly less hard-coded so that we can better support custom skins that might not match default - although we're still assuming that the login box will be a table with a tbody, you can use the config.ids.login.tbody variable to point at the ID you care about for your skin. git-svn-id: svn://svn.open-ils.org/ILS/trunk@16325 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/skin/craftsman/xml/common/login.xml | 4 +++- Open-ILS/web/opac/skin/default/js/password_reset.js | 2 +- Open-ILS/web/opac/skin/default/xml/common/login.xml | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Open-ILS/web/opac/skin/craftsman/xml/common/login.xml b/Open-ILS/web/opac/skin/craftsman/xml/common/login.xml index f955e6cec6..dd0a4ba066 100644 --- a/Open-ILS/web/opac/skin/craftsman/xml/common/login.xml +++ b/Open-ILS/web/opac/skin/craftsman/xml/common/login.xml @@ -5,18 +5,20 @@ config.ids.login = {}; config.css.login = {}; 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; +

&opac.login.login;

- + ", "login_tbody"); + dojo.place("", config.ids.login.tbody); dojo.query("#pwResetLink").attr("innerHTML", opac_strings.PWD_RESET_FORGOT_PROMPT); }); 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 b94cb5b2c4..a875410c1d 100644 --- a/Open-ILS/web/opac/skin/default/xml/common/login.xml +++ b/Open-ILS/web/opac/skin/default/xml/common/login.xml @@ -5,6 +5,7 @@ config.ids.login = {}; config.css.login = {}; 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"; -- 2.43.2
&login.username; diff --git a/Open-ILS/web/opac/skin/default/js/password_reset.js b/Open-ILS/web/opac/skin/default/js/password_reset.js index 5382e8caa2..9da98b4022 100644 --- a/Open-ILS/web/opac/skin/default/js/password_reset.js +++ b/Open-ILS/web/opac/skin/default/js/password_reset.js @@ -41,7 +41,7 @@ dojo.addOnLoad(function() { } var deferred = dojo.xhrPost(xhrArgs); }); - dojo.place("