From b5edfc9ad0438e1f7f0ce4ea232e84750e908bcc Mon Sep 17 00:00:00 2001
From: Zack Spear <hi@zackspear.com>
Date: Thu, 22 May 2025 12:59:14 -0700
Subject: [PATCH] fix: enhance layout consistency in CPU isolation, pinning,
 and VM pages

- Updated form structures in CPUisol.page, CPUpin.page, and CPUvms.page to use flex containers for button alignment.
- Removed unnecessary div wrappers to streamline layout.
- This change continues the effort to enhance visual consistency across the plugin.
---
 emhttp/plugins/dynamix/CPUisol.page            | 16 +++++++++++-----
 emhttp/plugins/dynamix/CPUpin.page             | 15 +++++++++++----
 emhttp/plugins/dynamix/CPUvms.page             | 15 +++++++++++----
 emhttp/plugins/dynamix/styles/default-base.css |  2 +-
 4 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/emhttp/plugins/dynamix/CPUisol.page b/emhttp/plugins/dynamix/CPUisol.page
index 5dc51c9fa..2ba376c90 100644
--- a/emhttp/plugins/dynamix/CPUisol.page
+++ b/emhttp/plugins/dynamix/CPUisol.page
@@ -15,9 +15,8 @@ Tag="icon-cpu"
 */
 ?>
 <form name="is">
-<input type="hidden" name="names" value="isolcpus">
+    <input type="hidden" name="names" value="isolcpus">
 
-<div class="TableContainer">
     <table class='tablesorter shift' style='width:auto'>
         <thead>
             <tr>
@@ -25,10 +24,17 @@ Tag="icon-cpu"
                 <?create()?>
             </tr>
         </thead>
-    <tbody id="table-is"><?=$spinner?></tbody>
+        <tbody id="table-is"><?=$spinner?></tbody>
     </table>
-</div>
-<input type="button" value="_(Apply)_" onclick="apply(this.form)" disabled><input type="button" value="_(Done)_" onclick="done()"><span id="wait-is" class="red-text" style="display:none"><i class="fa fa-spinner fa-spin"></i> _(Please wait)_...</span>
+
+    <div class="flex flex-row items-center gap-2">
+        <input type="button" value="_(Apply)_" onclick="apply(this.form)" disabled>
+        <input type="button" value="_(Done)_" onclick="done()">
+        <span id="wait-is" class="red-text" style="display:none">
+            <i class="fa fa-spinner fa-spin"></i>
+            <span>_(Please wait)_...</span>
+        </span>
+    </div>
 </form>
 <?if (!$safemode):?>
 <?else:?>
diff --git a/emhttp/plugins/dynamix/CPUpin.page b/emhttp/plugins/dynamix/CPUpin.page
index 29d8c0a18..01d34066e 100644
--- a/emhttp/plugins/dynamix/CPUpin.page
+++ b/emhttp/plugins/dynamix/CPUpin.page
@@ -16,8 +16,8 @@ Tag="icon-cpu"
 ?>
 <?if ($dockerd):?>
 <form name="ct">
-<input type="hidden" name="names" id="names-ct" value="">
-<div class="TableContainer">
+    <input type="hidden" name="names" id="names-ct" value="">
+
     <table class='tablesorter shift' style='width:auto'>
         <thead>
             <tr>
@@ -29,8 +29,15 @@ Tag="icon-cpu"
             <?=$spinner?>
         </tbody>
     </table>
-</div>
-<input type="button" value="_(Apply)_" onclick="apply(this.form)" disabled><input type="button" value="_(Done)_" onclick="done()"><span id="wait-ct" class="red-text" style="display:none"><i class="fa fa-spinner fa-spin"></i> _(Please wait)_...</span>
+
+    <div class="flex flex-row items-center gap-2">
+        <input type="button" value="_(Apply)_" onclick="apply(this.form)" disabled>
+        <input type="button" value="_(Done)_" onclick="done()">
+        <span id="wait-ct" class="red-text" style="display:none">
+            <i class="fa fa-spinner fa-spin"></i>
+            <span>_(Please wait)_...</span>
+        </span>
+    </div>
 </form>
 <?else:?>
 <div class="notice">_(No CPU pinning available. Docker service must be started)_</div>
diff --git a/emhttp/plugins/dynamix/CPUvms.page b/emhttp/plugins/dynamix/CPUvms.page
index a5e756c48..9a46ca3ac 100644
--- a/emhttp/plugins/dynamix/CPUvms.page
+++ b/emhttp/plugins/dynamix/CPUvms.page
@@ -310,8 +310,8 @@ $(function() {
 </script>
 <?if ($libvirtd):?>
 <form name="vm">
-<input type="hidden" name="names" id="names-vm" value="">
-<div class="TableContainer">
+	<input type="hidden" name="names" id="names-vm" value="">
+
 	<table class='tablesorter shift' style='width:auto'>
 		<thead>
 			<tr>
@@ -321,8 +321,15 @@ $(function() {
 		</thead>
 		<tbody id="table-vm"><?=$spinner?></tbody>
 	</table>
-</div>
-<input type="button" value="_(Apply)_" onclick="apply(this.form)" disabled><input type="button" value="_(Done)_" onclick="done()"><span id="wait-vm" class="red-text" style="display:none"><i class="fa fa-spinner fa-spin"></i> _(Please wait)_...</span>
+
+	<div class="flex flex-row items-center gap-2">
+		<input type="button" value="_(Apply)_" onclick="apply(this.form)" disabled>
+		<input type="button" value="_(Done)_" onclick="done()">
+		<span id="wait-vm" class="red-text" style="display:none">
+			<i class="fa fa-spinner fa-spin"></i>
+			<span>_(Please wait)_...</span>
+		</span>
+	</div>
 </form>
 <?else:?>
 <div class="notice">_(No CPU pinning available. VM service must be started)_</div>
diff --git a/emhttp/plugins/dynamix/styles/default-base.css b/emhttp/plugins/dynamix/styles/default-base.css
index 2eb6a4c05..7b2757b67 100644
--- a/emhttp/plugins/dynamix/styles/default-base.css
+++ b/emhttp/plugins/dynamix/styles/default-base.css
@@ -1268,7 +1268,7 @@ a.list {
     * Force remove any small empty space elements.
     * Necessary evil to prevent needing to rewrite .page file parsing and allow for a more responsive page.
     */
-    dt, dd, p, div, span {
+    dt, dd, p {
         &:empty {
             display: none !important;
             margin: 0 !important;