Reorder settings sections and move rules to bottom

Author: alexphillips-dev

CHANGELOG-fixes.md

@@ -1,5 +1,11 @@
 # FolderView Plus Changelog
 
+## Version 2026.03.05.5
+
+- Move VMs directly below Docker in settings for a cleaner reading order.
+- Move Docker and VM auto-assignment rule editors into one dedicated bottom section.
+- Preserve existing auto-assignment behavior while improving layout clarity.
+
 ## Version 2026.03.05.4
 
 - Rework Docker/VM settings layout into clearer sections for actions, sorting, tables, and auto-assignment rules.

archive/folderview.plus-2026.03.05.5.txz

@@ -6,13 +6,18 @@
 <!ENTITY launch "Settings/FolderViewPlus">
 <!ENTITY plugdir "/usr/local/emhttp/plugins/&name;">
 <!ENTITY pluginURL "https://raw.githubusercontent.com/&github;/main/folderview.plus.plg">
-<!ENTITY version "2026.03.05.4">
-<!ENTITY md5 "689d0ab157bd57cdeb1f78c33aacb837">
+<!ENTITY version "2026.03.05.5">
+<!ENTITY md5 "b4f90f1ec6b356adda4fc4b69aa9277c">
 ]>
 
 <PLUGIN name="&name;" author="&author;" version="&version;" launch="&launch;" pluginURL="&pluginURL;" icon="folder-open-o" support="https://github.com/alexphillips-dev/FolderView-Plus/issues" min="7.0.0">
     <CHANGES>
 
+###2026.03.05.5
+- Move VMs directly below Docker in settings for clearer top-to-bottom workflow.
+- Move Docker and VM auto-assignment rule editors into a single dedicated section at the bottom.
+- Keep existing rule behavior and IDs while improving visual grouping.
+
 ###2026.03.05.4
 - Rework Docker/VM settings layout into clearer sections: actions, sort controls, folder table, and auto-assignment rules.
 - Replace stretched full-width controls with grouped, consistent button rows and responsive spacing.

folderview.plus.plg

@@ -63,33 +63,6 @@ require_once('/usr/local/emhttp/plugins/folderview.plus/langs/script.php');
             </tbody>
         </table>
     </div>
-    <div class="rules-panel">
-        <div class="rules-header">
-            <h3>Auto-assignment rules</h3>
-            <span class="rules-help">Automatically place new containers into folders.</span>
-        </div>
-        <div class="rules-editor">
-            <select id="docker-rule-folder"></select>
-            <select id="docker-rule-kind" onchange="toggleRuleKindFields('docker')">
-                <option value="name_regex">Name regex</option>
-                <option value="label">Docker label</option>
-            </select>
-            <input id="docker-rule-pattern" type="text" placeholder="Regex pattern (example: ^media-)">
-            <input id="docker-rule-label-key" type="text" placeholder="Label key (example: com.example.stack)" style="display:none;">
-            <input id="docker-rule-label-value" type="text" placeholder="Label value (optional, blank means any value)" style="display:none;">
-            <button class="rules-add-btn" onclick="addAutoRule('docker')"><i class="fa fa-plus"></i> Add rule</button>
-        </div>
-        <table class="rules-table">
-            <thead>
-                <tr>
-                    <th>Folder</th>
-                    <th>Match</th>
-                    <th>Action</th>
-                </tr>
-            </thead>
-            <tbody id="docker-rules"></tbody>
-        </table>
-    </div>
 </div>
 <hr>
 
@@ -133,9 +106,42 @@ require_once('/usr/local/emhttp/plugins/folderview.plus/langs/script.php');
             </tbody>
         </table>
     </div>
+</div>
+<hr>
+
+<h2>Auto-assignment rules</h2>
+<div class="rules-bottom-grid">
     <div class="rules-panel">
         <div class="rules-header">
-            <h3>Auto-assignment rules</h3>
+            <h3>Docker rules</h3>
+            <span class="rules-help">Automatically place new containers into folders.</span>
+        </div>
+        <div class="rules-editor">
+            <select id="docker-rule-folder"></select>
+            <select id="docker-rule-kind" onchange="toggleRuleKindFields('docker')">
+                <option value="name_regex">Name regex</option>
+                <option value="label">Docker label</option>
+            </select>
+            <input id="docker-rule-pattern" type="text" placeholder="Regex pattern (example: ^media-)">
+            <input id="docker-rule-label-key" type="text" placeholder="Label key (example: com.example.stack)" style="display:none;">
+            <input id="docker-rule-label-value" type="text" placeholder="Label value (optional, blank means any value)" style="display:none;">
+            <button class="rules-add-btn" onclick="addAutoRule('docker')"><i class="fa fa-plus"></i> Add rule</button>
+        </div>
+        <table class="rules-table">
+            <thead>
+                <tr>
+                    <th>Folder</th>
+                    <th>Match</th>
+                    <th>Action</th>
+                </tr>
+            </thead>
+            <tbody id="docker-rules"></tbody>
+        </table>
+    </div>
+
+    <div class="rules-panel">
+        <div class="rules-header">
+            <h3>VM rules</h3>
             <span class="rules-help">Automatically place new VMs into folders.</span>
         </div>
         <div class="rules-editor">
@@ -158,7 +164,6 @@ require_once('/usr/local/emhttp/plugins/folderview.plus/langs/script.php');
         </table>
     </div>
 </div>
-<hr>
 
 <div id="import-preview-dialog" style="display:none;">
     <p><strong>Import summary</strong></p>

src/folderview.plus/usr/local/emhttp/plugins/folderview.plus/FolderViewPlus.page

@@ -133,6 +133,13 @@
     background: rgba(255, 255, 255, 0.015);
 }
 
+.rules-bottom-grid {
+    display: grid;
+    grid-template-columns: 1fr;
+    gap: 0.85rem;
+    margin-bottom: 1rem;
+}
+
 .rules-header {
     display: flex;
     flex-wrap: wrap;
@@ -215,6 +222,12 @@
     }
 }
 
+@media (min-width: 1320px) {
+    .rules-bottom-grid {
+        grid-template-columns: 1fr 1fr;
+    }
+}
+
 @media (max-width: 760px) {
     .toolbar-actions > button {
         flex: 1 1 calc(50% - 0.5rem);