Index: typo3/index.php =================================================================== --- typo3/index.php (Revision 6504) +++ typo3/index.php (Arbeitskopie) @@ -249,6 +249,8 @@ $content = t3lib_parsehtml::substituteSubpart($content, '###LOGIN_ERROR###', ''); } else { $markers['ERROR_MESSAGE'] = $GLOBALS['LANG']->getLL('error.login', true); + $markers['ERROR_LOGIN_TITLE'] = $GLOBALS['LANG']->getLL('error.login.title', true); + $markers['ERROR_LOGIN_DESCRIPTION'] = $GLOBALS['LANG']->getLL('error.login.description', true); } @@ -324,6 +326,7 @@ 'ERROR_COOKIES' => $GLOBALS['LANG']->getLL('error.cookies', true), 'ERROR_COOKIES_IGNORE' => $GLOBALS['LANG']->getLL('error.cookies_ignore', true), 'ERROR_CAPSLOCK' => $GLOBALS['LANG']->getLL('error.capslock', true), + 'ERROR_FURTHERHELP' => $GLOBALS['LANG']->getLL('error.furtherInformation', true), 'LABEL_DONATELINK' => $GLOBALS['LANG']->getLL('labels.donate', true), 'LABEL_USERNAME' => $GLOBALS['LANG']->getLL('labels.username', true), 'LABEL_OPENID' => $GLOBALS['LANG']->getLL('labels.openId', true), Index: typo3/sysext/t3skin/templates/login.html =================================================================== --- typo3/sysext/t3skin/templates/login.html (Revision 6504) +++ typo3/sysext/t3skin/templates/login.html (Arbeitskopie) @@ -11,15 +11,11 @@
###FORM###
@@ -48,9 +44,9 @@ ###COPYRIGHT###
@@ -83,14 +79,11 @@
-

###ERROR_MESSAGE###

+

###ERROR_LOGIN_TITLE###

+

###ERROR_LOGIN_DESCRIPTION###

