Pman.Dialog.Login.bjs

Pman.Dialog.Login.js

diff --git a/Pman.Dialog.Login.bjs b/Pman.Dialog.Login.bjs
index ef68b4a..bebafc1 100644 (file)
--- a/Pman.Dialog.Login.bjs
+++ b/Pman.Dialog.Login.bjs
@@ -2,7 +2,7 @@
  "name" : "Pman.Dialog.Login",
  "parent" : "",
  "title" : "",
- "path" : "/home/johns/gitlive/Pman.BAdmin/Pman.Dialog.Login.bjs",
+ "path" : "/home/alan/gitlive/Pman.BAdmin/Pman.Dialog.Login.bjs",
  "permname" : "",
  "modOrder" : "001",
  "strings" : {
@@ -17,6 +17,13 @@
   "24efa7ee4511563b16144f39706d594f" : "Notice",
   "643a860f992333b8600ea264aca7c4fc" : "Email Address"
  },
+ "named_strings" : {
+  "username_placeholder" : "643a860f992333b8600ea264aca7c4fc",
+  "_force_value" : "cfcd208495d565ef66e7dff9f98764da",
+  "password_placeholder" : "dc647eb65e6711e155375218212b3964",
+  "oath_password_placeholder" : "06cf692a8d2bb0ab8318dc6c839ae931",
+  "OK_html" : "99dea78007133396a7b8ed70578ac6ae"
+ },
  "items" : [
   {
    "listeners" : {
@@ -46,7 +53,6 @@
         {
          "xtype" : "Row",
          "$ xns" : "Roo.bootstrap",
-         "String style" : "margin-top:20px;",
          "items" : [
           {
            "xtype" : "Container",
@@ -55,9 +61,9 @@
            "items" : [
             {
              "listeners" : {
+              "|actioncomplete" : "function (_self, action) {\n    \n    if(action.type == 'setdata'){\n\n        if(\n            _this.lastLogin && \n            _this.lastLogin.login_provider == ''\n        ){\n            _this.form.findField('username').setValue(_this.lastLogin.email);\n        }\n        \n        Roo.get('login-err').dom.innerHTML = \"\";\n        _this.dialog.el.select('.modal-content', true).first().unmask();\n        this.clearInvalid();\n        return;\n    }\n     \n    if(action.type == 'load'){\n        \n        return;\n    }\n    \n    if (action.type =='submit') {\n    \n        _this.dialog.hide();\n    \n        if (_this.callback) {\n            _this.callback.call(_this, action.result);\n         }\n         \n         _this.form.reset();\n         \n         return;\n    }\n}",
               "|render" : "function (_self) {\n    _this.form = _self;\n}",
-              "|actionfailed" : "function (_self, action) {\n    Roo.log('action failed?!');\n    Roo.log(action);\n    \n    _this.dialog.el.select('.modal-content', true).first().unmask();\n    \n    if (typeof(action) != 'undefined' && action.failureType == 'server') {\n        \n        switch (action.result.errorMsg) {\n                    \n            case 'Authenticated' :\n                \n                var data = Roo.apply(action.result.errors);\n                \n                data.target = _this.form.findField('username').getValue();\n                \n                Roo.bootstrap.MessageBox.alert(\"Error\", \"odd error messages\");\n                \n                break;\n                \n            case 'NEW-IP-ADDRESS' :\n            case 'PENDING-IP-ADDRESS' :\n            case 'BAD-IP-ADDRESS' :\n            case 'BLOCKED-IP-ADDRESS' :\n                \n                _this.dialog.hide();\n                \n                Pman.Dialog.LoginNotice.show({\n                    status : action.result.errorMsg,\n                    ip : action.result.errors.ip\n                });\n                \n                break;\n                \n            default:\n                Roo.get('login-err').dom.innerHTML = action.result.errorMsg;\n                break;\n        }\n        \n        return;\n    }\n    \n    Roo.get('login-err').dom.innerHTML = \"Fill in all the required fields\";\n}",
-              "|actioncomplete" : "function (_self, action) {\n    \n    if(action.type == 'setdata'){\n\n        if(\n            _this.lastLogin && \n            _this.lastLogin.login_provider == ''\n        ){\n            _this.form.findField('username').setValue(_this.lastLogin.email);\n        }\n        \n        Roo.get('login-err').dom.innerHTML = \"\";\n        _this.dialog.el.select('.modal-content', true).first().unmask();\n        this.clearInvalid();\n        return;\n    }\n     \n    if(action.type == 'load'){\n        \n        return;\n    }\n    \n    if (action.type =='submit') {\n    \n        _this.dialog.hide();\n    \n        if (_this.callback) {\n            _this.callback.call(_this, action.result);\n         }\n         \n         _this.form.reset();\n         \n         return;\n    }\n}"
+              "|actionfailed" : "function (_self, action) {\n    Roo.log('action failed?!');\n    Roo.log(action);\n    \n    _this.dialog.el.select('.modal-content', true).first().unmask();\n    \n    if (typeof(action) != 'undefined' && action.failureType == 'server') {\n        \n        switch (action.result.errorMsg) {\n                    \n            case 'Authenticated' :\n                \n                var data = Roo.apply(action.result.errors);\n                \n                data.target = _this.form.findField('username').getValue();\n                \n                Roo.bootstrap.MessageBox.alert(\"Error\", \"odd error messages\");\n                \n                break;\n                \n            case 'NEW-IP-ADDRESS' :\n            case 'PENDING-IP-ADDRESS' :\n            case 'BAD-IP-ADDRESS' :\n            case 'BLOCKED-IP-ADDRESS' :\n                \n                _this.dialog.hide();\n                \n                Pman.Dialog.LoginNotice.show({\n                    status : action.result.errorMsg,\n                    ip : action.result.errors.ip\n                });\n                \n                break;\n                \n            default:\n                Roo.get('login-err').dom.innerHTML = action.result.errorMsg;\n                break;\n        }\n        \n        return;\n    }\n    \n    Roo.get('login-err').dom.innerHTML = \"Fill in all the required fields\";\n}"
              },
              "$ url" : "baseURL + '/Login'",
              "labelAlign" : "left",
@@ -76,8 +82,8 @@
                   "specialkey" : "function (_self, e)\n{\n    if(e.getKey() == 13){\n        _this.dialog.el.select('.modal-content', true).first().mask('Sending...');\n        _this.form.doAction('submit');\n    }\n    \n}"
                  },
                  "inputType" : "email",
-                 "xtype" : "Input",
                  "vtype" : "email",
+                 "xtype" : "Input",
                  "placeholder" : "Email Address",
                  "allowBlank" : false,
                  "$ xns" : "Roo.bootstrap",
@@ -88,8 +94,8 @@
                   "specialkey" : "function (_self, e)\n{\n    if(e.getKey() == 13){\n        _this.dialog.el.select('.modal-content', true).first().mask('Sending...');\n        _this.form.doAction('submit');\n    }\n}"
                  },
                  "inputType" : "password",
-                 "placeholder" : "Password",
                  "xtype" : "Input",
+                 "placeholder" : "Password",
                  "allowBlank" : false,
                  "$ xns" : "Roo.bootstrap",
                  "name" : "password"
@@ -99,8 +105,8 @@
                   "specialkey" : "function (_self, e)\n{\n    if(e.getKey() == 13){\n        _this.dialog.el.select('.modal-content', true).first().mask('Sending...');\n        _this.form.doAction('submit');\n    }\n}"
                  },
                  "Number maxLength" : 6,
-                 "placeholder" : "Two-Factor Authentication Number (if relevant)",
                  "xtype" : "NumberField",
+                 "placeholder" : "Two-Factor Authentication Number (if relevant)",
                  "Boolean allowDecimals" : false,
                  "allowBlank" : true,
                  "Number decimalPrecision" : 0,
@@ -149,8 +155,8 @@
     },
     {
      "xtype" : "Button",
-     "$ string weight" : "'primary'",
      "html" : "Login",
+     "$ string weight" : "'primary'",
      "$ xns" : "Roo.bootstrap",
      "String style" : "float: right",
      "* prop" : "buttons[]",

diff --git a/Pman.Dialog.Login.js b/Pman.Dialog.Login.js
index e24c436..b33b483 100644 (file)
--- a/Pman.Dialog.Login.js
+++ b/Pman.Dialog.Login.js
@@ -154,7 +154,6 @@ Roo.apply(Pman.Dialog.Login.prototype, {
         items  : [
          {
           xtype : 'Row',
-          style : 'margin-top:20px;',
           xns : Roo.bootstrap,
           '|xns' : 'Roo.bootstrap',
           items  : [