aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/subsilver2
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-12-29 23:01:19 +0100
committerAndreas Fischer <bantu@phpbb.com>2010-12-29 23:01:19 +0100
commit979158f0a2e1ab88685f608e8756ff40248b86cf (patch)
treea2c1e8ba17bce08e1439a45ef3529516ad9469a4 /phpBB/styles/subsilver2
parent541879dc5ce4290d51bf0e888879e3cd9967d1a2 (diff)
parentc54683be8c0493a51d9a1dbf4c605e95d17940b2 (diff)
downloadforums-979158f0a2e1ab88685f608e8756ff40248b86cf.tar
forums-979158f0a2e1ab88685f608e8756ff40248b86cf.tar.gz
forums-979158f0a2e1ab88685f608e8756ff40248b86cf.tar.bz2
forums-979158f0a2e1ab88685f608e8756ff40248b86cf.tar.xz
forums-979158f0a2e1ab88685f608e8756ff40248b86cf.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'. [ticket/9953] Set focus to password on re-authentication [ticket/9905] Add SQLite to the DSN description [ticket/9859] Remove years from the credit line.
Diffstat (limited to 'phpBB/styles/subsilver2')
-rw-r--r--phpBB/styles/subsilver2/template/login_body.html2
-rw-r--r--phpBB/styles/subsilver2/template/overall_footer.html2
2 files changed, 2 insertions, 2 deletions
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')
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html
index 764f632e16..74d9276e8e 100644
--- a/phpBB/styles/subsilver2/template/overall_footer.html
+++ b/phpBB/styles/subsilver2/template/overall_footer.html
@@ -14,7 +14,7 @@
<div id="wrapfooter">
<!-- IF U_ACP --><span class="gensmall">[ <a href="{U_ACP}">{L_ACP}</a> ]</span><br /><br /><!-- ENDIF -->
- <span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; 2000, 2002, 2005, 2007 phpBB Group
+ <span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group
<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
<!-- IF DEBUG_OUTPUT --><br /><bdo dir="ltr">[ {DEBUG_OUTPUT} ]</bdo><!-- ENDIF --></span>
</div>