- -
- + +
@@ -134,7 +133,7 @@ ###LABEL_SWITCHOPENID###
Index: typo3/sysext/t3skin/backgrounds/login-border-bottom.png =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Index: typo3/sysext/t3skin/resources/login.js =================================================================== --- typo3/sysext/t3skin/resources/login.js (Revision 6504) +++ typo3/sysext/t3skin/resources/login.js (Arbeitskopie) @@ -28,6 +28,11 @@ ['focus', 'blur', 'keypress'], function() { TYPO3BackendLogin.setVisibilityOfClearIcon($(value), $(value + '-clearIcon')); } ); + Event.observe( + $(value), + 'keypress', + function(event) { TYPO3BackendLogin.showCapsLockWarning($(value + '-alert-capslock'), event); } + ); }) }, @@ -49,6 +54,14 @@ } }, + showCapsLockWarning: function(alertIcon, event) { + if (isCapslock(event)) { + alertIcon.show(); + } else { + alertIcon.hide(); + } + }, + clearInputField: function(formField) { formField.value = ''; formField.focus(); Index: typo3/sysext/t3skin/icons/login_capslock.gif =================================================================== Kann nicht anzeigen: Dateityp ist als binär angegeben. svn:mime-type = application/octet-stream Index: typo3/sysext/t3skin/stylesheets/typo3-index-php.css =================================================================== --- typo3/sysext/t3skin/stylesheets/typo3-index-php.css (Revision 6504) +++ typo3/sysext/t3skin/stylesheets/typo3-index-php.css (Arbeitskopie) @@ -15,8 +15,8 @@ } body#typo3-index-php #t3-login-form { - margin: 30px auto 10px; - width: 426px; + margin: 30px 16% 10px; + width: 456px; text-align: left; font-size: 11px; } @@ -26,12 +26,12 @@ padding-bottom: 2px; margin: 0; width: auto; - height: 24px; border-bottom: 1px solid #d6d9df; + min-height: 24px; } body#typo3-index-php .t3-headline h2 { - background: url('../icons/login-icon-key.gif') no-repeat 10px center; + background: url('../icons/login-icon-key.gif') no-repeat 10px 5px; background-color: transparent; margin: 0; padding: 0 0 0 40px; @@ -71,10 +71,6 @@ margin-top: 15px; } -body#typo3-index-php .t3-login-username input, -body#typo3-index-php .t3-login-password input { -} - body#typo3-index-php .t3-login-field { height: 21px; padding: 0; @@ -85,26 +81,34 @@ body#typo3-index-php .t3-login-field .t3-login-clearInputField { position: absolute; - left: 255px; + left: 275px; top: 5px; } +body#typo3-index-php .t3-login-field .t3-login-alert-capslock { + position: absolute; + left: 297px; + top: 2px; +} + body#typo3-index-php .t3-login-field label { color: #7f8083; float: left; padding-right: 10px; - width: 65px; + width: 85px; } body#typo3-index-php .t3-login-field input { color: #000; height: 19px; line-height: 19px; + font-size: 11px; width: 168px; margin: 0; padding: 2px 23px 0 5px; border: 1px solid #7c7c7c; background: #ffffff url('../backgrounds/login-field-input.gif') repeat-x; + -webkit-appearance: textfield; } body#typo3-index-php #t3-login-form-fields { @@ -152,7 +156,7 @@ body#typo3-index-php .t3-login-submit { font-size: 11px; border-color: #7c7c7c; - margin: 15px 0 0 75px; + margin: 15px 0 0 95px; padding: 3px 16px; text-align: left; background: #d6d6d6 url(../backgrounds/login_submit_bg.gif) repeat-x; @@ -199,8 +203,8 @@ body#typo3-index-php #t3-footer { border-top: 1px solid #d1d2d3; - margin: 40px auto 10px; - width: 426px; + margin: 40px 16% 10px; + width: 456px; } body#typo3-index-php #t3-meta-links { @@ -213,6 +217,10 @@ text-decoration: underline; } +body#typo3-index-php #t3-meta-links a.t3-login-link-donate { + font-weight: bold; +} + body#typo3-index-php #t3-meta-links a:hover { color: #000; } @@ -265,7 +273,7 @@ color: #7f8083; float: left; padding-right: 10px; - width: 65px; + width: 85px; line-height: 21px; } @@ -277,33 +285,55 @@ padding: 15px; } -.t3-login-alert p { - padding: 0 10px 0 30px; +.t3-login-alert h2 { + margin: 0; + background: none; font-size: 14px; line-height: 18px; - font-weight: bold; + padding: 0 10px 0 30px; } +.t3-login-alert p { + margin: 10px 0 0 0; + padding: 0 10px 0 30px; + font-size: 11px; + line-height: 15px; +} + +.t3-login-alert a { + text-decoration: underline; +} + .t3-login-alert-error { background: #f6d3cf; border: 1px solid #d66c68; } -.t3-login-alert-error p { +.t3-login-alert-error h2 { background: url('../icons/login-alert-error.gif') no-repeat left 2px; color: #be0027; } +.t3-login-alert-error p, +.t3-login-alert-error a { + color: #be0027; +} + .t3-login-alert-warning { background: #fbf6de; border: 1px solid #b1905c; } -.t3-login-alert-warning p { +.t3-login-alert-warning h2 { background: url('../icons/login-alert-warning.gif') no-repeat left 2px; color: #9e7d4a; } +.t3-login-alert-warning p, +.t3-login-alert-warning a { + color: #9e7d4a; +} + /** * @section box layout */ @@ -314,7 +344,7 @@ } .t3-login-box-body { - background: #e3e5ea url('../backgrounds/login-box-body.gif') repeat-x; + background: #e3e5ea url('../backgrounds/login-box-body.png') repeat-x; padding: 10px; } Index: typo3/sysext/lang/locallang_login.xml =================================================================== --- typo3/sysext/lang/locallang_login.xml (Revision 6504) +++ typo3/sysext/lang/locallang_login.xml (Arbeitskopie) @@ -27,10 +27,13 @@ + + +