Bug #21640 » 0012699_followup.patch
| typo3/index.php (Arbeitskopie) | ||
|---|---|---|
|
$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);
|
||
|
}
|
||
| ... | ... | |
|
'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),
|
||
| typo3/sysext/t3skin/templates/login.html (Arbeitskopie) | ||
|---|---|---|
|
<div class="t3-login-box-body">
|
||
|
<noscript>
|
||
|
<div id="t3-noscript-error" class="t3-login-alert t3-login-alert-error">
|
||
|
<p>
|
||
|
###ERROR_JAVASCRIPT###
|
||
|
</p>
|
||
|
<h2>###ERROR_JAVASCRIPT###</h2>
|
||
|
</div>
|
||
|
</noscript>
|
||
|
<div id="t3-nocookies-error" class="t3-login-alert t3-login-alert-warning" style="display:none">
|
||
|
<p>
|
||
|
###ERROR_COOKIES###
|
||
|
</p>
|
||
|
<h2>###ERROR_COOKIES###</h2>
|
||
|
</div>
|
||
|
###FORM###
|
||
|
<div class="t3-login-bottomBorder"></div>
|
||
| ... | ... | |
|
###COPYRIGHT###
|
||
|
</div>
|
||
|
<div id="t3-meta-links">
|
||
|
<a href="http://typo3.org" target="_blank">TYPO3.org</a>
|
||
|
<a href="http://typo3.org" target="_blank" class="t3-login-link-typo3">TYPO3.org</a>
|
||
|
|
|
||
|
<a href="http://typo3.org/donate/" target="_blank">###LABEL_DONATELINK###</a>
|
||
|
<a href="http://typo3.org/donate/" target="_blank" class="t3-login-link-donate">###LABEL_DONATELINK###</a>
|
||
|
</div>
|
||
|
</div>
|
||
|
<!-- ###PAGE### end -->
|
||
| ... | ... | |
|
|
||
|
<!-- ###LOGIN_ERROR### begin -->
|
||
|
<div id="t3-login-error" class="t3-login-alert t3-login-alert-error">
|
||
|
<p>###ERROR_MESSAGE###</p>
|
||
|
<h2>###ERROR_LOGIN_TITLE###</h2>
|
||
|
<p>###ERROR_LOGIN_DESCRIPTION###</p>
|
||
|
</div>
|
||
|
<!-- ###LOGIN_ERROR### end -->
|
||
|
|
||
|
<div id="t3-capslock" class="t3-login-alert t3-login-alert-warning" style="display: none">
|
||
|
<p>###ERROR_CAPSLOCK###</p>
|
||
|
</div>
|
||
|
|
||
|
<div id="t3-login-form-fields" class="###CSS_OPENIDCLASS###">
|
||
|
<div class="t3-login-username t3-login-field">
|
||
|
<label for="t3-username" class="t3-username" id="t3-login-label-username">
|
||
| ... | ... | |
|
<label for="t3-username" class="t3-username" id="t3-login-label-openId" style="display: none">
|
||
|
###LABEL_OPENID###
|
||
|
</label>
|
||
|
<input type="text" id="t3-username" name="username" value="###VALUE_USERNAME###" class="t3-username" tabindex="1" onkeypress="checkCapslock(event, false)" />
|
||
|
<input type="text" id="t3-username" name="username" value="###VALUE_USERNAME###" class="t3-username" tabindex="1" />
|
||
|
<div class="t3-login-clearInputField">
|
||
|
<a id="t3-username-clearIcon" style="display: none;">
|
||
|
<img src="sysext/t3skin/icons/common-input-clear.png" alt="clear" title="clear" />
|
||
|
<img src="sysext/t3skin/icons/common-input-clear.png" alt="###CLEAR###" title="###CLEAR###" />
|
||
|
</a>
|
||
|
</div>
|
||
|
<div id="t3-login-openIdLogo" style="display: none">
|
||
|
<img src="sysext/t3skin/icons/logo-openid.png" alt="OpenID" title="OpenID" />
|
||
|
</div>
|
||
|
<div class="t3-login-alert-capslock" id="t3-username-alert-capslock" style="display: none">
|
||
|
<img src="sysext/t3skin/icons/login_capslock.gif" alt="###ERROR_CAPSLOCK###" title="###ERROR_CAPSLOCK###" />
|
||
|
</div>
|
||
|
</div>
|
||
|
<div class="t3-login-password t3-login-field" id="t3-login-password-section">
|
||
|
<label for="t3-password" class="t3-password">
|
||
|
###LABEL_PASSWORD###
|
||
|
</label>
|
||
|
<input type="password" id="t3-password" name="p_field" value="###VALUE_PASSWORD###" class="t3-password" tabindex="2" onkeypress="checkCapslock(event, true);" />
|
||
|
<input type="password" id="t3-password" name="p_field" value="###VALUE_PASSWORD###" class="t3-password" tabindex="2" />
|
||
|
<div class="t3-login-clearInputField">
|
||
|
<a id="t3-password-clearIcon" style="display: none;">
|
||
|
<img src="sysext/t3skin/icons/common-input-clear.png" alt="clear" title="clear" />
|
||
|
<img src="sysext/t3skin/icons/common-input-clear.png" alt="###CLEAR###" title="###CLEAR###" />
|
||
|
</a>
|
||
|
</div>
|
||
|
<div class="t3-login-alert-capslock" id="t3-password-alert-capslock" style="display: none">
|
||
|
<img src="sysext/t3skin/icons/login_capslock.gif" alt="###ERROR_CAPSLOCK###" title="###ERROR_CAPSLOCK###" />
|
||
|
</div>
|
||
|
</div>
|
||
|
<!-- ###INTERFACE_SELECTOR### begin -->
|
||
|
<div class="t3-login-interface t3-login-field" id="t3-login-interface-section">
|
||
| ... | ... | |
|
<a id="t3-login-switchToOpenId" class="switchToOpenId">###LABEL_SWITCHOPENID###</a>
|
||
|
</div>
|
||
|
<div id="t3-login-form-footer-openId" style="display: none">
|
||
|
<a id="t3-login-whatIsOpenId" class="switchToOpenId">###LABEL_WHATISOPENID###</a>
|
||
|
<a href="http://openid.net/" id="t3-login-whatIsOpenId" target="_blank" class="switchToOpenId">###LABEL_WHATISOPENID###</a>
|
||
|
|
|
||
|
<a id="t3-login-switchToDefault" class="switchToOpenId">###LABEL_SWITCHDEFAULT###</a>
|
||
|
</div>
|
||
| typo3/sysext/t3skin/resources/login.js (Arbeitskopie) | ||
|---|---|---|
|
['focus', 'blur', 'keypress'],
|
||
|
function() { TYPO3BackendLogin.setVisibilityOfClearIcon($(value), $(value + '-clearIcon')); }
|
||
|
);
|
||
|
Event.observe(
|
||
|
$(value),
|
||
|
'keypress',
|
||
|
function(event) { TYPO3BackendLogin.showCapsLockWarning($(value + '-alert-capslock'), event); }
|
||
|
);
|
||
|
})
|
||
|
},
|
||
| ... | ... | |
|
}
|
||
|
},
|
||
|
showCapsLockWarning: function(alertIcon, event) {
|
||
|
if (isCapslock(event)) {
|
||
|
alertIcon.show();
|
||
|
} else {
|
||
|
alertIcon.hide();
|
||
|
}
|
||
|
},
|
||
|
clearInputField: function(formField) {
|
||
|
formField.value = '';
|
||
|
formField.focus();
|
||
| typo3/sysext/t3skin/stylesheets/typo3-index-php.css (Arbeitskopie) | ||
|---|---|---|
|
}
|
||
|
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;
|
||
|
}
|
||
| ... | ... | |
|
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;
|
||
| ... | ... | |
|
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;
|
||
| ... | ... | |
|
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 {
|
||
| ... | ... | |
|
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;
|
||
| ... | ... | |
|
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 {
|
||
| ... | ... | |
|
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;
|
||
|
}
|
||
| ... | ... | |
|
color: #7f8083;
|
||
|
float: left;
|
||
|
padding-right: 10px;
|
||
|
width: 65px;
|
||
|
width: 85px;
|
||
|
line-height: 21px;
|
||
|
}
|
||
| ... | ... | |
|
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
|
||
|
*/
|
||
| ... | ... | |
|
}
|
||
|
.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;
|
||
|
}
|
||
| typo3/sysext/lang/locallang_login.xml (Arbeitskopie) | ||
|---|---|---|
|
<label index="clear">Clear this field!</label>
|
||
|
<label index="newsheadline">Important Messages:</label>
|
||
|
<label index="error.login">Your login attempt did not succeed. Make sure to spell your username and password correctly, including upper/lowercase characters.</label>
|
||
|
<label index="error.login.title">Your login attempt did not succeed</label>
|
||
|
<label index="error.login.description">Make sure to spell your username and password correctly, including upper/lowercase characters.</label>
|
||
|
<label index="error.javascript">Activate JavaScript, please!</label>
|
||
|
<label index="error.cookies">Activate Cookies, please!</label>
|
||
|
<label index="error.cookies_ignore">Ignore!</label>
|
||
|
<label index="error.capslock">Attention: Caps lock enabled!</label>
|
||
|
<label index="error.furtherInformation">For more information or further help click here</label>
|
||
|
<label index="warranty.by">Warranty is supplied by %s; %sclick for details.%s</label>
|
||
|
<label index="no.warranty">TYPO3 comes with ABSOLUTELY NO WARRANTY; %sclick for details.%s</label>
|
||
|
<label index="typo3.logo">TYPO3 logo</label>
|
||