From f850264ab4e8d2d869a1f66ba7a9b6aa6d22a37d Mon Sep 17 00:00:00 2001
From: Dalen <dalencattmlsp@gmail.com>
Date: Sat, 1 Jan 2022 14:54:06 -0800
Subject: [PATCH] Fixed a typo and split DHCP page into different boxes.

Signed-off-by: Dalen <dalencattmlsp@gmail.com>
---
 scripts/pi-hole/js/settings.js |  4 ++--
 settings.php                   | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js
index e2751902..3663822f 100644
--- a/scripts/pi-hole/js/settings.js
+++ b/scripts/pi-hole/js/settings.js
@@ -227,7 +227,7 @@ var leasetable, staticleasetable;
 $(function () {
   if (document.getElementById("DHCPLeasesTable")) {
     leasetable = $("#DHCPLeasesTable").DataTable({
-      dom: 
+      dom:
         "<'row'<'col-sm-4'l><'col-sm-8'f>>" +
         "<'row'<'col-sm-12'<'table-responsive'tr>>>" +
         "<'row'<'col-sm-5'i><'col-sm-7'p>>",
@@ -257,7 +257,7 @@ $(function () {
 
   if (document.getElementById("DHCPStaticLeasesTable")) {
     staticleasetable = $("#DHCPStaticLeasesTable").DataTable({
-      dom: 
+      dom:
         "<'row'<'col-sm-4'l><'col-sm-8'f>>" +
         "<'row'<'col-sm-12'<'table-responsive'tr>>>" +
         "<'row'<'col-sm-5'i><'col-sm-7'p>>",
diff --git a/settings.php b/settings.php
index c9a15c96..e3e808de 100644
--- a/settings.php
+++ b/settings.php
@@ -614,12 +614,11 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "dns", "piho
                             <div class="col-md-12">
                                 <div class="box box-warning">
                                     <div class="box-header with-border">
-                                        <h3 class="box-title">DHCP leases</h3>
+                                        <h3 class="box-title">Currently active DHCP leases</h3>
                                     </div>
                                     <div class="box-body">
                                         <div class="row">
                                             <div class="col-md-12">
-                                                <label>Currently active DHCP leases</label>
                                                 <table id="DHCPLeasesTable" class="table table-striped table-bordered nowrap" width="100%">
                                                     <thead>
                                                         <tr>
@@ -648,10 +647,19 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "dns", "piho
                                                         <?php } ?>
                                                     </tbody>
                                                 </table>
-                                                <br>
                                             </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-md-12">
+                                <div class="box box-warning">
+                                    <div class="box-header with-border">
+                                        <h3 class="box-title">Static DHCP leases configuration</h3>
+                                    </div>
+                                    <div class="box-body">
+                                        <div class="row">
                                             <div class="col-md-12">
-                                                <label>Static DHCP leases configuration</label>
                                                 <table id="DHCPStaticLeasesTable" class="table table-striped table-bordered nowrap" width="100%">
                                                     <thead>
                                                     <tr>