improved styles for "archetyped buttons"

Evolveum · Jul 12, 2021 · 33f4325 · 33f4325
1 parent 02908f9
commit 33f4325
Show file tree

Hide file tree

Showing 35 changed files with 453 additions and 390 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AssignmentPopup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AssignmentPopup.java
@@ -12,6 +12,8 @@
 import java.util.Map;
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.gui.api.util.WebDisplayTypeUtil;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -98,7 +100,10 @@ private List<CompositedIconButtonDto> newButtonDescription() {
         relations.forEach(relation -> buttonDtoList.add(createCompositedButtonForAssignmentRelation(relation)));
 
         if (isGenericNewObjectButtonVisible()) {
-            DisplayType defaultButtonDisplayType = WebComponentUtil.createDisplayType(GuiStyleConstants.EVO_ASSIGNMENT_ICON, "green", createStringResource("AssignmentPanel.newAssignmentTitle", "", "").getString());
+            DisplayType defaultButtonDisplayType = WebDisplayTypeUtil.createDisplayType(GuiStyleConstants.EVO_ASSIGNMENT_ICON,
+                    "green",
+                    createStringResource("AssignmentPanel.defaultAssignment").getString(),
+                    createStringResource("AssignmentPanel.newAssignmentTitle", "", "").getString());
 //                    AssignmentPanel.this.createStringResource(isInducement() ?
 //                            "AssignmentPanel.newInducementTitle" : "AssignmentPanel.newAssignmentTitle", "", "").getString());
             CompositedIconButtonDto defaultButton = new CompositedIconButtonDto();
@@ -144,7 +149,7 @@ private CompositedIconButtonDto createCompositedButtonForAssignmentRelation(Assi
         CompositedIconButtonDto buttonDto = new CompositedIconButtonDto();
         buttonDto.setAssignmentObjectRelation(relation);
 
-        DisplayType additionalButtonDisplayType = WebComponentUtil.getAssignmentObjectRelationDisplayType(getPageBase(), relation, "AssignmentPanel.newAssignmentTitle");
+        DisplayType additionalButtonDisplayType = WebDisplayTypeUtil.getAssignmentObjectRelationDisplayType(getPageBase(), relation, "AssignmentPanel.newAssignmentTitle");
 //                isInducement() ? "AssignmentPanel.newInducementTitle" : "AssignmentPanel.newAssignmentTitle");
         buttonDto.setAdditionalButtonDisplayType(additionalButtonDisplayType);
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
@@ -8,6 +8,7 @@
 
 import java.util.*;
 
+import com.evolveum.midpoint.gui.api.util.WebDisplayTypeUtil;
 import com.evolveum.midpoint.gui.impl.util.ObjectCollectionViewUtil;
 import com.evolveum.midpoint.model.common.util.DefaultColumnUtils;
 
@@ -97,7 +98,7 @@ protected void newObjectPerformed(AjaxRequestTarget target, AssignmentObjectRela
     }
 
     private CompositedIcon createCompositedIcon(CompiledObjectCollectionView collectionView) {
-        DisplayType additionalButtonDisplayType = WebComponentUtil.getNewObjectDisplayTypeFromCollectionView(collectionView, getPageBase());
+        DisplayType additionalButtonDisplayType = WebDisplayTypeUtil.getNewObjectDisplayTypeFromCollectionView(collectionView, getPageBase());
         CompositedIconBuilder builder = new CompositedIconBuilder();
 
         builder.setBasicIcon(WebComponentUtil.getIconCssClass(additionalButtonDisplayType), IconCssStyle.IN_ROW_STYLE)
@@ -232,14 +233,14 @@ private DisplayType getNewObjectButtonStandardDisplayType() {
 
             CompiledObjectCollectionView view = getObjectCollectionView();
             if (ObjectCollectionViewUtil.isArchetypedCollectionView(view)) {
-                return WebComponentUtil.getNewObjectDisplayTypeFromCollectionView(view, getPageBase());
+                return WebDisplayTypeUtil.getNewObjectDisplayTypeFromCollectionView(view, getPageBase());
             }
         }
 
         String sb = createStringResource("MainObjectListPanel.newObject").getString()
                 + " "
                 + createStringResource("ObjectTypeLowercase." + getType().getSimpleName()).getString();
-        return WebComponentUtil.createDisplayType(GuiStyleConstants.CLASS_ADD_NEW_OBJECT, "green",
+        return WebDisplayTypeUtil.createDisplayType(GuiStyleConstants.CLASS_ADD_NEW_OBJECT, "green",
                 sb);
     }
 
@@ -256,7 +257,7 @@ private DisplayType getNewObjectButtonSpecialDisplayType() {
         String sb = createStringResource("MainObjectListPanel.newObject").getString()
                 + " "
                 + createStringResource("ObjectTypeLowercase." + getType().getSimpleName()).getString();
-        DisplayType display = WebComponentUtil.createDisplayType(iconCssStyle, "", sb);
+        DisplayType display = WebDisplayTypeUtil.createDisplayType(iconCssStyle, "", sb);
         display.setLabel(WebComponentUtil.createPolyFromOrigString(
                 getType().getSimpleName(), "ObjectType." + getType().getSimpleName()));
         return display;