From 1d624d041fb12162eaae3a428e8eca57dc91d50a Mon Sep 17 00:00:00 2001 From: maTh Date: Tue, 7 Dec 2021 23:19:58 +0100 Subject: Fix: global view does not show "no articles to show" alert (#4042) * fix * phpcs fixed * fix JS --- app/views/index/global.phtml | 12 +++++++++++- p/scripts/main.js | 7 +++++++ p/themes/base-theme/template.css | 4 ++++ p/themes/base-theme/template.rtl.css | 4 ++++ 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml index 5b7e886e8..306c6604b 100644 --- a/app/views/index/global.phtml +++ b/app/views/index/global.phtml @@ -20,11 +20,14 @@ 'params' => $params, ); + $unreadArticles = 0; + foreach ($this->categories as $cat) { $feeds = $cat->feeds(); $url_base['params']['get'] = 'c_' . $cat->id(); if (!empty($feeds)) { + $unreadArticles += $cat->nbNotRead(); ?>
+ + if ($unreadArticles < 1) { + ?> + +
diff --git a/p/scripts/main.js b/p/scripts/main.js index 16ae7d0f0..3093d1da8 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -1481,9 +1481,11 @@ function refreshUnreads() { } const isAll = document.querySelector('.category.all.active'); let new_articles = false; + let nbUnreadFeeds = 0; Object.keys(json.feeds).forEach(function (feed_id) { const nbUnreads = json.feeds[feed_id]; + nbUnreadFeeds += nbUnreads; feed_id = 'f_' + feed_id; const elem = document.getElementById(feed_id); const feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0; @@ -1497,6 +1499,11 @@ function refreshUnreads() { } }); + const noArticlesToShow_div = document.getElementById('noArticlesToShow'); + if (nbUnreadFeeds > 0 && noArticlesToShow_div) { + noArticlesToShow_div.classList.add('hide'); + } + let nbUnreadTags = 0; Object.keys(json.tags).forEach(function (tag_id) { diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 421660433..3ac7eea28 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -434,6 +434,10 @@ a.btn { margin: 5px 20px; } +.alert.hide { + display: none; +} + /*=== Icons */ .icon { display: inline-block; diff --git a/p/themes/base-theme/template.rtl.css b/p/themes/base-theme/template.rtl.css index 19c27ddd7..fd5436ec2 100644 --- a/p/themes/base-theme/template.rtl.css +++ b/p/themes/base-theme/template.rtl.css @@ -434,6 +434,10 @@ a.btn { margin: 5px 20px; } +.alert.hide { + display: none; +} + /*=== Icons */ .icon { display: inline-block; -- cgit v1.2.3