MID-6271 operational buttons improvements, still messy there

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

Hide file tree

Showing 10 changed files with 20 additions and 63 deletions.
diff --git a/gui/admin-gui/src/frontend/scss/midpoint-theme.scss b/gui/admin-gui/src/frontend/scss/midpoint-theme.scss
@@ -1825,11 +1825,6 @@ fieldset.objectButtons {
   }
 }
 
-.operationalButtonLabel {
-  font-size: 13px;
-  margin-left:5px;
-}
-
 .execute-options {
   &.radio input[type=radio] {
     margin-left: 0px;

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/AjaxCompositedIconButton.java b/...-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/AjaxCompositedIconButton.java
@@ -83,16 +83,15 @@ public void onComponentTagBody(final MarkupStream markupStream, final ComponentT
             icon = buttonModel.getObject().getCompositedIcon();
         }
         if (icon.hasBasicIcon()) {
-            sb.append("<i class=\"").append(icon.getBasicIcon()).append("\"");
+            String margin = titleAsLabel ? "mr-1" : "";
+            sb.append("<i class=\"" + margin + " ").append(icon.getBasicIcon()).append("\"");
             if (icon.hasBasicIconHtmlColor()) {
                 sb.append(" style=\"color: " + icon.getBasicIconHtmlColor() + ";\"");
             }
             sb.append("></i> ");
 
             if (titleAsLabel) {
-                sb.append("<span class=\"operationalButtonLabel\">")
-                        .append(title.getObject())
-                        .append("</span>");
+                sb.append(title.getObject());
             }
         }
 

diff --git a/...om/evolveum/midpoint/gui/impl/page/admin/cases/component/CaseOperationalButtonsPanel.html b/...om/evolveum/midpoint/gui/impl/page/admin/cases/component/CaseOperationalButtonsPanel.html
@@ -11,7 +11,7 @@
     <wicket:extend>
         <fieldset class="objectButtons">
             <legend><wicket:message key="CaseOperationalButtonsPanel.buttons.case" /></legend>
-            <span class="mr-2 btn" wicket:id="caseButtons"/>
+            <a class="mr-2 btn" wicket:id="caseButtons"/>
         </fieldset>
     </wicket:extend>
 </wicket:panel>

diff --git a/...ain/java/com/evolveum/midpoint/gui/impl/page/admin/component/OperationalButtonsPanel.html b/...ain/java/com/evolveum/midpoint/gui/impl/page/admin/component/OperationalButtonsPanel.html
@@ -13,11 +13,11 @@
             <div class="d-flex flex-wrap">
                 <fieldset class="objectButtons">
                     <legend><wicket:message key="OperationalButtonsPanel.buttons.main"/></legend>
-                    <span class="m-1 m-sm-0 mr-sm-2 btn" wicket:id="buttons"/>
+                    <a class="m-1 m-sm-0 mr-sm-2 btn" wicket:id="buttons"/>
                 </fieldset>
                 <wicket:child/>
                 <span class="pull-right button-group">
-                     <span class="m-1 m-sm-0 mr-sm-2 btn" wicket:id="stateButtons"/>
+                    <a class="m-1 m-sm-0 mr-sm-2 btn" wicket:id="stateButtons"/>
                 </span>
             </div>
         </div>

diff --git a/.../com/evolveum/midpoint/gui/impl/page/admin/component/ResourceOperationalButtonsPanel.html b/.../com/evolveum/midpoint/gui/impl/page/admin/component/ResourceOperationalButtonsPanel.html
@@ -11,7 +11,7 @@
     <wicket:extend>
         <fieldset class="objectButtons">
             <legend><wicket:message key="ResourceOperationalButtonsPanel.buttons.resource"/></legend>
-            <span class="mr-2 btn" wicket:id="resourceButtons"/>
+            <a class="mr-2 btn btn-default btn-sm" wicket:id="resourceButtons"/>
         </fieldset>
     </wicket:extend>
 </wicket:panel>

diff --git a/.../com/evolveum/midpoint/gui/impl/page/admin/component/ResourceOperationalButtonsPanel.java b/.../com/evolveum/midpoint/gui/impl/page/admin/component/ResourceOperationalButtonsPanel.java
@@ -70,7 +70,6 @@ public void onClick(AjaxRequestTarget target) {
         };
         test.showTitleAsLabel(true);
         test.add(new VisibleBehaviour(() -> isEditingObject()));
-        test.add(AttributeAppender.append("class", "btn-default btn-sm"));
         resourceButtons.add(test);
 
         AjaxIconButton setMaintenance = new AjaxIconButton(resourceButtons.newChildId(), Model.of(GuiStyleConstants.CLASS_ICON_RESOURCE_MAINTENANCE),
@@ -84,15 +83,7 @@ public void onClick(AjaxRequestTarget target) {
             }
         };
         setMaintenance.showTitleAsLabel(true);
-        setMaintenance.add(new VisibleEnableBehaviour() {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public boolean isVisible() {
-                return isEditingObject() && canEdit(getObjectType());
-            }
-        });
-        setMaintenance.add(AttributeAppender.append("class", "btn-default btn-sm"));
+        setMaintenance.add(new VisibleBehaviour(() -> isEditingObject() && canEdit(getObjectType())));
         resourceButtons.add(setMaintenance);
 
         AjaxIconButton refreshSchema = new AjaxIconButton(resourceButtons.newChildId(), Model.of(GuiStyleConstants.CLASS_ICON_RESOURCE_SCHEMA),
@@ -104,16 +95,8 @@ public void onClick(AjaxRequestTarget target) {
                 WebComponentUtil.refreshResourceSchema(getPrismObject(), OPERATION_REFRESH_SCHEMA, target, getPageBase());
             }
         };
-        refreshSchema.add(new VisibleEnableBehaviour() {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public boolean isVisible() {
-                return isVisibleRefresSchemaButton(getObjectType());
-            }
-        });
+        refreshSchema.add(new VisibleBehaviour(() -> isVisibleRefresSchemaButton(getObjectType())));
         refreshSchema.showTitleAsLabel(true);
-        refreshSchema.add(AttributeAppender.append("class", "btn-default btn-sm"));
         resourceButtons.add(refreshSchema);
 
         AjaxIconButton wizardShow = new AjaxIconButton(resourceButtons.newChildId(), Model.of(GuiStyleConstants.CLASS_ICON_WIZARD),
@@ -126,15 +109,7 @@ public void onClick(AjaxRequestTarget target) {
             }
         };
         wizardShow.showTitleAsLabel(true);
-        wizardShow.add(new VisibleEnableBehaviour() {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public boolean isVisible() {
-                return isEditingObject() && canEdit(getObjectType());
-            }
-        });
-        wizardShow.add(AttributeAppender.append("class", "btn-default btn-sm"));
+        wizardShow.add(new VisibleBehaviour(() -> isEditingObject() && canEdit(getObjectType())));
         resourceButtons.add(wizardShow);
         AjaxIconButton wizardEdit = new AjaxIconButton(resourceButtons.newChildId(), Model.of(GuiStyleConstants.CLASS_ICON_WIZARD),
                 createStringResource("pageResource.button.wizardEdit")) {
@@ -146,17 +121,8 @@ public void onClick(AjaxRequestTarget target) {
             }
         };
         wizardEdit.showTitleAsLabel(true);
-        wizardEdit.add(new VisibleEnableBehaviour() {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public boolean isVisible() {
-                return isEditingObject() && canEdit(getObjectType());
-            }
-        });
-        wizardEdit.add(AttributeAppender.append("class", "btn-default btn-sm"));
+        wizardEdit.add(new VisibleBehaviour(() -> isEditingObject() && canEdit(getObjectType())));
         resourceButtons.add(wizardEdit);
-
     }
 
     private void testConnectionPerformed(AjaxRequestTarget target) {
@@ -235,5 +201,4 @@ private boolean isVisibleRefresSchemaButton(ResourceType resource) {
     protected void refreshStatus(AjaxRequestTarget target) {
 
     }
-
 }
diff --git a/...java/com/evolveum/midpoint/gui/impl/page/admin/component/TaskOperationalButtonsPanel.html b/...java/com/evolveum/midpoint/gui/impl/page/admin/component/TaskOperationalButtonsPanel.html
@@ -11,7 +11,7 @@
     <wicket:extend>
         <fieldset wicket:id="taskButtonsContainer" class="objectButtons">
             <legend><wicket:message key="TaskOperationalButtonsPanel.buttons.task"/></legend>
-            <span class="mr-2 btn btn-sm" wicket:id="taskButtons"/>
+            <a class="mr-2 btn btn-sm" wicket:id="taskButtons"/>
         </fieldset>
         <fieldset wicket:id="refreshingButtonsContainer" class="objectButtons">
             <legend><wicket:message key="TaskOperationalButtonsPanel.buttons.refresh"/></legend>

diff --git a/...evolveum/midpoint/gui/impl/page/admin/report/component/ReportOperationalButtonsPanel.html b/...evolveum/midpoint/gui/impl/page/admin/report/component/ReportOperationalButtonsPanel.html
@@ -11,7 +11,7 @@
     <wicket:extend>
         <fieldset class="objectButtons">
             <legend><wicket:message key="ReportOperationalButtonsPanel.buttons.report"/></legend>
-            <span class="mr-2 btn" wicket:id="reportButtons"/>
+            <a class="mr-2 btnbtn-primary btn-sm" wicket:id="reportButtons"/>
         </fieldset>
     </wicket:extend>
 </wicket:panel>

diff --git a/...gui/src/main/java/com/evolveum/midpoint/web/component/AjaxCompositedIconSubmitButton.java b/...gui/src/main/java/com/evolveum/midpoint/web/component/AjaxCompositedIconSubmitButton.java
@@ -6,8 +6,6 @@
  */
 package com.evolveum.midpoint.web.component;
 
-import com.evolveum.midpoint.gui.impl.component.icon.LayerIcon;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
@@ -18,7 +16,7 @@
 import org.apache.wicket.model.IModel;
 
 import com.evolveum.midpoint.gui.impl.component.icon.CompositedIcon;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.IconType;
+import com.evolveum.midpoint.gui.impl.component.icon.LayerIcon;
 
 /**
  * @author skublik
@@ -72,16 +70,15 @@ public void onComponentTagBody(final MarkupStream markupStream, final ComponentT
 
         CompositedIcon icon = this.icon;
         if (icon.hasBasicIcon()) {
-            sb.append("<i class=\"").append(icon.getBasicIcon() != null ? icon.getBasicIcon().trim() : "").append("\"");
+            String margin = titleAsLabel ? "mr-1" : "";
+            sb.append("<i class=\"" + margin + " ").append(icon.getBasicIcon() != null ? icon.getBasicIcon().trim() : "").append("\"");
             if (icon.hasBasicIconHtmlColor()) {
                 sb.append(" style=\"color: " + icon.getBasicIconHtmlColor() + ";\"");
             }
             sb.append("></i> ");
 
             if (titleAsLabel) {
-                sb.append("<span class=\"operationalButtonLabel\">")
-                        .append(title.getObject())
-                        .append("</span>");
+                sb.append(title.getObject());
             }
         }
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxIconButton.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxIconButton.java
@@ -59,14 +59,15 @@ public void onComponentTagBody(final MarkupStream markupStream, final ComponentT
 
         String icon = getModelObject();
         if (StringUtils.isNotEmpty(icon)) {
-            sb.append("<i class=\"").append(icon).append("\"></i>");
+            String margin = showTitleAsLabel ? "mr-1" : "";
+            sb.append("<i class=\"" + margin + " ").append(icon).append("\"></i>");
         }
 
         if (StringUtils.isEmpty(icon)) {
             sb.append(title);
         } else {
             if (showTitleAsLabel) {
-                sb.append("<span class=\"operationalButtonLabel\">").append(title).append("</span>");
+                sb.append(title);
             }
         }