1 files changed, 9 insertions, 5 deletions

diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginProgress.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginProgress.js
index 5d082b5..26506e7 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginProgress.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginProgress.js
@@ -73,38 +73,40 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.LoginProgress, Clipperz.PM.UI
                                 {tag:'h3', id:this.getId('title'), html:"login progress"}
                         ]},
                         {tag:'div', cls:'body', children:[
                                 {tag:'div', id:this.getId('progressBar')},
                                 {tag:'div', id:this.getId('errorBox'), cls:'errorBox', children:[
         //                                      {tag:'div',cls:'img ALERT', children:[{tag:'div'}]},
                                                 {tag:'div',cls:'img ALERT', children:[{tag:'canvas', id:this.getId('canvas')}]},
                                         {tag:'p', html:"Login failed"}
                                 ]}
                         ]},
                         {tag:'div', cls:'footer', children:[
                                 {tag:'div', cls:'buttonArea', id:this.getId('buttonArea'), children:[
-                                        {tag:'div', cls:'button', id:this.getId('button'), children:[
-                                                {tag:'a', href:'#', id:this.getId('buttonLink'), html:"cancel"}
-                                        ]}
+        //                              {tag:'div', cls:'button', id:this.getId('button'), children:[
+        //                                      {tag:'a', href:'#', id:this.getId('buttonLink'), html:"cancel"}
+        //                              ]}
+                                        {tag:'a', cls:'button', id:this.getId('button'), html:"cancel"}
                                 ]}
                         ]}
                 ]});
         //      ]);
 
                 Clipperz.PM.UI.Canvas.marks['!'](this.getElement('canvas'), "#ffffff");
 
                 this.addComponent(new Clipperz.PM.UI.Common.Components.ProgressBar({'element':this.getElement('progressBar')}));
                 MochiKit.Style.hideElement(this.getElement('errorBox'));
                 
-                MochiKit.Signal.connect(this.getId('buttonLink'), 'onclick', this, 'cancelEventHandler');
+        //      MochiKit.Signal.connect(this.getId('buttonLink'), 'onclick', this, 'cancelEventHandler');
+                MochiKit.Signal.connect(this.getId('button'), 'onclick', this, 'cancelEventHandler');
         },
 
         //-------------------------------------------------------------------------
 
         'displayElement': function() {
                 return MochiKit.DOM.getElement('loginProgress');
         },
 
         //-------------------------------------------------------------------------
 
         'cancelEventHandler': function(anEvent) {
                 anEvent.preventDefault();
@@ -112,25 +114,27 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.LoginProgress, Clipperz.PM.UI
                 MochiKit.Signal.signal(this, 'cancelEvent');
         },
 
         //-------------------------------------------------------------------------
 
         'disableCancel': function() {
                 MochiKit.Style.hideElement(this.getElement('buttonArea'));
         },
 
         //-------------------------------------------------------------------------
 
         'showErrorMessage': function() {
-                this.getElement('buttonLink').innerHTML = "close";
+        //      this.getElement('buttonLink').innerHTML = "close";
+                this.getElement('button').innerHTML = "close";
+                MochiKit.DOM.addElementClass(this.getElement('button'), 'default');
 
                 MochiKit.Style.hideElement(this.getElement('progressBar'));
 
                 this.getElement('title').innerHTML = "Error";
                 MochiKit.Style.showElement(this.getElement('errorBox'));
                 MochiKit.Style.showElement(this.getElement('buttonArea'));
         },
 
         //-------------------------------------------------------------------------
 
         'deferredHideModalAndRemove': function(someParameters, aResult) {
                         vardeferredResult;