More fixes to dialog backgrounds in GWT console

Signed-off-by: Claudio Mezzasalma <claudio.mezzasalma@eurotech.com>
eclipse-kapua · Dec 22, 2017 · f8b0082 · f8b0082
1 parent 54c800d
commit f8b0082
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 30 deletions.
diff --git a/...i/src/main/java/org/eclipse/kapua/app/console/module/api/client/ui/dialog/InfoDialog.java b/...i/src/main/java/org/eclipse/kapua/app/console/module/api/client/ui/dialog/InfoDialog.java
@@ -17,12 +17,11 @@
 import com.extjs.gxt.ui.client.event.ButtonEvent;
 import com.extjs.gxt.ui.client.event.SelectionListener;
 import com.extjs.gxt.ui.client.widget.button.Button;
-import com.google.gwt.resources.client.ImageResource;
 
 public class InfoDialog extends KapuaDialog {
 
     public enum InfoDialogType {
-        SUCCESS, INFO, ERROR;
+        SUCCESS, INFO, ERROR
     }
 
     private String headerMessage;
@@ -56,15 +55,15 @@ public InfoDialog(InfoDialogType infoDialogType,
         this.infoMessage = infoMessage;
     }
 
-    public InfoDialog(ImageResource headerIcon,
+    public InfoDialog(
             String headerMessage,
-            ImageResource infoIcon,
+            KapuaIcon infoIcon,
             String infoMessage) {
         super();
 
         this.headerMessage = headerMessage;
         this.infoMessage = infoMessage;
-
+        this.infoIcon = infoIcon;
         setWidth(450);
     }
 

diff --git a/.../src/main/java/org/eclipse/kapua/app/console/module/api/client/ui/dialog/KapuaDialog.java b/.../src/main/java/org/eclipse/kapua/app/console/module/api/client/ui/dialog/KapuaDialog.java
@@ -63,7 +63,7 @@ protected void onRender(Element parent, int pos) {
         infoPanel.setHeaderVisible(false);
         infoPanel.setLayout(new TableLayout(2));
         infoPanel.setStyleAttribute("background-color", "#F0F0F0");
-        infoPanel.setBodyStyle("background-color:transparent");
+        infoPanel.setBodyStyle("background-color: #F0F0F0");
         add(infoPanel);
 
         // Heading Message (if implementation needs one)

diff --git a/...src/main/java/org/eclipse/kapua/app/console/module/api/client/ui/dialog/SimpleDialog.java b/...src/main/java/org/eclipse/kapua/app/console/module/api/client/ui/dialog/SimpleDialog.java
@@ -34,7 +34,7 @@ protected void onRender(Element parent, int pos) {
         bodyPanel.setBodyBorder(false);
         bodyPanel.setHeaderVisible(false);
         bodyPanel.setStyleAttribute("background-color", "#F0F0F0");
-        bodyPanel.setBodyStyle("background-color:transparent");
+        bodyPanel.setBodyStyle("background-color: #F0F0F0");
 
         createBody();
 

diff --git a/...a/app/console/module/authentication/client/tabs/credentials/ApiKeyConfirmationDialog.java b/...a/app/console/module/authentication/client/tabs/credentials/ApiKeyConfirmationDialog.java
@@ -12,46 +12,29 @@
 package org.eclipse.kapua.app.console.module.authentication.client.tabs.credentials;
 
 import com.extjs.gxt.ui.client.Style.Scroll;
-import com.extjs.gxt.ui.client.widget.Dialog;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
 import com.google.gwt.user.client.Element;
 import org.eclipse.kapua.app.console.module.api.client.resources.icons.IconSet;
 import org.eclipse.kapua.app.console.module.api.client.resources.icons.KapuaIcon;
-import org.eclipse.kapua.app.console.module.api.client.ui.dialog.KapuaDialog;
+import org.eclipse.kapua.app.console.module.api.client.ui.dialog.InfoDialog;
 import org.eclipse.kapua.app.console.module.authentication.client.messages.ConsoleCredentialMessages;
 
-public class ApiKeyConfirmationDialog extends KapuaDialog {
+public class ApiKeyConfirmationDialog extends InfoDialog {
 
     protected static final ConsoleCredentialMessages CRED_MSGS = GWT.create(ConsoleCredentialMessages.class);
 
-    private final String apiKey;
-
     public ApiKeyConfirmationDialog(String apiKey) {
-        this.apiKey = apiKey;
+        super(CRED_MSGS.dialogConfirmationAPI(), new KapuaIcon(IconSet.KEY), new SafeHtmlBuilder().appendEscapedLines(CRED_MSGS.dialogAddConfirmationApiKey(apiKey)).toSafeHtml().asString());
+        setStyleAttribute("background-color", "#F0F0F0");
+        setBodyStyle("background-color: #F0F0F0");
     }
 
     @Override
     protected void onRender(Element parent, int pos) {
         super.onRender(parent, pos);
-        setButtons(Dialog.OK);
-        setHideOnButtonClick(true);
-        setSize(350, 175);
+        setSize(350, 200);
         setScrollMode(Scroll.AUTO);
     }
 
-    @Override
-    public String getHeaderMessage() {
-        return CRED_MSGS.dialogConfirmationAPI();
-    }
-
-    @Override
-    public KapuaIcon getInfoIcon() {
-        return new KapuaIcon(IconSet.KEY);
-    }
-
-    @Override
-    public String getInfoMessage() {
-        return new SafeHtmlBuilder().appendEscapedLines(CRED_MSGS.dialogAddConfirmationApiKey(apiKey)).toSafeHtml().asString();
-    }
 }