composited buttons for suspend task and run now task (MID-6467)

Evolveum · Sep 18, 2021 · 3c79f14 · 3c79f14
1 parent 5091589
commit 3c79f14
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/...ui/src/main/java/com/evolveum/midpoint/gui/impl/component/icon/CompositedIconBuilder.java b/...ui/src/main/java/com/evolveum/midpoint/gui/impl/component/icon/CompositedIconBuilder.java
@@ -90,8 +90,10 @@ public CompositedIconBuilder appendColorHtmlValue(String colorHtmlValue) {
         return this;
     }
 
-    public CompositedIconBuilder appendLayerIcon(String icon, CompositedIconCssStyle style) {
-        return appendLayerIcon(icon, style, "");
+    public CompositedIconBuilder appendLayerIcon(String icon, LayeredIconCssStyle style) {
+        IconType iconType = new IconType();
+        iconType.setCssClass(icon);
+        return appendLayerIcon(iconType, style);
     }
 
     public CompositedIconBuilder appendLayerIcon(String icon, CompositedIconCssStyle style, String additionalCssClass) {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTablePanel.java
@@ -10,6 +10,9 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import com.evolveum.midpoint.gui.api.util.WebDisplayTypeUtil;
+import com.evolveum.midpoint.gui.impl.component.icon.CompositedIcon;
+import com.evolveum.midpoint.gui.impl.component.icon.CompositedIconCssStyle;
+import com.evolveum.midpoint.gui.impl.component.icon.LayeredIconCssStyle;
 import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
 import com.evolveum.midpoint.schema.util.task.TaskInformation;
 import com.evolveum.midpoint.web.component.util.SerializableBiConsumer;
@@ -359,7 +362,11 @@ public void onClick(AjaxRequestTarget target) {
 
             @Override
             public CompositedIconBuilder getIconCompositedBuilder() {
-                return getDefaultCompositedIconBuilder(icon);
+                CompositedIconBuilder builder = getDefaultCompositedIconBuilder(icon);
+                if (GuiStyleConstants.CLASS_SUSPEND_MENU_ITEM.equals(icon) || GuiStyleConstants.CLASS_START_MENU_ITEM.equals(icon)) {
+                    builder.appendLayerIcon(GuiStyleConstants.CLASS_OBJECT_TASK_ICON, CompositedIconCssStyle.BOTTOM_RIGHT_STYLE);
+                }
+                return builder;
             }
 
             @Override