Pman.Login.js

[Pman.Core] / Pman.Login.js

diff --git a/Pman.Login.js b/Pman.Login.js
index caa822f..4074d1b 100644 (file)
--- 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
@@ -403,14 +407,21 @@ Pman.Login =  new Roo.util.Observable({
         ef.dom.style.margin = 10;
           
         this.form.render(ef.dom);
-         // logoprefix comes from base config.
-        Pman.Login.form.el.createChild({
+         // 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' ;
+         
+         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) {
+            this.dom.style.display = 'none';
+        });
        
         var vp = this.dialog.getLayout().add('center', new Roo.ContentPanel(ef, {
             autoCreate : true,
@@ -483,6 +494,8 @@ Pman.Login =  new Roo.util.Observable({
         this.dialog.show();
         this.dialog.el.unmask(); 
         this.resizeToLogo.defer(1000,this);
+        
+        // if we have not created a provider.. do it now...
         if (!Roo.state.Manager.getProvider().expires) { 
             Roo.state.Manager.setProvider(new Roo.state.CookieProvider());
         }