MID-6271 prism container header buttons css/html fixes

Evolveum · May 4, 2022 · e55cee0 · e55cee0
1 parent c878df4
commit e55cee0
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 13 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/ItemHeaderPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/ItemHeaderPanel.html
@@ -10,9 +10,21 @@
 <wicket:panel>
         <span wicket:id="label"/>
         <span wicket:id="required" style="color: #f00; font-weight: bold;" wicket:message="title:prismPropertyPanel.required">*</span>
-        <i wicket:id="help"/>
-        <i wicket:id="deprecated"/>
-        <i wicket:id="experimental"/>
+        <wicket:enclosure child="help">
+            <button class="btn btn-tool">
+                <i wicket:id="help"/>
+            </button>
+        </wicket:enclosure>
+        <wicket:enclosure child="deprecated">
+            <button class="btn btn-tool">
+                <i wicket:id="deprecated"/>
+            </button>
+        </wicket:enclosure>
+        <wicket:enclosure child="experimental">
+            <button class="btn btn-tool">
+                <i wicket:id="experimental"/>
+            </button>
+        </wicket:enclosure>
 
         <wicket:child/>
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/ItemHeaderPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/ItemHeaderPanel.java
@@ -115,10 +115,8 @@ private void createExperimentalTooltip() {
 
             @Override
             public String getCssClass() {
-                return "fa fa-fw  fa-lightbulb-o text-warning";
+                return "far fa-lightbulb text-warning";
             }
-
-
         });
         experimental.add(AttributeModifier.replace("title", createStringResource("ItemHeaderPanel.experimentalFeature")));
         experimental.add(new VisibleBehaviour(() -> getModelObject() != null && getModelObject().isExperimental()));

diff --git a/...i/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerHeaderPanel.html b/...i/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerHeaderPanel.html
@@ -11,13 +11,24 @@
     <div class="row">
         <button wicket:id="expandCollapseButton" wicket:message="title:PrismObjectPanel.expandCollapseContainer"
                 class="btn btn-tool expand-collapse-button" trigger="hover">
-
         </button>
         <a class="prism-title" wicket:id="label"/>
         <span wicket:id="required" class="text-danger" style="font-weight: bold;" wicket:message="title:prismPropertyPanel.required">*</span>
-        <i wicket:id="help"/>
-        <i wicket:id="deprecated"/>
-        <i wicket:id="experimental"/>
+        <wicket:enclosure child="help">
+            <button class="btn btn-tool">
+                <i wicket:id="help"/>
+            </button>
+        </wicket:enclosure>
+        <wicket:enclosure child="deprecated">
+            <button class="btn btn-tool">
+                <i wicket:id="deprecated"/>
+            </button>
+        </wicket:enclosure>
+        <wicket:enclosure child="experimental">
+            <button class="btn btn-tool">
+                <i wicket:id="experimental"/>
+            </button>
+        </wicket:enclosure>
 
         <button wicket:id="add" wicket:message="title:ItemHeaderPanel.addValue" class="btn btn-tool" trigger="hover">
             <i class="fa fa-plus-circle"></i>

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
@@ -12,7 +12,11 @@
         <div class="prism-header mb-1" wicket:id="header">
             <button wicket:id="expandCollapseButton" wicket:message="title:PrismObjectPanel.expandCollapseContainer" class="btn btn-tool expand-collapse-button" trigger="hover"></button>
             <a class="prism-title" wicket:id="label"/>
-            <i class="helpTextIcon" wicket:id="help"/>
+            <wicket:enclosure child="help">
+                <button class="btn btn-tool">
+                    <i class="helpTextIcon" wicket:id="help"/>
+                </button>
+            </wicket:enclosure>
             <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" trigger="hover">
                 <i class="fa fa-plus-circle"></i>

diff --git a/.../java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsPanel.html b/.../java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsPanel.html
@@ -22,7 +22,7 @@ <h3 class="box-title"><wicket:message key="ExecuteChangeOptionsPanel.options"/><
             <!-- TODO style -->
             <div class="option-checkbox" wicket:id="tracingContainer">
                 <div class="checkbox">
-                    <i class="helpTextIcon fa fa-fw fa-lightbulb-o text-warning" wicket:message="title:ItemHeaderPanel.experimentalFeature"></i>
+                    <i class="helpTextIcon far fa-fw fa-lightbulb text-warning" wicket:message="title:ItemHeaderPanel.experimentalFeature"></i>
                     <label style="padding-left: 0;" wicket:message="title:ExecuteChangeOptionsPanel.label.trace.help">
                         <wicket:message key="ExecuteChangeOptionsPanel.label.trace"/>
                         <select wicket:id="tracing"></select>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/InfoTooltipBehavior.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/InfoTooltipBehavior.java
@@ -29,6 +29,6 @@ public void onConfigure(Component component) {
      *  Override to provide custom css class (image, icon) for the tooltip
      * */
     public String getCssClass(){
-        return "fa fa-fw fa-info-circle text-info";
+        return "fa fa-info-circle text-info";
     }
 }