Browse Source

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

- Fix some indentation
- Factorize/merge some <span>
- Remove superfluous spaces
- Reindent some nested tags
Julien Voisin 8 months ago
parent
commit
ed0e4a667d
1 changed files with 21 additions and 17 deletions
  1. 21 17
      internal/template/templates/common/feed_list.html

+ 21 - 17
internal/template/templates/common/feed_list.html

@@ -10,7 +10,7 @@
                 <h2 id="feed-title-{{ .ID }}" class="item-title">
                     <a href="{{ route "feedEntries" "feedID" .ID }}">
                         {{ 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 }}
                         {{ if .Disabled }} 🚫 {{ end }}
                         {{ .Title }}
@@ -19,11 +19,9 @@
                 <span id="feed-entries-counter" class="feed-entries-counter">
                     <span aria-hidden="true">(</span>
                     <span class="sr-only">{{ plural "page.unread_entry_count" .UnreadCount .UnreadCount }}</span>
-                    <span aria-hidden="true">{{ .UnreadCount }}</span>
-                    <span aria-hidden="true">/</span>
+                    <span aria-hidden="true">{{ .UnreadCount }} /</span>
                     <span class="sr-only">{{ plural "page.total_entry_count" .NumberOfVisibleEntries .NumberOfVisibleEntries }}</span>
-                    <span aria-hidden="true">{{ .NumberOfVisibleEntries }}</span>
-                    <span aria-hidden="true">)</span>
+                    <span aria-hidden="true">{{ .NumberOfVisibleEntries }} )</span>
                 </span>
                 <span class="category">
                     <a id="feed-category-{{ .ID }}"
@@ -37,7 +35,9 @@
             <div class="item-meta">
                 <ul class="item-meta-info">
                     <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 class="item-meta-info-checked-at">
                         {{ t "page.feeds.last_check" }} <time datetime="{{ isodate .CheckedAt }}" title="{{ isodate .CheckedAt }}">{{ elapsed $.user.Timezone .CheckedAt }}</time>
@@ -51,12 +51,14 @@
                 </ul>
                 <ul class="item-meta-icons">
                     <li class="item-meta-icons-refresh">
-                        <a href="{{ route "refreshFeed" "feedID" .ID }}"
-                            aria-describedby="feed-title-{{ .ID }}">{{ icon "refresh" }}<span class="icon-label">{{ t "menu.refresh_feed" }}</span></a>
+                        <a href="{{ route "refreshFeed" "feedID" .ID }}" aria-describedby="feed-title-{{ .ID }}">
+                            {{ icon "refresh" }}<span class="icon-label">{{ t "menu.refresh_feed" }}</span>
+                        </a>
                     </li>
                     <li class="item-meta-icons-edit">
-                        <a href="{{ route "editFeed" "feedID" .ID }}"
-                            aria-describedby="feed-title-{{ .ID }}">{{ icon "edit" }}<span class="icon-label">{{ t "menu.edit_feed" }}</span></a>
+                        <a href="{{ route "editFeed" "feedID" .ID }}" aria-describedby="feed-title-{{ .ID }}">
+                            {{ icon "edit" }}<span class="icon-label">{{ t "menu.edit_feed" }}</span>
+                        </a>
                     </li>
                     <li class="item-meta-icons-remove">
                         <button
@@ -73,7 +75,7 @@
                             {{ end }}>{{ icon "delete" }}<span class="icon-label">{{ t "action.remove" }}</span></button>
                     </li>
                     {{ if .UnreadCount }}
-                      <li class="item-meta-icons-mark-as-read">
+                    <li class="item-meta-icons-mark-as-read">
                         <button
                             aria-describedby="feed-title-{{ .ID }}"
                             data-confirm="true"
@@ -81,16 +83,18 @@
                             data-label-yes="{{ t "confirm.yes" }}"
                             data-label-no="{{ t "confirm.no" }}"
                             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>
-                      </li>
+                            data-url="{{ route "markFeedAsRead" "feedID" .ID }}">
+                                {{ icon "read" }}<span class="icon-label">{{ t "menu.mark_all_as_read" }}</span>
+                        </button>
+                    </li>
                     {{ end }}
                 </ul>
             </div>
             {{ if ne .ParsingErrorCount 0 }}
-                <div class="parsing-error">
-                    <strong title="{{ .ParsingErrorMsg }}" class="parsing-error-count">{{ plural "page.feeds.error_count" .ParsingErrorCount .ParsingErrorCount }}</strong>
-                    - <small class="parsing-error-message">{{ .ParsingErrorMsg }}</small>
-                </div>
+            <div class="parsing-error">
+                <strong title="{{ .ParsingErrorMsg }}" class="parsing-error-count">{{ plural "page.feeds.error_count" .ParsingErrorCount .ParsingErrorCount }}</strong>
+                - <small class="parsing-error-message">{{ .ParsingErrorMsg }}</small>
+            </div>
             {{ end }}
         </article>
         {{ end }}