MID-6271 page size popover html/css fixed, still there are two same c…

…lasses/htmls
Evolveum · May 2, 2022 · ebbd517 · ebbd517
1 parent 0276517
commit ebbd517
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 33 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.java
@@ -6,10 +6,6 @@
  */
 package com.evolveum.midpoint.web.component.data;
 
-import com.evolveum.midpoint.gui.api.model.LoadableModel;
-import com.evolveum.midpoint.gui.api.page.PageBase;
-import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
-
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -21,6 +17,10 @@
 import org.apache.wicket.markup.repeater.data.DataViewBase;
 import org.apache.wicket.model.IModel;
 
+import com.evolveum.midpoint.gui.api.model.LoadableModel;
+import com.evolveum.midpoint.gui.api.page.PageBase;
+import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
+
 /**
  * @author lazyman
  */
@@ -39,13 +39,7 @@ protected void onInitialize() {
         super.onInitialize();
 
         WebMarkupContainer td = new WebMarkupContainer(ID_TD);
-        td.add(AttributeModifier.replace("colspan", new IModel<String>() {
-
-            @Override
-            public String getObject() {
-                return String.valueOf(getTable().getColumns().size());
-            }
-        }));
+        td.add(AttributeModifier.replace("colspan", () -> String.valueOf(getTable().getColumns().size())));
         add(td);
 
         Label count = new Label(ID_COUNT, createModel(this, getTable()));
@@ -59,18 +53,12 @@ protected void pageSizeChanged(AjaxRequestTarget target) {
                 CountToolbar.this.pageSizeChanged(target);
             }
         };
-        popover.add(new VisibleEnableBehaviour() {
-
-            @Override
-            public boolean isVisible() {
-                return CountToolbar.this.isPageSizePopupVisible();
-            }
-        });
+        popover.add(new VisibleBehaviour(() -> CountToolbar.this.isPageSizePopupVisible()));
         td.add(popover);
     }
 
     private IModel<String> createModel(Component component, IPageable pageable) {
-        return new LoadableModel<String>() {
+        return new LoadableModel<>() {
 
             @Override
             protected String load() {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.html
@@ -14,8 +14,8 @@
 
     <div wicket:id="popover" class="popover fade left in">
         <div class="arrow"></div>
-        <h3 class="popover-title"><wicket:message key="PageSizePopover.title"/></h3>
-        <div class="popover-content">
+        <h3 class="popover-header"><wicket:message key="PageSizePopover.title"/></h3>
+        <div class="popover-body">
             <form wicket:id="form">
                 <div class="input-group">
                     <input wicket:id="input" type="text" size="1" style="display: inline-block; width: auto;"

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.java
@@ -6,8 +6,6 @@
  */
 package com.evolveum.midpoint.web.component.data;
 
-import com.evolveum.midpoint.web.session.UserProfileStorage;
-
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
@@ -21,13 +19,13 @@
 import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.web.component.AjaxSubmitButton;
 import com.evolveum.midpoint.web.component.form.MidpointForm;
+import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.web.util.SearchFormEnterBehavior;
 
 /**
  * @author lazyman
  */
 public class PageSizePopover extends BasePanel<PageSizePopover> {
-
     private static final String ID_POP_BUTTON = "popButton";
     private static final String ID_POPOVER = "popover";
     private static final String ID_FORM = "form";
@@ -91,7 +89,7 @@ protected void onSubmit(AjaxRequestTarget target) {
     }
 
     private IModel<Integer> createInputModel() {
-        return new IModel<Integer>() {
+        return new IModel<>() {
 
             @Override
             public Integer getObject() {

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/component/data/TableConfigurationPanel.html b/...n-gui/src/main/java/com/evolveum/midpoint/web/component/data/TableConfigurationPanel.html
@@ -21,8 +21,8 @@
 
     <div wicket:id="popover" class="popover fade left in">
         <div class="arrow"></div>
-        <h3 class="popover-title"><wicket:message key="PageSizePopover.title"/></h3>
-        <div class="popover-content">
+        <h3 class="popover-header"><wicket:message key="PageSizePopover.title"/></h3>
+        <div class="popover-body">
             <form wicket:id="form">
                 <span wicket:id="inputFeedback" class="text-danger"/>
                 <div class="input-group">

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/component/data/TableConfigurationPanel.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/component/data/TableConfigurationPanel.java
@@ -6,11 +6,6 @@
  */
 package com.evolveum.midpoint.web.component.data;
 
-import com.evolveum.midpoint.gui.api.component.BasePanel;
-import com.evolveum.midpoint.web.component.AjaxSubmitButton;
-import com.evolveum.midpoint.web.session.UserProfileStorage;
-import com.evolveum.midpoint.web.util.SearchFormEnterBehavior;
-
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.feedback.ComponentFeedbackMessageFilter;
@@ -23,7 +18,11 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.validation.validator.RangeValidator;
 
+import com.evolveum.midpoint.gui.api.component.BasePanel;
+import com.evolveum.midpoint.web.component.AjaxSubmitButton;
 import com.evolveum.midpoint.web.component.form.MidpointForm;
+import com.evolveum.midpoint.web.session.UserProfileStorage;
+import com.evolveum.midpoint.web.util.SearchFormEnterBehavior;
 
 /**
  * @author Viliam Repan (lazyman)
@@ -119,7 +118,7 @@ private void tableColumnsPerformed(AjaxRequestTarget target) {
     }
 
     private IModel<Integer> createInputModel() {
-        return new IModel<Integer>() {
+        return new IModel<>() {
 
             @Override
             public Integer getObject() {