Move all files from /scripts/pi-hole/ to /scripts/

Signed-off-by: yubiuser <github@yubiuser.dev>
2025-12-19 18:28:24 +00:00 · 2024-10-28 20:22:09 +01:00
parent 732932a162
commit 1e922a8b29
58 changed files with 101 additions and 101 deletions
--- 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')
 ?>
 <body class="hold-transition layout-boxed login-page">
    <div class="box login-box">
--- 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')
 ?>
 <body class="hold-transition layout-boxed login-page">
    <div class="box login-box">
--- 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')
 ?>
 <!-- Title -->
 <div class="page-header">
@@ -27,5 +27,5 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
 <button type="button" id="gravityBtn" class="btn btn-lg btn-primary btn-block">Update</button>
 <pre id="output" style="width: 100%; height: 100%;" hidden></pre>

-<script src="<?=pihole.fileversion('scripts/pi-hole/js/gravity.js')?>"></script>
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<script src="<?=pihole.fileversion('scripts/js/gravity.js')?>"></script>
+<? mg.include('scripts/lua/footer.lp','r')?>
--- 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')
 ?>

 <!-- Title -->
@@ -93,8 +93,8 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')

 <script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/ip-address-sorting.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/groups-common.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/groups-clients.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/groups-clients.js')?>"></script>

-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
--- 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')
 ?>

 <!-- Title -->
@@ -150,7 +150,7 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')

 <script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/groups-common.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/groups-domains.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/groups-domains.js')?>"></script>

-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
--- 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')
 ?>

 <!-- Title -->
@@ -92,7 +92,7 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')

 <script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/groups-common.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/groups-lists.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/groups-lists.js')?>"></script>

-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
--- 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')
 ?>

 <!-- Title -->
@@ -81,7 +81,7 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')

 <script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/groups-common.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/groups.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/groups.js')?>"></script>

-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
--- 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')
 ?>
 <!-- Small boxes (Stat box) -->
 <div class="row">
@@ -279,7 +279,7 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
 </div>
 <!-- /.row -->

-<script src="<?=pihole.fileversion('scripts/pi-hole/js/charts.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/index.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/charts.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/index.js')?>"></script>

-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
--- 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')
 ?>
 <!-- Title -->
 <div class="page-header">
@@ -32,5 +32,5 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')

 <pre id="output" style="width: 100%; height: 100%;" hidden></pre>

-<script src="<?=pihole.fileversion('scripts/pi-hole/js/interfaces.js')?>"></script>
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<script src="<?=pihole.fileversion('scripts/js/interfaces.js')?>"></script>
+<? mg.include('scripts/lua/footer.lp','r')?>
--- 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')
 ?>
 <body class="hold-transition layout-boxed login-page">
 <div class="box login-box" id="login-box">
@@ -120,7 +120,7 @@ mg.include('scripts/pi-hole/lua/header.lp','r')
        <strong><a href="https://pi-hole.net/donate/" rel="noopener" target="_blank"><i class="fa fa-heart text-red"></i> Donate</a></strong> if you found this useful.
    </div>
 </div>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/login.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/footer.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/login.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/footer.js')?>"></script>
 </body>
 </html>
--- 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')
 ?>

 <!-- Title -->
@@ -41,6 +41,6 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
    </div>
 </div>

-<script src="<?=pihole.fileversion('scripts/pi-hole/js/messages.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/messages.js')?>"></script>

-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
--- 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')
 ?>

 <div class="row">
@@ -64,7 +64,7 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
 </div>
 <!-- /.row -->

-<script src="<?=pihole.fileversion('scripts/pi-hole/js/ip-address-sorting.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/network.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/network.js')?>"></script>

-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
--- 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"
  },
--- 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')
 ?>
 <!-- Alert Modal -->
 <div id="alertModal" class="modal fade" role="dialog" data-backdrop="static" data-keyboard="false">
@@ -195,8 +195,8 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
 <!-- /.row -->

 <script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/ip-address-sorting.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
 <script src="<?=pihole.fileversion('vendor/daterangepicker/daterangepicker.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/queries.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/queries.js')?>"></script>

