From 4c216416632c21bb6358a6e460afb7569eca76fb Mon Sep 17 00:00:00 2001 From: yubiuser Date: Mon, 28 Oct 2024 20:04:20 +0100 Subject: [PATCH] Unify vendor file location Signed-off-by: yubiuser --- .github/workflows/codespell.yml | 2 +- LICENSE | 4 +- groups-clients.lp | 4 +- groups-domains.lp | 4 +- groups-lists.lp | 4 +- groups.lp | 4 +- queries.lp | 4 +- scripts/pi-hole/js/footer.js | 2 +- scripts/pi-hole/lua/header.lp | 47 +++++++++--------- scripts/pi-hole/lua/header_authenticated.lp | 22 ++++---- settings-all.lp | 2 +- settings-api.lp | 6 +-- settings-dhcp.lp | 2 +- settings-dns.lp | 2 +- settings-dnsrecords.lp | 4 +- settings-privacy.lp | 2 +- settings-system.lp | 4 +- settings-teleporter.lp | 2 +- style/vendor/LICENSE | 20 -------- {scripts/vendor => vendor}/LICENSE | 0 .../adminLTE}/AdminLTE.min.css | 0 .../adminLTE}/adminlte.min.js | 0 .../vendor => vendor/animate}/animate.min.css | 0 .../bootstrap-notify}/bootstrap-notify.min.js | 0 .../bootstrap-select.min.css | 0 .../bootstrap-select}/bootstrap-select.min.js | 0 .../bootstrap-select.min.js.map | 0 .../bootstrap-toggle.min.css | 0 .../bootstrap-toggle}/bootstrap-toggle.min.js | 0 .../bootstrap-toggle.min.js.map | 0 .../bootstrap}/bootstrap.min.css | 0 .../bootstrap}/bootstrap.min.css.map | 0 .../js => vendor/bootstrap}/bootstrap.min.js | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../bstreeview}/bstreeview.min.css | 0 .../bstreeview}/bstreeview.min.js | 0 .../chartjs-adapter-moment.js | 0 .../chartjs-adapter-moment.min.js.map | 0 .../chartjs-plugin-deferred.min.js | 0 .../chartjs-plugin-zoom.min.js | 0 .../vendor => vendor/chartjs}/chart.umd.js | 0 .../chartjs}/chart.umd.js.map | 0 .../datatables.buttons.min.css | 9 ---- .../datatables.buttons.min.js | 0 .../datatables.select.min.css | 6 +++ .../datatables.select.min.js | 0 .../datatables}/datatables.min.css | 0 .../datatables}/datatables.min.js | 0 .../daterangepicker}/daterangepicker.min.css | 0 .../daterangepicker}/daterangepicker.min.js | 0 .../daterangepicker.min.js.map | 0 .../font-awesome/font-awesome.min.js | 0 .../fonts}/SourceSansPro/SourceSansPro.css | 0 .../source-sans-pro-v13-latin-300.woff | Bin .../source-sans-pro-v13-latin-300.woff2 | Bin .../source-sans-pro-v13-latin-300italic.woff | Bin .../source-sans-pro-v13-latin-300italic.woff2 | Bin .../source-sans-pro-v13-latin-600.woff | Bin .../source-sans-pro-v13-latin-600.woff2 | Bin .../source-sans-pro-v13-latin-600italic.woff | Bin .../source-sans-pro-v13-latin-600italic.woff2 | Bin .../source-sans-pro-v13-latin-700.woff | Bin .../source-sans-pro-v13-latin-700.woff2 | Bin .../source-sans-pro-v13-latin-italic.woff | Bin .../source-sans-pro-v13-latin-italic.woff2 | Bin .../source-sans-pro-v13-latin-regular.woff | Bin .../source-sans-pro-v13-latin-regular.woff2 | Bin .../antonio-v1-latin-ext_latin-100.woff | Bin .../antonio-v1-latin-ext_latin-100.woff2 | Bin .../antonio-v1-latin-ext_latin-700.woff | Bin .../antonio-v1-latin-ext_latin-700.woff2 | Bin .../antonio-v1-latin-ext_latin-regular.woff | Bin .../antonio-v1-latin-ext_latin-regular.woff2 | Bin .../fonts/antonio/antonio.css | 0 .../ubuntu-mono-v10-latin-ext_latin-700.woff | Bin .../ubuntu-mono-v10-latin-ext_latin-700.woff2 | Bin ...tu-mono-v10-latin-ext_latin-700italic.woff | Bin ...u-mono-v10-latin-ext_latin-700italic.woff2 | Bin ...buntu-mono-v10-latin-ext_latin-italic.woff | Bin ...untu-mono-v10-latin-ext_latin-italic.woff2 | Bin ...untu-mono-v10-latin-ext_latin-regular.woff | Bin ...ntu-mono-v10-latin-ext_latin-regular.woff2 | Bin .../fonts/ubuntu-mono/ubuntu-mono.css | 0 .../vendor => vendor/hammer}/hammer.min.js | 0 .../icheck}/icheck-bootstrap.min.css | 0 .../icheck}/icheck-material.min.css | 0 .../jquery-confirm}/jquery.confirm.min.js | 0 .../vendor => vendor/jquery}/jquery.min.js | 0 .../jquery}/jquery.min.js.map | 0 {style/vendor => vendor/js-warn}/js-warn.css | 0 .../vendor => vendor/moment}/moment.min.js | 0 .../moment}/moment.min.js.map | 0 .../nprogress}/nprogress.min.css | 0 .../nprogress}/nprogress.min.js | 0 .../vendor => vendor/qrious}/qrious.min.js | 0 .../qrious}/qrious.min.js.map | 0 .../vendor => vendor/select2}/select2.min.css | 0 .../vendor => vendor/select2}/select2.min.js | 0 .../vendor => vendor/waitMe}/waitMe.min.css | 0 .../vendor => vendor/waitMe}/waitMe.min.js | 0 104 files changed, 67 insertions(+), 89 deletions(-) delete mode 100644 style/vendor/LICENSE rename {scripts/vendor => vendor}/LICENSE (100%) rename {style/vendor => vendor/adminLTE}/AdminLTE.min.css (100%) rename {scripts/vendor => vendor/adminLTE}/adminlte.min.js (100%) rename {style/vendor => vendor/animate}/animate.min.css (100%) rename {scripts/vendor => vendor/bootstrap-notify}/bootstrap-notify.min.js (100%) rename {style/vendor => vendor/bootstrap-select}/bootstrap-select.min.css (100%) rename {scripts/vendor => vendor/bootstrap-select}/bootstrap-select.min.js (100%) rename {scripts/vendor => vendor/bootstrap-select}/bootstrap-select.min.js.map (100%) rename {style/vendor => vendor/bootstrap-toggle}/bootstrap-toggle.min.css (100%) rename {scripts/vendor => vendor/bootstrap-toggle}/bootstrap-toggle.min.js (100%) rename {scripts/vendor => vendor/bootstrap-toggle}/bootstrap-toggle.min.js.map (100%) rename {style/vendor/bootstrap/css => vendor/bootstrap}/bootstrap.min.css (100%) rename {style/vendor/bootstrap/css => vendor/bootstrap}/bootstrap.min.css.map (100%) rename {style/vendor/bootstrap/js => vendor/bootstrap}/bootstrap.min.js (100%) rename {style/vendor => vendor}/bootstrap/fonts/glyphicons-halflings-regular.eot (100%) rename {style/vendor => vendor}/bootstrap/fonts/glyphicons-halflings-regular.svg (100%) rename {style/vendor => vendor}/bootstrap/fonts/glyphicons-halflings-regular.ttf (100%) rename {style/vendor => vendor}/bootstrap/fonts/glyphicons-halflings-regular.woff (100%) rename {style/vendor => vendor}/bootstrap/fonts/glyphicons-halflings-regular.woff2 (100%) rename {style/vendor => vendor/bstreeview}/bstreeview.min.css (100%) rename {scripts/vendor => vendor/bstreeview}/bstreeview.min.js (100%) rename {scripts/vendor => vendor/chartjs-adapter-moment}/chartjs-adapter-moment.js (100%) rename {scripts/vendor => vendor/chartjs-adapter-moment}/chartjs-adapter-moment.min.js.map (100%) rename {scripts/vendor => vendor/chartjs-plugin-deferred}/chartjs-plugin-deferred.min.js (100%) rename {scripts/vendor => vendor/chartjs-plugin-zoom}/chartjs-plugin-zoom.min.js (100%) rename {scripts/vendor => vendor/chartjs}/chart.umd.js (100%) rename {scripts/vendor => vendor/chartjs}/chart.umd.js.map (100%) rename style/vendor/datatables_extensions.min.css => vendor/datatables-buttons/datatables.buttons.min.css (71%) rename {scripts/vendor => vendor/datatables-buttons}/datatables.buttons.min.js (100%) create mode 100644 vendor/datatables-select/datatables.select.min.css rename {scripts/vendor => vendor/datatables-select}/datatables.select.min.js (100%) rename {style/vendor => vendor/datatables}/datatables.min.css (100%) rename {scripts/vendor => vendor/datatables}/datatables.min.js (100%) rename {style/vendor => vendor/daterangepicker}/daterangepicker.min.css (100%) rename {scripts/vendor => vendor/daterangepicker}/daterangepicker.min.js (100%) rename {scripts/vendor => vendor/daterangepicker}/daterangepicker.min.js.map (100%) rename style/vendor/font-awesome/js/all.min.js => vendor/font-awesome/font-awesome.min.js (100%) rename {style/vendor => vendor/fonts}/SourceSansPro/SourceSansPro.css (100%) rename {style/vendor => vendor/fonts}/SourceSansPro/source-sans-pro-v13-latin-300.woff (100%) rename {style/vendor => vendor/fonts}/SourceSansPro/source-sans-pro-v13-latin-300.woff2 (100%) rename {style/vendor => vendor/fonts}/SourceSansPro/source-sans-pro-v13-latin-300italic.woff (100%) rename {style/vendor => vendor/fonts}/SourceSansPro/source-sans-pro-v13-latin-300italic.woff2 (100%) rename {style/vendor => vendor/fonts}/SourceSansPro/source-sans-pro-v13-latin-600.woff (100%) rename {style/vendor => vendor/fonts}/SourceSansPro/source-sans-pro-v13-latin-600.woff2 (100%) rename {style/vendor => vendor/fonts}/SourceSansPro/source-sans-pro-v13-latin-600italic.woff (100%) rename {style/vendor => vendor/fonts}/SourceSansPro/source-sans-pro-v13-latin-600italic.woff2 (100%) rename {style/vendor => vendor/fonts}/SourceSansPro/source-sans-pro-v13-latin-700.woff (100%) rename {style/vendor => vendor/fonts}/SourceSansPro/source-sans-pro-v13-latin-700.woff2 (100%) rename {style/vendor => vendor/fonts}/SourceSansPro/source-sans-pro-v13-latin-italic.woff (100%) rename {style/vendor => vendor/fonts}/SourceSansPro/source-sans-pro-v13-latin-italic.woff2 (100%) rename {style/vendor => vendor/fonts}/SourceSansPro/source-sans-pro-v13-latin-regular.woff (100%) rename {style/vendor => vendor/fonts}/SourceSansPro/source-sans-pro-v13-latin-regular.woff2 (100%) rename {style/vendor => vendor}/fonts/antonio/antonio-v1-latin-ext_latin-100.woff (100%) rename {style/vendor => vendor}/fonts/antonio/antonio-v1-latin-ext_latin-100.woff2 (100%) rename {style/vendor => vendor}/fonts/antonio/antonio-v1-latin-ext_latin-700.woff (100%) rename {style/vendor => vendor}/fonts/antonio/antonio-v1-latin-ext_latin-700.woff2 (100%) rename {style/vendor => vendor}/fonts/antonio/antonio-v1-latin-ext_latin-regular.woff (100%) rename {style/vendor => vendor}/fonts/antonio/antonio-v1-latin-ext_latin-regular.woff2 (100%) rename {style/vendor => vendor}/fonts/antonio/antonio.css (100%) rename {style/vendor => vendor}/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-700.woff (100%) rename {style/vendor => vendor}/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-700.woff2 (100%) rename {style/vendor => vendor}/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-700italic.woff (100%) rename {style/vendor => vendor}/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-700italic.woff2 (100%) rename {style/vendor => vendor}/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-italic.woff (100%) rename {style/vendor => vendor}/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-italic.woff2 (100%) rename {style/vendor => vendor}/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-regular.woff (100%) rename {style/vendor => vendor}/fonts/ubuntu-mono/ubuntu-mono-v10-latin-ext_latin-regular.woff2 (100%) rename {style/vendor => vendor}/fonts/ubuntu-mono/ubuntu-mono.css (100%) rename {scripts/vendor => vendor/hammer}/hammer.min.js (100%) rename {style/vendor => vendor/icheck}/icheck-bootstrap.min.css (100%) rename {style/vendor => vendor/icheck}/icheck-material.min.css (100%) rename {scripts/vendor => vendor/jquery-confirm}/jquery.confirm.min.js (100%) rename {scripts/vendor => vendor/jquery}/jquery.min.js (100%) rename {scripts/vendor => vendor/jquery}/jquery.min.js.map (100%) rename {style/vendor => vendor/js-warn}/js-warn.css (100%) rename {scripts/vendor => vendor/moment}/moment.min.js (100%) rename {scripts/vendor => vendor/moment}/moment.min.js.map (100%) rename {style/vendor => vendor/nprogress}/nprogress.min.css (100%) rename {scripts/vendor => vendor/nprogress}/nprogress.min.js (100%) rename {scripts/vendor => vendor/qrious}/qrious.min.js (100%) rename {scripts/vendor => vendor/qrious}/qrious.min.js.map (100%) rename {style/vendor => vendor/select2}/select2.min.css (100%) rename {scripts/vendor => vendor/select2}/select2.min.js (100%) rename {style/vendor => vendor/waitMe}/waitMe.min.css (100%) rename {scripts/vendor => vendor/waitMe}/waitMe.min.js (100%) 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') ?> - - - - - - - - - - - + + + + + + + + + + +