Unify vendor file location

Signed-off-by: yubiuser <[email protected]>
pi-hole · Oct 28, 2024 · 77b98e5 · 77b98e5
1 parent 8020179
commit 77b98e5
Show file tree

Hide file tree

Showing 104 changed files with 67 additions and 377 deletions.
diff --git 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
@@ -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
@@ -91,8 +91,8 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
     </div>
 </div>
 
-<script src="<?=pihole.fileversion('scripts/vendor/bootstrap-select.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/vendor/bootstrap-toggle.min.js')?>"></script>
+<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>

diff --git a/groups-domains.lp b/groups-domains.lp
@@ -148,8 +148,8 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
     </div>
 </div>
 
-<script src="<?=pihole.fileversion('scripts/vendor/bootstrap-select.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/vendor/bootstrap-toggle.min.js')?>"></script>
+<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>
 

diff --git a/groups-lists.lp b/groups-lists.lp
@@ -90,8 +90,8 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
     </div>
 </div>
 
-<script src="<?=pihole.fileversion('scripts/vendor/bootstrap-select.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/vendor/bootstrap-toggle.min.js')?>"></script>
+<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>
 

diff --git a/groups.lp b/groups.lp
@@ -79,8 +79,8 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
     </div>
 </div>
 
-<script src="<?=pihole.fileversion('scripts/vendor/bootstrap-select.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/vendor/bootstrap-toggle.min.js')?>"></script>
+<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>
 

diff --git a/queries.lp b/queries.lp
@@ -194,9 +194,9 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
 </div>
 <!-- /.row -->
 
-<script src="<?=pihole.fileversion('scripts/vendor/bootstrap-select.min.js')?>"></script>
+<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/vendor/daterangepicker.min.js')?>"></script>
+<script src="<?=pihole.fileversion('vendor/daterangepicker/daterangepicker.min.js')?>"></script>
 <script src="<?=pihole.fileversion('scripts/pi-hole/js/queries.js')?>"></script>
 
 <? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
