southfox/miniflux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Feeds with errors should appear before unread ones

Browse source
This commit is contained in:
Frédéric Guillot 2021-06-02 18:54:28 -07:00 committed by fguillot
parent 4b2a25eed4
commit 409d05eec8
5 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
storage/feed.go
View file

@ -21,7 +21,11 @@ type byStateAndName struct{ f model.Feeds }
func (l byStateAndName) Len() int { return len(l.f) }
func (l byStateAndName) Swap(i, j int) { l.f[i], l.f[j] = l.f[j], l.f[i] }
func (l byStateAndName) Less(i, j int) bool {
if l.f[i].UnreadCount > 0 && l.f[j].UnreadCount == 0 {
if l.f[i].ParsingErrorCount > 0 && l.f[j].ParsingErrorCount == 0 {
return true
} else if l.f[i].ParsingErrorCount == 0 && l.f[j].ParsingErrorCount > 0 {
return false
} else if l.f[i].UnreadCount > 0 && l.f[j].UnreadCount == 0 {
return true
} else if l.f[i].UnreadCount == 0 && l.f[j].UnreadCount > 0 {
return false

3
ui/static/css/common.css
View file

@ -746,7 +746,8 @@ a.button {
/* Feeds list */
article.feed-parsing-error {
background-color: var(--feed-parsing-error-background-color);
border-color: #aaa;
border-style: var(--feed-parsing-error-border-style);
border-color: var(--feed-parsing-error-border-color);
}
article.feed-has-unread {

7
ui/static/css/dark.css
View file

@ -100,10 +100,13 @@
--entry-enclosure-border-color: #333;
--parsing-error-color: #eee;
--feed-parsing-error-background-color: #343434;
--feed-parsing-error-background-color: #3a1515;
--feed-parsing-error-border-style: solid;
--feed-parsing-error-border-color: #562222;
--feed-has-unread-background-color: #1b1a1a;
--feed-has-unread-border-style: solid;
--feed-has-unread-border-color: rgba(82, 168, 236, 0.6);
--feed-has-unread-border-color: rgb(33 57 76);
--keyboard-shortcuts-li-color: #9b9b9b;

7
ui/static/css/light.css
View file

@ -101,9 +101,12 @@
--parsing-error-color: #333;
--feed-parsing-error-background-color: #fcf8e3;
--feed-parsing-error-border-style: solid;
--feed-parsing-error-border-color: #f9e883;
--feed-has-unread-background-color: #dfd;
--feed-has-unread-border-style: dotted;
--feed-has-unread-border-color: var(--entry-header-border-color);
--feed-has-unread-border-style: solid;
--feed-has-unread-border-color: #bee6bc;
--keyboard-shortcuts-li-color: #333;

14
ui/static/css/system.css
View file

@ -100,9 +100,12 @@
--parsing-error-color: #333;
--feed-parsing-error-background-color: #fcf8e3;
--feed-parsing-error-border-style: solid;
--feed-parsing-error-border-color: #f9e883;
--feed-has-unread-background-color: #dfd;
--feed-has-unread-border-style: dotted;
--feed-has-unread-border-color: var(--entry-header-border-color);
--feed-has-unread-border-style: solid;
--feed-has-unread-border-color: #bee6bc;
--keyboard-shortcuts-li-color: #333;
@ -210,10 +213,13 @@
--entry-enclosure-border-color: #333;
--parsing-error-color: #eee;
--feed-parsing-error-background-color: #343434;
--feed-parsing-error-background-color: #3a1515;
--feed-parsing-error-border-style: solid;
--feed-parsing-error-border-color: #562222;
--feed-has-unread-background-color: #1b1a1a;
--feed-has-unread-border-style: solid;
--feed-has-unread-border-color: rgba(82, 168, 236, 0.6);
--feed-has-unread-border-color: rgb(33 57 76);
--keyboard-shortcuts-li-color: #9b9b9b;