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

Always display feed entries even when there is a feed error

Browse source
This commit is contained in:
Frédéric Guillot 2019-04-02 21:17:01 -07:00 committed by fguillot
parent f593dc8463
commit 8ee1a09dc7
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
template/html/feed_entries.html
View file

@ -43,7 +43,9 @@
<h3>{{ t "alert.feed_error" }}</h3> <h3>{{ t "alert.feed_error" }}</h3>
<p>{{ t .feed.ParsingErrorMsg }}</p> <p>{{ t .feed.ParsingErrorMsg }}</p>
</div> </div>
{{ else if not .entries }} {{ end }}
{{ if not .entries }}
{{ if .showOnlyUnreadEntries }} {{ if .showOnlyUnreadEntries }}
<p class="alert">{{ t "alert.no_unread_entry" }}</p> <p class="alert">{{ t "alert.no_unread_entry" }}</p>
{{ else }} {{ else }}

6
template/views.go
View file

@ -735,7 +735,9 @@ var templateViewsMap = map[string]string{
<h3>{{ t "alert.feed_error" }}</h3> <h3>{{ t "alert.feed_error" }}</h3>
<p>{{ t .feed.ParsingErrorMsg }}</p> <p>{{ t .feed.ParsingErrorMsg }}</p>
</div> </div>
{{ else if not .entries }} {{ end }}
{{ if not .entries }}
{{ if .showOnlyUnreadEntries }} {{ if .showOnlyUnreadEntries }}
<p class="alert">{{ t "alert.no_unread_entry" }}</p> <p class="alert">{{ t "alert.no_unread_entry" }}</p>
{{ else }} {{ else }}
@ -1415,7 +1417,7 @@ var templateViewsMapChecksums = map[string]string{
"edit_feed": "ab30c31a4385a7b16c54baa78bdcb93a57181ed1c5018ce097d7eb50673bb995", "edit_feed": "ab30c31a4385a7b16c54baa78bdcb93a57181ed1c5018ce097d7eb50673bb995",
"edit_user": "f4f99412ba771cfca2a2a42778b023b413c5494e9a287053ba8cf380c2865c5f", "edit_user": "f4f99412ba771cfca2a2a42778b023b413c5494e9a287053ba8cf380c2865c5f",
"entry": "2ea9fee1ae5513ef1abb5923221c2ef1212e26d3bb651da66069ce8a336cbb7c", "entry": "2ea9fee1ae5513ef1abb5923221c2ef1212e26d3bb651da66069ce8a336cbb7c",
"feed_entries": "ba6a764d2784797629103500cc099178f29856dcfc95e59f0d134c32951cd3a4", "feed_entries": "f76de17ba8739c94897c3259e72acc82f7b74181125ee78c2873c5e5f20215f3",
"feeds": "31acc253c547a6cce5710d72a6f6b3b396162ecd5e5af295b2cf47c1ff55bd06", "feeds": "31acc253c547a6cce5710d72a6f6b3b396162ecd5e5af295b2cf47c1ff55bd06",
"history_entries": "b65ca1d85615caa7c314a33f1cb997aa3477a79e66b9894b2fd387271ad467d2", "history_entries": "b65ca1d85615caa7c314a33f1cb997aa3477a79e66b9894b2fd387271ad467d2",
"import": "8349e47a783bb40d8e9248b4771656e5f006185e11079e1c4680dd52633420ed", "import": "8349e47a783bb40d8e9248b4771656e5f006185e11079e1c4680dd52633420ed",