-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
--- a/scripts/pi-hole/js/charts.js
+++ b/scripts/pi-hole/js/charts.js
--- a/scripts/pi-hole/js/debug.js
+++ b/scripts/pi-hole/js/debug.js
@@ -26,7 +26,7 @@ function eventsource() {
  if (typeof EventSource !== "function") {
    $.ajax({
      method: "GET",
-      url: "scripts/pi-hole/php/debug.php?IE&token=" + token + checked,
+      url: "scripts/php/debug.php?IE&token=" + token + checked,
      async: false,
    }).done(function (data) {
      ta.show();
@@ -36,7 +36,7 @@ function eventsource() {
    return;
  }

-  var source = new EventSource("scripts/pi-hole/php/debug.php?&token=" + token + checked);
+  var source = new EventSource("scripts/php/debug.php?&token=" + token + checked);

  // Reset and show field
  ta.empty();
--- a/scripts/pi-hole/js/footer.js
+++ b/scripts/pi-hole/js/footer.js
--- a/scripts/pi-hole/js/gravity.js
+++ b/scripts/pi-hole/js/gravity.js
--- a/scripts/pi-hole/js/groups-clients.js
+++ b/scripts/pi-hole/js/groups-clients.js
--- a/scripts/pi-hole/js/groups-common.js
+++ b/scripts/pi-hole/js/groups-common.js
--- a/scripts/pi-hole/js/groups-domains.js
+++ b/scripts/pi-hole/js/groups-domains.js
--- a/scripts/pi-hole/js/groups-lists.js
+++ b/scripts/pi-hole/js/groups-lists.js
--- a/scripts/pi-hole/js/groups.js
+++ b/scripts/pi-hole/js/groups.js
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
--- a/scripts/pi-hole/js/interfaces.js
+++ b/scripts/pi-hole/js/interfaces.js
--- a/scripts/pi-hole/js/ip-address-sorting.js
+++ b/scripts/pi-hole/js/ip-address-sorting.js
--- a/scripts/pi-hole/js/login.js
+++ b/scripts/pi-hole/js/login.js
--- a/scripts/pi-hole/js/logout.js
+++ b/scripts/pi-hole/js/logout.js
--- a/scripts/pi-hole/js/messages.js
+++ b/scripts/pi-hole/js/messages.js
--- a/scripts/pi-hole/js/network.js
+++ b/scripts/pi-hole/js/network.js
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
--- a/scripts/pi-hole/js/search.js
+++ b/scripts/pi-hole/js/search.js
--- a/scripts/pi-hole/js/settings-advanced.js
+++ b/scripts/pi-hole/js/settings-advanced.js
--- a/scripts/pi-hole/js/settings-api.js
+++ b/scripts/pi-hole/js/settings-api.js
--- a/scripts/pi-hole/js/settings-dhcp.js
+++ b/scripts/pi-hole/js/settings-dhcp.js
--- a/scripts/pi-hole/js/settings-dns-records.js
+++ b/scripts/pi-hole/js/settings-dns-records.js
--- a/scripts/pi-hole/js/settings-dns.js
+++ b/scripts/pi-hole/js/settings-dns.js
--- a/scripts/pi-hole/js/settings-privacy.js
+++ b/scripts/pi-hole/js/settings-privacy.js
--- a/scripts/pi-hole/js/settings-system.js
+++ b/scripts/pi-hole/js/settings-system.js
--- a/scripts/pi-hole/js/settings-teleporter.js
+++ b/scripts/pi-hole/js/settings-teleporter.js
--- a/scripts/pi-hole/js/settings.js
+++ b/scripts/pi-hole/js/settings.js
--- a/scripts/pi-hole/js/taillog.js
+++ b/scripts/pi-hole/js/taillog.js
--- a/scripts/pi-hole/js/utils.js
+++ b/scripts/pi-hole/js/utils.js
--- a/scripts/pi-hole/lua/footer.lp
+++ b/scripts/pi-hole/lua/footer.lp
@@ -66,7 +66,7 @@ end

 </div>
 <!-- ./wrapper -->
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/footer.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/footer.js')?>"></script>

 <div id="advanced-info-data" style="display: none;" data-starttime="<?=starttime?>" data-endtime="<?=mg.time(true)?>" data-client-ip="<?=mg.request_info.remote_addr?>" data-tls="<?=tostring(is_secure)?>" data-xff="<?=x_forwarded_for?>"></div>
 </body>
--- a/scripts/pi-hole/lua/header.lp
+++ b/scripts/pi-hole/lua/header.lp
@@ -120,6 +120,6 @@ if startsWith(scriptname, 'groups') then
    <script src="<?=pihole.fileversion('vendor/adminLTE/adminlte.min.js')?>"></script>
    <script src="<?=pihole.fileversion('vendor/bootstrap-notify/bootstrap-notify.min.js')?>"></script>
    <script src="<?=pihole.fileversion('vendor/font-awesome/font-awesome.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('scripts/pi-hole/js/utils.js')?>"></script>
+    <script src="<?=pihole.fileversion('scripts/js/utils.js')?>"></script>
    <script src="<?=pihole.fileversion('vendor/waitMe/waitMe.min.js')?>"></script>
    <link rel="stylesheet" href="<?=pihole.fileversion('vendor/waitMe/waitMe.min.css')?>">
--- a/scripts/pi-hole/lua/header_authenticated.lp
+++ b/scripts/pi-hole/lua/header_authenticated.lp
@@ -9,7 +9,7 @@
 ]]--
 mg.include('header.lp','r')
 ?>
-    <script src="<?=pihole.fileversion('scripts/pi-hole/js/logout.js')?>"></script>
+    <script src="<?=pihole.fileversion('scripts/js/logout.js')?>"></script>
    <script src="<?=pihole.fileversion('vendor/select2/select2.min.js')?>"></script>
    <script src="<?=pihole.fileversion('vendor/datatables/datatables.min.js')?>"></script>
    <script src="<?=pihole.fileversion('vendor/datatables-select/datatables.select.min.js')?>"></script>
--- a/scripts/pi-hole/lua/settings_header.lp
+++ b/scripts/pi-hole/lua/settings_header.lp
--- a/scripts/pi-hole/lua/sidebar.lp
+++ b/scripts/pi-hole/lua/sidebar.lp
--- 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')
 ?>
 <!-- Title -->
 <div class="page-header">
@@ -48,5 +48,5 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')

 <pre id="output" style="width: 100%; height: 100%;" hidden></pre>

-<script src="<?=pihole.fileversion('scripts/pi-hole/js/search.js')?>"></script>
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<script src="<?=pihole.fileversion('scripts/js/search.js')?>"></script>
+<? mg.include('scripts/lua/footer.lp','r')?>
--- 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')
 ?>
 <div class="row settings-level-expert" id="advanced-content">
    <div class="overlay" id="advanced-overlay">
@@ -33,7 +33,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    </div>
 </div>
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings-advanced.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-advanced.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>

-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
--- 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')
 ?>
 <div class="row">
    <div class="col-md-6 settings-level-basic">
@@ -249,7 +249,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
 <script src="<?=pihole.fileversion('vendor/jquery-confirm/jquery.confirm.min.js')?>"></script>
 <script src="<?=pihole.fileversion('vendor/qrious/qrious.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings-api.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-api.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>

-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
--- 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')
 ?>
 <div class="row">
    <!-- DHCP Settings Box -->
@@ -226,8 +226,8 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    </div>
 </div>
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings-dhcp.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/ip-address-sorting.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-dhcp.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>

-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
--- 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')
 ?>
 <div class="row">
    <div class="col-lg-6">
@@ -238,7 +238,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
    </div>
 </div>
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings-dns.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-dns.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>

-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
--- 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')
 ?>
 <div class="row">
    <div class="col-md-12 col-lg-6">
@@ -109,8 +109,8 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
 </div>
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
 <script src="<?=pihole.fileversion('vendor/jquery-confirm/jquery.confirm.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings-dns-records.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/ip-address-sorting.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-dns-records.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>

-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
--- 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')
 ?>
 <div class="row">
    <div class="col-md-6 settings-level-basic">
@@ -109,7 +109,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
 </div>

 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings-privacy.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-privacy.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>

-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
--- 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')
 ?>
 <div class="row">
    <div class="col-md-6">
@@ -318,8 +318,8 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
 </div>
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
 <script src="<?=pihole.fileversion('vendor/jquery-confirm/jquery.confirm.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/charts.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings-system.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/charts.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-system.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>

-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
--- 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')
 ?>
 <div class="row">
    <div class="col-md-6">
@@ -102,7 +102,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
 </div>

 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings-teleporter.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-teleporter.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>

-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
--- 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')
 ?>
 <div class="row">
    <div class="col-md-12">
@@ -33,6 +33,6 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
    </div>
 </div>

-<script src="<?=pihole.fileversion('scripts/pi-hole/js/taillog.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/taillog.js')?>"></script>

-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>