From 7ad275e1fd045cfbf3c915d90b997cf40c6956c9 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Tue, 19 May 2020 16:31:25 +0300
Subject: [PATCH] Move non-Bootstrap files outside of the bootstrap folder

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
---
 scripts/pi-hole/php/header.php                            | 8 ++++----
 .../js => scripts/vendor}/bootstrap-select.min.js         | 0
 .../js => scripts/vendor}/bootstrap-toggle.min.js         | 0
 style/vendor/{bootstrap/css => }/bootstrap-select.min.css | 0
 style/vendor/{bootstrap/css => }/bootstrap-toggle.min.css | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename {style/vendor/bootstrap/js => scripts/vendor}/bootstrap-select.min.js (100%)
 rename {style/vendor/bootstrap/js => scripts/vendor}/bootstrap-toggle.min.js (100%)
 rename style/vendor/{bootstrap/css => }/bootstrap-select.min.css (100%)
 rename style/vendor/{bootstrap/css => }/bootstrap-toggle.min.css (100%)

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index 7d4c2e1d..16c5b438 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -209,8 +209,8 @@
     <link rel="stylesheet" href="style/vendor/animate.min.css">
 
 <?php if(in_array($scriptname, array("groups.php", "groups-clients.php", "groups-domains.php", "groups-adlists.php"))){ ?>
-    <link rel="stylesheet" href="style/vendor/bootstrap/css/bootstrap-select.min.css">
-    <link rel="stylesheet" href="style/vendor/bootstrap/css/bootstrap-toggle.min.css">
+    <link rel="stylesheet" href="style/vendor/bootstrap-select.min.css">
+    <link rel="stylesheet" href="style/vendor/bootstrap-toggle.min.css">
 <?php } ?>
     <link rel="stylesheet" href="style/vendor/iCheck/<?php echo $checkbox_theme_name;?>/<?php echo $checkbox_theme_variant;?>.css">
     <link rel="stylesheet" href="style/pi-hole.css">
@@ -224,8 +224,8 @@
     <script src="scripts/vendor/bootstrap-notify.min.js"></script>
 
 <?php if(in_array($scriptname, array("groups.php", "groups-clients.php", "groups-domains.php", "groups-adlists.php"))){ ?>
-    <script src="style/vendor/bootstrap/js/bootstrap-select.min.js"></script>
-    <script src="style/vendor/bootstrap/js/bootstrap-toggle.min.js"></script>
+    <script src="scripts/vendor/bootstrap-select.min.js"></script>
+    <script src="scripts/vendor/bootstrap-toggle.min.js"></script>
 <?php } ?>
 
     <script src="scripts/vendor/jquery.dataTables.min.js"></script>
diff --git a/style/vendor/bootstrap/js/bootstrap-select.min.js b/scripts/vendor/bootstrap-select.min.js
similarity index 100%
rename from style/vendor/bootstrap/js/bootstrap-select.min.js
rename to scripts/vendor/bootstrap-select.min.js
diff --git a/style/vendor/bootstrap/js/bootstrap-toggle.min.js b/scripts/vendor/bootstrap-toggle.min.js
similarity index 100%
rename from style/vendor/bootstrap/js/bootstrap-toggle.min.js
rename to scripts/vendor/bootstrap-toggle.min.js
diff --git a/style/vendor/bootstrap/css/bootstrap-select.min.css b/style/vendor/bootstrap-select.min.css
similarity index 100%
rename from style/vendor/bootstrap/css/bootstrap-select.min.css
rename to style/vendor/bootstrap-select.min.css
diff --git a/style/vendor/bootstrap/css/bootstrap-toggle.min.css b/style/vendor/bootstrap-toggle.min.css
similarity index 100%
rename from style/vendor/bootstrap/css/bootstrap-toggle.min.css
rename to style/vendor/bootstrap-toggle.min.css