From 7ec751d40ba7a294ec9b95bceaee15024dc4a29b Mon Sep 17 00:00:00 2001
From: lemon24 <damian.adrian24@gmail.com>
Date: Sat, 28 Nov 2020 17:44:59 +0200
Subject: [PATCH] Add counts to the tag page.

For #185.
---
 src/reader/_app/__init__.py            | 14 ++++++++-
 src/reader/_app/static/style.css       | 18 +++++++++++-
 src/reader/_app/templates/entries.html |  2 +-
 src/reader/_app/templates/feeds.html   |  4 +--
 src/reader/_app/templates/tags.html    | 40 +++++++++++++++++---------
 5 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/src/reader/_app/__init__.py b/src/reader/_app/__init__.py
index 18c58d3d..5aeb457a 100644
--- a/src/reader/_app/__init__.py
+++ b/src/reader/_app/__init__.py
@@ -402,7 +402,19 @@ def entry():
 @blueprint.route('/tags')
 def tags():
     reader = get_reader()
-    tags = itertools.chain([True, False], reader.get_feed_tags())
+
+    with_counts = request.args.get('counts')
+    with_counts = {None: None, 'no': False, 'yes': True}[with_counts]
+
+    tags = (
+        (
+            tag,
+            reader.get_feed_counts(tags=[tag]) if with_counts else None,
+            reader.get_entry_counts(feed_tags=[tag]) if with_counts else None,
+        )
+        for tag in itertools.chain([True, False], reader.get_feed_tags())
+    )
+
     return render_template('tags.html', tags=tags)
 
 
diff --git a/src/reader/_app/static/style.css b/src/reader/_app/static/style.css
index cd6dcfe7..04d0fddf 100644
--- a/src/reader/_app/static/style.css
+++ b/src/reader/_app/static/style.css
@@ -157,9 +157,25 @@ ul.controls .collapsible {
 }
 
 
+.tag-list dt {
+    clear: left;
+    float: left;
+    min-width: 8em;
+}
+.tag-list dd {
+    display: inline;
+    margin-left: 1em;
+}
+.tag-list dd::after {
+    content: "";
+    display: block;
+    height: 1em;
+}
+
+
 abbr[title]:hover::after,
 abbr[title]:focus::after {
-    content: attr(title);
+    content: " " attr(title);
 }
 
 
diff --git a/src/reader/_app/templates/entries.html b/src/reader/_app/templates/entries.html
index b606df90..aaf993d7 100644
--- a/src/reader/_app/templates/entries.html
+++ b/src/reader/_app/templates/entries.html
@@ -210,7 +210,7 @@
 
 {% if counts %}
 <p>
-    <abbr title='({{ counts.read }} read, {{ counts.important }} important )'>
+    <abbr title='({{ counts.read }} read, {{ counts.important }} important)'>
     {{ counts.total }} entries
     </abbr>
 {% endif %}
diff --git a/src/reader/_app/templates/feeds.html b/src/reader/_app/templates/feeds.html
index f65e8604..2599074a 100644
--- a/src/reader/_app/templates/feeds.html
+++ b/src/reader/_app/templates/feeds.html
@@ -64,7 +64,7 @@
 
 {% if counts %}
 <p>
-    <abbr title='({{ counts.broken }} broken, {{ counts.total - counts.updates_enabled }} disabled )'>
+    <abbr title='({{ counts.broken }} broken, {{ counts.total - counts.updates_enabled }} disabled)'>
     {{ counts.total }} feeds
     </abbr>
 {% endif %}
@@ -98,7 +98,7 @@ <h2 title="{{ macros.feed_title_secondary(feed) }}">
 
 {% if entry_counts %}
 <li>
-    <abbr title='({{ entry_counts.read }} read, {{ entry_counts.important }} important )'>
+    <abbr title='({{ entry_counts.read }} read, {{ entry_counts.important }} important)'>
     {{ entry_counts.total }} entries
     </abbr>
 {% endif %}
diff --git a/src/reader/_app/templates/tags.html b/src/reader/_app/templates/tags.html
index 47e64486..6d4943cc 100644
--- a/src/reader/_app/templates/tags.html
+++ b/src/reader/_app/templates/tags.html
@@ -22,18 +22,30 @@
 </div>
 
 
-<ul>
-
-{% for tag in tags %}
-<li id="tag-{{ loop.index }}">
-    <p>
-        <a href="{{ url_for('.feeds', tags=[tag] | tojson) }}">feeds</a> or
-        <a href="{{ url_for('.entries', tags=[tag] | tojson) }}">entries</a>
-        with
-        {% if tag is true %} any tags
-        {% elif tag is false %} no tags
-        {% else %} <span class="tag">{{ tag }}</span>
-        {% endif %}
+<dl class="tag-list">
+
+{% for tag, feed_counts, entry_counts in tags %}
+<dt id="tag-{{ loop.index }}">
+    {% if tag is true %} <span class="tag-text">any tags</span>
+    {% elif tag is false %} <span class="tag-text">no tags</span>
+    {% else %} <span class="tag">{{ tag }}</span>
+    {% endif %}
+</dt>
+
+<dd>
+    {% if feed_counts %}
+        <abbr title='({{ feed_counts.broken }} broken, {{ feed_counts.total - feed_counts.updates_enabled }} disabled)'>{{ feed_counts.total }}
+    {% endif %}
+    <a href="{{ url_for('.feeds', tags=[tag] | tojson) }}">feeds</a>
+    {%- if feed_counts %}</abbr>{% endif -%}
+    ,
+    {% if entry_counts %}
+        <abbr title='({{ entry_counts.read }} read, {{ entry_counts.important }} important)'>{{ entry_counts.total }}
+    {% endif %}
+    <a href="{{ url_for('.entries', tags=[tag] | tojson) }}">entries</a>
+    {% if entry_counts %}</abbr>{% endif %}
+</dd>
+
 {% else %}
 
 {% if not error %}
@@ -41,6 +53,8 @@
 {% endif %}
 
 {% endfor %}
-</ul>
+</dl>
+
+
 
 {% endblock %}