MID-8086 case work items styles improvements, wip

Evolveum · Sep 20, 2022 · c26d884 · c26d884
1 parent 66dbd92
commit c26d884
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 22 deletions.
diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneButtonPanel.html b/...in-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/SceneButtonPanel.html
@@ -8,6 +8,6 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <a class="btn btn-tool" wicket:id="minimizeButton"><i wicket:id="icon"></i></a>
+    <button type="button" class="btn btn-tool" wicket:id="minimizeButton"><i wicket:id="icon"></i></button>
 </wicket:panel>
 </html>
diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemActionsPanel.html b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemActionsPanel.html
@@ -8,11 +8,9 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <div wicket:id="actionButtons">
-        <div class="btn btn-danger" wicket:id="workItemRejectButton"/>
-        <div class="btn btn-success" wicket:id="workItemApproveButton"/>
-        <div class="btn btn-primary" wicket:id="workItemForwardButton"/>
-        <div class="btn btn-primary" wicket:id="workItemClaimButton"/>
-    </div>
+    <a class="btn btn-danger" wicket:id="workItemRejectButton"/>
+    <a class="btn btn-success" wicket:id="workItemApproveButton"/>
+    <a class="btn btn-primary" wicket:id="workItemForwardButton"/>
+    <a class="btn btn-primary" wicket:id="workItemClaimButton"/>
 </wicket:panel>
 </html>
diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemActionsPanel.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemActionsPanel.java
@@ -10,7 +10,7 @@
 
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.model.IModel;
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
@@ -50,7 +50,6 @@ public class CaseWorkItemActionsPanel extends BasePanel<CaseWorkItemType> {
     private static final String ID_WORK_ITEM_REJECT_BUTTON = "workItemRejectButton";
     private static final String ID_WORK_ITEM_FORWARD_BUTTON = "workItemForwardButton";
     private static final String ID_WORK_ITEM_CLAIM_BUTTON = "workItemClaimButton";
-    private static final String ID_ACTION_BUTTONS = "actionButtons";
 
     public CaseWorkItemActionsPanel(String id, IModel<CaseWorkItemType> caseWorkItemModel) {
         super(id, caseWorkItemModel);
@@ -63,10 +62,9 @@ protected void onInitialize() {
     }
 
     private void initLayout() {
-        WebMarkupContainer actionButtonsContainer = new WebMarkupContainer(ID_ACTION_BUTTONS);
-        actionButtonsContainer.setOutputMarkupId(true);
-        actionButtonsContainer.add(new VisibleBehaviour(() -> CaseTypeUtil.isCaseWorkItemNotClosed(CaseWorkItemActionsPanel.this.getModelObject())));
-        add(actionButtonsContainer);
+        setOutputMarkupId(true);
+        add(AttributeAppender.append("class", "d-flex gap-2"));
+        add(new VisibleBehaviour(() -> CaseTypeUtil.isCaseWorkItemNotClosed(CaseWorkItemActionsPanel.this.getModelObject())));
 
         AjaxButton workItemApproveButton = new AjaxButton(ID_WORK_ITEM_APPROVE_BUTTON, getApproveButtonTitleModel()) {
             private static final long serialVersionUID = 1L;
@@ -82,7 +80,7 @@ public void onClick(AjaxRequestTarget ajaxRequestTarget) {
         };
         workItemApproveButton.add(new VisibleBehaviour(this::isApproveRejectButtonVisible));
         workItemApproveButton.setOutputMarkupId(true);
-        actionButtonsContainer.add(workItemApproveButton);
+        add(workItemApproveButton);
 
         AjaxButton workItemRejectButton = new AjaxButton(ID_WORK_ITEM_REJECT_BUTTON, getRejectButtonTitleModel()) {
             private static final long serialVersionUID = 1L;
@@ -97,7 +95,7 @@ public void onClick(AjaxRequestTarget ajaxRequestTarget) {
         };
         workItemRejectButton.setOutputMarkupId(true);
         workItemRejectButton.add(new VisibleBehaviour(this::isApproveRejectButtonVisible));
-        actionButtonsContainer.add(workItemRejectButton);
+        add(workItemRejectButton);
 
         AjaxButton workItemForwardButton = new AjaxButton(ID_WORK_ITEM_FORWARD_BUTTON,
                 createStringResource("pageWorkItem.button.forward")) {
@@ -110,7 +108,7 @@ public void onClick(AjaxRequestTarget ajaxRequestTarget) {
         };
         workItemForwardButton.setOutputMarkupId(true);
         workItemForwardButton.add(new VisibleBehaviour(this::isForwardButtonVisible));
-        actionButtonsContainer.add(workItemForwardButton);
+        add(workItemForwardButton);
 
         AjaxButton workItemClaimButton = new AjaxButton(ID_WORK_ITEM_CLAIM_BUTTON,
                 createStringResource("pageWorkItem.button.claim")) {
@@ -124,7 +122,7 @@ public void onClick(AjaxRequestTarget ajaxRequestTarget) {
         workItemClaimButton.add(new VisibleBehaviour(() -> isClaimButtonVisible()));
         workItemClaimButton.setOutputMarkupId(true);
 
-        actionButtonsContainer.add(workItemClaimButton);
+        add(workItemClaimButton);
     }
 
     private CaseWorkItemType getCaseWorkItemModelObject() {

diff --git a/...ain/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemListWithDetailsPanel.html b/...ain/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemListWithDetailsPanel.html
@@ -8,11 +8,9 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:extend>
-    <div class="row">
-        <div class="container-fluid prism-container">
-            <div class="pull-left btn btn-default" style="margin-right: 5px;" wicket:id="cancelButton"/>
-            <div wicket:id="caseWorkItemActionsPanel"/>
-        </div>
+    <div class="d-flex gap-2">
+        <a class="btn btn-default" wicket:id="cancelButton"/>
+        <div wicket:id="caseWorkItemActionsPanel"/>
     </div>
 </wicket:extend>
 </html>