aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar maTh <math-home@web.de> 2022-07-31 13:20:48 +0200
committerGravatar GitHub <noreply@github.com> 2022-07-31 13:20:48 +0200
commit5177a17c9fd4a92465b56f5486c233aa0b3504e2 (patch)
tree7dc00999e8e8e9a85bb783dae2b2190175935fd7
parent18b8e91e3f29329d25d78fdf06376dee608936b3 (diff)
sidebar and subscription management (#4474)
-rw-r--r--app/layout/aside_feed.phtml2
-rw-r--r--app/views/subscription/index.phtml3
-rw-r--r--p/themes/base-theme/template.css7
-rw-r--r--p/themes/base-theme/template.rtl.css7
4 files changed, 15 insertions, 4 deletions
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index ebaaeaa15..248c6174c 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -102,7 +102,7 @@
?>
<li id="f_<?= $feed->id() ?>" class="item feed<?= $f_active ? ' active' : '', $feed->mute() ? ' mute' : '' ?><?=
$feed->inError() ? ' error' : '' ?><?= $feed->nbEntries() <= 0 ? ' empty' : ''
- ?>" data-unread="<?= $feed->nbNotRead() ?>" data-priority="<?= $feed->priority() ?>"><?php
+ ?>" title="<?= $feed->inError() ? _t('sub.feed.error') : '' ?>" data-unread="<?= $feed->nbNotRead() ?>" data-priority="<?= $feed->priority() ?>"><?php
if ($f_active || $nbFeedsTotal < FreshRSS_Context::$user_conf->simplify_over_n_feeds):
?><div class="dropdown no-mobile">
<div class="dropdown-target"></div><a class="dropdown-toggle" data-fweb="<?= $feed->website() ?>"><?= _i('configure') ?></a><?php /* feed_config_template */ ?>
diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index d2123a2ac..b546eea6d 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -49,11 +49,12 @@
$empty = $feed->nbEntries() == 0 ? ' empty' : '';
?>
<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>
<?php if (FreshRSS_Context::$user_conf->show_favicons): ?><img class="favicon" src="<?= $feed->favicon() ?>" alt="✇" loading="lazy" /><?php endif; ?>
- <?= $feed->name() ?>
+ <span class="item-title"><?= $feed->name() ?></span>
</li>
<?php
}
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 51d688f5b..17388af97 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -1661,11 +1661,16 @@ input:checked + .slide-container .properties {
}
.item.share.error a::after,
-.category .title.error::before {
+.category .title.error::before,
+.item.feed.error .item-title::before {
content: " ⚠ ";
color: #bd362f;
}
+.feed.item.error.active .item-title::before {
+ color: white;
+}
+
.category .title:not([data-unread="0"])::after,
.feed .item-title:not([data-unread="0"])::after {
margin: 0.75em 0 0 0;
diff --git a/p/themes/base-theme/template.rtl.css b/p/themes/base-theme/template.rtl.css
index cd5d61589..56a98a765 100644
--- a/p/themes/base-theme/template.rtl.css
+++ b/p/themes/base-theme/template.rtl.css
@@ -1661,11 +1661,16 @@ input:checked + .slide-container .properties {
}
.item.share.error a::after,
-.category .title.error::before {
+.category .title.error::before,
+.item.feed.error .item-title::before {
content: " ⚠ ";
color: #bd362f;
}
+.feed.item.error.active .item-title::before {
+ color: white;
+}
+
.category .title:not([data-unread="0"])::after,
.feed .item-title:not([data-unread="0"])::after {
margin: 0.75em 0 0 0;