MID-6271 input group buttons fix

Evolveum · Apr 25, 2022 · a70e42e · a70e42e
1 parent a908e12
commit a70e42e
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 17 deletions.
diff --git a/...ui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerValuePanel.html b/...ui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerValuePanel.html
@@ -14,8 +14,12 @@
             <a class="prism-title" wicket:id="label"/>
             <i class="helpTextIcon" wicket:id="help"/>
             <button wicket:id="sortProperties" wicket:message="title:PrismObjectPanel.sortProperties" class="btn btn-tool"></button>
-            <button wicket:id="addChildContainer" wicket:message="title:PrismObjectPanel.addChildContainer" class="btn btn-tool fa fa-plus-circle" trigger="hover"></button>
-            <button wicket:id="removeButton" wicket:message="title:PrismObjectPanel.deleteContainer" class="btn btn-tool fa fa-minus-circle" trigger="hover"></button>
+            <button wicket:id="addChildContainer" wicket:message="title:PrismObjectPanel.addChildContainer" class="btn btn-tool" trigger="hover">
+                <i class="fa fa-plus-circle"></i>
+            </button>
+            <button wicket:id="removeButton" wicket:message="title:PrismObjectPanel.deleteContainer" class="btn btn-tool" trigger="hover">
+                <i class="fa fa-minus-circle"></i>
+            </button>
             <a class="btn btn-tool" wicket:id="showMetadata" wicket:message="title:PageBase.button.metadata">
                 <i class="fa fa-tag"></i>
             </a>

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
@@ -20,7 +20,7 @@ <h3 class="popover-title"><wicket:message key="PageSizePopover.title"/></h3>
                 <div class="input-group">
                     <input wicket:id="input" type="text" size="1" style="display: inline-block; width: auto;"
                            class="form-control form-control-sm">
-                    <span class="input-group-btn">
+                    <span class="input-group-append">
                         <button wicket:id="button" type="button" class="btn btn-sm btn-success">
                             <i class="fa fa-check"></i>
                         </button>

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
@@ -28,7 +28,7 @@ <h3 class="popover-title"><wicket:message key="PageSizePopover.title"/></h3>
                 <div class="input-group">
                     <input wicket:id="input" type="text" size="3" style="display: inline-block; width: auto;"
                            class="form-control form-control-sm">
-                    <div class="input-group-btn" style="width: auto;">
+                    <div class="input-group-append" style="width: auto;">
                         <button wicket:id="button" type="button" class="btn btn-sm btn-success">
                             <i class="fa fa-check"></i>
                         </button>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.html
@@ -11,7 +11,7 @@
 
           <div wicket:id="textWrapper">
             <div class="input-group input-group-sm">
-                <span class="input-group-btn">
+                <span class="input-group-prepend">
                     <button wicket:id="edit" class="btn btn-primary" type="button">
                         <wicket:message key="PageBase.button.edit" />
                     </button>

diff --git a/.../com/evolveum/midpoint/web/component/form/multivalue/GenericMultiValueLabelEditPanel.html b/.../com/evolveum/midpoint/web/component/form/multivalue/GenericMultiValueLabelEditPanel.html
@@ -20,7 +20,7 @@
     <wicket:container wicket:id="repeater">
         <div wicket:id="textWrapper">
             <div class="input-group input-group-sm">
-                <span class="input-group-btn">
+                <span class="input-group-prepend">
                     <button wicket:id="edit" class="btn btn-primary" type="button">
                         <wicket:message key="PageBase.button.edit" />
                     </button>

diff --git a/.../com/evolveum/midpoint/web/component/form/multivalue/MultiValueAutoCompleteTextPanel.html b/.../com/evolveum/midpoint/web/component/form/multivalue/MultiValueAutoCompleteTextPanel.html
@@ -19,7 +19,7 @@
             <div class="input-group">
                 <input wicket:id="input" type="text" class="form-control form-control-sm" value="first"/>
 
-                <div wicket:id="buttonGroup" class="input-group-btn">
+                <div wicket:id="buttonGroup" class="input-group-append">
                     <a wicket:id="delete" class="btn btn-sm btn-danger" title="Remove">
                         <i class="fa fa-minus"/>
                     </a>

diff --git a/...ain/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueDropDownPanel.html b/...ain/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueDropDownPanel.html
@@ -19,7 +19,7 @@
             <div class="input-group">
                 <select wicket:id="input" class="form-control form-control-sm"></select>
 
-                <div wicket:id="buttonGroup" class="input-group-btn">
+                <div wicket:id="buttonGroup" class="input-group-append">
                     <a wicket:id="delete" class="btn btn-sm btn-danger" title="Remove">
                         <i class="fa fa-minus"/>
                     </a>

