Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-20 02:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove settings-level-1 and rename level 0 to basic, level 2 to expert

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2023-11-29 13:11:27 +01:00
parent ceb1118c0b
commit ce96e15d59
11 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/pi-hole/js/footer.js
View File

@@ -681,13 +681,11 @@ function initSettingsLevel() {
function applyExpertSettings() {
if (localStorage.getItem("expert_settings") === "true") {
$(".settings-level-0").show();
$(".settings-level-1").show();
$(".settings-level-2").show();
$(".settings-level-basic").show();
$(".settings-level-expert").show();
} else {
$(".settings-level-0").show();
$(".settings-level-1").hide();
$(".settings-level-2").hide();
$(".settings-level-basic").show();
$(".settings-level-expert").hide();
}
}

2
scripts/pi-hole/js/settings-advanced.js
View File

@@ -327,7 +327,7 @@ function createDynamicConfigTabs() {
$("#advanced-overlay").hide();
$("#advanced-content").append(
'<div class="col-lg-12 settings-level-1">' +
'<div class="col-lg-12 settings-level-expert">' +
'<button type="button" class="btn btn-primary save-button" id="save"><i class="fa-solid fa-fw fa-floppy-disk"></i>&nbsp;Save & Apply</button>' +
"</div>"
);

4
scripts/pi-hole/lua/sidebar.lp
View File

@@ -163,12 +163,12 @@
<i class="fa-fw menu-icon fa-solid fa-file-export"></i> <span>Teleporter</span>
</a>
</li>
<li class="<? if scriptname == 'settings/dnsrecords' then ?> active<? end ?> settings-level-1">
<li class="<? if scriptname == 'settings/dnsrecords' then ?> active<? end ?> settings-level-expert">
<a href="<?=webhome?>settings/dnsrecords">
<i class="fa-fw menu-icon fa-solid fa-address-book"></i> <span>Local DNS Records</span>
</a>
</li>
<li class="<? if scriptname == 'settings/all' then ?> active<? end ?> settings-level-2">
<li class="<? if scriptname == 'settings/all' then ?> active<? end ?> settings-level-expert">
<a href="<?=webhome?>settings/all">
<i class="fa-fw menu-icon fa-solid fa-pen-to-square"></i> <span>All settings</span>
</a>

4
settings-all.lp
View File

@@ -13,12 +13,12 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
PageTitle = "All Settings"
mg.include('scripts/pi-hole/lua/settings_header.lp','r')
?>
<div class="row settings-level-2" id="advanced-content">
<div class="row settings-level-expert" id="advanced-content">
<!-- dynamically filled with content -->
<div class="overlay" id="advanced-overlay">
<i class="fa fa-sync fa-spin"></i>
</div>
<div class="col-lg-12 settings-level-2">
<div class="col-lg-12 settings-level-expert">
<button type="button" class="btn btn-primary save-button"><i class="fa-solid fa-fw fa-floppy-disk"></i>&nbsp;Save & Apply</button>
</div>
</div>

12
settings-api.lp
View File

@@ -14,9 +14,9 @@ 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-0">
<div class="col-md-6 settings-level-basic">
<div class="row">
<div class="col-md-12 settings-level-1">
<div class="col-md-12 settings-level-expert">
<div class="box box-warning">
<div class="box-header with-border">
<h3 class="box-title" data-configkeys="webserver.api.excludeDomains webserver.api.excludeClients">Exclusions</h3>
@@ -37,7 +37,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
</div>
</div>
</div>
<div class="col-md-12 settings-level-0">
<div class="col-md-12 settings-level-basic">
<div class="box box-warning">
<div class="box-header with-border">
<h3 class="box-title" data-configkeys="webserver.interface.theme webserver.interface.boxed">Theme settings</h3>
@@ -89,7 +89,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
</div>
</div>
</div>-->
<div class="col-md-6 settings-level-1">
<div class="col-md-6 settings-level-expert">
<div class="box box-warning">
<div class="box-header with-border">
<h3 class="box-title" data-configkeys="webserver.api.localAPIauth webserver.api.prettyJSON webserver.api.allow_destructive webserver.api.temp.limit webserver.api.temp.unit">Advanced Settings</h3>
@@ -146,7 +146,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
</div>
</div>
</div>
<div class="col-md-12 settings-level-2">
<div class="col-md-12 settings-level-expert">
<div class="box box-warning">
<div class="box-header with-border">
<h3 class="box-title">Currently active sessions</h3>
@@ -177,7 +177,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
</div>
</div>
</div>
<div class="col-lg-12 settings-level-0">
<div class="col-lg-12 settings-level-basic">
<button type="button" class="btn btn-primary save-button"><i class="fa-solid fa-fw fa-floppy-disk"></i>&nbsp;Save & Apply</button>
</div>
</div>

8
settings-dhcp.lp
View File

@@ -15,7 +15,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
?>
<div class="row">
<!-- DHCP Settings Box -->
<div class="col-md-6 settings-level-0">
<div class="col-md-6 settings-level-basic">
<div class="box box-warning">
<div class="box-header with-border">
<h3 class="box-title" data-configkeys="dhcp.active dhcp.start dhcp.end dhcp.router dhcp.ipv6">DHCP Settings</h3>
@@ -79,7 +79,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
</div>
</div>
</div>
<div class="col-md-6 settings-level-1">
<div class="col-md-6 settings-level-expert">
<div class="box box-warning">
<div class="box-header with-border">
<h3 class="box-title" data-configkeys="dhcp.leaseTime dhcp.rapidCommit dhcp.multiDNS">Advanced DHCP Settings</h3>
@@ -144,7 +144,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
</div>
</div>
</div>
<div class="col-md-12 settings-level-2">
<div class="col-md-12 settings-level-expert">
<div class="box box-warning">
<div class="box-header with-border">
<h3 class="box-title" data-configkeys="dhcp.hosts">Static DHCP configuration</h3>
@@ -200,7 +200,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
</div>
</div>
</div>
<div class="col-lg-12 settings-level-0">
<div class="col-lg-12 settings-level-basic">
<button type="button" class="btn btn-primary save-button"><i class="fa-solid fa-fw fa-floppy-disk"></i>&nbsp;Save & Apply</button>
</div>
</div>

8
settings-dns.lp
View File

@@ -57,7 +57,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
</div>
</div>
</div>
<div class="box box-warning settings-level-1">
<div class="box box-warning settings-level-expert">
<div class="box-header with-border">
<h3 class="box-title" data-configkeys="dns.revServer.active dns.revServer.cidr dns.revServer.target dns.revServer.domain">Conditional forwarding</h3>
</div>
@@ -122,7 +122,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
</div>
</div>
</div>
<div class="col-lg-6 settings-level-1">
<div class="col-lg-6 settings-level-expert">
<div class="box box-warning">
<div class="box-header with-border">
<h1 class="box-title" data-configkeys="dns.listeningMode">Interface settings</h1>
@@ -233,7 +233,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
</div>
</div>
</div>
<div class="box box-warning settings-level-2">
<div class="box box-warning settings-level-expert">
<div class="box-header with-border">
<h3 class="box-title" data-configkeys="dns.rateLimit.count dns.rateLimit.interval">Rate-limiting</h3>
</div>
@@ -258,7 +258,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
</div>
</div>
</div>
<div class="col-lg-12 settings-level-0">
<div class="col-lg-12 settings-level-basic">
<button type="button" class="btn btn-primary save-button"><i class="fa-solid fa-fw fa-floppy-disk"></i>&nbsp;Save & Apply</button>
</div>
</div>

4
settings-dnsrecords.lp
View File

@@ -14,7 +14,7 @@ PageTitle = "Local DNS Settings"
mg.include('scripts/pi-hole/lua/settings_header.lp','r')
?>
<div class="row">
<div class="col-md-12 col-lg-6 settings-level-1">
<div class="col-md-12 col-lg-6 settings-level-expert">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title" id="title-hosts" data-configkeys="dns.hosts">Local DNS records</h3>
@@ -56,7 +56,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
</div>
</div>
</div>
<div class="col-md-12 col-lg-6 settings-level-1">
<div class="col-md-12 col-lg-6 settings-level-expert">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title" id="title-cnameRecords" data-configkeys="dns.cnameRecords">Local CNAME records records</h3>

8
settings-privacy.lp
View File

@@ -14,7 +14,7 @@ PageTitle = "Privacy Settings"
mg.include('scripts/pi-hole/lua/settings_header.lp','r')
?>
<div class="row">
<div class="col-md-6 settings-level-0">
<div class="col-md-6 settings-level-basic">
<div class="row">
<div class="col-md-12">
<div class="box box-warning">
@@ -34,7 +34,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
</div>
</div>
</div>
<div class="col-md-12 settings-level-2">
<div class="col-md-12 settings-level-expert">
<div class="box box-warning">
<div class="box-header with-border">
<h3 class="box-title" data-configkeys="database.DBimport database.DBexport database.maxDBdays database.network.expire">Privacy-related database settings</h3>
@@ -68,7 +68,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
</div>
</div>
</div>
<div class="col-md-6 settings-level-1">
<div class="col-md-6 settings-level-expert">
<div class="box box-warning">
<div class="box-header with-border">
<h3 class="box-title" data-configkeys="misc.privacylevel">Query Anonymization ("Privacy Level")</h3>
@@ -103,7 +103,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
</div>
</div>
</div>
<div class="col-lg-12 settings-level-0">
<div class="col-lg-12 settings-level-basic">
<button type="button" class="btn btn-primary save-button"><i class="fa-solid fa-fw fa-floppy-disk"></i>&nbsp;Save & Apply</button>
</div>
</div>

12
settings-system.lp
View File

@@ -61,7 +61,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
<i class="fa fa-sync fa-spin"></i>
</div>
</div>
<div class="box settings-level-2">
<div class="box settings-level-expert">
<div class="box-header with-border">
<h3 class="box-title">DHCP server metrics</h3>
</div>
@@ -163,7 +163,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
</div>
</div>
<div class="col-md-6">
<div class="box settings-level-1" id="cache-metrics">
<div class="box settings-level-expert" id="cache-metrics">
<div class="box-header with-border">
<h3 class="box-title">DNS cache metrics</h3>
</div>
@@ -210,7 +210,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
</tr>
</tbody>
</table>
<!-- <table class="table table-striped table-bordered nowrap settings-level-2">
<!-- <table class="table table-striped table-bordered nowrap settings-level-expert">
<tbody id="dns-cache-table">
</tbody>
</table> -->
@@ -263,7 +263,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
</th>
<td id="sysinfo-dns-replies-unanswered">&nbsp;</td>
</tr>
<tr class="settings-level-2">
<tr class="settings-level-expert">
<th scope="row">
<span>Authoritative replies:</span>
</th>
@@ -279,7 +279,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
</div>
</div>
</div>
<div class="col-md-12 settings-level-1">
<div class="col-md-12 settings-level-expert">
<div class="box box-warning">
<div class="box-header with-border">
<h3 class="box-title">Actions<span id="actions-title"></span></h3>
@@ -295,7 +295,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
<div class="col-xs-12 col-md-6 col-lg-3">
<button type="button" class="btn btn-danger confirm-flusharp btn-block button-pad destructive_action" disabled="true">Flush network table</button>
</div>
<div class="col-xs-12 col-md-6 col-lg-3 settings-level-2">
<div class="col-xs-12 col-md-6 col-lg-3 settings-level-expert">
<button type="button" class="btn btn-danger confirm-flushlogs btn-block button-pad destructive_action" disabled="true">Flush logs (last 24 hours)</button>
</div>
</div>

6
style/pi-hole.css
View File

@@ -1148,15 +1148,15 @@ table.dataTable tbody > tr > .selected {
z-index: 10;
}
.settings-level-0 {
.settings-level-basic {
display: none;
}
.settings-level-1 {
.settings-level-expert {
display: none;
}
.settings-level-2 {
.settings-level-expert {
display: none;
}