diff --git 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
@@ -77,48 +77,49 @@ is_authenticated = mg.request_info.is_authenticated
         html { background-color: #000; }
     </style>
 <? end ?>
-    <script src="<?=pihole.fileversion('scripts/vendor/nprogress.min.js')?>"></script>
-    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/nprogress.min.css')?>">
+    <script src="<?=pihole.fileversion('vendor/nprogress/nprogress.min.js')?>"></script>
+    <link rel="stylesheet" href="<?=pihole.fileversion('vendor/nprogress/nprogress.min.css')?>">
 
     <!-- Theme fonts -->
 <? if theme.name == 'lcars' then ?>
-    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/fonts/ubuntu-mono/ubuntu-mono.css')?>">
-    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/fonts/antonio/antonio.css')?>">
+    <link rel="stylesheet" href="<?=pihole.fileversion('vendor/fonts/ubuntu-mono/ubuntu-mono.css')?>">
+    <link rel="stylesheet" href="<?=pihole.fileversion('vendor/fonts/antonio/antonio.css')?>">
 <? else ?>
-    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/SourceSansPro/SourceSansPro.css')?>">
+    <link rel="stylesheet" href="<?=pihole.fileversion('vendor/fonts/SourceSansPro/SourceSansPro.css')?>">
 <? end ?>
 
     <!-- Common styles -->
-    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/bootstrap/css/bootstrap.min.css')?>">
-    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/animate.min.css')?>">
-    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/bstreeview.min.css')?>">
+    <link rel="stylesheet" href="<?=pihole.fileversion('vendor/bootstrap/bootstrap.min.css')?>">
+    <link rel="stylesheet" href="<?=pihole.fileversion('vendor/animate/animate.min.css')?>">
+    <link rel="stylesheet" href="<?=pihole.fileversion('vendor/bstreeview/bstreeview.min.css')?>">
 <?
 if startsWith(scriptname, 'groups') then
     -- Group management styles
 ?>
-    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/bootstrap-select.min.css')?>">
+    <link rel="stylesheet" href="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.css')?>">
 <? end ?>
 <? if is_authenticated then ?>
-    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/datatables.min.css')?>">
-    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/datatables_extensions.min.css')?>">
-    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/daterangepicker.min.css')?>">
-    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/bootstrap-toggle.min.css')?>">
+    <link rel="stylesheet" href="<?=pihole.fileversion('vendor/datatables/datatables.min.css')?>">
+    <link rel="stylesheet" href="<?=pihole.fileversion('vendor/datatables-buttons/datatables.buttons.min.css')?>">
+    <link rel="stylesheet" href="<?=pihole.fileversion('vendor/datatables-select/datatables.select.min.css')?>">
+    <link rel="stylesheet" href="<?=pihole.fileversion('vendor/daterangepicker/daterangepicker.min.css')?>">
+    <link rel="stylesheet" href="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.css')?>">
 <? end ?>
-    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/select2.min.css')?>">
-    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/AdminLTE.min.css')?>">
+    <link rel="stylesheet" href="<?=pihole.fileversion('vendor/select2/select2.min.css')?>">
+    <link rel="stylesheet" href="<?=pihole.fileversion('vendor/adminLTE/AdminLTE.min.css')?>">
 
     <!-- Theme styles -->
     <link rel="stylesheet" href="<?=pihole.fileversion('style/pi-hole.css')?>">
     <link rel="stylesheet" href="<?=pihole.fileversion('style/themes/'..theme.name..'.css')?>">
 
-    <noscript><link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/js-warn.css')?>"></noscript>
+    <noscript><link rel="stylesheet" href="<?=pihole.fileversion('vendor/js-warn/js-warn.css')?>"></noscript>
 
     <!-- scripts -->
-    <script src="<?=pihole.fileversion('scripts/vendor/jquery.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('style/vendor/bootstrap/js/bootstrap.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('scripts/vendor/adminlte.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('scripts/vendor/bootstrap-notify.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('style/vendor/font-awesome/js/all.min.js')?>"></script>
+    <script src="<?=pihole.fileversion('vendor/jquery/jquery.min.js')?>"></script>
+    <script src="<?=pihole.fileversion('vendor/bootstrap/bootstrap.min.js')?>"></script>
+    <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/vendor/waitMe.min.js')?>"></script>
-    <link rel="stylesheet" href="<?=pihole.fileversion('style/vendor/waitMe.min.css')?>">
+    <script src="<?=pihole.fileversion('vendor/waitMe/waitMe.min.js')?>"></script>
+    <link rel="stylesheet" href="<?=pihole.fileversion('vendor/waitMe/waitMe.min.css')?>">
diff --git 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')
 ?>
     <script src="<?=pihole.fileversion('scripts/pi-hole/js/logout.js')?>"></script>
-    <script src="<?=pihole.fileversion('scripts/vendor/select2.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('scripts/vendor/datatables.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('scripts/vendor/datatables.select.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('scripts/vendor/datatables.buttons.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('scripts/vendor/chart.umd.js')?>"></script>
-    <script src="<?=pihole.fileversion('scripts/vendor/chartjs-plugin-deferred.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('scripts/vendor/moment.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('scripts/vendor/chartjs-adapter-moment.js')?>"></script>
-    <script src="<?=pihole.fileversion('scripts/vendor/hammer.min.js')?>"></script> <!-- Needed for chartjs-plugin-zoom --->
-    <script src="<?=pihole.fileversion('scripts/vendor/chartjs-plugin-zoom.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('scripts/vendor/bstreeview.min.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>
+    <script src="<?=pihole.fileversion('vendor/datatables-buttons/datatables.buttons.min.js')?>"></script>
+    <script src="<?=pihole.fileversion('vendor/chartjs/chart.umd.js')?>"></script>
+    <script src="<?=pihole.fileversion('vendor/chartjs-plugin-deferred/chartjs-plugin-deferred.min.js')?>"></script>
+    <script src="<?=pihole.fileversion('vendor/moment/moment.min.js')?>"></script>
+    <script src="<?=pihole.fileversion('vendor/chartjs-adapter-moment/chartjs-adapter-moment.js')?>"></script>
+    <script src="<?=pihole.fileversion('vendor/hammer/hammer.min.js')?>"></script> <!-- Needed for chartjs-plugin-zoom --->
+    <script src="<?=pihole.fileversion('vendor/chartjs-plugin-zoom/chartjs-plugin-zoom.min.js')?>"></script>
+    <script src="<?=pihole.fileversion('vendor/bstreeview/bstreeview.min.js')?>"></script>
 </head>
 <body class="<?=theme.name?> hold-transition sidebar-mini <? if pihole.boxedlayout() then ?>layout-boxed<? end ?> logged-in">
 <noscript>

diff --git a/settings-all.lp b/settings-all.lp
@@ -32,7 +32,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
         <button type="button" class="btn btn-primary save-button"><i class="fa-solid fa-fw fa-floppy-disk"></i>&nbsp;Save & Apply</button>
     </div>
 </div>
-<script src="<?=pihole.fileversion('scripts/vendor/bootstrap-toggle.min.js')?>"></script>
+<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>
 

diff --git a/settings-api.lp b/settings-api.lp
@@ -246,9 +246,9 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
     </div>
 </div>
 
-<script src="<?=pihole.fileversion('scripts/vendor/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/vendor/jquery.confirm.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/vendor/qrious.min.js')?>"></script>
+<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>
 

diff --git a/settings-dhcp.lp b/settings-dhcp.lp
@@ -225,7 +225,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
         <button type="button" class="btn btn-primary save-button"><i class="fa-solid fa-fw fa-floppy-disk"></i>&nbsp;Save & Apply</button>
     </div>
 </div>
-<script src="<?=pihole.fileversion('scripts/vendor/bootstrap-toggle.min.js')?>"></script>
+<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>

diff --git a/settings-dns.lp b/settings-dns.lp
@@ -237,7 +237,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
         <button type="button" class="btn btn-primary save-button"><i class="fa-solid fa-fw fa-floppy-disk"></i>&nbsp;Save & Apply</button>
     </div>
 </div>
-<script src="<?=pihole.fileversion('scripts/vendor/bootstrap-toggle.min.js')?>"></script>
+<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>
 

diff --git a/settings-dnsrecords.lp b/settings-dnsrecords.lp
@@ -107,8 +107,8 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
         </div>
     </div>
 </div>
-<script src="<?=pihole.fileversion('scripts/vendor/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/vendor/jquery.confirm.min.js')?>"></script>
+<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>

diff --git a/settings-privacy.lp b/settings-privacy.lp
@@ -108,7 +108,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
     </div>
 </div>
 
-<script src="<?=pihole.fileversion('scripts/vendor/bootstrap-toggle.min.js')?>"></script>
+<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>
 

diff --git a/settings-system.lp b/settings-system.lp
@@ -316,8 +316,8 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
         </div>
     </div>
 </div>
-<script src="<?=pihole.fileversion('scripts/vendor/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/vendor/jquery.confirm.min.js')?>"></script>
+<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>

diff --git a/settings-teleporter.lp b/settings-teleporter.lp
@@ -101,7 +101,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
     </div>
 </div>
 
-<script src="<?=pihole.fileversion('scripts/vendor/bootstrap-toggle.min.js')?>"></script>
+<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>
 

diff --git a/style/vendor/LICENSE b/style/vendor/LICENSE
diff --git a/style/vendor/bootstrap/fonts/glyphicons-halflings-regular.eot b/style/vendor/bootstrap/fonts/glyphicons-halflings-regular.eot