drop jslint lines

[pve-manager.git] / www / manager6 / window / LoginWindow.js

diff --git a/www/manager6/window/LoginWindow.js b/www/manager6/window/LoginWindow.js
index 4c1261b153243b1180c9663d16f36726d80f1e20..6123c655ab89d4e0053da37152a9ad0fac747e4e 100644 (file)
--- a/www/manager6/window/LoginWindow.js
+++ b/www/manager6/window/LoginWindow.js
@@ -63,9 +63,13 @@ Ext.define('PVE.window.LoginWindow', {
                uf.focus(true, true);
            };
 
-           Ext.MessageBox.alert(gettext('Error'),
-                                gettext("Login failed. Please try again"),
-                                handler);
+           let emsg = gettext("Login failed. Please try again");
+
+           if (resp.failureType === "connect") {
+               emsg = gettext("Connection failure. Network error or Proxmox VE services not running?");
+           }
+
+           Ext.MessageBox.alert(gettext('Error'), emsg, handler);
        },
        success: function(data) {
            var me = this;
@@ -107,7 +111,7 @@ Ext.define('PVE.window.LoginWindow', {
                msg.close();
                if (res.errorCode) {
                    Proxmox.Utils.authClear();
-                   Ext.Msg.alert(gettext('Error'), "U2F Error: "+res.errorCode);
+                   Ext.Msg.alert(gettext('Error'), PVE.Utils.render_u2f_error(res.errorCode));
                    return;
                }
                delete res.errorCode;
@@ -151,18 +155,6 @@ Ext.define('PVE.window.LoginWindow', {
                    }
                }
            },
-           'field[name=realm]': {
-               change: function(f, value) {
-                   var otp_field = this.lookupReference('otpField');
-                   if (f.needOTP(value)) {
-                       otp_field.setVisible(true);
-                       otp_field.setDisabled(false);
-                   } else {
-                       otp_field.setVisible(false);
-                       otp_field.setDisabled(true);
-                   }
-               }
-           },
            'field[name=lang]': {
                change: function(f, value) {
                    var dt = Ext.Date.add(new Date(), Ext.Date.YEAR, 10);
@@ -195,23 +187,16 @@ Ext.define('PVE.window.LoginWindow', {
     },
 
     width: 400,
-
     modal: true,
-
     border: false,
-
     draggable: true,
-
     closable: false,
-
     resizable: false,
-
     layout: 'auto',
 
     title: gettext('Proxmox VE Login'),
 
     defaultFocus: 'usernameField',
-
     defaultButton: 'loginButton',
 
     items: [{
@@ -242,15 +227,7 @@ Ext.define('PVE.window.LoginWindow', {
                reference: 'passwordField'
            },
            {
-               xtype: 'textfield',
-               fieldLabel: gettext('OTP'),
-               name: 'otp',
-               reference: 'otpField',
-               allowBlank: false,
-               hidden: true
-           },
-           {
-               xtype: 'pveRealmComboBox',
+               xtype: 'pmxRealmComboBox',
                name: 'realm'
            },
            {
@@ -269,7 +246,7 @@ Ext.define('PVE.window.LoginWindow', {
                name: 'saveusername',
                reference: 'saveunField',
                stateId: 'login-saveusername',
-               labelWidth: 'auto',
+               labelWidth: 250,
                labelAlign: 'right',
                submitValue: false
            },
@@ -285,7 +262,7 @@ Ext.define('PVE.window.TFALoginWindow', {
 
     modal: true,
     resizable: false,
-    title: gettext('Two Factor Authentication'),
+    title: 'Two-Factor Authentication',
     layout: 'form',
     defaultButton: 'loginButton',
     defaultFocus: 'otpField',
@@ -295,7 +272,7 @@ Ext.define('PVE.window.TFALoginWindow', {
        login: function() {
            var me = this;
            var view = me.getView();
-           view.onLogin(me.lookup('otpField').value);
+           view.onLogin(me.lookup('otpField').getValue());
            view.close();
        },
        cancel: function() {
@@ -309,12 +286,12 @@ Ext.define('PVE.window.TFALoginWindow', {
     items: [
        {
            xtype: 'textfield',
-           fieldLabel: gettext('Please enter your OTP token:'),
+           fieldLabel: gettext('Please enter your OTP verification code:'),
            name: 'otp',
            itemId: 'otpField',
            reference: 'otpField',
-           allowBlank: false,
-       },
+           allowBlank: false
+       }
     ],
 
     buttons: [