1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-11 17:51:01 +00:00

refactor(template): reindent and merge tags in feed_list.html

- Fix some indentation
- Factorize/merge some <span>
- Remove superfluous spaces
- Reindent some nested tags
This commit is contained in:
Julien Voisin 2025-08-06 02:50:09 +02:00 committed by GitHub
parent 5affd78f4f
commit ed0e4a667d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -10,7 +10,7 @@
<h2 id="feed-title-{{ .ID }}" class="item-title"> <h2 id="feed-title-{{ .ID }}" class="item-title">
<a href="{{ route "feedEntries" "feedID" .ID }}"> <a href="{{ route "feedEntries" "feedID" .ID }}">
{{ if and (.Icon) (gt .Icon.IconID 0) }} {{ if and (.Icon) (gt .Icon.IconID 0) }}
<img src="{{ route "feedIcon" "externalIconID" .Icon.ExternalIconID }}" width="16" height="16" loading="lazy" alt=""> <img src="{{ route "feedIcon" "externalIconID" .Icon.ExternalIconID }}" width="16" height="16" loading="lazy" alt="">
{{ end }} {{ end }}
{{ if .Disabled }} 🚫 {{ end }} {{ if .Disabled }} 🚫 {{ end }}
{{ .Title }} {{ .Title }}
@ -19,11 +19,9 @@
<span id="feed-entries-counter" class="feed-entries-counter"> <span id="feed-entries-counter" class="feed-entries-counter">
<span aria-hidden="true">(</span> <span aria-hidden="true">(</span>
<span class="sr-only">{{ plural "page.unread_entry_count" .UnreadCount .UnreadCount }}</span> <span class="sr-only">{{ plural "page.unread_entry_count" .UnreadCount .UnreadCount }}</span>
<span aria-hidden="true">{{ .UnreadCount }}</span> <span aria-hidden="true">{{ .UnreadCount }} /</span>
<span aria-hidden="true">/</span>
<span class="sr-only">{{ plural "page.total_entry_count" .NumberOfVisibleEntries .NumberOfVisibleEntries }}</span> <span class="sr-only">{{ plural "page.total_entry_count" .NumberOfVisibleEntries .NumberOfVisibleEntries }}</span>
<span aria-hidden="true">{{ .NumberOfVisibleEntries }}</span> <span aria-hidden="true">{{ .NumberOfVisibleEntries }} )</span>
<span aria-hidden="true">)</span>
</span> </span>
<span class="category"> <span class="category">
<a id="feed-category-{{ .ID }}" <a id="feed-category-{{ .ID }}"
@ -37,7 +35,9 @@
<div class="item-meta"> <div class="item-meta">
<ul class="item-meta-info"> <ul class="item-meta-info">
<li class="item-meta-info-site-url" dir="auto"> <li class="item-meta-info-site-url" dir="auto">
<a href="{{ .SiteURL | safeURL }}" title="{{ .SiteURL }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }} rel="noopener noreferrer" referrerpolicy="no-referrer" data-original-link="{{ $.user.MarkReadOnView }}">{{ domain .SiteURL }}</a> <a href="{{ .SiteURL | safeURL }}" title="{{ .SiteURL }}" {{ if $.user.OpenExternalLinksInNewTab }}target="_blank"{{ end }} rel="noopener noreferrer" referrerpolicy="no-referrer" data-original-link="{{ $.user.MarkReadOnView }}">
{{ domain .SiteURL }}
</a>
</li> </li>
<li class="item-meta-info-checked-at"> <li class="item-meta-info-checked-at">
{{ t "page.feeds.last_check" }} <time datetime="{{ isodate .CheckedAt }}" title="{{ isodate .CheckedAt }}">{{ elapsed $.user.Timezone .CheckedAt }}</time> {{ t "page.feeds.last_check" }} <time datetime="{{ isodate .CheckedAt }}" title="{{ isodate .CheckedAt }}">{{ elapsed $.user.Timezone .CheckedAt }}</time>
@ -51,12 +51,14 @@
</ul> </ul>
<ul class="item-meta-icons"> <ul class="item-meta-icons">
<li class="item-meta-icons-refresh"> <li class="item-meta-icons-refresh">
<a href="{{ route "refreshFeed" "feedID" .ID }}" <a href="{{ route "refreshFeed" "feedID" .ID }}" aria-describedby="feed-title-{{ .ID }}">
aria-describedby="feed-title-{{ .ID }}">{{ icon "refresh" }}<span class="icon-label">{{ t "menu.refresh_feed" }}</span></a> {{ icon "refresh" }}<span class="icon-label">{{ t "menu.refresh_feed" }}</span>
</a>
</li> </li>
<li class="item-meta-icons-edit"> <li class="item-meta-icons-edit">
<a href="{{ route "editFeed" "feedID" .ID }}" <a href="{{ route "editFeed" "feedID" .ID }}" aria-describedby="feed-title-{{ .ID }}">
aria-describedby="feed-title-{{ .ID }}">{{ icon "edit" }}<span class="icon-label">{{ t "menu.edit_feed" }}</span></a> {{ icon "edit" }}<span class="icon-label">{{ t "menu.edit_feed" }}</span>
</a>
</li> </li>
<li class="item-meta-icons-remove"> <li class="item-meta-icons-remove">
<button <button
@ -73,7 +75,7 @@
{{ end }}>{{ icon "delete" }}<span class="icon-label">{{ t "action.remove" }}</span></button> {{ end }}>{{ icon "delete" }}<span class="icon-label">{{ t "action.remove" }}</span></button>
</li> </li>
{{ if .UnreadCount }} {{ if .UnreadCount }}
<li class="item-meta-icons-mark-as-read"> <li class="item-meta-icons-mark-as-read">
<button <button
aria-describedby="feed-title-{{ .ID }}" aria-describedby="feed-title-{{ .ID }}"
data-confirm="true" data-confirm="true"
@ -81,16 +83,18 @@
data-label-yes="{{ t "confirm.yes" }}" data-label-yes="{{ t "confirm.yes" }}"
data-label-no="{{ t "confirm.no" }}" data-label-no="{{ t "confirm.no" }}"
data-label-loading="{{ t "confirm.loading" }}" data-label-loading="{{ t "confirm.loading" }}"
data-url="{{ route "markFeedAsRead" "feedID" .ID }}">{{ icon "read" }}<span class="icon-label">{{ t "menu.mark_all_as_read" }}</span></button> data-url="{{ route "markFeedAsRead" "feedID" .ID }}">
</li> {{ icon "read" }}<span class="icon-label">{{ t "menu.mark_all_as_read" }}</span>
</button>
</li>
{{ end }} {{ end }}
</ul> </ul>
</div> </div>
{{ if ne .ParsingErrorCount 0 }} {{ if ne .ParsingErrorCount 0 }}
<div class="parsing-error"> <div class="parsing-error">
<strong title="{{ .ParsingErrorMsg }}" class="parsing-error-count">{{ plural "page.feeds.error_count" .ParsingErrorCount .ParsingErrorCount }}</strong> <strong title="{{ .ParsingErrorMsg }}" class="parsing-error-count">{{ plural "page.feeds.error_count" .ParsingErrorCount .ParsingErrorCount }}</strong>
- <small class="parsing-error-message">{{ .ParsingErrorMsg }}</small> - <small class="parsing-error-message">{{ .ParsingErrorMsg }}</small>
</div> </div>
{{ end }} {{ end }}
</article> </article>
{{ end }} {{ end }}