From 168e4617bdce786730b47f18e6ca89098a2db5b4 Mon Sep 17 00:00:00 2001
From: girst <tobi@isticktoit.net>
Date: Sat, 18 Jul 2020 17:46:57 +0200
Subject: [PATCH] clean up sub* managers

---
 app/reddit/templates/subreddit_manager.html.j2     | 12 +++++++-----
 app/static/style.css                               |  5 ++++-
 app/youtube/templates/subscription_manager.html.j2 | 13 ++++++-------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/reddit/templates/subreddit_manager.html.j2 b/app/reddit/templates/subreddit_manager.html.j2
index 86e23e8..a2a562e 100644
--- a/app/reddit/templates/subreddit_manager.html.j2
+++ b/app/reddit/templates/subreddit_manager.html.j2
@@ -6,20 +6,22 @@
 {% import 'macros.imp.j2' as macros with context %}
 {{ macros.headerbar() }}
 
-<b style=font-size:large>Subreddit Manager</b><hr>
+<article>
+<h1>Subreddit Manager</h1>
 
 {% include 'messages.inc.j2' %}
 
 <ul id=submgr>
 	<form method=post>
-		<input class="emoji" type=submit value="&#128221;&#xFE0F;" title="subscribe">{#
-		#}<input name=subscribe placeholder="/r/...">
+		<input class="emoji" type=submit value="&#128221;&#xFE0F;" title="subscribe">
+		<input name=subscribe placeholder="/r/...">
 	</form>
 	{% for subreddit in subreddits %}
 	<li><form method=post>
-		<input class=emoji type=submit value="&#128465;&#xFE0F;" title="unsubscribe">{#
-		#}<a href="/r/{{ subreddit }}">{{ subreddit | capitalize | e }}</a>
+		<input class=emoji type=submit value="&#128465;&#xFE0F;" title="unsubscribe">
 		<input type="hidden" name="unsubscribe" value="{{ subreddit }}">
 	</form>
+	<a href="/r/{{ subreddit }}">{{ subreddit | capitalize | e }}</a>
 	{% endfor %}
 </ul>
+</article>
diff --git a/app/static/style.css b/app/static/style.css
index 56ec277..fb9bec6 100644
--- a/app/static/style.css
+++ b/app/static/style.css
@@ -118,7 +118,10 @@ details .details {
 }
 ul#submgr{list-style: none}
 #submgr form {
-  margin-bottom: 1em;
+  display: inline;
+}
+#submgr li {
+  margin: 1em 0;
 }
 
 .video_error {
diff --git a/app/youtube/templates/subscription_manager.html.j2 b/app/youtube/templates/subscription_manager.html.j2
index c9fed90..9317e0c 100644
--- a/app/youtube/templates/subscription_manager.html.j2
+++ b/app/youtube/templates/subscription_manager.html.j2
@@ -6,23 +6,22 @@
 {% import 'macros.imp.j2' as macros with context %}
 {{ macros.headerbar() }}
 
+<article>
 <h1>Subscription Manager</h1>
 
 {% include 'messages.inc.j2' %}
 
 <ul id=submgr>
 	<form method=post>
-		<input class="emoji" type=submit value="&#128221;&#xFE0F;" title="subscribe">{#
-		#}<input name=subscribe placeholder="channel id">
+		<input class="emoji" type=submit value="&#128221;&#xFE0F;" title="subscribe">
+		<input name=subscribe placeholder="channel id">
 	</form>
 	{% for row in rows %}
-	<li><form method=post>
-		<input class=emoji type=submit value="&#128465;&#xFE0F;" title="unsubscribe">{#
-		#}<a href="/channel/{{ row.channel_id }}">{{ row.author | e }}</a>
+	<li>{{ macros.emoji_button("subscribe", row.channel_id, True) }}
+		<a href="/channel/{{ row.channel_id }}">{{ row.author | e }}</a>
 		{% if row.subscribed_until %}
 		<abbr style="text-decoration:0" title="websub-subscription not renewed!">&#x1F6D1;&#xFE0F;</abbr>
 		{% endif %}
-		<input type="hidden" name="unsubscribe" value="{{ row.channel_id }}">
-	</form>
 	{% endfor %}
 </ul>
+</article>
-- 
2.39.3