From b26dcf36b859e3fdf5f2fa1a831d0615dee111d5 Mon Sep 17 00:00:00 2001
From: RD WebDesign <github@rdwebdesign.com.br>
Date: Wed, 19 Jul 2023 00:25:41 -0300
Subject: [PATCH] Settings pages: move level selector from top bar and add page
 titles

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
---
 scripts/pi-hole/lua/header_authenticated.lp | 8 --------
 scripts/pi-hole/lua/settings_header.lp      | 7 +++++++
 settings-advanced.lp                        | 4 ++++
 settings-api.lp                             | 4 ++++
 settings-dhcp.lp                            | 4 ++++
 settings-dns.lp                             | 4 ++++
 settings-dnsrecords.lp                      | 4 ++++
 settings-privacy.lp                         | 4 ++++
 settings-system.lp                          | 4 ++++
 settings-teleporter.lp                      | 4 ++++
 10 files changed, 39 insertions(+), 8 deletions(-)
 create mode 100644 scripts/pi-hole/lua/settings_header.lp

diff --git a/scripts/pi-hole/lua/header_authenticated.lp b/scripts/pi-hole/lua/header_authenticated.lp
index 48145a968..d147de84f 100644
--- a/scripts/pi-hole/lua/header_authenticated.lp
+++ b/scripts/pi-hole/lua/header_authenticated.lp
@@ -50,14 +50,6 @@ mg.include('header.lp','r')
             </a>
             <div class="navbar-custom-menu">
                 <ul class="nav navbar-nav">
-                <? if startsWith(scriptname, 'settings/') then ?>
-                    <li class="nav-item">
-                        <p class="navbar-text">
-                            Settings level: <select id="settings-level" class="form-control input-sm">
-                            </select>
-                        </p>
-                    </li>
-                <? end ?>
                     <li<? if string.len(hostname) == 0 then ?> class="hidden"<? end ?>>
                         <p class="navbar-text">
                             <span class="hidden-xs">hostname:</span>
diff --git a/scripts/pi-hole/lua/settings_header.lp b/scripts/pi-hole/lua/settings_header.lp
new file mode 100644
index 000000000..b0727caf9
--- /dev/null
+++ b/scripts/pi-hole/lua/settings_header.lp
@@ -0,0 +1,7 @@
+<!-- Title -->
+<div class="page-header flex-header">
+    <h1><?= PageTitle ?></h1>
+    <div class="settings-selector">
+        Settings level: <select id="settings-level" class="form-control input-sm"></select>
+    </div>
+</div>
diff --git a/settings-advanced.lp b/settings-advanced.lp
index 183206dbc..5302bade6 100644
--- a/settings-advanced.lp
+++ b/settings-advanced.lp
@@ -8,6 +8,10 @@
 --]]
 
 mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+
+-- Page title and level selector
+PageTitle = "Advanced Settings"
+mg.include('scripts/pi-hole/lua/settings_header.lp','r')
 ?>
 <div class="row settings-level-2" id="advanced-content">
     <!-- dynamically filled with content -->
diff --git a/settings-api.lp b/settings-api.lp
index e29863999..479da5601 100644
--- a/settings-api.lp
+++ b/settings-api.lp
@@ -8,6 +8,10 @@
 --]]
 
 mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+
+-- Page title and level selector
+PageTitle = "Web Interface - API Settings"
+mg.include('scripts/pi-hole/lua/settings_header.lp','r')
 ?>
 <div class="row">
     <div class="col-md-6 settings-level-1">
diff --git a/settings-dhcp.lp b/settings-dhcp.lp
index 56069c5a2..75178e0ed 100644
--- a/settings-dhcp.lp
+++ b/settings-dhcp.lp
@@ -8,6 +8,10 @@
 --]]
 
 mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+
+-- Page title and level selector
+PageTitle = "DHCP Settings"
+mg.include('scripts/pi-hole/lua/settings_header.lp','r')
 ?>
 <div class="row">
     <!-- DHCP Settings Box -->
diff --git a/settings-dns.lp b/settings-dns.lp
index 20c2fd7cc..4f756ca82 100644
--- a/settings-dns.lp
+++ b/settings-dns.lp
@@ -8,6 +8,10 @@
 --]]
 
 mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+
+-- Page title and level selector
+PageTitle = "DNS Settings"
+mg.include('scripts/pi-hole/lua/settings_header.lp','r')
 ?>
 <div class="row">
     <div class="col-lg-6">
diff --git a/settings-dnsrecords.lp b/settings-dnsrecords.lp
index e89d69929..993883e7b 100644
--- a/settings-dnsrecords.lp
+++ b/settings-dnsrecords.lp
@@ -8,6 +8,10 @@
 --]]
 
 mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+
+-- Page title and level selector
+PageTitle = "Local DNS Settings"
+mg.include('scripts/pi-hole/lua/settings_header.lp','r')
 ?>
 <div class="row">
     <div class="col-md-6 settings-level-1">
diff --git a/settings-privacy.lp b/settings-privacy.lp
index f1b2e2086..ec7ecb9a8 100644
--- a/settings-privacy.lp
+++ b/settings-privacy.lp
@@ -8,6 +8,10 @@
 --]]
 
 mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+
+-- Page title and level selector
+PageTitle = "Privacy Settings"
+mg.include('scripts/pi-hole/lua/settings_header.lp','r')
 ?>
 <div class="row">
     <div class="col-md-6 settings-level-0">
diff --git a/settings-system.lp b/settings-system.lp
index 31647f3d5..e3757c4c4 100644
--- a/settings-system.lp
+++ b/settings-system.lp
@@ -8,6 +8,10 @@
 --]]
 
 mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+
+-- Page title and level selector
+PageTitle = "System Settings"
+mg.include('scripts/pi-hole/lua/settings_header.lp','r')
 ?>
 <div class="row">
     <div class="col-md-6">
diff --git a/settings-teleporter.lp b/settings-teleporter.lp
index 059a396f6..761f54cdc 100644
--- a/settings-teleporter.lp
+++ b/settings-teleporter.lp
@@ -8,6 +8,10 @@
 --]]
 
 mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+
+-- Page title and level selector
+PageTitle = "Teleporter"
+mg.include('scripts/pi-hole/lua/settings_header.lp','r')
 ?>
 <div class="row">
     <div class="col-md-6">