aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-12-29 22:56:40 +0100
committerAndreas Fischer <bantu@phpbb.com>2010-12-29 22:56:40 +0100
commit410f1fdbc0703305865b0cfbeeb124be632a61fb (patch)
tree0c9130473be399f85172db3bbcb4ad1c7c2427d8 /phpBB
parent7442cd214ce2907ee67e79bf1e72ed0fc65f0cd5 (diff)
parent7f0f08bcc497d04746b209510a55ebfadcfe13bb (diff)
downloadforums-410f1fdbc0703305865b0cfbeeb124be632a61fb.tar
forums-410f1fdbc0703305865b0cfbeeb124be632a61fb.tar.gz
forums-410f1fdbc0703305865b0cfbeeb124be632a61fb.tar.bz2
forums-410f1fdbc0703305865b0cfbeeb124be632a61fb.tar.xz
forums-410f1fdbc0703305865b0cfbeeb124be632a61fb.zip
Merge branch 'ticket/noxwizard/9953' into develop-olympus
* ticket/noxwizard/9953: [ticket/9953] Set focus to password on re-authentication
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/styles/prosilver/template/login_body.html2
-rw-r--r--phpBB/styles/subsilver2/template/login_body.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/styles/prosilver/template/login_body.html b/phpBB/styles/prosilver/template/login_body.html
index 26e425a1d0..36c2eae349 100644
--- a/phpBB/styles/prosilver/template/login_body.html
+++ b/phpBB/styles/prosilver/template/login_body.html
@@ -2,7 +2,7 @@
<script type="text/javascript">
// <![CDATA[
- onload_functions.push('document.getElementById("{USERNAME_CREDENTIAL}").focus();');
+ onload_functions.push('document.getElementById("<!-- IF S_ADMIN_AUTH -->{PASSWORD_CREDENTIAL}<!-- ELSE -->{USERNAME_CREDENTIAL}<!-- ENDIF -->").focus();');
// ]]>
</script>
diff --git a/phpBB/styles/subsilver2/template/login_body.html b/phpBB/styles/subsilver2/template/login_body.html
index 90bbf8c139..262341e0c0 100644
--- a/phpBB/styles/subsilver2/template/login_body.html
+++ b/phpBB/styles/subsilver2/template/login_body.html
@@ -92,7 +92,7 @@
// <![CDATA[
(function()
{
- var elements = document.getElementsByName("{USERNAME_CREDENTIAL}");
+ var elements = document.getElementsByName("<!-- IF S_ADMIN_AUTH -->{PASSWORD_CREDENTIAL}<!-- ELSE -->{USERNAME_CREDENTIAL}<!-- ENDIF -->");
for (var i = 0; i < elements.length; ++i)
{
if (elements[i].tagName.toLowerCase() == 'input')