diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-12-29 23:01:19 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-12-29 23:01:19 +0100 |
| commit | 979158f0a2e1ab88685f608e8756ff40248b86cf (patch) | |
| tree | a2c1e8ba17bce08e1439a45ef3529516ad9469a4 /phpBB/styles/prosilver | |
| parent | 541879dc5ce4290d51bf0e888879e3cd9967d1a2 (diff) | |
| parent | c54683be8c0493a51d9a1dbf4c605e95d17940b2 (diff) | |
| download | forums-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/prosilver')
| -rw-r--r-- | phpBB/styles/prosilver/template/login_body.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_footer.html | 2 |
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 cc216595a3..03615398c1 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/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index 8373629ecc..6a3f76ad09 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -30,7 +30,7 @@ The phpBB Group : 2006 //--> - <div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> © 2000, 2002, 2005, 2007 phpBB Group + <div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> © phpBB Group <!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF --> <!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF --> <!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF --> |