multi button panel styles

Evolveum · Aug 16, 2021 · 0a700e7 · 0a700e7
1 parent 9405b9b
commit 0a700e7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/CompositedButtonPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/CompositedButtonPanel.html
@@ -6,7 +6,7 @@
   ~ and European Union Public License. See LICENSE file for details.
   -->
 <wicket:panel xmlns:wicket="http://wicket.apache.org">
-    <button class="compositedButton">
+    <button class="compositedButton" wicket:id="compositedButton">
         <span class="compositedButtonIcon" wicket:id="compositedIcon"></span>
         <span class="compositedButtonLabel" wicket:id="label"></span>
 <!--        <div class="compositedButtonDescription" wicket:id="description"></div>-->

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/CompositedButtonPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/CompositedButtonPanel.java
@@ -19,12 +19,14 @@
 import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
 
 public class CompositedButtonPanel extends BasePanel<CompositedIconButtonDto> {
 
+    private static final String ID_COMPOSITED_BUTTON = "compositedButton";
     private static final String ID_COMPOSITED_ICON = "compositedIcon";
     private static final String ID_LABEL = "label";
     private static final String ID_DESCRIPTION = "description";
@@ -40,23 +42,25 @@ protected void onInitialize() {
     }
 
     private void initLayout() {
+        WebMarkupContainer buttonContainer = new WebMarkupContainer(ID_COMPOSITED_BUTTON);
+        add(buttonContainer);
 
         CompositedIconPanel compositedIconPanel = new CompositedIconPanel(ID_COMPOSITED_ICON, new PropertyModel<>(getModel(), CompositedIconButtonDto.F_COMPOSITED_ICON));
-        add(compositedIconPanel);
+        buttonContainer.add(compositedIconPanel);
 
         Label label = new Label(ID_LABEL, new ReadOnlyModel<>(() -> {
             DisplayType displayType = getModelObject().getAdditionalButtonDisplayType();
             return WebComponentUtil.getTranslatedPolyString(displayType.getLabel());
         }));
-        add(label);
+        buttonContainer.add(label);
 
-        compositedIconPanel.add(AttributeAppender.append("title", new ReadOnlyModel<>(() -> {
+        buttonContainer.add(AttributeAppender.append("title", new ReadOnlyModel<>(() -> {
             DisplayType displayType = getModelObject().getAdditionalButtonDisplayType();
             return WebComponentUtil.getTranslatedPolyString(displayType.getTooltip());
         })));
-        compositedIconPanel.add(new TooltipBehavior());
+        buttonContainer.add(new TooltipBehavior());
 
-        compositedIconPanel.add(new AjaxEventBehavior("click"){
+        buttonContainer.add(new AjaxEventBehavior("click"){
 
             @Override
             protected void onEvent(AjaxRequestTarget target) {
@@ -74,7 +78,7 @@ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
 //            DisplayType displayType = getModelObject().getAdditionalButtonDisplayType();
 //            return WebComponentUtil.getTranslatedPolyString(displayType.getTooltip());
 //        }));
-//        add(description);
+//        buttonContainer.add(description);
     }
 
     protected void onButtonClicked(AjaxRequestTarget target, CompositedIconButtonDto buttonDescription) {

diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/component/MultiCompositedButtonPanel.html b/...min-gui/src/main/java/com/evolveum/midpoint/web/component/MultiCompositedButtonPanel.html
@@ -7,8 +7,8 @@
   -->
 <wicket:panel xmlns:wicket="http://wicket.apache.org">
     <div class="row">
-        <div wicket:id="additionalButton">
-            <div class="col-md-2" wicket:id="compositedButton"></div>
+        <div wicket:id="additionalButtons">
+            <div wicket:id="additionalButton" class="col-md-2"></div>
             <!--            <div wicket:id="buttonDescription"></div>-->
         </div>
     </div>

diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/component/MultiCompositedButtonPanel.java b/...min-gui/src/main/java/com/evolveum/midpoint/web/component/MultiCompositedButtonPanel.java
@@ -16,13 +16,11 @@
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.model.IModel;
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
-import com.evolveum.midpoint.gui.impl.component.AjaxCompositedIconButton;
 import com.evolveum.midpoint.model.api.AssignmentObjectRelation;
 import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
@@ -31,9 +29,9 @@
 
 public abstract class MultiCompositedButtonPanel extends BasePanel<List<CompositedIconButtonDto>> implements Popupable {
 
-    private static final String ID_BUTTON_PANEL = "additionalButton";
+    private static final String ID_BUTTONS_PANEL = "additionalButtons";
     private static final String ID_BUTTON_DESCRIPTION = "buttonDescription";
-    private static final String ID_COMPOSITED_BUTTON = "compositedButton";
+    private static final String ID_ADDITIONAL_BUTTON = "additionalButton";
     private static final String ID_BUTTON_CANCEL = "cancelButton";
 
     public MultiCompositedButtonPanel(String id, IModel<List<CompositedIconButtonDto>> model) {
@@ -47,11 +45,11 @@ protected void onInitialize() {
     }
 
     private void initLayout() {
-        ListView<CompositedIconButtonDto> buttonsPanel = new ListView<>(ID_BUTTON_PANEL, getModel()) {
+        ListView<CompositedIconButtonDto> buttonsPanel = new ListView<>(ID_BUTTONS_PANEL, getModel()) {
 
             @Override
             protected void populateItem(ListItem<CompositedIconButtonDto> item) {
-                CompositedButtonPanel additionalButton = new CompositedButtonPanel(ID_COMPOSITED_BUTTON, item.getModel()) {
+                CompositedButtonPanel additionalButton = new CompositedButtonPanel(ID_ADDITIONAL_BUTTON, item.getModel()) {
 
                     @Override
                     protected void onButtonClicked(AjaxRequestTarget target, CompositedIconButtonDto buttonDescription) {