Add mark as read/unread link on list items

7 files changed, 49 insertions, 161 deletions

diff --git a/template/html/category_entries.html b/template/html/category_entries.html
index ff73a16..d7ce9d9 100644
--- a/template/html/category_entries.html
+++ b/template/html/category_entries.html
@@ -27,38 +27,7 @@
                 </span>
                 <span class="category"><a href="{{ route "categoryEntries" "categoryID" .Feed.Category.ID }}">{{ .Feed.Category.Title }}</a></span>
             </div>
-            <div class="item-meta">
-                <ul>
-                    <li>
-                        <a href="{{ route "feedEntries" "feedID" .Feed.ID }}" title="{{ .Feed.Title }}">{{ domain .Feed.SiteURL }}</a>
-                    </li>
-                    <li>
-                        <time datetime="{{ isodate .Date }}" title="{{ isodate .Date }}">{{ elapsed .Date }}</time>
-                    </li>
-                    <li>
-                        <a href="#"
-                            title="{{ t "Save this article" }}"
-                            data-save-entry="true"
-                            data-save-url="{{ route "saveEntry" "entryID" .ID }}"
-                            data-label-loading="{{ t "Saving..." }}"
-                            data-label-done="{{ t "Done!" }}"
-                            >{{ t "Save" }}</a>
-                    </li>
-                    <li>
-                        <a href="{{ .URL }}" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer" data-original-link="true">{{ t "Original" }}</a>
-                    </li>
-                    <li>
-                        <a href="#"
-                            data-toggle-bookmark="true"
-                            data-bookmark-url="{{ route "toggleBookmark" "entryID" .ID }}"
-                            data-label-loading="{{ t "Saving..." }}"
-                            data-label-star="☆ {{ t "Star" }}"
-                            data-label-unstar="★ {{ t "Unstar" }}"
-                            data-value="{{ if .Starred }}star{{ else }}unstar{{ end }}"
-                            >{{ if .Starred }}★ {{ t "Unstar" }}{{ else }}☆ {{ t "Star" }}{{ end }}</a>
-                    </li>
-                </ul>
-            </div>
+            {{ template "item_meta" . }}
         </article>
         {{ end }}
     </div>
diff --git a/template/html/common/item_meta.html b/template/html/common/item_meta.html
new file mode 100644
index 0000000..668a5d2
--- /dev/null
+++ b/template/html/common/item_meta.html
@@ -0,0 +1,43 @@
+{{ define "item_meta" }}
+<div class="item-meta">
+    <ul>
+        <li>
+            <a href="{{ route "feedEntries" "feedID" .Feed.ID }}" title="{{ .Feed.Title }}">{{ domain .Feed.SiteURL }}</a>
+        </li>
+        <li>
+            <time datetime="{{ isodate .Date }}" title="{{ isodate .Date }}">{{ elapsed .Date }}</time>
+        </li>
+        <li>
+            <a href="#"
+                title="{{ t "Save this article" }}"
+                data-save-entry="true"
+                data-save-url="{{ route "saveEntry" "entryID" .ID }}"
+                data-label-loading="{{ t "Saving..." }}"
+                data-label-done="{{ t "Done!" }}"
+                >{{ t "Save" }}</a>
+        </li>
+        <li>
+            <a href="{{ .URL }}" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer" data-original-link="true">{{ t "Original" }}</a>
+        </li>
+        <li>
+            <a href="#"
+                data-toggle-bookmark="true"
+                data-bookmark-url="{{ route "toggleBookmark" "entryID" .ID }}"
+                data-label-loading="{{ t "Saving..." }}"
+                data-label-star="☆ {{ t "Star" }}"
+                data-label-unstar="★ {{ t "Unstar" }}"
+                data-value="{{ if .Starred }}star{{ else }}unstar{{ end }}"
+                >{{ if .Starred }}★ {{ t "Unstar" }}{{ else }}☆ {{ t "Star" }}{{ end }}</a>
+        </li>
+        <li>
+            <a href="#"
+                title="{{ t "Change entry status" }}"
+                data-toggle-status="true"
+                data-label-read="✔ {{ t "Read" }}"
+                data-label-unread="✘ {{ t "Unread" }}"
+                data-value="{{ if eq .Status "read" }}read{{ else }}unread{{ end }}"
+                >{{ if eq .Status "read" }}✘ {{ t "Unread" }}{{ else }}✔ {{ t "Read" }}{{ end }}</a>
+        </li>
+    </ul>
+</div>
+{{ end }}
\ No newline at end of file
diff --git a/template/html/common/layout.html b/template/html/common/layout.html
index fd32499..ca19313 100644
--- a/template/html/common/layout.html
+++ b/template/html/common/layout.html
@@ -61,7 +61,7 @@
                     <a href="{{ route "settings" }}" data-page="settings">{{ t "Settings" }}</a>
                 </li>
                 <li>
