From 6e3d66ed36cf4a4df1d5c35c3e7276393d2c92f1 Mon Sep 17 00:00:00 2001
From: Zack Spear <hi@zackspear.com>
Date: Fri, 5 Sep 2025 12:10:01 -0700
Subject: [PATCH 1/4] refactor: update ShareEdit.page and related styles

- Added a new form element in ShareEdit.page to enhance share editing functionality.
- Removed unnecessary CSS rules from ShareEdit.css to streamline styling.
- Adjusted padding in default-base.css for better layout consistency.
---
 emhttp/plugins/dynamix/ShareEdit.page          | 2 +-
 emhttp/plugins/dynamix/sheets/ShareEdit.css    | 7 -------
 emhttp/plugins/dynamix/styles/default-base.css | 6 +-----
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/emhttp/plugins/dynamix/ShareEdit.page b/emhttp/plugins/dynamix/ShareEdit.page
index b82da1cfd..026a2013e 100644
--- a/emhttp/plugins/dynamix/ShareEdit.page
+++ b/emhttp/plugins/dynamix/ShareEdit.page
@@ -335,6 +335,7 @@ $filteredShares = array_filter($shares, function($list) use ($name) {
 :share_edit_global2_help:
 <?endif;?>
 
+<form class="relative" markdown="1" name="share_edit" method="POST" action="/update.htm" target="progressFrame" onsubmit="return prepareEdit()"<?=$name?" onchange=\"toggleButton('writeshare',true);$('#s5').dropdownchecklist('disable')\">":">"?>
 <?if ($share['hasCfg']!='similar'):?>
 <?if (!empty($filteredShares)):?>
 <div markdown="1" class="clone-settings shade">
@@ -371,7 +372,6 @@ _(Write settings to)_ <i class="fa fa-arrow-right fa-fw"></i>
 <?endif;?>
 <?endif;?>
 
-<form markdown="1" name="share_edit" method="POST" action="/update.htm" target="progressFrame" onsubmit="return prepareEdit()"<?=$name?" onchange=\"toggleButton('writeshare',true);$('#s5').dropdownchecklist('disable')\">":">"?>
 <input type="hidden" name="shareNameOrig" value="<?=htmlspecialchars($share['nameOrig'])?>">
 <input type="hidden" name="shareUseCache" value="<?=$share['useCache']?>">
 <input type="hidden" name="shareCachePool2" value="<?=$share['cachePool2']?>">
diff --git a/emhttp/plugins/dynamix/sheets/ShareEdit.css b/emhttp/plugins/dynamix/sheets/ShareEdit.css
index 9d4e58aa7..7cc6306bc 100644
--- a/emhttp/plugins/dynamix/sheets/ShareEdit.css
+++ b/emhttp/plugins/dynamix/sheets/ShareEdit.css
@@ -12,10 +12,3 @@
 i.fa-info.i {
     margin-right: 10px;
 }
-
-.Theme--black,
-.Theme--white {
-    form[name="share_edit"] {
-        margin-top: -20px;
-    }
-}
diff --git a/emhttp/plugins/dynamix/styles/default-base.css b/emhttp/plugins/dynamix/styles/default-base.css
index 3bf522d25..43b232bd3 100644
--- a/emhttp/plugins/dynamix/styles/default-base.css
+++ b/emhttp/plugins/dynamix/styles/default-base.css
@@ -2152,7 +2152,7 @@ span#wlan0 {
         right: 0;
         width: 40rem;
         margin: 0;
-        padding: 3rem 1rem 0 0;
+        padding: 1rem;
         background-color: transparent;
 
         dl {
@@ -2160,10 +2160,6 @@ span#wlan0 {
             gap: 1.5rem 1rem;
         }
     }
-
-    .clone-settings-less-padding {
-        padding-top: 1rem;
-    }
 }
 
 /* plugin overrides */

From 401f775fc0b2284af20d0a6c5a9fb10814a6721b Mon Sep 17 00:00:00 2001
From: Zack Spear <hi@zackspear.com>
Date: Fri, 5 Sep 2025 12:10:24 -0700
Subject: [PATCH 2/4] refactor: simplify clone-settings markup in
 SecurityNFS.page and SecuritySMB.page

- Removed unnecessary 'clone-settings-less-padding' class from the clone-settings div in both SecurityNFS.page and SecuritySMB.page to streamline the layout.
---
 emhttp/plugins/dynamix/SecurityNFS.page | 2 +-
 emhttp/plugins/dynamix/SecuritySMB.page | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/emhttp/plugins/dynamix/SecurityNFS.page b/emhttp/plugins/dynamix/SecurityNFS.page
