Fix: global view does not show "no articles to show" alert (#4042)

* fix

* phpcs fixed

* fix JS
This commit is contained in:
maTh authored and GitHub committed 2021-12-07 23:19:58 +01:00
1 parent c25dace809
commit 1d624d041f
4 files changed
+26 -1

No files matched your search

+11 -1
View File
@@ -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();
?>
<div class="box category" data-unread="<?= $cat->nbNotRead() ?>">
<div class="box-title"><a class="title" data-unread="<?= format_number($cat->nbNotRead()) ?>"
@@ -49,7 +52,14 @@
<?php
}
}
?>
if ($unreadArticles < 1) {
?>
<div id="noArticlesToShow" class="prompt alert alert-warn">
<h2 class="alert-head"><?= _t('index.feed.empty') ?></h2>
<p><a href="<?= _url('subscription', 'add') ?>"><?= _t('index.feed.add') ?></a></p>
</div>
<?php } ?>
</main>
<div id="overlay">
+7
View File
@@ -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) {
+4
View File
@@ -434,6 +434,10 @@ a.btn {
margin: 5px 20px;
}
.alert.hide {
display: none;
}
/*=== Icons */
.icon {
display: inline-block;
+4
View File
@@ -434,6 +434,10 @@ a.btn {
margin: 5px 20px;
}
.alert.hide {
display: none;
}
/*=== Icons */
.icon {
display: inline-block;