-                    <a href="{{ route "logout" }}" title="{{ t "Logged as" }} {{ .user.Username }}">{{ t "Logout" }}</a>
+                    <a href="{{ route "logout" }}" title="{{ t "Logged as %s" .user.Username }}">{{ t "Logout" }}</a>
                 </li>
             </ul>
         </nav>
diff --git a/template/html/feed_entries.html b/template/html/feed_entries.html
index 1568f40..ebd8ea7 100644
--- a/template/html/feed_entries.html
+++ b/template/html/feed_entries.html
@@ -38,38 +38,7 @@
                 </span>
                 <span class="category"><a href="{{ route "categoryEntries" "categoryID" .Feed.Category.ID }}">{{ .Feed.Category.Title }}</a></span>
             </div>
-            <div class="item-meta">
-                <ul>
-                    <li>
-                        <a href="{{ route "feedEntries" "feedID" .Feed.ID }}" title="{{ .Feed.Title }}">{{ domain .Feed.SiteURL }}</a>
-                    </li>
-                    <li>
-                        <time datetime="{{ isodate .Date }}" title="{{ isodate .Date }}">{{ elapsed .Date }}</time>
-                    </li>
-                    <li>
-                        <a href="#"
-                            title="{{ t "Save this article" }}"
-                            data-save-entry="true"
-                            data-save-url="{{ route "saveEntry" "entryID" .ID }}"
-                            data-label-loading="{{ t "Saving..." }}"
-                            data-label-done="{{ t "Done!" }}"
-                            >{{ t "Save" }}</a>
-                    </li>
-                    <li>
-                        <a href="{{ .URL }}" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer" data-original-link="true">{{ t "Original" }}</a>
-                    </li>
-                    <li>
-                        <a href="#"
-                            data-toggle-bookmark="true"
-                            data-bookmark-url="{{ route "toggleBookmark" "entryID" .ID }}"
-                            data-label-loading="{{ t "Saving..." }}"
-                            data-label-star="☆ {{ t "Star" }}"
-                            data-label-unstar="★ {{ t "Unstar" }}"
-                            data-value="{{ if .Starred }}star{{ else }}unstar{{ end }}"
-                            >{{ if .Starred }}★ {{ t "Unstar" }}{{ else }}☆ {{ t "Star" }}{{ end }}</a>
-                    </li>
-                </ul>
-            </div>
+            {{ template "item_meta" . }}
         </article>
         {{ end }}
     </div>
diff --git a/template/html/history.html b/template/html/history.html
index 5baa0df..892f183 100644
--- a/template/html/history.html
+++ b/template/html/history.html
@@ -27,38 +27,7 @@
                 </span>
                 <span class="category"><a href="{{ route "categoryEntries" "categoryID" .Feed.Category.ID }}">{{ .Feed.Category.Title }}</a></span>
             </div>
-            <div class="item-meta">
-                <ul>
-                    <li>
-                        <a href="{{ route "feedEntries" "feedID" .Feed.ID }}" title="{{ .Feed.Title }}">{{ domain .Feed.SiteURL }}</a>
-                    </li>
-                    <li>
-                        <time datetime="{{ isodate .Date }}" title="{{ isodate .Date }}">{{ elapsed .Date }}</time>
-                    </li>
-                    <li>
-                        <a href="#"
-                            title="{{ t "Save this article" }}"
-                            data-save-entry="true"
-                            data-save-url="{{ route "saveEntry" "entryID" .ID }}"
-                            data-label-loading="{{ t "Saving..." }}"
-                            data-label-done="{{ t "Done!" }}"
-                            >{{ t "Save" }}</a>
-                    </li>
-                    <li>
-                        <a href="{{ .URL }}" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer" data-original-link="true">{{ t "Original" }}</a>
-                    </li>
-                    <li>
-                        <a href="#"
-                            data-toggle-bookmark="true"
-                            data-bookmark-url="{{ route "toggleBookmark" "entryID" .ID }}"
-                            data-label-loading="{{ t "Saving..." }}"
-                            data-label-star="☆ {{ t "Star" }}"
-                            data-label-unstar="★ {{ t "Unstar" }}"
-                            data-value="{{ if .Starred }}star{{ else }}unstar{{ end }}"
-                            >{{ if .Starred }}★ {{ t "Unstar" }}{{ else }}☆ {{ t "Star" }}{{ end }}</a>
-                    </li>
-                </ul>
-            </div>
+            {{ template "item_meta" . }}
         </article>
         {{ end }}
     </div>
