From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 30 Dec 2025 12:51:52 +0000 (+0000)
Subject: dnsbl: Create a separate page that lists all lists
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24a2773e8a9b0299c2014c3706df5fd93040c44b;p=ipfire.org.git

dnsbl: Create a separate page that lists all lists

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/Makefile.am b/Makefile.am
index b2496c22..f3517695 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -185,7 +185,8 @@ templates_blog_modulesdir = $(templates_blogdir)/modules
 
 templates_dnsbl_DATA = \
 	src/templates/dnsbl/index.html \
-	src/templates/dnsbl/list.html
+	src/templates/dnsbl/list.html \
+	src/templates/dnsbl/lists.html
 
 templates_dnsbldir = $(templatesdir)/dnsbl
 
diff --git a/src/templates/base.html b/src/templates/base.html
index f7f21b9a..060c3c70 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -96,6 +96,12 @@
 
 								{# DNSBL #}
 								{% if request.path.startswith("/dnsbl") %}
+									<a class="navbar-item is-tab
+											{% if request.path.startswith("/dnsbl/lists") %}is-active{% end %}"
+											href="/dnsbl/lists">
+										{{ _("Lists") }}
+									</a>
+
 									<a class="navbar-item is-tab
 											{% if request.path.startswith("/dnsbl/how-to-use") %}is-active{% end %}"
 											href="/dnsbl/how-to-use">
diff --git a/src/templates/dnsbl/index.html b/src/templates/dnsbl/index.html
index f51bce51..94a531da 100644
--- a/src/templates/dnsbl/index.html
+++ b/src/templates/dnsbl/index.html
@@ -124,12 +124,4 @@
 			</div>
 		</div>
 	</section>
-
-	<section class="hero">
-		<div class="hero-body">
-			<div class="container">
-				{% module DNSBLLists(lists) %}
-			</div>
-		</div>
-	</section>
 {% end block %}
diff --git a/src/templates/dnsbl/lists.html b/src/templates/dnsbl/lists.html
new file mode 100644
index 00000000..7c78b96a
--- /dev/null
+++ b/src/templates/dnsbl/lists.html
@@ -0,0 +1,37 @@
+{% extends "../base.html" %}
+
+{% block head %}
+	{% module OpenGraph(
+		title=_("IPFire DNSBL - Lists"),
+	) %}
+{% end block %}
+
+{% block title %}{{ _("IPFire DNSBL") }} - {{ _("Lists") }}{% end block %}
+
+{% block container %}
+	<section class="hero">
+		<div class="hero-body">
+			<div class="container">
+				<nav class="breadcrumb" aria-label="breadcrumbs">
+					<ul>
+						<li>
+							<a href="/dnsbl">
+								{{ _("IPFire DNSBL") }}
+							</a>
+						</li>
+
+						<li class="is-active">
+							<a href="#" aria-current="page">{{ _("Lists") }}</a>
+						</li>
+					</ul>
+				</nav>
+			</div>
+		</div>
+	</section>
+
+	<section>
+		<div class="container">
+			{% module DNSBLLists(lists) %}
+		</div>
+	</section>
+{% end block %}
diff --git a/src/web/__init__.py b/src/web/__init__.py
index 67b25f08..f80678f7 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -214,7 +214,8 @@ class Application(tornado.web.Application):
 			(r"/location/lookup/(.+)", location.LookupHandler),
 
 			# DNSBL
-			(r"/dnsbl/?", dnsbl.IndexHandler),
+			(r"/dnsbl/?", StaticHandler, { "template" : "dnsbl/index.html" }),
+			(r"/dnsbl/lists", dnsbl.ListsHandler),
 			(r"/dnsbl/lists/(\w+)", dnsbl.ListHandler),
 			(r"/dnsbl/report", dnsbl.SubmitReportHandler),
 			(r"/dnsbl/reports/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})", dnsbl.ReportHandler),
diff --git a/src/web/dnsbl.py b/src/web/dnsbl.py
index f66e7496..c1131b21 100644
--- a/src/web/dnsbl.py
+++ b/src/web/dnsbl.py
@@ -12,13 +12,13 @@ class BaseHandler(base.BaseHandler):
 		return await self.backend.dnsbl.get_list(slug)
 
 
-class IndexHandler(base.AnalyticsMixin, BaseHandler):
+class ListsHandler(base.AnalyticsMixin, BaseHandler):
 	async def get(self):
 		# Fetch all lists
 		lists = await self.backend.dnsbl.get_lists()
 
 		# Render the page
-		self.render("dnsbl/index.html", lists=lists)
+		self.render("dnsbl/lists.html", lists=lists)
 
 
 class ListHandler(base.AnalyticsMixin, BaseHandler):