new collection view object button style

Evolveum · Jul 22, 2019 · a576c0e · a576c0e
1 parent 5e6790b
commit a576c0e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
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
@@ -146,6 +146,11 @@ protected DisplayType getMainButtonDisplayType(){
                 return getNewObjectButtonStandardDisplayType();
             }
 
+            @Override
+            protected Map<IconCssStyle, IconType> getMainButtonLayerIcons(){
+                return getNewObjectButtonLayerIconStyleMap();
+            }
+
             @Override
             protected CompositedIconBuilder getAdditionalIconBuilder(S influencingObject, DisplayType additionalButtonDisplayType){
                 CompositedIconBuilder builder = MainObjectListPanel.this.getNewObjectButtonAdditionalIconBuilder(influencingObject, additionalButtonDisplayType);
@@ -279,6 +284,10 @@ protected DisplayType getNewObjectButtonStandardDisplayType(){
                 sb.toString());
     }
 
+    protected Map<IconCssStyle, IconType> getNewObjectButtonLayerIconStyleMap(){
+        return null;
+    }
+
     protected DisplayType getNewObjectButtonSpecialDisplayType(){
         String iconCssStyle = WebComponentUtil.createDefaultBlackIcon(WebComponentUtil.classToQName(getPageBase().getPrismContext(), getType()));
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultifunctionalButton.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultifunctionalButton.java
@@ -34,6 +34,7 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by honchar
@@ -64,9 +65,15 @@ private void initLayout(){
         if (StringUtils.isEmpty(mainButtonDisplayType.getIcon().getCssClass())){
             mainButtonDisplayType.getIcon().setCssClass(defaultObjectButtonDisplayType.getIcon().getCssClass());
         }
-        CompositedIconBuilder builder = new CompositedIconBuilder();
+        final CompositedIconBuilder builder = new CompositedIconBuilder();
         builder.setBasicIcon(WebComponentUtil.getIconCssClass(mainButtonDisplayType), IconCssStyle.IN_ROW_STYLE)
                 .appendColorHtmlValue(WebComponentUtil.getIconColor(mainButtonDisplayType));
+        final Map<IconCssStyle, IconType> layerIcons = getMainButtonLayerIcons();
+        if (layerIcons != null) {
+            layerIcons.entrySet().forEach(layerIconStyle -> {
+                builder.appendLayerIcon(layerIconStyle.getValue(), layerIconStyle.getKey());
+            });
+        }
 
         AjaxCompositedIconButton mainButton = new AjaxCompositedIconButton(ID_MAIN_BUTTON, builder.build(),
                 Model.of(WebComponentUtil.getDisplayTypeTitle(mainButtonDisplayType))) {
@@ -179,5 +186,8 @@ protected List<S> getAdditionalButtonsObjects(){
         return new ArrayList<>();
     }
 
+    protected Map<IconCssStyle, IconType> getMainButtonLayerIcons(){
+        return null;
+    }
 
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectList.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectList.java
@@ -18,6 +18,7 @@
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.api.component.MainObjectListPanel;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
+import com.evolveum.midpoint.gui.impl.component.icon.IconCssStyle;
 import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView;
 import com.evolveum.midpoint.prism.query.ObjectFilter;
 import com.evolveum.midpoint.prism.query.ObjectOrdering;
@@ -134,6 +135,16 @@ protected DisplayType getNewObjectButtonStandardDisplayType(){
                 return super.getNewObjectButtonStandardDisplayType();
             }
 
+            @Override
+            protected Map<IconCssStyle, IconType> getNewObjectButtonLayerIconStyleMap(){
+                if (!isCollectionViewPage()){
+                    return null;
+                }
+                Map<IconCssStyle, IconType> layerIconMap = new HashMap<>();
+                layerIconMap.put(IconCssStyle.BOTTOM_RIGHT_STYLE, WebComponentUtil.createIconType(GuiStyleConstants.CLASS_PLUS_CIRCLE, "green"));
+                return layerIconMap;
+            }
+
             @Override
             protected DisplayType getNewObjectButtonAdditionalDisplayType(CompiledObjectCollectionView collectionView){
                 return WebComponentUtil.getNewObjectDisplayTypeFromCollectionView(collectionView, PageAdminObjectList.this);