diff --git a/template/html/starred.html b/template/html/starred.html
index 1ed1b13..b16b9e7 100644
--- a/template/html/starred.html
+++ b/template/html/starred.html
@@ -20,38 +20,7 @@
                 </span>
                 <span class="category"><a href="{{ route "categoryEntries" "categoryID" .Feed.Category.ID }}">{{ .Feed.Category.Title }}</a></span>
             </div>
-            <div class="item-meta">
-                <ul>
-                    <li>
-                        <a href="{{ route "feedEntries" "feedID" .Feed.ID }}" title="{{ .Feed.Title }}">{{ domain .Feed.SiteURL }}</a>
-                    </li>
-                    <li>
-                        <time datetime="{{ isodate .Date }}" title="{{ isodate .Date }}">{{ elapsed .Date }}</time>
-                    </li>
-                    <li>
-                        <a href="#"
-                            title="{{ t "Save this article" }}"
-                            data-save-entry="true"
-                            data-save-url="{{ route "saveEntry" "entryID" .ID }}"
-                            data-label-loading="{{ t "Saving..." }}"
-                            data-label-done="{{ t "Done!" }}"
-                            >{{ t "Save" }}</a>
-                    </li>
-                    <li>
-                        <a href="{{ .URL }}" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer" data-original-link="true">{{ t "Original" }}</a>
-                    </li>
-                    <li>
-                        <a href="#"
-                            data-toggle-bookmark="true"
-                            data-bookmark-url="{{ route "toggleBookmark" "entryID" .ID }}"
-                            data-label-loading="{{ t "Saving..." }}"
-                            data-label-star="☆ {{ t "Star" }}"
-                            data-label-unstar="★ {{ t "Unstar" }}"
-                            data-value="{{ if .Starred }}star{{ else }}unstar{{ end }}"
-                            >{{ if .Starred }}★ {{ t "Unstar" }}{{ else }}☆ {{ t "Star" }}{{ end }}</a>
-                    </li>
-                </ul>
-            </div>
+            {{ template "item_meta" . }}
         </article>
         {{ end }}
     </div>
diff --git a/template/html/unread.html b/template/html/unread.html
index 7f285d0..e88c847 100644
--- a/template/html/unread.html
+++ b/template/html/unread.html
@@ -30,38 +30,7 @@
                 </span>
                 <span class="category"><a href="{{ route "categoryEntries" "categoryID" .Feed.Category.ID }}">{{ .Feed.Category.Title }}</a></span>
             </div>
-            <div class="item-meta">
-                <ul>
-                    <li>
-                        <a href="{{ route "feedEntries" "feedID" .Feed.ID }}" title="{{ .Feed.Title }}">{{ domain .Feed.SiteURL }}</a>
-                    </li>
-                    <li>
-                        <time datetime="{{ isodate .Date }}" title="{{ isodate .Date }}">{{ elapsed .Date }}</time>
-                    </li>
-                    <li>
-                        <a href="#"
-                            title="{{ t "Save this article" }}"
-                            data-save-entry="true"
-                            data-save-url="{{ route "saveEntry" "entryID" .ID }}"
-                            data-label-loading="{{ t "Saving..." }}"
-                            data-label-done="{{ t "Done!" }}"
-                            >{{ t "Save" }}</a>
-                    </li>
-                    <li>
-                        <a href="{{ .URL }}" target="_blank" rel="noopener noreferrer" referrerpolicy="no-referrer" data-original-link="true">{{ t "Original" }}</a>
-                    </li>
-                    <li>
-                        <a href="#"
-                            data-toggle-bookmark="true"
-                            data-bookmark-url="{{ route "toggleBookmark" "entryID" .ID }}"
-                            data-label-loading="{{ t "Saving..." }}"
-                            data-label-star="☆ {{ t "Star" }}"
-                            data-label-unstar="★ {{ t "Unstar" }}"
-                            data-value="{{ if .Starred }}star{{ else }}unstar{{ end }}"
-                            >{{ if .Starred }}★ {{ t "Unstar" }}{{ else }}☆ {{ t "Star" }}{{ end }}</a>
-                    </li>
-                </ul>
-            </div>
+            {{ template "item_meta" . }}
         </article>
         {{ end }}
     </div>