From 064a0aae9c1407e3b3cf8bbc57e5f548ec242d55 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 30 Apr 2020 01:43:29 +0200 Subject: [PATCH] Use the iCheck library for input box styling. Signed-off-by: DL6ER --- scripts/pi-hole/js/footer.js | 9 + scripts/pi-hole/php/header.php | 14 +- scripts/vendor/iCheck.min.js | 19 + settings.php | 12 +- style/pi-hole.css | 4 + style/themes/default-dark.css | 72 -- style/themes/default-light.css | 70 -- style/vendor/iCheck/all.css | 61 ++ style/vendor/iCheck/flat/_all.css | 530 ++++++++++++++ style/vendor/iCheck/flat/aero.css | 53 ++ style/vendor/iCheck/flat/aero.png | Bin 0 -> 1520 bytes style/vendor/iCheck/flat/aero@2x.png | Bin 0 -> 3218 bytes style/vendor/iCheck/flat/blue.css | 53 ++ style/vendor/iCheck/flat/blue.png | Bin 0 -> 1518 bytes style/vendor/iCheck/flat/blue@2x.png | Bin 0 -> 3217 bytes style/vendor/iCheck/flat/flat.css | 53 ++ style/vendor/iCheck/flat/flat.png | Bin 0 -> 1515 bytes style/vendor/iCheck/flat/flat@2x.png | Bin 0 -> 3217 bytes style/vendor/iCheck/flat/green.css | 53 ++ style/vendor/iCheck/flat/green.png | Bin 0 -> 1444 bytes style/vendor/iCheck/flat/green@2x.png | Bin 0 -> 3117 bytes style/vendor/iCheck/flat/grey.css | 53 ++ style/vendor/iCheck/flat/grey.png | Bin 0 -> 1516 bytes style/vendor/iCheck/flat/grey@2x.png | Bin 0 -> 3217 bytes style/vendor/iCheck/flat/orange.css | 53 ++ style/vendor/iCheck/flat/orange.png | Bin 0 -> 1518 bytes style/vendor/iCheck/flat/orange@2x.png | Bin 0 -> 3275 bytes style/vendor/iCheck/flat/pink.css | 53 ++ style/vendor/iCheck/flat/pink.png | Bin 0 -> 1522 bytes style/vendor/iCheck/flat/pink@2x.png | Bin 0 -> 3218 bytes style/vendor/iCheck/flat/purple.css | 53 ++ style/vendor/iCheck/flat/purple.png | Bin 0 -> 1519 bytes style/vendor/iCheck/flat/purple@2x.png | Bin 0 -> 3218 bytes style/vendor/iCheck/flat/red.css | 53 ++ style/vendor/iCheck/flat/red.png | Bin 0 -> 1516 bytes style/vendor/iCheck/flat/red@2x.png | Bin 0 -> 3276 bytes style/vendor/iCheck/flat/yellow.css | 53 ++ style/vendor/iCheck/flat/yellow.png | Bin 0 -> 1516 bytes style/vendor/iCheck/flat/yellow@2x.png | Bin 0 -> 3216 bytes style/vendor/iCheck/futurico/futurico.css | 53 ++ style/vendor/iCheck/futurico/futurico.png | Bin 0 -> 1734 bytes style/vendor/iCheck/futurico/futurico@2x.png | Bin 0 -> 3446 bytes style/vendor/iCheck/line/_all.css | 710 +++++++++++++++++++ style/vendor/iCheck/line/aero.css | 71 ++ style/vendor/iCheck/line/blue.css | 71 ++ style/vendor/iCheck/line/green.css | 71 ++ style/vendor/iCheck/line/grey.css | 71 ++ style/vendor/iCheck/line/line.css | 71 ++ style/vendor/iCheck/line/line.png | Bin 0 -> 588 bytes style/vendor/iCheck/line/line@2x.png | Bin 0 -> 1073 bytes style/vendor/iCheck/line/orange.css | 71 ++ style/vendor/iCheck/line/pink.css | 71 ++ style/vendor/iCheck/line/purple.css | 71 ++ style/vendor/iCheck/line/red.css | 71 ++ style/vendor/iCheck/line/yellow.css | 71 ++ style/vendor/iCheck/minimal/_all.css | 590 +++++++++++++++ style/vendor/iCheck/minimal/aero.css | 59 ++ style/vendor/iCheck/minimal/aero.png | Bin 0 -> 1151 bytes style/vendor/iCheck/minimal/aero@2x.png | Bin 0 -> 1409 bytes style/vendor/iCheck/minimal/blue.css | 59 ++ style/vendor/iCheck/minimal/blue.png | Bin 0 -> 1132 bytes style/vendor/iCheck/minimal/blue@2x.png | Bin 0 -> 1410 bytes style/vendor/iCheck/minimal/green.css | 59 ++ style/vendor/iCheck/minimal/green.png | Bin 0 -> 1143 bytes style/vendor/iCheck/minimal/green@2x.png | Bin 0 -> 1408 bytes style/vendor/iCheck/minimal/grey.css | 59 ++ style/vendor/iCheck/minimal/grey.png | Bin 0 -> 1142 bytes style/vendor/iCheck/minimal/grey@2x.png | Bin 0 -> 1407 bytes style/vendor/iCheck/minimal/minimal.css | 59 ++ style/vendor/iCheck/minimal/minimal.png | Bin 0 -> 1114 bytes style/vendor/iCheck/minimal/minimal@2x.png | Bin 0 -> 1410 bytes style/vendor/iCheck/minimal/orange.css | 59 ++ style/vendor/iCheck/minimal/orange.png | Bin 0 -> 1139 bytes style/vendor/iCheck/minimal/orange@2x.png | Bin 0 -> 1407 bytes style/vendor/iCheck/minimal/pink.css | 59 ++ style/vendor/iCheck/minimal/pink.png | Bin 0 -> 1150 bytes style/vendor/iCheck/minimal/pink@2x.png | Bin 0 -> 1409 bytes style/vendor/iCheck/minimal/purple.css | 59 ++ style/vendor/iCheck/minimal/purple.png | Bin 0 -> 1132 bytes style/vendor/iCheck/minimal/purple@2x.png | Bin 0 -> 1409 bytes style/vendor/iCheck/minimal/red.css | 59 ++ style/vendor/iCheck/minimal/red.png | Bin 0 -> 1130 bytes style/vendor/iCheck/minimal/red@2x.png | Bin 0 -> 1410 bytes style/vendor/iCheck/minimal/yellow.css | 59 ++ style/vendor/iCheck/minimal/yellow.png | Bin 0 -> 1135 bytes style/vendor/iCheck/minimal/yellow@2x.png | Bin 0 -> 1406 bytes style/vendor/iCheck/polaris/polaris.css | 59 ++ style/vendor/iCheck/polaris/polaris.png | Bin 0 -> 6401 bytes style/vendor/iCheck/polaris/polaris@2x.png | Bin 0 -> 16760 bytes style/vendor/iCheck/square/_all.css | 590 +++++++++++++++ style/vendor/iCheck/square/aero.css | 59 ++ style/vendor/iCheck/square/aero.png | Bin 0 -> 2167 bytes style/vendor/iCheck/square/aero@2x.png | Bin 0 -> 4455 bytes style/vendor/iCheck/square/blue.css | 59 ++ style/vendor/iCheck/square/blue.png | Bin 0 -> 2185 bytes style/vendor/iCheck/square/blue@2x.png | Bin 0 -> 4485 bytes style/vendor/iCheck/square/green.css | 59 ++ style/vendor/iCheck/square/green.png | Bin 0 -> 2193 bytes style/vendor/iCheck/square/green@2x.png | Bin 0 -> 4498 bytes style/vendor/iCheck/square/grey.css | 59 ++ style/vendor/iCheck/square/grey.png | Bin 0 -> 2186 bytes style/vendor/iCheck/square/grey@2x.png | Bin 0 -> 4483 bytes style/vendor/iCheck/square/orange.css | 59 ++ style/vendor/iCheck/square/orange.png | Bin 0 -> 2181 bytes style/vendor/iCheck/square/orange@2x.png | Bin 0 -> 4474 bytes style/vendor/iCheck/square/pink.css | 59 ++ style/vendor/iCheck/square/pink.png | Bin 0 -> 2189 bytes style/vendor/iCheck/square/pink@2x.png | Bin 0 -> 4479 bytes style/vendor/iCheck/square/purple.css | 59 ++ style/vendor/iCheck/square/purple.png | Bin 0 -> 2188 bytes style/vendor/iCheck/square/purple@2x.png | Bin 0 -> 4501 bytes style/vendor/iCheck/square/red.css | 59 ++ style/vendor/iCheck/square/red.png | Bin 0 -> 2190 bytes style/vendor/iCheck/square/red@2x.png | Bin 0 -> 4490 bytes style/vendor/iCheck/square/square.css | 59 ++ style/vendor/iCheck/square/square.png | Bin 0 -> 2175 bytes style/vendor/iCheck/square/square@2x.png | Bin 0 -> 4478 bytes style/vendor/iCheck/square/yellow.css | 59 ++ style/vendor/iCheck/square/yellow.png | Bin 0 -> 2131 bytes style/vendor/iCheck/square/yellow@2x.png | Bin 0 -> 4385 bytes 120 files changed, 5062 insertions(+), 151 deletions(-) create mode 100644 scripts/vendor/iCheck.min.js create mode 100644 style/vendor/iCheck/all.css create mode 100644 style/vendor/iCheck/flat/_all.css create mode 100644 style/vendor/iCheck/flat/aero.css create mode 100644 style/vendor/iCheck/flat/aero.png create mode 100644 style/vendor/iCheck/flat/aero@2x.png create mode 100644 style/vendor/iCheck/flat/blue.css create mode 100644 style/vendor/iCheck/flat/blue.png create mode 100644 style/vendor/iCheck/flat/blue@2x.png create mode 100644 style/vendor/iCheck/flat/flat.css create mode 100644 style/vendor/iCheck/flat/flat.png create mode 100644 style/vendor/iCheck/flat/flat@2x.png create mode 100644 style/vendor/iCheck/flat/green.css create mode 100644 style/vendor/iCheck/flat/green.png create mode 100644 style/vendor/iCheck/flat/green@2x.png create mode 100644 style/vendor/iCheck/flat/grey.css create mode 100644 style/vendor/iCheck/flat/grey.png create mode 100644 style/vendor/iCheck/flat/grey@2x.png create mode 100644 style/vendor/iCheck/flat/orange.css create mode 100644 style/vendor/iCheck/flat/orange.png create mode 100644 style/vendor/iCheck/flat/orange@2x.png create mode 100644 style/vendor/iCheck/flat/pink.css create mode 100644 style/vendor/iCheck/flat/pink.png create mode 100644 style/vendor/iCheck/flat/pink@2x.png create mode 100644 style/vendor/iCheck/flat/purple.css create mode 100644 style/vendor/iCheck/flat/purple.png create mode 100644 style/vendor/iCheck/flat/purple@2x.png create mode 100644 style/vendor/iCheck/flat/red.css create mode 100644 style/vendor/iCheck/flat/red.png create mode 100644 style/vendor/iCheck/flat/red@2x.png create mode 100644 style/vendor/iCheck/flat/yellow.css create mode 100644 style/vendor/iCheck/flat/yellow.png create mode 100644 style/vendor/iCheck/flat/yellow@2x.png create mode 100644 style/vendor/iCheck/futurico/futurico.css create mode 100644 style/vendor/iCheck/futurico/futurico.png create mode 100644 style/vendor/iCheck/futurico/futurico@2x.png create mode 100644 style/vendor/iCheck/line/_all.css create mode 100644 style/vendor/iCheck/line/aero.css create mode 100644 style/vendor/iCheck/line/blue.css create mode 100644 style/vendor/iCheck/line/green.css create mode 100644 style/vendor/iCheck/line/grey.css create mode 100644 style/vendor/iCheck/line/line.css create mode 100644 style/vendor/iCheck/line/line.png create mode 100644 style/vendor/iCheck/line/line@2x.png create mode 100644 style/vendor/iCheck/line/orange.css create mode 100644 style/vendor/iCheck/line/pink.css create mode 100644 style/vendor/iCheck/line/purple.css create mode 100644 style/vendor/iCheck/line/red.css create mode 100644 style/vendor/iCheck/line/yellow.css create mode 100644 style/vendor/iCheck/minimal/_all.css create mode 100644 style/vendor/iCheck/minimal/aero.css create mode 100644 style/vendor/iCheck/minimal/aero.png create mode 100644 style/vendor/iCheck/minimal/aero@2x.png create mode 100644 style/vendor/iCheck/minimal/blue.css create mode 100644 style/vendor/iCheck/minimal/blue.png create mode 100644 style/vendor/iCheck/minimal/blue@2x.png create mode 100644 style/vendor/iCheck/minimal/green.css create mode 100644 style/vendor/iCheck/minimal/green.png create mode 100644 style/vendor/iCheck/minimal/green@2x.png create mode 100644 style/vendor/iCheck/minimal/grey.css create mode 100644 style/vendor/iCheck/minimal/grey.png create mode 100644 style/vendor/iCheck/minimal/grey@2x.png create mode 100644 style/vendor/iCheck/minimal/minimal.css create mode 100644 style/vendor/iCheck/minimal/minimal.png create mode 100644 style/vendor/iCheck/minimal/minimal@2x.png create mode 100644 style/vendor/iCheck/minimal/orange.css create mode 100644 style/vendor/iCheck/minimal/orange.png create mode 100644 style/vendor/iCheck/minimal/orange@2x.png create mode 100644 style/vendor/iCheck/minimal/pink.css create mode 100644 style/vendor/iCheck/minimal/pink.png create mode 100644 style/vendor/iCheck/minimal/pink@2x.png create mode 100644 style/vendor/iCheck/minimal/purple.css create mode 100644 style/vendor/iCheck/minimal/purple.png create mode 100644 style/vendor/iCheck/minimal/purple@2x.png create mode 100644 style/vendor/iCheck/minimal/red.css create mode 100644 style/vendor/iCheck/minimal/red.png create mode 100644 style/vendor/iCheck/minimal/red@2x.png create mode 100644 style/vendor/iCheck/minimal/yellow.css create mode 100644 style/vendor/iCheck/minimal/yellow.png create mode 100644 style/vendor/iCheck/minimal/yellow@2x.png create mode 100644 style/vendor/iCheck/polaris/polaris.css create mode 100644 style/vendor/iCheck/polaris/polaris.png create mode 100644 style/vendor/iCheck/polaris/polaris@2x.png create mode 100644 style/vendor/iCheck/square/_all.css create mode 100644 style/vendor/iCheck/square/aero.css create mode 100644 style/vendor/iCheck/square/aero.png create mode 100644 style/vendor/iCheck/square/aero@2x.png create mode 100644 style/vendor/iCheck/square/blue.css create mode 100644 style/vendor/iCheck/square/blue.png create mode 100644 style/vendor/iCheck/square/blue@2x.png create mode 100644 style/vendor/iCheck/square/green.css create mode 100644 style/vendor/iCheck/square/green.png create mode 100644 style/vendor/iCheck/square/green@2x.png create mode 100644 style/vendor/iCheck/square/grey.css create mode 100644 style/vendor/iCheck/square/grey.png create mode 100644 style/vendor/iCheck/square/grey@2x.png create mode 100644 style/vendor/iCheck/square/orange.css create mode 100644 style/vendor/iCheck/square/orange.png create mode 100644 style/vendor/iCheck/square/orange@2x.png create mode 100644 style/vendor/iCheck/square/pink.css create mode 100644 style/vendor/iCheck/square/pink.png create mode 100644 style/vendor/iCheck/square/pink@2x.png create mode 100644 style/vendor/iCheck/square/purple.css create mode 100644 style/vendor/iCheck/square/purple.png create mode 100644 style/vendor/iCheck/square/purple@2x.png create mode 100644 style/vendor/iCheck/square/red.css create mode 100644 style/vendor/iCheck/square/red.png create mode 100644 style/vendor/iCheck/square/red@2x.png create mode 100644 style/vendor/iCheck/square/square.css create mode 100644 style/vendor/iCheck/square/square.png create mode 100644 style/vendor/iCheck/square/square@2x.png create mode 100644 style/vendor/iCheck/square/yellow.css create mode 100644 style/vendor/iCheck/square/yellow.png create mode 100644 style/vendor/iCheck/square/yellow@2x.png diff --git a/scripts/pi-hole/js/footer.js b/scripts/pi-hole/js/footer.js index d8c98720..171b9164 100644 --- a/scripts/pi-hole/js/footer.js +++ b/scripts/pi-hole/js/footer.js @@ -100,6 +100,15 @@ $(document).ready(function () { if (seconds > 0) { setTimeout(countDown, 100); } + if (!testCookies() && $("#cookieInfo").length) { + $("#cookieInfo").show(); + } + + var checkbox_theme = $("#checkbox_theme").text(); + $('input').icheck({ + checkboxClass: 'icheckbox_' + checkbox_theme, + radioClass: 'iradio_' + checkbox_theme + }); }); // Handle Enable/Disable diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php index 0b5fead5..bf72c7d4 100644 --- a/scripts/pi-hole/php/header.php +++ b/scripts/pi-hole/php/header.php @@ -13,6 +13,12 @@ //$theme = "default-light"; $theme = "default-dark"; + //$checkbox_theme_name = "flat"; + //$checkbox_theme_variant = "blue"; + $checkbox_theme_name = "polaris"; + $checkbox_theme_variant = "polaris"; + //$checkbox_theme_name = "futurico"; + //$checkbox_theme_variant = "futurico"; check_cors(); @@ -206,8 +212,6 @@ - - @@ -227,6 +231,10 @@ + + + +