index a625b9462..521ced8b2 100644
--- a/emhttp/plugins/dynamix/SecurityNFS.page
+++ b/emhttp/plugins/dynamix/SecurityNFS.page
@@ -22,7 +22,7 @@ $sec_nfs[$name]['hostList']	= str_replace(" ", "\n", $sec_nfs[$name]['hostList']
 :nfs_security_help:
 
 <div markdown="1" class="relative">
-<div markdown="1" class="clone-settings clone-settings-less-padding shade">
+<div markdown="1" class="clone-settings shade">
 _(Read settings from)_ <i class="fa fa-arrow-left fa-fw"></i>
 : <span class="flex flex-row items-center gap-4">
 	<select name="readnfs" onchange="toggleButton('readnfs',false)">
diff --git a/emhttp/plugins/dynamix/SecuritySMB.page b/emhttp/plugins/dynamix/SecuritySMB.page
index 0fb9871c2..98862bc18 100644
--- a/emhttp/plugins/dynamix/SecuritySMB.page
+++ b/emhttp/plugins/dynamix/SecuritySMB.page
@@ -145,7 +145,7 @@ _(Security)_:
 :smb_secure_access_help:
 
 <div markdown="1" class="relative">
-<div markdown="1" class="clone-settings clone-settings-less-padding shade">
+<div markdown="1" class="clone-settings shade">
 _(Read settings from)_ <i class="fa fa-arrow-left fa-fw"></i>
 : <span class="flex flex-row items-center gap-4">
 	<select name="readusersmb" onchange="toggleButton('readusersmb',false)">
@@ -208,7 +208,7 @@ _(Write settings to)_ <i class="fa fa-arrow-right fa-fw"></i>
 :smb_private_access_help:
 
 <div markdown="1" class="relative">
-<div markdown="1" class="clone-settings clone-settings-less-padding shade">
+<div markdown="1" class="clone-settings shade">
 _(Read settings from)_ <i class="fa fa-arrow-left fa-fw"></i>
 : <span class="flex flex-row items-center gap-4">
 	<select name="readusersmb" onchange="toggleButton('readusersmb',false)">

From 0387b08d3b1143738c6440aa303aad50499428e5 Mon Sep 17 00:00:00 2001
From: Zack Spear <hi@zackspear.com>
Date: Fri, 5 Sep 2025 12:24:55 -0700
Subject: [PATCH 3/4] refactor: adjust form structure in ShareEdit.page

- Wrapped the existing form element in a div for improved layout consistency.
- Ensured proper markdown usage for the form and surrounding elements.
---
 emhttp/plugins/dynamix/ShareEdit.page | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/ShareEdit.page b/emhttp/plugins/dynamix/ShareEdit.page
index 026a2013e..8db8ddfc3 100644
--- a/emhttp/plugins/dynamix/ShareEdit.page
+++ b/emhttp/plugins/dynamix/ShareEdit.page
@@ -335,7 +335,7 @@ $filteredShares = array_filter($shares, function($list) use ($name) {
 :share_edit_global2_help:
 <?endif;?>
 
-<form class="relative" markdown="1" name="share_edit" method="POST" action="/update.htm" target="progressFrame" onsubmit="return prepareEdit()"<?=$name?" onchange=\"toggleButton('writeshare',true);$('#s5').dropdownchecklist('disable')\">":">"?>
+<div markdown="1" class="relative">
 <?if ($share['hasCfg']!='similar'):?>
 <?if (!empty($filteredShares)):?>
 <div markdown="1" class="clone-settings shade">
@@ -372,6 +372,7 @@ _(Write settings to)_ <i class="fa fa-arrow-right fa-fw"></i>
 <?endif;?>
 <?endif;?>
 
+<form markdown="1" name="share_edit" method="POST" action="/update.htm" target="progressFrame" onsubmit="return prepareEdit()"<?=$name?" onchange=\"toggleButton('writeshare',true);$('#s5').dropdownchecklist('disable')\">":">"?>
 <input type="hidden" name="shareNameOrig" value="<?=htmlspecialchars($share['nameOrig'])?>">
 <input type="hidden" name="shareUseCache" value="<?=$share['useCache']?>">
 <input type="hidden" name="shareCachePool2" value="<?=$share['cachePool2']?>">
@@ -600,6 +601,7 @@ _(Mover action)_:
 </div>
 <?endif;?>
 </form>
+</div>
 
 <script>
 let form = document.share_edit;

From ac5ca07301daa8e157ff656b6b1ecce57f0fb9c4 Mon Sep 17 00:00:00 2001
From: Zack Spear <hi@zackspear.com>
Date: Fri, 5 Sep 2025 12:30:40 -0700
Subject: [PATCH 4/4] fix: correct typo in ShareEdit.page warning message

- Changed "Case-insensitve" to "Case-insensitive" in the warning message for clarity.
---
 emhttp/plugins/dynamix/ShareEdit.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/ShareEdit.page b/emhttp/plugins/dynamix/ShareEdit.page
index 8db8ddfc3..da7d6d352 100644
--- a/emhttp/plugins/dynamix/ShareEdit.page
+++ b/emhttp/plugins/dynamix/ShareEdit.page
@@ -595,7 +595,7 @@ _(Mover action)_:
 	<input type="submit" id="cmdEditShare" name="cmdEditShare" value="_(Apply)_" onclick="if (this.value=='_(Delete)_') this.value='Delete'; else this.value='Apply'; return handleDeleteClick(this)" disabled>
 	<input type="button" value="_(Done)_" onclick="done()">
         <?if ($share['hasCfg']=='similar'):?>
-                <span class="orange-text"><i class="fa fa-warning"></i> _(Case-insensitve Share name is not unique)_</span>
+                <span class="orange-text"><i class="fa fa-warning"></i> _(Case-insensitive Share name is not unique)_</span>
         <?endif;?>
   </span>
 </div>