--- a/management/univention-management-console-frontend/umc/dialog/LoginDialog.js +++ a/management/univention-management-console-frontend/umc/dialog/LoginDialog.js @@ -125,19 +125,22 @@ define([ if (message.slice(-1) !== '.') { message += '.'; } - var title = _('Authentication failure'); + var title = info.title || _('Authentication failure'); if (result.password_expired) { title = _('The password is expired'); } else if (result.missing_prompts) { title = _('One time password required'); } - this.set('LoginMessage', '

' + title + '

' + message + '

'); + message = '

' + title + '

' + message + '

'; } + this.set('LoginMessage', message); }, _setLoginMessageAttr: function(content) { this._text.set('content', content); - this._wipeInMessage(); + if (content) { + this._wipeInMessage(); + } }, _wipeInMessage: function() { @@ -370,12 +373,13 @@ define([ // update info text var msg = ''; + var title = ''; // Show warning if connection is unsecured if (window.location.protocol === 'http:') { var link = ''; - msg += '

' + _('Insecure Connection') + '

'; - msg += '

' + _('This network connection is not encrypted. All personal or sensitive data will be transmitted in plain text. Please follow %s this link to use a secure SSL connection.', link) + '

'; + title = _('Insecure Connection'); + msg = _('This network connection is not encrypted. All personal or sensitive data will be transmitted in plain text. Please follow %s this link to use a secure SSL connection.', link); } if (has('ie') < 9 || has('ff') < 24) { @@ -386,13 +390,14 @@ define([ // IE 8 is also known to cause timeouts when under heavy load // (presumably because of many async requests to the server // during UDM-Form loading) - msg += '

' + _('Your Browser is outdated') + '

'; - msg += '

' + _('Your Browser is outdated and should be updated. You may continue to use Univention Management Console but you may experience performance issues and other problems.') + '

'; + title = _('Your Browser is outdated'); + msg = _('Your Browser is outdated and should be updated. You may continue to use Univention Management Console but you may experience performance issues and other problems.') + msg; } if (tools.status('setupGui')) { // user has already logged in before, show message for relogin - msg = '

' + _('Session timeout') + '

' + _('Your session has been closed due to inactivity. Please login again.') + '

'; + title = _('Session timeout'); + msg = _('Your session has been closed due to inactivity. Please login again.'); // remove language selection and SSO button after first successful login query('#umcLoginHeaderRight').style('display', 'none'); @@ -400,7 +405,7 @@ define([ } query('#umcLoginMessages').style('display', 'none'); - this._text.set('content', msg); + this.updateForm({message: msg, title: title}); return this._show(); },