diff --git a/error403.lp b/error403.lp index d071669f..82144646 100644 --- a/error403.lp +++ b/error403.lp @@ -7,7 +7,7 @@ * Please see LICENSE file for your rights under this license. --]] -mg.include('scripts/pi-hole/lua/header.lp','r') +mg.include('scripts/lua/header.lp','r') ?>
diff --git a/error404.lp b/error404.lp index 394e1a89..4aed89b5 100644 --- a/error404.lp +++ b/error404.lp @@ -7,7 +7,7 @@ * Please see LICENSE file for your rights under this license. --]] -mg.include('scripts/pi-hole/lua/header.lp','r') +mg.include('scripts/lua/header.lp','r') ?>
diff --git a/gravity.lp b/gravity.lp index 063125d8..c2312acd 100644 --- a/gravity.lp +++ b/gravity.lp @@ -7,7 +7,7 @@ * Please see LICENSE file for your rights under this license. --]] -mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') +mg.include('scripts/lua/header_authenticated.lp','r') ?>
@@ -27,5 +27,5 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') - - + + diff --git a/groups-clients.lp b/groups-clients.lp index e0fd29c7..2ffbea9b 100644 --- a/groups-clients.lp +++ b/groups-clients.lp @@ -7,7 +7,7 @@ * Please see LICENSE file for your rights under this license. --]] -mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') +mg.include('scripts/lua/header_authenticated.lp','r') ?> @@ -93,8 +93,8 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') - - - + + + - + diff --git a/groups-domains.lp b/groups-domains.lp index 80d4a8c8..59d460f1 100644 --- a/groups-domains.lp +++ b/groups-domains.lp @@ -7,7 +7,7 @@ * Please see LICENSE file for your rights under this license. --]] -mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') +mg.include('scripts/lua/header_authenticated.lp','r') ?> @@ -150,7 +150,7 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') - - + + - + diff --git a/groups-lists.lp b/groups-lists.lp index 4fb0c73d..4803e37f 100644 --- a/groups-lists.lp +++ b/groups-lists.lp @@ -7,7 +7,7 @@ * Please see LICENSE file for your rights under this license. --]] -mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') +mg.include('scripts/lua/header_authenticated.lp','r') ?> @@ -92,7 +92,7 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') - - + + - + diff --git a/groups.lp b/groups.lp index 0e70f5d9..06db01da 100644 --- a/groups.lp +++ b/groups.lp @@ -7,7 +7,7 @@ * Please see LICENSE file for your rights under this license. --]] -mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') +mg.include('scripts/lua/header_authenticated.lp','r') ?> @@ -81,7 +81,7 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') - - + + - + diff --git a/index.lp b/index.lp index 3cb316ef..a5b3ab83 100644 --- a/index.lp +++ b/index.lp @@ -8,7 +8,7 @@ --]] indexpage = true -mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') +mg.include('scripts/lua/header_authenticated.lp','r') ?>
@@ -279,7 +279,7 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
- - + + - + diff --git a/interfaces.lp b/interfaces.lp index b4341c99..d3f1a915 100644 --- a/interfaces.lp +++ b/interfaces.lp @@ -7,7 +7,7 @@ * Please see LICENSE file for your rights under this license. --]] -mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') +mg.include('scripts/lua/header_authenticated.lp','r') ?>
@@ -32,5 +32,5 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') - - + + diff --git a/login.lp b/login.lp index 1d572260..32605a4e 100644 --- a/login.lp +++ b/login.lp @@ -7,7 +7,7 @@ * Please see LICENSE file for your rights under this license. --]] -mg.include('scripts/pi-hole/lua/header.lp','r') +mg.include('scripts/lua/header.lp','r') ?>
- - + + diff --git a/messages.lp b/messages.lp index d96999d9..23968958 100644 --- a/messages.lp +++ b/messages.lp @@ -7,7 +7,7 @@ * Please see LICENSE file for your rights under this license. */ ]]-- -mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') +mg.include('scripts/lua/header_authenticated.lp','r') ?> @@ -41,6 +41,6 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
- + - + diff --git a/network.lp b/network.lp index 5c26559f..75545221 100644 --- a/network.lp +++ b/network.lp @@ -7,7 +7,7 @@ * Please see LICENSE file for your rights under this license. --]] -mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') +mg.include('scripts/lua/header_authenticated.lp','r') ?>
@@ -64,7 +64,7 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
- - + + - + diff --git a/package.json b/package.json index 1404f2bd..f173bc27 100644 --- a/package.json +++ b/package.json @@ -16,11 +16,11 @@ "homepage": "https://github.com/pi-hole/web#readme", "scripts": { "prefix": "postcss \"style/*.css\" \"style/themes/*.css\" --use autoprefixer --no-map --replace", - "prettier:check": "prettier -l \"style/*.css\" \"style/themes/*.css\" \"scripts/pi-hole/**/*.js\"", - "prettier:fix": "prettier --write \"style/*.css\" \"style/themes/*.css\" \"scripts/pi-hole/**/*.js\"", + "prettier:check": "prettier -l \"style/*.css\" \"style/themes/*.css\" \"scripts/**/*.js\"", + "prettier:fix": "prettier --write \"style/*.css\" \"style/themes/*.css\" \"scripts/**/*.js\"", "xo": "xo", - "xo:check": "npm run xo -- \"style/*.css\" \"style/themes/*.css\" \"scripts/pi-hole/**\"", - "xo:fix": "npm run xo -- --fix \"style/*.css\" \"style/themes/*.css\" \"scripts/pi-hole/**\"", + "xo:check": "npm run xo -- \"style/*.css\" \"style/themes/*.css\" \"scripts/**\"", + "xo:fix": "npm run xo -- --fix \"style/*.css\" \"style/themes/*.css\" \"scripts/**\"", "test": "npm run prettier:check && npm run xo:check", "testpr": "npm run prettier:fix && git diff --ws-error-highlight=all --color=always --exit-code && npm run xo:check" }, diff --git a/queries.lp b/queries.lp index 3c5b9d01..baeaa1b4 100644 --- a/queries.lp +++ b/queries.lp @@ -7,7 +7,7 @@ * Please see LICENSE file for your rights under this license. --]] -mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') +mg.include('scripts/lua/header_authenticated.lp','r') ?> - + diff --git a/scripts/pi-hole/lua/header.lp b/scripts/lua/header.lp similarity index 98% rename from scripts/pi-hole/lua/header.lp rename to scripts/lua/header.lp index 3dfb482b..257b046d 100644 --- a/scripts/pi-hole/lua/header.lp +++ b/scripts/lua/header.lp @@ -120,6 +120,6 @@ if startsWith(scriptname, 'groups') then - + diff --git a/scripts/pi-hole/lua/header_authenticated.lp b/scripts/lua/header_authenticated.lp similarity index 98% rename from scripts/pi-hole/lua/header_authenticated.lp rename to scripts/lua/header_authenticated.lp index be65a501..8c20d9c8 100644 --- a/scripts/pi-hole/lua/header_authenticated.lp +++ b/scripts/lua/header_authenticated.lp @@ -9,7 +9,7 @@ ]]-- mg.include('header.lp','r') ?> - + diff --git a/scripts/pi-hole/lua/settings_header.lp b/scripts/lua/settings_header.lp similarity index 100% rename from scripts/pi-hole/lua/settings_header.lp rename to scripts/lua/settings_header.lp diff --git a/scripts/pi-hole/lua/sidebar.lp b/scripts/lua/sidebar.lp similarity index 100% rename from scripts/pi-hole/lua/sidebar.lp rename to scripts/lua/sidebar.lp diff --git a/search.lp b/search.lp index 7b5a0892..01b60ae6 100644 --- a/search.lp +++ b/search.lp @@ -7,7 +7,7 @@ * Please see LICENSE file for your rights under this license. --]] -mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') +mg.include('scripts/lua/header_authenticated.lp','r') ?>
@@ -48,5 +48,5 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') - - + + diff --git a/settings-all.lp b/settings-all.lp index 75905fbc..f758b761 100644 --- a/settings-all.lp +++ b/settings-all.lp @@ -7,11 +7,11 @@ * Please see LICENSE file for your rights under this license. --]] -mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') +mg.include('scripts/lua/header_authenticated.lp','r') -- Page title and level selector PageTitle = "All Settings" -mg.include('scripts/pi-hole/lua/settings_header.lp','r') +mg.include('scripts/lua/settings_header.lp','r') ?>
@@ -33,7 +33,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
- - + + - + diff --git a/settings-api.lp b/settings-api.lp index 71e0d9c1..9d9a3e90 100644 --- a/settings-api.lp +++ b/settings-api.lp @@ -7,11 +7,11 @@ * Please see LICENSE file for your rights under this license. --]] -mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') +mg.include('scripts/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') +mg.include('scripts/lua/settings_header.lp','r') ?>
@@ -249,7 +249,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r') - - + + - + diff --git a/settings-dhcp.lp b/settings-dhcp.lp index 639b4d1a..196c039f 100644 --- a/settings-dhcp.lp +++ b/settings-dhcp.lp @@ -7,11 +7,11 @@ * Please see LICENSE file for your rights under this license. --]] -mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') +mg.include('scripts/lua/header_authenticated.lp','r') -- Page title and level selector PageTitle = "DHCP Settings" -mg.include('scripts/pi-hole/lua/settings_header.lp','r') +mg.include('scripts/lua/settings_header.lp','r') ?>
@@ -226,8 +226,8 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
- - - + + + - + diff --git a/settings-dns.lp b/settings-dns.lp index 75be8110..e400ec6c 100644 --- a/settings-dns.lp +++ b/settings-dns.lp @@ -7,11 +7,11 @@ * Please see LICENSE file for your rights under this license. --]] -mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') +mg.include('scripts/lua/header_authenticated.lp','r') -- Page title and level selector PageTitle = "DNS Settings" -mg.include('scripts/pi-hole/lua/settings_header.lp','r') +mg.include('scripts/lua/settings_header.lp','r') ?>
@@ -238,7 +238,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
- - + + - + diff --git a/settings-dnsrecords.lp b/settings-dnsrecords.lp index e79228d8..ce3c745d 100644 --- a/settings-dnsrecords.lp +++ b/settings-dnsrecords.lp @@ -7,11 +7,11 @@ * Please see LICENSE file for your rights under this license. --]] -mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') +mg.include('scripts/lua/header_authenticated.lp','r') -- Page title and level selector PageTitle = "Local DNS Settings" -mg.include('scripts/pi-hole/lua/settings_header.lp','r') +mg.include('scripts/lua/settings_header.lp','r') ?>
@@ -109,8 +109,8 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
- - - + + + - + diff --git a/settings-privacy.lp b/settings-privacy.lp index 08325bce..753306ad 100644 --- a/settings-privacy.lp +++ b/settings-privacy.lp @@ -7,11 +7,11 @@ * Please see LICENSE file for your rights under this license. --]] -mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') +mg.include('scripts/lua/header_authenticated.lp','r') -- Page title and level selector PageTitle = "Privacy Settings" -mg.include('scripts/pi-hole/lua/settings_header.lp','r') +mg.include('scripts/lua/settings_header.lp','r') ?>
@@ -109,7 +109,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
- - + + - + diff --git a/settings-system.lp b/settings-system.lp index 5f16714d..683fb89e 100644 --- a/settings-system.lp +++ b/settings-system.lp @@ -7,11 +7,11 @@ * Please see LICENSE file for your rights under this license. --]] -mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') +mg.include('scripts/lua/header_authenticated.lp','r') -- Page title and level selector PageTitle = "System Settings" -mg.include('scripts/pi-hole/lua/settings_header.lp','r') +mg.include('scripts/lua/settings_header.lp','r') ?>
@@ -318,8 +318,8 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
- - - + + + - + diff --git a/settings-teleporter.lp b/settings-teleporter.lp index e59c6a65..359ac2e1 100644 --- a/settings-teleporter.lp +++ b/settings-teleporter.lp @@ -7,11 +7,11 @@ * Please see LICENSE file for your rights under this license. --]] -mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') +mg.include('scripts/lua/header_authenticated.lp','r') -- Page title and level selector PageTitle = "Teleporter" -mg.include('scripts/pi-hole/lua/settings_header.lp','r') +mg.include('scripts/lua/settings_header.lp','r') ?>
@@ -102,7 +102,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
- - + + - + diff --git a/taillog.lp b/taillog.lp index 4d0aa487..4e1c5c71 100644 --- a/taillog.lp +++ b/taillog.lp @@ -7,7 +7,7 @@ * Please see LICENSE file for your rights under this license. */ ]]-- -mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') +mg.include('scripts/lua/header_authenticated.lp','r') ?>
@@ -33,6 +33,6 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
- + - +