diff --git a/scripts/pi-hole/js/footer.js b/scripts/pi-hole/js/footer.js index e5909737..8f0189de 100644 --- a/scripts/pi-hole/js/footer.js +++ b/scripts/pi-hole/js/footer.js @@ -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(); } } diff --git a/scripts/pi-hole/js/settings-advanced.js b/scripts/pi-hole/js/settings-advanced.js index 81a9ba11..c60c4acf 100644 --- a/scripts/pi-hole/js/settings-advanced.js +++ b/scripts/pi-hole/js/settings-advanced.js @@ -327,7 +327,7 @@ function createDynamicConfigTabs() { $("#advanced-overlay").hide(); $("#advanced-content").append( - '
' + + '
' + '' + "
" ); diff --git a/scripts/pi-hole/lua/sidebar.lp b/scripts/pi-hole/lua/sidebar.lp index 9efe9ddc..7b20d99a 100644 --- a/scripts/pi-hole/lua/sidebar.lp +++ b/scripts/pi-hole/lua/sidebar.lp @@ -163,12 +163,12 @@ Teleporter -
  • +
  • Local DNS Records
  • -
  • +
  • All settings diff --git a/settings-all.lp b/settings-all.lp index 720cb633..1bb13259 100644 --- a/settings-all.lp +++ b/settings-all.lp @@ -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') ?> -
    +
    -
    +
    diff --git a/settings-api.lp b/settings-api.lp index 695bd278..fdcb956f 100644 --- a/settings-api.lp +++ b/settings-api.lp @@ -14,9 +14,9 @@ PageTitle = "Web Interface - API Settings" mg.include('scripts/pi-hole/lua/settings_header.lp','r') ?>
    -
    +
    -
    +

    Exclusions

    @@ -37,7 +37,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    -
    +

    Theme settings

    @@ -89,7 +89,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    --> -
    +

    Advanced Settings

    @@ -146,7 +146,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    -
    +

    Currently active sessions

    @@ -177,7 +177,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    -
    +
    diff --git a/settings-dhcp.lp b/settings-dhcp.lp index c1a57129..542f6550 100644 --- a/settings-dhcp.lp +++ b/settings-dhcp.lp @@ -15,7 +15,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r') ?>
    -
    +

    DHCP Settings

    @@ -79,7 +79,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    -
    +

    Advanced DHCP Settings

    @@ -144,7 +144,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    -
    +

    Static DHCP configuration

    @@ -200,7 +200,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    -
    +
    diff --git a/settings-dns.lp b/settings-dns.lp index bc77cf75..acd05dbf 100644 --- a/settings-dns.lp +++ b/settings-dns.lp @@ -57,7 +57,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    -
    +

    Conditional forwarding

    @@ -122,7 +122,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    -
    +

    Interface settings

    @@ -233,7 +233,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    -
    +

    Rate-limiting

    @@ -258,7 +258,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    -
    +
    diff --git a/settings-dnsrecords.lp b/settings-dnsrecords.lp index 5f64bdc1..24402d21 100644 --- a/settings-dnsrecords.lp +++ b/settings-dnsrecords.lp @@ -14,7 +14,7 @@ PageTitle = "Local DNS Settings" mg.include('scripts/pi-hole/lua/settings_header.lp','r') ?>
    -
    +

    Local DNS records

    @@ -56,7 +56,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    -
    +

    Local CNAME records records

    diff --git a/settings-privacy.lp b/settings-privacy.lp index 3de3c3b7..d98f4467 100644 --- a/settings-privacy.lp +++ b/settings-privacy.lp @@ -14,7 +14,7 @@ PageTitle = "Privacy Settings" mg.include('scripts/pi-hole/lua/settings_header.lp','r') ?>
    -
    +
    @@ -34,7 +34,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    -
    +

    Privacy-related database settings

    @@ -68,7 +68,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    -
    +

    Query Anonymization ("Privacy Level")

    @@ -103,7 +103,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    -
    +
    diff --git a/settings-system.lp b/settings-system.lp index 213ed60d..45d8dc7c 100644 --- a/settings-system.lp +++ b/settings-system.lp @@ -61,7 +61,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    -
    +

    DHCP server metrics

    @@ -163,7 +163,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    -
    +

    DNS cache metrics

    @@ -210,7 +210,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r') - @@ -263,7 +263,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')   - + Authoritative replies: @@ -279,7 +279,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    -
    +

    Actions

    @@ -295,7 +295,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    -
    +
    diff --git a/style/pi-hole.css b/style/pi-hole.css index 2cc8dbe3..e4c32dee 100644 --- a/style/pi-hole.css +++ b/style/pi-hole.css @@ -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; }