Issue 3029 - Add a 'warning' state for the notifications (#3113)

Using the `#F0AD4E` code for the darkish orange background, so the font can remain white and be consistent with other types of notifications Signed-off-by: Xavier Coulon <[email protected]>
eclipse-che · Nov 18, 2016 · 13000b0 · 13000b0
1 parent 44b6e46
commit 13000b0
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 3 deletions.
diff --git a/...e-core-ide-api/src/main/java/org/eclipse/che/ide/api/notification/StatusNotification.java b/...e-core-ide-api/src/main/java/org/eclipse/che/ide/api/notification/StatusNotification.java
@@ -23,6 +23,7 @@ public class StatusNotification extends Notification {
     public enum Status {
         PROGRESS,
         SUCCESS,
+        WARNING,
         FAIL
     }
 

diff --git a/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/theme/Theme.java b/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/theme/Theme.java
@@ -1493,7 +1493,6 @@ public interface Theme {
      */
     String loaderProgressStatusColor();
 
-
     /**
      * The placeholder color for input fields.
      *
@@ -1529,6 +1528,8 @@ public interface Theme {
 
     String notificationPopupProgressBackground();
 
+    String notificationPopupWarningBackground();
+
     String notificationPopupPanelShadow();
 
     String notificationPopupIconSuccessFill();
@@ -1537,6 +1538,8 @@ public interface Theme {
 
     String notificationPopupIconProgressFill();
 
+    String notificationPopupIconWarningFill();
+
     String notificationPopupIconSvgFill();
 
     String notificationPopupTextColor();

diff --git a/...ore-ide-app/src/main/java/org/eclipse/che/ide/notification/NotificationContainerItem.java b/...ore-ide-app/src/main/java/org/eclipse/che/ide/notification/NotificationContainerItem.java
@@ -228,6 +228,10 @@ private SVGImage getIconBaseOnStatus() {
                 icon = resources.fail();
                 status = "fail";
                 break;
+            case WARNING:
+            	icon = resources.warning();
+            	status = "warning";
+            	break;
             default:
                 throw new IllegalArgumentException("Can't determine notification icon");
         }

diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/notification/NotificationPopup.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/notification/NotificationPopup.java
@@ -199,6 +199,10 @@ private SVGImage getIconBaseOnStatus() {
                 icon = resources.fail();
                 status = "fail";
                 break;
+            case WARNING:
+            	icon = resources.warning();
+            	status = "warning";
+            	break;
             default:
                 throw new IllegalArgumentException("Can't determine notification icon");
         }
@@ -301,6 +305,7 @@ private void update() {
         removeStyleName(resources.notificationCss().notificationStatusProgress());
         removeStyleName(resources.notificationCss().notificationStatusSuccess());
         removeStyleName(resources.notificationCss().notificationStatusFail());
+        removeStyleName(resources.notificationCss().notificationStatusWarning());
 
         DisplayMode displayMode = notification.getDisplayMode();
         Status status = notification.getStatus();
@@ -312,8 +317,11 @@ private void update() {
                 setStyleName(resources.notificationCss().notificationStatusSuccess(), true);
                 break;
             case FAIL:
-                setStyleName(resources.notificationCss().notificationStatusFail(), true);
+            	setStyleName(resources.notificationCss().notificationStatusFail(), true);
                 break;
+            case WARNING:
+            	setStyleName(resources.notificationCss().notificationStatusWarning(), true);
+            	break;
         }
 
         if (FLOAT_MODE == displayMode && PROGRESS == status) {

diff --git a/...he-core-ide-app/src/main/java/org/eclipse/che/ide/notification/NotificationResources.java b/...he-core-ide-app/src/main/java/org/eclipse/che/ide/notification/NotificationResources.java
@@ -46,6 +46,8 @@ interface NotificationCss extends CssResource {
 
         String notificationStatusFail();
 
+        String notificationStatusWarning();
+
         String notificationPopup();
 
         String notificationPopupContentWrapper();
@@ -78,4 +80,7 @@ interface NotificationCss extends CssResource {
 
     @Source("progress.svg")
     SVGResource progress();
+
+    @Source("warning.svg")
+    SVGResource warning();
 }
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/theme/DarkTheme.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/theme/DarkTheme.java
@@ -1361,6 +1361,11 @@ public String notificationPopupProgressBackground() {
         return "#9b9b9b";
     }
 
+    @Override
+    public String notificationPopupWarningBackground() {
+    	return "#F0AD4E";
+    }
+
     @Override
     public String notificationPopupPanelShadow() {
         return "0 0 10px rgba(0,0,0,0.6)";
@@ -1381,6 +1386,11 @@ public String notificationPopupIconProgressFill() {
         return "#9b9b9b";
     }
 
+    @Override
+    public String notificationPopupIconWarningFill() {
+    	return "#F0AD4E";
+    }
+
     @Override
     public String notificationPopupIconSvgFill() {
         return "#FFFFFF";

diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/theme/LightTheme.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/theme/LightTheme.java
@@ -1337,6 +1337,11 @@ public String notificationPopupProgressBackground() {
         return "#9b9b9b";
     }
 
+    @Override
+    public String notificationPopupWarningBackground() {
+    	return "#F0AD4E";
+    }
+
     @Override
     public String notificationPopupPanelShadow() {
         return "0 0 7px rgba(0,0,0,0.2)";
@@ -1356,7 +1361,12 @@ public String notificationPopupIconFailFill() {
     public String notificationPopupIconProgressFill() {
         return "#9b9b9b";
     }
-
+
+    @Override
+    public String notificationPopupIconWarningFill() {
+    	return "#F0AD4E";
+    }
+
     @Override
     public String notificationPopupIconSvgFill() {
         return "#FFFFFF";

diff --git a/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/notification/notification.css b/ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/notification/notification.css
@@ -11,10 +11,12 @@
 @eval notificationPopupSuccessBackground org.eclipse.che.ide.api.theme.Style.theme.notificationPopupSuccessBackground();
 @eval notificationPopupFailBackground org.eclipse.che.ide.api.theme.Style.theme.notificationPopupFailBackground();
 @eval notificationPopupProgressBackground org.eclipse.che.ide.api.theme.Style.theme.notificationPopupProgressBackground();
+@eval notificationPopupWarningBackground org.eclipse.che.ide.api.theme.Style.theme.notificationPopupWarningBackground();
 @eval notificationPopupPanelShadow org.eclipse.che.ide.api.theme.Style.theme.notificationPopupPanelShadow();
 @eval notificationPopupIconSuccessFill org.eclipse.che.ide.api.theme.Style.theme.notificationPopupIconSuccessFill();
 @eval notificationPopupIconFailFill org.eclipse.che.ide.api.theme.Style.theme.notificationPopupIconFailFill();
 @eval notificationPopupIconProgressFill org.eclipse.che.ide.api.theme.Style.theme.notificationPopupIconProgressFill();
+@eval notificationPopupIconWarningFill org.eclipse.che.ide.api.theme.Style.theme.notificationPopupIconWarningFill();
 @eval notificationPopupIconSvgFill org.eclipse.che.ide.api.theme.Style.theme.notificationPopupIconSvgFill();
 @eval notificationPopupTextColor org.eclipse.che.ide.api.theme.Style.theme.notificationPopupTextColor();
 @eval closeNotificationButtonColor org.eclipse.che.ide.api.theme.Style.theme.closeNotificationButtonColor();
@@ -60,6 +62,10 @@
     fill: notificationPopupIconProgressFill;
 }
 
+.notificationIconWrapper svg[name="warning"] {
+    fill: notificationPopupIconWarningFill;
+}
+
 .notificationContentWrapper{
     display: inline-block;
     width: literal("calc(100% - 75px)");
@@ -129,6 +135,10 @@
     background-color: notificationPopupProgressBackground;
 }
 
+.notificationStatusWarning {
+    background-color: notificationPopupWarningBackground;
+}
+
 .notificationStatusSuccess {
     background-color: notificationPopupSuccessBackground;
 }

diff --git a/...he-core-ide-app/src/main/resources/org/eclipse/che/ide/notification/warning.svg b/...he-core-ide-app/src/main/resources/org/eclipse/che/ide/notification/warning.svg