MID-6271 more tasks icons

Evolveum · May 12, 2022 · 0e9d840 · 0e9d840
1 parent d161e71
commit 0e9d840
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 24 deletions.
diff --git a/gui/admin-gui/src/frontend/scss/midpoint-theme.scss b/gui/admin-gui/src/frontend/scss/midpoint-theme.scss
@@ -1269,14 +1269,6 @@ th.countLabel{
 	cursor: pointer;
 }
 
-.buttons-panel-marging{
-	margin-right: 10px;
-}
-
-.position-relative{
-	position: relative;
-}
-
 .small-box h3{
 	white-space: normal;
 	font-size: 28px;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
@@ -13,8 +13,11 @@
 public class GuiStyleConstants {
 
     public static final String ICON_FAR_COPY="far fa-copy";
-
     public static final String ICON_FAR_ADDRESS_CARD = "far fa-address-card";
+    public static final String ICON_FAR_CLOCK = "far fa-clock";
+    public static final String ICON_FA_BED = "fa fa-bed";
+    public static final String ICON_FA_POWER_OFF = "fa fa-power-off";
+    public static final String ICON_FA_SPINNER = "fa fa-spinner";
 
     public static final String CLASS_BOX = "box";
     public static final String CLASS_BOX_DEFAULT = "box-default";
@@ -113,7 +116,7 @@ public class GuiStyleConstants {
     public static final String CLASS_APPROVAL_OUTCOME_ICON_REJECTED_COLORED = "fa fa-times text-danger";
     public static final String CLASS_APPROVAL_OUTCOME_ICON_SKIPPED_COLORED = "fa fa-step-forward text-success";
     public static final String CLASS_APPROVAL_OUTCOME_ICON_FORWARDED_COLORED = "fa  fa-fast-forward text-success";
-    public static final String CLASS_APPROVAL_OUTCOME_ICON_IN_PROGRESS_COLORED = "fa fa-clock-o text-info";
+    public static final String CLASS_APPROVAL_OUTCOME_ICON_IN_PROGRESS_COLORED = GuiStyleConstants.ICON_FAR_CLOCK + " text-info";
     public static final String CLASS_APPROVAL_OUTCOME_ICON_FUTURE_COLORED = "fa fa-question-circle text-warning";
     public static final String CLASS_APPROVAL_OUTCOME_ICON_CANCELLED_COLORED = "fa fa-ban text-warning";
 
@@ -146,7 +149,7 @@ public class GuiStyleConstants {
     public static final String CLASS_OP_RESULT_STATUS_ICON_FATAL_ERROR_COLORED = "fa fa-times-circle text-danger";
     public static final String CLASS_OP_RESULT_STATUS_ICON_HANDLED_ERROR_COLORED = "fa fa-minus-circle text-warning";
     public static final String CLASS_OP_RESULT_STATUS_ICON_NOT_APPLICABLE_COLORED = "fa fa-check-circle text-muted";
-    public static final String CLASS_OP_RESULT_STATUS_ICON_IN_PROGRESS_COLORED = "fa fa-clock-o text-info";
+    public static final String CLASS_OP_RESULT_STATUS_ICON_IN_PROGRESS_COLORED = GuiStyleConstants.ICON_FAR_CLOCK + " text-info";
 
     //menu items icons classes
     public static final String CLASS_THREE_DOTS = "fa fa-ellipsis-h";
@@ -160,7 +163,7 @@ public class GuiStyleConstants {
     public static final String CLASS_START_MENU_ITEM = "fa fa-play";
     public static final String CLASS_IMPORT_MENU_ITEM = "fa fa-download";
     public static final String CLASS_NAVIGATE_ARROW = "fa fa-share";
-    public static final String CLASS_SELECTION_HAND = "fa fa-hand-o-up";
+    public static final String CLASS_SELECTION_HAND = "far fa-hand-point-up";
 
     public static final String CLASS_BUTTON_TOGGLE_OFF = "btn-default";
     public static final String CLASS_BUTTON_TOGGLE_ON = "btn-info";

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -4049,7 +4049,7 @@ private static String appendMaintenanceInfoAndUpdateTitle(String title, Resource
     private static void appendTriggerInfo(String title, boolean isColumn, CompositedIconBuilder builder) {
         if (StringUtils.isNotBlank(title)) {
             IconType icon = new IconType();
-            icon.setCssClass("fa fa-clock-o " + GuiStyleConstants.BLUE_COLOR);
+            icon.setCssClass(GuiStyleConstants.ICON_FAR_CLOCK + " " + GuiStyleConstants.BLUE_COLOR);
             if (isColumn) {
                 builder.appendLayerIcon(icon, IconCssStyle.TOP_RIGHT_FOR_COLUMN_STYLE);
             } else {

diff --git a/...a/com/evolveum/midpoint/gui/impl/page/admin/task/component/ActivitiesStatisticsPanel.html b/...a/com/evolveum/midpoint/gui/impl/page/admin/task/component/ActivitiesStatisticsPanel.html
@@ -11,15 +11,15 @@
 
     <div wicket:id="itemProcessing"></div>
     <div class="row">
-        <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+        <div class="col-12">
             <div wicket:id="synchronizationStatistics">
                 <div wicket:id="synchronizationSituationTransitions"></div>
             </div>
         </div>
-        <div class="col-xs-12 col-sm-12 col-md-12 col-lg-6">
+        <div class="col-xl-12 col-xxl-6">
             <div wicket:id="resultingActionsExecuted"></div>
         </div>
-        <div class="col-xs-12 col-sm-12 col-md-12 col-lg-6">
+        <div class="col-xl-12 col-xxl-6">
             <div wicket:id="allActionsExecuted"></div>
         </div>
     </div>

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java
@@ -18,6 +18,7 @@
 
 import com.evolveum.midpoint.xml.ns._public.common.common_3.SummaryPanelSpecificationType;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DurationFormatUtils;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
@@ -139,16 +140,30 @@ private String getIconForExecutionState(TaskDtoExecutionState status) {
         if (status == null) {
             return "fa fa-fw fa-question-circle text-warning";
         }
+
+        String css;
         switch (status) {
-            //TODO move to the GUI style constants?
-            case RUNNING: return "fa fa-fw fa-spinner";
-            case RUNNABLE: return "fa fa-fw fa-hand-o-up";
-            case SUSPENDED: return "fa fa-fw fa-bed";
-            case SUSPENDING: return "fa fa-fw fa-bed";
-            case WAITING: return "fa fa-fw fa-clock-o";
-            case CLOSED: return "fa fa-fw fa-power-off";
-            default: return "";
+            case RUNNING:
+                css = GuiStyleConstants.ICON_FA_SPINNER;
+                break;
+            case RUNNABLE:
+                css = GuiStyleConstants.CLASS_SELECTION_HAND + " fa-fw";
+                break;
+            case SUSPENDED:
+            case SUSPENDING:
+                css =  GuiStyleConstants.ICON_FA_BED;
+                break;
+            case WAITING:
+                css = GuiStyleConstants.ICON_FAR_CLOCK;
+                break;
+            case CLOSED:
+                css =  GuiStyleConstants.ICON_FA_POWER_OFF;
+                break;
+            default:
+                css =  "";
         }
+
+        return StringUtils.isNotEmpty(css) ? css + " fa-fw" : "";
     }
 
     @Override