3 files changed, 51 insertions, 21 deletions

diff --git a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/BaseComponent.js b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/BaseComponent.js
index 2a03fdf..b9d7adf 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/BaseComponent.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/BaseComponent.js
@@ -408,2 +408,6 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.BaseComponent, /*Ext.Compo
 
+        'getAnchor': function (aValue) {
+                return '#' + this.getId(aValue);
+        },
+
         //-------------------------------------------------------------------------
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/Button.js b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/Button.js
index 716d851..1010c9d 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/Button.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/Button.js
@@ -64,3 +64,4 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Button, Clipperz.PM.UI.Com
         'renderSelf': function () {
-                this.append(this.element(), {tag:'div', id:this.getId('wrapper'), cls:'button_wrapper', children:[
+/*
+                this.append(this.element(), {tag:'div', id:this.getId('button'), cls:'button_wrapper', children:[
                         {tag:'div', id:this.getId('bodyWrapper'), cls:'button_bodyWrapper', children:[
@@ -72,11 +73,18 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Button, Clipperz.PM.UI.Com
                 ]});
+*/
+/*
+                this.append(this.element(), {tag:'div', id:this.getId('button'), cls:'button', children:[
+                        {tag:'span', html:this.text()}
+                ]});
+*/
+                this.append(this.element(), {tag:'a', id:this.getId('button'), cls:'button', html:this.text()});
 
                 if (this.isDefault()) {
-                        MochiKit.DOM.addElementClass(this.getId('wrapper'), 'default');
+                        MochiKit.DOM.addElementClass(this.getId('button'), 'default');
                 }
 
-                        MochiKit.Signal.connect(this.getId('wrapper'), 'onmouseenter',this, 'handleOnMouseEnter');
-                        MochiKit.Signal.connect(this.getId('wrapper'), 'onmouseleave',this, 'handleOnMouseLeave');
-                        MochiKit.Signal.connect(this.getId('wrapper'), 'onmousedown',this, 'handleOnMouseDown');
-                        MochiKit.Signal.connect(this.getId('wrapper'), 'onclick',       this, 'handleOnClick');
+        //              MochiKit.Signal.connect(this.getId('button'), 'onmouseenter',this, 'handleOnMouseEnter');
+        //              MochiKit.Signal.connect(this.getId('button'), 'onmouseleave',this, 'handleOnMouseLeave');
+        //              MochiKit.Signal.connect(this.getId('button'), 'onmousedown',this, 'handleOnMouseDown');
+                        MochiKit.Signal.connect(this.getId('button'), 'onclick',        this, 'handleOnClick');
         },
@@ -84,5 +92,5 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Button, Clipperz.PM.UI.Com
         //-------------------------------------------------------------------------
-
+/*
         'handleOnMouseEnter': function (anEvent) {
-                MochiKit.DOM.addElementClass(this.getId('wrapper'), 'hover');
+                MochiKit.DOM.addElementClass(this.getId('button'), 'hover');
         },
@@ -90,4 +98,4 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Button, Clipperz.PM.UI.Com
         'handleOnMouseLeave': function (anEvent) {
-                MochiKit.DOM.removeElementClass(this.getId('wrapper'), 'hover');
-                MochiKit.DOM.removeElementClass(this.getId('wrapper'), 'clicked');
+                MochiKit.DOM.removeElementClass(this.getId('button'), 'hover');
+                MochiKit.DOM.removeElementClass(this.getId('button'), 'clicked');
         },
@@ -95,5 +103,5 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Button, Clipperz.PM.UI.Com
         'handleOnMouseDown': function (anEvent) {
-                MochiKit.DOM.addElementClass(this.getId('wrapper'), 'clicked');
+                MochiKit.DOM.addElementClass(this.getId('button'), 'clicked');
         },
-        
+        */
         'handleOnClick': function (anEvent) {
@@ -101,3 +109,3 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Button, Clipperz.PM.UI.Com
         },
-        
+
         //-------------------------------------------------------------------------
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/SimpleMessagePanel.js b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/SimpleMessagePanel.js
index 1992154..1d816a9 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/SimpleMessagePanel.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/SimpleMessagePanel.js
@@ -100,6 +100,6 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.SimpleMessagePanel, Clippe
         'setType': function (aValue) {
-                if (this.getElement('icon') != null) {
-                        MochiKit.DOM.removeElementClass(this.getId('icon'), this._type);
-                        MochiKit.DOM.addElementClass(this.getId('icon'), aValue);
-                }
+        //      if (this.getElement('icon') != null) {
+        //              MochiKit.DOM.removeElementClass(this.getId('icon'), this._type);
+        //              MochiKit.DOM.addElementClass(this.getId('icon'), aValue);
+        //      }
 
@@ -108,2 +108,17 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.SimpleMessagePanel, Clippe
 
+        'icon': function () {
+                var type = this.type();
+                var result;
+
+                if (type == 'ALERT') {
+                        result = '!';
+                } else if (type == 'INFO') {
+                        result = 'i';
+                } else if (type == 'ERROR') {
+                        result = '!';
+                }
+
+                return result;
+        },
+
         //-------------------------------------------------------------------------
@@ -134,5 +149,6 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.SimpleMessagePanel, Clippe
                 this.append(this.element(), {tag:'div', cls:'SimpleMessagePanel', id:this.getId('panel'), children: [
-                        {tag:'div', cls:'header', children:[]},
+        //              {tag:'div', cls:'header', children:[]},
                         {tag:'div', cls:'body', children:[
-                                        {tag:'div',     id:this.getId('icon'),cls:'img ' + this.type(), children:[{tag:'div'}]},
+        //                              {tag:'div',     id:this.getId('icon'),cls:'img ' + this.type(), children:[{tag:'div'}]},
+                                        {tag:'div',     /*id:this.getId('icon'),*/cls:'img ' + this.type(), children:[{tag:'canvas', id:this.getId('icon')}]},
                                         {tag:'h3',      id:this.getId('title'),html:this.title()},
@@ -141,6 +157,8 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.SimpleMessagePanel, Clippe
                                 {tag:'div', id:this.getId('buttonArea'), cls:'buttonArea', children:[]}
-                        ]},
-                        {tag:'div', cls:'footer', children:[]}
+                        ]}
+        //              {tag:'div', cls:'footer', children:[]}
                 ]});
 
+                Clipperz.PM.UI.Canvas.marks[this.icon()](this.getElement('icon'), "#ffffff");
+
                 MochiKit.Signal.connect(this.getId('panel'), 'onkeydown', this, 'keyDownHandler');