From 6bed64f6f360e1480bf5efc0d52d255b85791242 Mon Sep 17 00:00:00 2001
From: maTh <math-home@web.de>
Date: Sun, 18 Sep 2022 18:31:14 +0200
Subject: Improved: Mouse title on empty feeds (#4617)

* Update aside_feed.phtml

* Update global.phtml

* Update idle.phtml

* Update index.phtml

* Update idle.phtml

* improved

* Update app/views/subscription/index.phtml

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>

* Update app/views/stats/idle.phtml

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
---
 app/views/index/global.phtml       | 20 +++++++++++++++++---
 app/views/stats/idle.phtml         | 19 ++++++++++++++++---
 app/views/subscription/index.phtml | 25 ++++++++++++++++++-------
 3 files changed, 51 insertions(+), 13 deletions(-)

(limited to 'app/views')

diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml
index 9bc291fca..7348c9cd1 100644
--- a/app/views/index/global.phtml
+++ b/app/views/index/global.phtml
@@ -41,11 +41,25 @@
 			<?php
 				foreach ($feeds as $feed) {
 					$nb_not_read = $feed->nbNotRead();
-					$error = $feed->inError() ? ' error' : '';
-					$empty = $feed->nbEntries() === 0 ? ' empty' : '';
+
+					$error_class = '';
+					$error_title = '';
+					if ($feed->inError()) {
+						$error_class = ' error';
+						$error_title = _t('sub.feed.error');
+					}
+
+					$empty_class = '';
+					$empty_title = '';
+					if ($feed->nbEntries() == 0) {
+						$empty_class = ' empty';
+						$empty_title = _t('sub.feed.empty');
+					}
+					$mute_class = $feed->mute() ? ' mute' : '';
+
 					$url_base['params']['get'] = 'f_' . $feed->id();
 			?>
-			<li id="f_<?= $feed->id() ?>" class="item feed<?= $error, $empty, $feed->mute() ? ' mute' : '' ?>"
+			<li id="f_<?= $feed->id() ?>" class="item feed<?= $error_class, $empty_class, $mute_class ?>" title="<?= $error_title, $empty_title ?>"
 				data-unread="<?= $feed->nbNotRead() ?>" data-priority="<?= $feed->priority() ?>">
 				<?php if (FreshRSS_Context::$user_conf->show_favicons): ?><img class="favicon" src="<?= $feed->favicon() ?>" alt="✇" loading="lazy" /><?php endif; ?>
 				<a class="item-title" data-unread="<?= format_number($feed->nbNotRead()) ?>" href="<?= Minz_Url::display($url_base) ?>"><?= $feed->name() ?></a>
diff --git a/app/views/stats/idle.phtml b/app/views/stats/idle.phtml
index 9dbfbf4ab..a88dbeb8a 100644
--- a/app/views/stats/idle.phtml
+++ b/app/views/stats/idle.phtml
@@ -26,10 +26,23 @@
 				<?php
 					foreach ($feedsInPeriod as $feedInPeriod) {
 						$feed = $this->feeds[$feedInPeriod['id']] ?? null;
-						$error = $feed == null || $feed->inError() ? ' error' : '';
-						$empty = $feed != null && $feed->nbEntries() == 0 ? ' empty' : '';
+
+						$error_class = '';
+						$error_title = '';
+						if ($feed == null || $feed->inError()) {
+							$error_class = ' error';
+							$error_title = _t('sub.feed.error');
+						}
+
+						$empty_class = '';
+						$empty_title = '';
+						if ($feed != null && $feed->nbEntries() == 0) {
+							$empty_class = ' empty';
+							$empty_title = _t('sub.feed.empty');
+						}
+						$mute_class = $feed->mute() ? ' mute' : '';
 				?>
-					<li class="item feed<?= $error, $empty, $feed->mute() ? ' mute' : '' ?>">
+					<li class="item feed<?= $error_class, $empty_class, $mute_class ?>" title="<?= $error_title, $empty_title ?>">
 						<a class="configure open-slider" href="<?= _url('stats', 'feed', 'id', $feedInPeriod['id'], 'sub', 'idle') ?>" title="<?= _t('gen.action.manage') ?>"><?= _i('configure') ?></a>
 						<?php if (FreshRSS_Context::$user_conf->show_favicons): ?><img class="favicon" src="<?= $feedInPeriod['favicon'] ?>" alt="✇" loading="lazy" /><?php endif; ?>
 						<span title="<?= timestamptodate($feedInPeriod['last_date'], false) ?>"><?= $feedInPeriod['name'] ?>
diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index b546eea6d..f056214d2 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -45,14 +45,25 @@
 						if ($this->onlyFeedsWithError && !$feed->inError()) {
 							continue;
 						}
-						$error = $feed->inError() ? ' error' : '';
-						$empty = $feed->nbEntries() == 0 ? ' empty' : '';
+
+						$error_class = '';
+						$error_title = '';
+						if ($feed->inError()) {
+							$error_class = ' error';
+							$error_title = _t('sub.feed.error');
+						}
+
+						$empty_class = '';
+						$empty_title = '';
+						if ($feed->nbEntries() == 0) {
+							$empty_class = ' empty';
+							$empty_title = _t('sub.feed.empty');
+						}
+						$mute_class = $feed->mute() ? ' mute' : '';
 				?>
-				<li class="item feed<?= $error, $empty, $feed->mute() ? ' mute' : '' ?>"
-					title="<?= $feed->inError() ? _t('sub.feed.error') : '' ?>"
-					draggable="true"
-					data-feed-id="<?= $feed->id() ?>">
-					<a class="configure open-slider" href="<?= _url('subscription', 'feed', 'id', $feed->id()) ?>"><?= _i('configure') ?></a>
+				<li class="item feed<?= $error_class, $empty_class, $mute_class ?>" title="<?= $error_title, $empty_title ?>"
+					draggable="true" data-feed-id="<?= $feed->id() ?>">
+					<a class="configure open-slider" href="<?= _url('subscription', 'feed', 'id', $feed->id()) ?>" title="<?= _t('gen.action.manage') ?>"><?= _i('configure') ?></a>
 					<?php if (FreshRSS_Context::$user_conf->show_favicons): ?><img class="favicon" src="<?= $feed->favicon() ?>" alt="✇" loading="lazy" /><?php endif; ?>
 					<span class="item-title"><?= $feed->name() ?></span>
 				</li>
-- 
cgit v1.2.3