[open-ils-commits] r16326 - in branches/rel_1_6/Open-ILS/web/opac/skin: craftsman/xml/common default/js default/xml/common (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2010-04-27 18:01:28 -0400 (Tue, 27 Apr 2010)
New Revision: 16326

Modified:
   branches/rel_1_6/Open-ILS/web/opac/skin/craftsman/xml/common/login.xml
   branches/rel_1_6/Open-ILS/web/opac/skin/default/js/password_reset.js
   branches/rel_1_6/Open-ILS/web/opac/skin/default/xml/common/login.xml
Log:
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.


Modified: branches/rel_1_6/Open-ILS/web/opac/skin/craftsman/xml/common/login.xml
===================================================================
--- branches/rel_1_6/Open-ILS/web/opac/skin/craftsman/xml/common/login.xml	2010-04-27 22:00:28 UTC (rev 16325)
+++ branches/rel_1_6/Open-ILS/web/opac/skin/craftsman/xml/common/login.xml	2010-04-27 22:01:28 UTC (rev 16326)
@@ -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;
 	</script>
+	<script type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/password_reset.js'></script>
 
 	<div class='form-panels'>
 		<h2><span>&opac.login.login;</span></h2>
 		
 		<table id='login_table'>
-			<tbody>
+			<tbody id='login_tbody'>
 				<tr>
 					<td style='vertical-align: middle;'><span style='font-size: 12px; font-family: Verdana, Arial, Helvetica, sans-serif;'>&login.username;</span></td>
 					<td>

Modified: branches/rel_1_6/Open-ILS/web/opac/skin/default/js/password_reset.js
===================================================================
--- branches/rel_1_6/Open-ILS/web/opac/skin/default/js/password_reset.js	2010-04-27 22:00:28 UTC (rev 16325)
+++ branches/rel_1_6/Open-ILS/web/opac/skin/default/js/password_reset.js	2010-04-27 22:01:28 UTC (rev 16326)
@@ -41,7 +41,7 @@
         }
         var deferred = dojo.xhrPost(xhrArgs);
     });
-    dojo.place("<tr><td colspan='2' align='center'><a class='classic_link' id='pwResetLink' onClick='dijit.byId(\"pwResetFormDlg\").show();'</a></td></tr>", "login_tbody");
+    dojo.place("<tr><td colspan='2' align='center'><a class='classic_link' id='pwResetLink' onClick='dijit.byId(\"pwResetFormDlg\").show();'</a></td></tr>", config.ids.login.tbody);
     dojo.query("#pwResetLink").attr("innerHTML", opac_strings.PWD_RESET_FORGOT_PROMPT);
 
 });

Modified: branches/rel_1_6/Open-ILS/web/opac/skin/default/xml/common/login.xml
===================================================================
--- branches/rel_1_6/Open-ILS/web/opac/skin/default/xml/common/login.xml	2010-04-27 22:00:28 UTC (rev 16325)
+++ branches/rel_1_6/Open-ILS/web/opac/skin/default/xml/common/login.xml	2010-04-27 22:01:28 UTC (rev 16326)
@@ -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";