Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-19 04:56:58 +01:00
Code Issues Packages Projects Releases Activity

merge with branch issue-183

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-06-15 16:04:06 +02:00
parent c3fb8c04ca 394a01c4ed
commit 122008c978
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-webapp/src/main/webapp/resources/js/i18n/de.js
View File

@@ -86,7 +86,9 @@ if (Sonia.login.Form){
cancelText: 'Abbrechen',
waitTitleText: 'Verbinden',
WaitMsgText: 'Übertrage Daten...',
failedMsgText: 'Anmeldung fehlgeschlagen!'
failedMsgText: 'Anmeldung fehlgeschlagen!',
failedDescriptionText: 'Falscher Benutzername, Passwort oder sie haben nicht\n\
genug Berechtigungen. Bitte versuchen sie es erneut.'
});
}

11
scm-webapp/src/main/webapp/resources/js/login/sonia.login.form.js
View File

@@ -38,6 +38,7 @@ Sonia.login.Form = Ext.extend(Ext.FormPanel,{
waitTitleText: 'Connecting',
WaitMsgText: 'Sending data...',
failedMsgText: 'Login failed!',
failedDescriptionText: 'Incorrect username, password or not enough permission. Please Try again.',
initComponent: function(){
@@ -88,7 +89,7 @@ Sonia.login.Form = Ext.extend(Ext.FormPanel,{
}]
};
this.addEvents('cancel');
this.addEvents('cancel', 'failure');
Ext.apply(this, Ext.apply(this.initialConfig, config));
Sonia.login.Form.superclass.initComponent.apply(this, arguments);
@@ -118,7 +119,13 @@ Sonia.login.Form = Ext.extend(Ext.FormPanel,{
if ( debug ){
console.debug( 'login failed' );
}
Ext.Msg.alert(this.failedMsgText);
this.fireEvent('failure');
Ext.Msg.show({
title: this.failedMsgText,
msg: this.failedDescriptionText,
buttons: Ext.Msg.OK,
icon: Ext.MessageBox.WARNING
});
form.reset();
}
});