diff --git a/...ain/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextEditPanel.html b/...ain/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextEditPanel.html
@@ -20,7 +20,7 @@
                 <div class="input-group">
                     <input wicket:id="input" type="text" class="form-control form-control-sm" value="first"/>
 
-                    <div wicket:id="buttonGroup" class="input-group-btn">
+                    <div wicket:id="buttonGroup" class="input-group-append">
                         <a wicket:id="edit" class="btn btn-sm btn-primary" title="Edit">
                             <i class="fa fa-pen-square"/>
                         </a>

diff --git a/...rc/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextPanel.html b/...rc/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextPanel.html
@@ -19,7 +19,7 @@
                 <div class="input-group">
                     <input wicket:id="input" type="text" class="form-control form-control-sm" />
 
-                    <span wicket:id="buttonGroup" class="input-group-btn">
+                    <span wicket:id="buttonGroup" class="input-group-append">
                         <a wicket:id="minus" class="btn btn-box-tool" title="Remove">
                             <i class="fa fa-minus-circle"/>
                         </a>

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/BrowserPopupPanel.html b/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/BrowserPopupPanel.html
@@ -11,7 +11,7 @@
 <wicket:panel>
     <input wicket:id="browserInput" type="text" class="form-control"
            style="width: auto; min-width: 150px;" size="20" disabled="true">
-    <span class="input-group-btn">
+    <span class="input-group-append">
         <a wicket:id="browse" class="btn btn-primary" wicket:message="title:SearchItemPanel.browse">
             <i class="fa fa-pencil-square-o"/>
         </a>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ComboPopupPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ComboPopupPanel.html
@@ -11,7 +11,7 @@
 <body>
 <wicket:panel>
     <select wicket:id="comboInput" class="form-control form-control-sm" style="width: auto; min-width: 150px;"/>
-    <span class="input-group-btn">
+    <span class="input-group-append">
         <a wicket:id="remove" class="btn btn-danger" wicket:message="title:SearchItemPanel.remove">
             <i class="fa fa-minus"/>
         </a>

diff --git a/...n/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.html b/...n/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.html
@@ -25,7 +25,7 @@ <h3 class="box-title"><wicket:message key="SchemaListPanel.objectClasses"/></h3>
                                     <input type="text" class="form-control form-control-sm" wicket:id="objectClass"
                                            wicket:message="placeholder:SchemaListPanel.objectClass"/>
 
-                            <span class="input-group-btn">
+                            <span class="input-group-append">
                                 <a class="btn btn-danger btn-sm" wicket:id="clearSearch"
                                    wicket:message="title:PageBase.button.tooltip.clearSearch">
                                     <i class="fa fa-remove"/>

diff --git a/...int/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.html b/...int/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.html
@@ -228,7 +228,7 @@ <h4 class="panel-title">
                         <dd class="cap-dl-multivalue">
                             <div class="input-group">
                                 <input wicket:id="outboundLabel" type="text" class="form-control form-control-sm"/>
-                                <span class="input-group-btn">
+                                <span class="input-group-append">
                                     <a wicket:id="buttonOutbound" class="btn btn-sm btn-primary" title="Edit">
                                         <i class="fa fa-pencil-square-o"/>
                                     </a>

diff --git a/...point/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.html b/...point/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.html
@@ -145,7 +145,7 @@ <h3><span wicket:id="label"></span></h3>
         <dd class="cap-dl-multivalue">
             <div class="input-group">
                 <input wicket:id="outboundLabel" type="text" class="form-control form-control-sm"/>
-                <span class="input-group-btn">
+                <span class="input-group-append">
                     <a wicket:id="buttonOutbound" class="btn btn-sm btn-primary"
                        wicket:message="title:ResourceAttributeEditor.title.edit">
                         <i class="fa fa-pencil-square-o"/>

diff --git a/...int/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.html b/...int/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.html
@@ -32,7 +32,7 @@ <h3><wicket:message key="ResourceCredentialsEditor.label" /></h3>
         <dd>
             <div class="input-group">
                 <input wicket:id="outboundLabel" type="text" class="form-control form-control-sm" value="first"/>
-                <span class="input-group-btn">
+                <span class="input-group-append">
                     <a wicket:id="outboundButton" class="btn btn-sm btn-primary" title="Edit">
                         <i class="fa fa-pencil-square-o"/>
                     </a>

diff --git a/...in/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.html b/...in/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.html
@@ -15,7 +15,7 @@
         <div wicket:id="inputContainer">
             <div class="input-group input-group-sm">
                 <input type="text" class="form-control" disabled="disabled" wicket:id="name" />
-                <span class="input-group-btn">
+                <span class="input-group-append">
                     <button wicket:id="choose" class="btn btn-primary" type="button">
                         <wicket:message key="objectPolicyConfigurationEditor.button.edit" />
                     </button>