diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 70053705f..a7aeda61d 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -20,4 +20,4 @@ jobs: uses: codespell-project/actions-codespell@master with: ignore_words_file: .codespellignore - skip: ./scripts/vendor,./style/vendor,./package.json,./package-lock.json + skip: ./vendor,./package.json,./package-lock.json diff --git a/LICENSE b/LICENSE index a11a10879..657d21050 100644 --- a/LICENSE +++ b/LICENSE @@ -7,8 +7,8 @@ Please see https://joinup.ec.europa.eu/community/eupl/og_page/eupl for official This license applies to the whole project EXCEPT the files located under -- styles/vendor, and -- scripts/vendor +- vendor/ + whose licenses are located therein. ------------------------------------------------------------- diff --git a/groups-clients.lp b/groups-clients.lp index 86b7a082e..e0fd29c79 100644 --- a/groups-clients.lp +++ b/groups-clients.lp @@ -91,8 +91,8 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') - - + + diff --git a/groups-domains.lp b/groups-domains.lp index 1fb0a7c06..80d4a8c88 100644 --- a/groups-domains.lp +++ b/groups-domains.lp @@ -148,8 +148,8 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') - - + + diff --git a/groups-lists.lp b/groups-lists.lp index 8aee83baf..4fb0c73d2 100644 --- a/groups-lists.lp +++ b/groups-lists.lp @@ -90,8 +90,8 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') - - + + diff --git a/groups.lp b/groups.lp index cb9fcfce5..0e70f5d9d 100644 --- a/groups.lp +++ b/groups.lp @@ -79,8 +79,8 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') - - + + diff --git a/queries.lp b/queries.lp index 676f1c5b3..3c5b9d01b 100644 --- a/queries.lp +++ b/queries.lp @@ -194,9 +194,9 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') - + - + diff --git a/scripts/pi-hole/js/footer.js b/scripts/pi-hole/js/footer.js index 9b2e56ffb..7a98c0f21 100644 --- a/scripts/pi-hole/js/footer.js +++ b/scripts/pi-hole/js/footer.js @@ -197,7 +197,7 @@ function applyCheckboxRadioStyle() { function initCheckboxRadioStyle() { function getCheckboxURL(style) { var extra = style.startsWith("material-") ? "material" : "bootstrap"; - return "/admin/style/vendor/icheck-" + extra + ".min.css"; + return "/admin/vendor/icheck/icheck-" + extra + ".min.css"; } // Read from local storage, initialize if needed diff --git a/scripts/pi-hole/lua/header.lp b/scripts/pi-hole/lua/header.lp index ae8fbf8ec..e6c0b4209 100644 --- a/scripts/pi-hole/lua/header.lp +++ b/scripts/pi-hole/lua/header.lp @@ -77,48 +77,49 @@ is_authenticated = mg.request_info.is_authenticated html { background-color: #000; } - - + + - - + + - + - - - + + + - + - - - - + + + + + - - + + - + - - - - - + + + + + - - + + diff --git a/scripts/pi-hole/lua/header_authenticated.lp b/scripts/pi-hole/lua/header_authenticated.lp index c689d99f7..be65a5015 100644 --- a/scripts/pi-hole/lua/header_authenticated.lp +++ b/scripts/pi-hole/lua/header_authenticated.lp @@ -10,17 +10,17 @@ mg.include('header.lp','r') ?> - - - - - - - - - - - + + + + + + + + + + +