MID-6271 bulk page fixed

Evolveum · May 4, 2022 · 9631fde · 9631fde
1 parent fb6bd83
commit 9631fde
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 17 deletions.
diff --git a/gui/admin-gui/src/frontend/scss/midpoint-theme-variables.scss b/gui/admin-gui/src/frontend/scss/midpoint-theme-variables.scss
@@ -28,3 +28,5 @@ $object-shadow-color: #001F3F;
 $object-disabled-color: #BEBEBE;
 $object-access-color: #00a65a;
 $object-failed-color: #dd4b39;
+
+$legend-border-color: $gray-500;
diff --git a/gui/admin-gui/src/frontend/scss/midpoint-theme.scss b/gui/admin-gui/src/frontend/scss/midpoint-theme.scss
@@ -1811,10 +1811,11 @@ td .prism-property-value {
 
 fieldset.objectButtons {
 
-  //border-right: 1px solid $legend-border-color;
+  border-right: 1px solid $legend-border-color;
   padding: 0;
+  padding-right: 2rem;
   width: max-content;
-  margin-right: 10px;
+  margin-right: 2rem;
 
   > legend {
     font-size: 13px;
@@ -1823,6 +1824,10 @@ fieldset.objectButtons {
     width: auto;
     //color: $legend-color;
   }
+
+  &:last-of-type {
+    border-right: 0;
+  }
 }
 
 .execute-options {

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageBulkAction.html b/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageBulkAction.html
@@ -10,28 +10,30 @@
 <body>
 <wicket:extend>
     <form wicket:id="mainForm" class="form-horizontal">
-        <div class="form-group">
-            <label class="col-md-2 control-label"><wicket:message key="PageBulkAction.options"/></label>
-
-            <div class="col-md-8">
-                <div>
-                    <label class="col-md-2 checkbox-inline">
-                        <input type="checkbox" wicket:id="async">
-                        <wicket:message key="PageBulkAction.async"/>
-                    </label>
+        <!-- todo cleanup operation panel, make component out of it -->
+        <div class="card">
+            <div class="card-body">
+                <div class="d-flex flex-wrap">
+                    <fieldset class="objectButtons">
+                        <legend><wicket:message key="OperationalButtonsPanel.buttons.main"/></legend>
+                        <a class="btn btn-primary btn-sm" wicket:id="start"/>
+                    </fieldset>
+                    <fieldset class="objectButtons">
+                        <legend><wicket:message key="PageBulkAction.options"/></legend>
+                        <div class="form-check">
+                            <input class="form-check-input" type="checkbox" wicket:id="async">
+                            <label class="form-check-label"><wicket:message key="PageBulkAction.async"/></label>
+                        </div>
+                    </fieldset>
                 </div>
             </div>
         </div>
 
-        <div class="form-group">
-            <div class="col-md-12">
+        <div class="card">
+            <div class="card-body p-0">
                 <textarea wicket:id="editor"></textarea>
             </div>
         </div>
-
-        <div class="main-button-bar">
-            <a class="btn btn-primary" wicket:id="start"/>
-        </div>
     </form>
 </wicket:extend>
 </body>