X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Login.js;h=234b9c099d3eef4ef42aea03dc812eec73172906;hp=3e6226bdd0fd388e0da41cb7146f2f8cc1729240;hb=c1af5e6bb6064e88469651271f4d9aaff34d69c0;hpb=9b93079403eb9e5d08b5ebfd7b143eca2fff41de

diff --git a/Pman.Login.js b/Pman.Login.js
index 3e6226bd..234b9c09 100644
--- a/Pman.Login.js
+++ b/Pman.Login.js
@@ -36,6 +36,8 @@ Pman.Login =  new Roo.util.Observable({
     versionWarn: false,
     sending : false,
     
+    checkConnection : false, // the Roo.data.Connection for checking if still authenticated.
+    
     onLoad : function() // called on page load...
     {
         // load 
@@ -105,8 +107,10 @@ Pman.Login =  new Roo.util.Observable({
             return;
         }
         this.sending = true;
-        
-        Roo.Ajax.request({  
+        if (!this.checkConnection) {
+            this.checkConnection = new Roo.data.Connection();
+        }
+        this.checkConnection.request({
             url: baseURL + '/Login.js',  
             params: {
                 getAuthUser: true
@@ -255,15 +259,15 @@ Pman.Login =  new Roo.util.Observable({
                 Roo.MessageBox.alert("Error", "Fill in your email address");
                 return;
             }
-            Roo.Ajax.request({
-                url: baseURL + '/Login.js',  
+            new Pman.Request({
+                url: baseURL + '/Login.js',
+                mask : "Sending Password Reset email",
                 params: {
                     passwordRequest: n
                 },
                 method: 'POST',  
-                success:  function(response, opts)  {  // check successfull...
+                success:  function(res)  {  // check successfull...
                 
-                    var res = Pman.processResponse(response);
                     if (!res.success) { // error!
                        Roo.MessageBox.alert("Error" , res.errorMsg ? res.errorMsg  : "Problem Requesting Password Reset");
                        return;
@@ -403,18 +407,22 @@ Pman.Login =  new Roo.util.Observable({
         ef.dom.style.margin = 10;
           
         this.form.render(ef.dom);
-         // logoprefix comes from base config.
+         // logoprefix comes from base config - normally the owner company logo...
+         // ??? 
          
         var img = typeof(appLogo) != 'undefined'  && appLogo.length ? appLogo :
-            rootURL + '/Pman/'+appNameShort + '/templates/images/logo.gif' 
+            rootURL + '/Pman/'+appNameShort + '/templates/images/logo.gif' ;
          
-        Pman.Login.form.el.createChild({
+         Pman.Login.form.el.createChild({
                 tag: 'img', 
-                src: rootURL + '/Pman/'+appNameShort + '/templates/images/logo.gif',
+                src: img,
                 style: 'margin-bottom: 10px;'
             },
             Pman.Login.form.el.dom.firstChild 
-        );
+        ).on('error', function() {
+            this.dom.style.visibility = 'hidden';
+            this.dom.style.height = '10px';
+        });
        
         var vp = this.dialog.getLayout().add('center', new Roo.ContentPanel(ef, {
             autoCreate : true,