diff --git a/app/css/custom.css b/app/css/custom.css index ebd8cb4f..75cff67a 100644 --- a/app/css/custom.css +++ b/app/css/custom.css @@ -230,3 +230,8 @@ canvas#divDBChartBandwidthhourly { opacity: 0; color: #1cc88a; } + +.check-progress { + color: #999; +} + diff --git a/app/css/hackernews.css b/app/css/hackernews.css index 113b5b4c..27700268 100644 --- a/app/css/hackernews.css +++ b/app/css/hackernews.css @@ -245,3 +245,17 @@ canvas#divDBChartBandwidthhourly { .table { margin-bottom: 0rem; } + +.check-hidden { + visibility: hidden; +} + +.check-updated { + opacity: 0; + color: #1cc88a; +} + +.check-progress { + color: #999; +} + diff --git a/app/css/lightsout.css b/app/css/lightsout.css index 88a807d2..f3a48f3d 100644 --- a/app/css/lightsout.css +++ b/app/css/lightsout.css @@ -434,3 +434,17 @@ canvas#divDBChartBandwidthhourly { .figure, .authors { filter: brightness(70%) !important; } + +.check-hidden { + visibility: hidden; +} + +.check-updated { + opacity: 0; + color: #1cc88a; +} + +.check-progress { + color: #999; +} + diff --git a/app/js/custom.js b/app/js/custom.js index 1fd5e6bf..7eb97e42 100644 --- a/app/js/custom.js +++ b/app/js/custom.js @@ -298,16 +298,19 @@ function loadChannelSelect(selected) { function updateBlocklist() { var blocklist_id = $('#cbxblocklist').val(); if (blocklist_id == '') { return; } + $('#cbxblocklist-status').find('i').removeClass('fas fa-check').addClass('fas fa-cog fa-spin'); + $('#cbxblocklist-status').removeClass('check-hidden').addClass('check-progress'); $.post('ajax/adblock/update_blocklist.php',{ 'blocklist_id':blocklist_id },function(data){ var jsonData = JSON.parse(data); if (jsonData['return'] == '0') { - $('#cbxblocklist-status').removeClass('check-hidden').addClass('check-updated').delay(500).animate({ opacity: 1 }, 700); + $('#cbxblocklist-status').find('i').removeClass('fas fa-cog fa-spin').addClass('fas fa-check'); + $('#cbxblocklist-status').removeClass('check-progress').addClass('check-updated').delay(500).animate({ opacity: 1 }, 700); } }) } function clearBlocklistStatus() { - $('#cbxblocklist-status').addClass('check-hidden'); + $('#cbxblocklist-status').removeClass('check-updated').addClass('check-hidden'); } // Static Array method Array.range = (start, end) => Array.from({length: (end - start)}, (v, k) => k + start); diff --git a/templates/adblock.php b/templates/adblock.php index 1aca4e4f..34ad4ebe 100755 --- a/templates/adblock.php +++ b/templates/adblock.php @@ -32,7 +32,6 @@