more icons

Evolveum · Sep 25, 2021 · 5839b50 · 5839b50
1 parent f24732f
commit 5839b50
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 13 deletions.
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
@@ -254,4 +254,10 @@ public class GuiStyleConstants {
     public static final String CLASS_TASK_STATISTICS_ICON = "fa fa-line-chart";
     public static final String CLASS_TASK_ERRORS_ICON = "fa fa-exclamation-circle";
     public static final String CLASS_TASK_ACTIVITY_ICON = "fa fa-cog";
+
+    public static final String CLASS_GROUP_ICON = "fa fa-users";
+    public static final String CLASS_APPLICABLE_POLICY_ICON = "fa fa-share-alt";
+    public static final String CLASS_LIFECYCLE_ICON = "fa fa-recycle";
+    public static final String CLASS_TRIGGER_ICON = "fa fa-calendar-check-o";
+    public static final String CLASS_PASSWORD_ICON = "fa fa-key";
 }
diff --git a/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java b/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java
@@ -89,27 +89,27 @@
         @PanelInstance(identifier = "roleMembers",
                 applicableForType = RoleType.class,
                 applicableForOperation = OperationTypeType.MODIFY,
-                display = @PanelDisplay(label = "pageRole.members", order = 80)),
+                display = @PanelDisplay(label = "pageRole.members", icon = GuiStyleConstants.CLASS_GROUP_ICON, order = 80)),
         @PanelInstance(identifier = "roleGovernance",
                 applicableForType = RoleType.class,
                 applicableForOperation = OperationTypeType.MODIFY,
-                display = @PanelDisplay(label = "pageRole.governance", order = 90)),
+                display = @PanelDisplay(label = "pageRole.governance", icon = GuiStyleConstants.CLASS_GROUP_ICON, order = 90)),
         @PanelInstance(identifier = "serviceMembers",
                 applicableForType = ServiceType.class,
                 applicableForOperation = OperationTypeType.MODIFY,
-                display = @PanelDisplay(label = "pageRole.members", order = 80)),
+                display = @PanelDisplay(label = "pageRole.members", icon = GuiStyleConstants.CLASS_GROUP_ICON, order = 80)),
         @PanelInstance(identifier = "serviceGovernance",
                 applicableForType = ServiceType.class,
                 applicableForOperation = OperationTypeType.MODIFY,
-                display = @PanelDisplay(label = "pageRole.governance", order = 90)),
+                display = @PanelDisplay(label = "pageRole.governance", icon = GuiStyleConstants.CLASS_GROUP_ICON, order = 90)),
         @PanelInstance(identifier = "archetypeMembers",
                 applicableForType = ArchetypeType.class,
                 applicableForOperation = OperationTypeType.MODIFY,
-                display = @PanelDisplay(label = "pageRole.members", order = 80)),
+                display = @PanelDisplay(label = "pageRole.members", icon = GuiStyleConstants.CLASS_GROUP_ICON, order = 80)),
         @PanelInstance(identifier = "archetypeGovernance",
                 applicableForType = ArchetypeType.class,
                 applicableForOperation = OperationTypeType.MODIFY,
-                display = @PanelDisplay(label = "pageRole.governance", order = 90))
+                display = @PanelDisplay(label = "pageRole.governance", icon = GuiStyleConstants.CLASS_GROUP_ICON, order = 90))
 })
 @PanelDisplay(label = "Members", order = 60)
 public class AbstractRoleMemberPanel<R extends AbstractRoleType> extends AbstractObjectMainPanel<R, FocusDetailsModels<R>> {

diff --git a/...eum/midpoint/gui/impl/page/admin/abstractrole/component/FocusApplicablePoliciesPanel.java b/...eum/midpoint/gui/impl/page/admin/abstractrole/component/FocusApplicablePoliciesPanel.java
@@ -7,6 +7,7 @@
  */
 package com.evolveum.midpoint.gui.impl.page.admin.abstractrole.component;
 
+import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.impl.page.admin.AbstractObjectMainPanel;
 import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.FocusDetailsModels;
 import com.evolveum.midpoint.web.application.PanelDisplay;
@@ -26,7 +27,7 @@
 @PanelType(name = "applicablePolicies")
 @PanelInstance(identifier = "applicablePolicies",
         applicableForType = AbstractRoleType.class,
-        display = @PanelDisplay(label = "pageAdminFocus.applicablePolicies", order = 60))
+        display = @PanelDisplay(label = "pageAdminFocus.applicablePolicies", icon = GuiStyleConstants.CLASS_APPLICABLE_POLICY_ICON , order = 60))
 public class FocusApplicablePoliciesPanel<AR extends AbstractRoleType> extends AbstractObjectMainPanel<AR, FocusDetailsModels<AR>> {
     private static final long serialVersionUID = 1L;
 

diff --git a/.../java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusActivationPanel.java b/.../java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusActivationPanel.java
@@ -6,6 +6,8 @@
  */
 package com.evolveum.midpoint.gui.impl.page.admin.focus.component;
 
+import com.evolveum.midpoint.gui.api.GuiStyleConstants;
+
 import org.apache.wicket.model.IModel;
 
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismObjectWrapper;
@@ -26,7 +28,7 @@
 @PanelType(name = "activation")
 @PanelInstance(identifier = "activation",
         applicableForType = FocusType.class,
-        display = @PanelDisplay(label = "ActivationType.title", order = 40))
+        display = @PanelDisplay(label = "ActivationType.title", icon = GuiStyleConstants.CLASS_LIFECYCLE_ICON, order = 40))
 public class FocusActivationPanel<F extends FocusType, FDM extends FocusDetailsModels<F>> extends AbstractObjectMainPanel<F, FDM> {
     private static final long serialVersionUID = 1L;
 

diff --git a/...in/java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusPasswordPanel.java b/...in/java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusPasswordPanel.java
@@ -6,6 +6,7 @@
  */
 package com.evolveum.midpoint.gui.impl.page.admin.focus.component;
 
+import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismObjectWrapper;
 import com.evolveum.midpoint.gui.impl.page.admin.AbstractObjectMainPanel;
 import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.FocusDetailsModels;
@@ -25,8 +26,8 @@
 
 @PanelType(name = "password")
 @PanelInstance(identifier = "password",
-        applicableForType = UserType.class,
-        display = @PanelDisplay(label = "prismPropertyPanel.name.credentials.password", order = 50))
+        applicableForType = FocusType.class,
+        display = @PanelDisplay(label = "prismPropertyPanel.name.credentials.password", icon = GuiStyleConstants.CLASS_PASSWORD_ICON, order = 50))
 public class FocusPasswordPanel<F extends FocusType, FDM extends FocusDetailsModels<F>> extends AbstractObjectMainPanel<F, FDM> {
     private static final long serialVersionUID = 1L;
 

diff --git a/...in/java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusTriggersPanel.java b/...in/java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusTriggersPanel.java
@@ -41,7 +41,7 @@
 @PanelInstance(identifier = "focusTriggers",
         applicableForOperation = OperationTypeType.MODIFY,
         applicableForType = FocusType.class,
-        display = @PanelDisplay(label = "pageAdminFocus.triggers", icon = GuiStyleConstants.EVO_CASE_OBJECT_ICON, order = 110))
+        display = @PanelDisplay(label = "pageAdminFocus.triggers", icon = GuiStyleConstants.CLASS_TRIGGER_ICON, order = 110))
 @Counter(provider = FocusTriggersCounter.class)
 public class FocusTriggersPanel<F extends FocusType, FDM extends FocusDetailsModels<F>> extends AbstractObjectMainPanel<F, FDM> {
     private static final long serialVersionUID = 1L;

diff --git a/...src/main/java/com/evolveum/midpoint/gui/impl/page/admin/org/component/OrgMemberPanel.java b/...src/main/java/com/evolveum/midpoint/gui/impl/page/admin/org/component/OrgMemberPanel.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.api.prism.ItemStatus;
 import com.evolveum.midpoint.web.application.PanelDisplay;
 import com.evolveum.midpoint.web.application.PanelInstance;
@@ -34,10 +35,10 @@
 @PanelInstances(instances = {
         @PanelInstance(identifier = "orgMembers", applicableForType = OrgType.class,
                 applicableForOperation = OperationTypeType.MODIFY,
-                display = @PanelDisplay(label = "pageRole.members", order = 60)),
+                display = @PanelDisplay(label = "pageRole.members", icon = GuiStyleConstants.CLASS_GROUP_ICON, order = 60)),
         @PanelInstance(identifier = "orgGovernance", applicableForType = OrgType.class,
                 applicableForOperation = OperationTypeType.MODIFY,
-                display = @PanelDisplay(label = "pageRole.governance", order = 70))
+                display = @PanelDisplay(label = "pageRole.governance", icon = GuiStyleConstants.CLASS_GROUP_ICON, order = 70))
 })
 public class OrgMemberPanel extends AbstractRoleMemberPanel<OrgType> {
     private static final long serialVersionUID = 1L;