From 36000b159273d06aba3fb56eab2cd78099b7e54a Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Sat, 25 Aug 2018 18:20:45 +0100
Subject: Add list of relevant forum topics to last page of results

---
 app/templates/macros/topics.html           | 52 ++++++++++++++++++++++++++++++
 app/templates/macros/topictable.html       | 33 -------------------
 app/templates/packages/list.html           |  8 +++++
 app/templates/todo/topics.html             |  4 +--
 app/templates/users/user_profile_page.html |  4 +--
 5 files changed, 64 insertions(+), 37 deletions(-)
 create mode 100644 app/templates/macros/topics.html
 delete mode 100644 app/templates/macros/topictable.html

(limited to 'app/templates')

diff --git a/app/templates/macros/topics.html b/app/templates/macros/topics.html
new file mode 100644
index 0000000..0e01185
--- /dev/null
+++ b/app/templates/macros/topics.html
@@ -0,0 +1,52 @@
+{% macro render_topics_table(topics, show_author=True) -%}
+<table>
+	<tr>
+		<th>Id</th>
+		<th></th>
+		<th>Title</th>
+		{% if show_author %}<th>Author</th>{% endif %}
+		<th>Name</th>
+		<th>Link</th>
+		<th>Actions</th>
+	</tr>
+	{% for topic in topics %}
+		<tr{% if topic.wip %} class="wiptopic"{% endif %}>
+			<td>{{ topic.topic_id }}</td>
+			<td>
+				[{{ topic.type.value }}]
+			</td>
+			<td>
+				<a href="https://forum.minetest.net/viewtopic.php?t={{ topic.topic_id}}">{{ topic.title }}</a>
+				{% if topic.wip %}[WIP]{% endif %}
+			</td>
+			{% if show_author %}
+				<td><a href="{{ url_for('user_profile_page', username=topic.author.username) }}">{{ topic.author.display_name}}</a></td>
+			{% endif %}
+			<td>{{ topic.name or ""}}</td>
+			<td>{% if topic.link %}<a href="{{ topic.link }}">{{ topic.link | domain }}</a>{% endif %}</td>
+			<td>
+				<a href="{{ url_for('create_edit_package_page', author=topic.author.username, repo=topic.getRepoURL(), forums=topic.topic_id, title=topic.title, bname=topic.name) }}">Create</a>
+			</td>
+		</tr>
+	{% endfor %}
+</table>
+{% endmacro %}
+
+
+{% macro render_topics(topics, current_user, show_author=True) -%}
+<ul>
+	{% for topic in topics %}
+		<li{% if topic.wip %} class="wiptopic"{% endif %}>
+			<a href="https://forum.minetest.net/viewtopic.php?t={{ topic.topic_id}}">{{ topic.title }}</a>
+			{% if topic.wip %}[WIP]{% endif %}
+			{% if topic.name %}[{{ topic.name }}]{% endif %}
+			{% if show_author %}
+				by <a href="{{ url_for('user_profile_page', username=topic.author.username) }}">{{ topic.author.display_name }}</a>
+			{% endif %}
+			{% if not topic.author.checkPerm(current_user, "CHANGE_AUTHOR") %}
+				<a href="{{ url_for('create_edit_package_page', author=topic.author.username, repo=topic.getRepoURL(), forums=topic.topic_id, title=topic.title, bname=topic.name) }}">Create</a>
+			{% endif %}
+		</li>
+	{% endfor %}
+</ul>
+{% endmacro %}
diff --git a/app/templates/macros/topictable.html b/app/templates/macros/topictable.html
deleted file mode 100644
index 8a6b31c..0000000
--- a/app/templates/macros/topictable.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% macro render_topictable(topics, show_author=True) -%}
-<table>
-	<tr>
-		<th>Id</th>
-		<th></th>
-		<th>Title</th>
-		{% if show_author %}<th>Author</th>{% endif %}
-		<th>Name</th>
-		<th>Link</th>
-		<th>Actions</th>
-	</tr>
-	{% for topic in topics %}
-		<tr{% if topic.wip %} class="wiptopic"{% endif %}>
-			<td>{{ topic.topic_id }}</td>
-			<td>
-				[{{ topic.type.value }}]
-			</td>
-			<td>
-				<a href="https://forum.minetest.net/viewtopic.php?t={{ topic.topic_id}}">{{ topic.title }}</a>
-				{% if topic.wip %}[WIP]{% endif %}
-			</td>
-			{% if show_author %}
-				<td><a href="{{ url_for('user_profile_page', username=topic.author.username) }}">{{ topic.author.display_name}}</a></td>
-			{% endif %}
-			<td>{{ topic.name or ""}}</td>
-			<td>{% if topic.link %}<a href="{{ topic.link }}">{{ topic.link | domain }}</a>{% endif %}</td>
-			<td>
-				<a href="{{ url_for('create_edit_package_page', author=topic.author.username, repo=topic.getRepoURL(), forums=topic.topic_id, title=topic.title, bname=topic.name) }}">Create</a>
-			</td>
-		</tr>
-	{% endfor %}
-</table>
-{% endmacro %}
diff --git a/app/templates/packages/list.html b/app/templates/packages/list.html
index 0ce5c90..53ffac0 100644
--- a/app/templates/packages/list.html
+++ b/app/templates/packages/list.html
@@ -37,4 +37,12 @@
 		<li>{{ page }} / {{ page_max }}</li>
 		{% if next_url %}<li><a href="{{ next_url }}">Next</a></li> {% endif %}
 	</ul>
+
+	{% if topics %}
+		<h2 style="margin-top:2em;">More content from the forums</h2>
+
+		{% from "macros/topics.html" import render_topics %}
+		{{ render_topics(topics, current_user) }}
+	{% endif %}
+
 {% endblock %}
diff --git a/app/templates/todo/topics.html b/app/templates/todo/topics.html
index f53c4eb..74a9381 100644
--- a/app/templates/todo/topics.html
+++ b/app/templates/todo/topics.html
@@ -12,6 +12,6 @@ Topics to be Added
 		{{ topics | count }} remaining.
 	</p>
 
-	{% from "macros/topictable.html" import render_topictable %}
-	{{ render_topictable(topics) }}
+	{% from "macros/topics.html" import render_topics_table %}
+	{{ render_topics_table(topics) }}
 {% endblock %}
diff --git a/app/templates/users/user_profile_page.html b/app/templates/users/user_profile_page.html
index 81b5934..1120849 100644
--- a/app/templates/users/user_profile_page.html
+++ b/app/templates/users/user_profile_page.html
@@ -107,8 +107,8 @@
 				List of your forum topics which do not have a matching package.
 			</p>
 
-			{% from "macros/topictable.html" import render_topictable %}
-			{{ render_topictable(topics_to_add, show_author=False) }}
+			{% from "macros/topics.html" import render_topics_table %}
+			{{ render_topics_table(topics_to_add, show_author=False) }}
 		</div>
 	</div>
 {% endif %}
-- 
cgit v1.2.3