From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 30 Dec 2025 14:09:53 +0000 (+0000)
Subject: dnsbl: Move the list templates into their own sub-directory
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0959abf5c10802a548fb8b75094bceae13318d87;p=ipfire.org.git

dnsbl: Move the list templates into their own sub-directory

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

diff --git a/Makefile.am b/Makefile.am
index f3517695..20327fc4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -184,12 +184,16 @@ templates_blog_modules_DATA = \
 templates_blog_modulesdir = $(templates_blogdir)/modules
 
 templates_dnsbl_DATA = \
-	src/templates/dnsbl/index.html \
-	src/templates/dnsbl/list.html \
-	src/templates/dnsbl/lists.html
+	src/templates/dnsbl/index.html
 
 templates_dnsbldir = $(templatesdir)/dnsbl
 
+templates_dnsbl_lists_DATA = \
+	src/templates/dnsbl/lists/index.html \
+	src/templates/dnsbl/lists/show.html
+
+templates_dnsbl_listsdir = $(templates_dnsbldir)/lists
+
 templates_dnsbl_modules_DATA = \
 	src/templates/dnsbl/modules/lists.html
 
diff --git a/src/templates/dnsbl/lists.html b/src/templates/dnsbl/lists/index.html
similarity index 96%
rename from src/templates/dnsbl/lists.html
rename to src/templates/dnsbl/lists/index.html
index b4661e0c..a22e466f 100644
--- a/src/templates/dnsbl/lists.html
+++ b/src/templates/dnsbl/lists/index.html
@@ -1,4 +1,4 @@
-{% extends "../base.html" %}
+{% extends "../../base.html" %}
 
 {% block head %}
 	{% module OpenGraph(
diff --git a/src/templates/dnsbl/list.html b/src/templates/dnsbl/lists/show.html
similarity index 98%
rename from src/templates/dnsbl/list.html
rename to src/templates/dnsbl/lists/show.html
index 0e0f64e5..e773a864 100644
--- a/src/templates/dnsbl/list.html
+++ b/src/templates/dnsbl/lists/show.html
@@ -1,4 +1,4 @@
-{% extends "../base.html" %}
+{% extends "../../base.html" %}
 
 {% block head %}
 	{% module OpenGraph(
diff --git a/src/web/dnsbl.py b/src/web/dnsbl.py
index c1131b21..59e0d03b 100644
--- a/src/web/dnsbl.py
+++ b/src/web/dnsbl.py
@@ -18,7 +18,7 @@ class ListsHandler(base.AnalyticsMixin, BaseHandler):
 		lists = await self.backend.dnsbl.get_lists()
 
 		# Render the page
-		self.render("dnsbl/lists.html", lists=lists)
+		self.render("dnsbl/lists/index.html", lists=lists)
 
 
 class ListHandler(base.AnalyticsMixin, BaseHandler):
@@ -32,7 +32,7 @@ class ListHandler(base.AnalyticsMixin, BaseHandler):
 		sources = await list.get_sources()
 
 		# Render the page
-		self.render("dnsbl/list.html", list=list, sources=sources)
+		self.render("dnsbl/lists/show.html", list=list, sources=sources)
 
 
 class SubmitReportHandler(base.AnalyticsMixin, BaseHandler):