From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 30 Dec 2025 12:15:38 +0000 (+0000)
Subject: dnsbl: Move report templates into a sub-directory
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=089519b13768ad221b613c280a6ff80d70ebbe9a;p=ipfire.org.git

dnsbl: Move report templates into a sub-directory

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

diff --git a/Makefile.am b/Makefile.am
index e2f8cef0..b2496c22 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -185,10 +185,7 @@ templates_blog_modulesdir = $(templates_blogdir)/modules
 
 templates_dnsbl_DATA = \
 	src/templates/dnsbl/index.html \
-	src/templates/dnsbl/list.html \
-	src/templates/dnsbl/report.html \
-	src/templates/dnsbl/report-submit.html \
-	src/templates/dnsbl/report-submitted.html
+	src/templates/dnsbl/list.html
 
 templates_dnsbldir = $(templatesdir)/dnsbl
 
@@ -197,6 +194,13 @@ templates_dnsbl_modules_DATA = \
 
 templates_dnsbl_modulesdir = $(templates_dnsbldir)/modules
 
+templates_dnsbl_reports_DATA = \
+	src/templates/dnsbl/reports/show.html \
+	src/templates/dnsbl/reports/submit.html \
+	src/templates/dnsbl/reports/submitted.html
+
+templates_dnsbl_reportsdir = $(templates_dnsbldir)/reports
+
 templates_donate_DATA = \
 	src/templates/donate/donate.html \
 	src/templates/donate/error.html \
diff --git a/src/templates/dnsbl/report.html b/src/templates/dnsbl/reports/show.html
similarity index 96%
rename from src/templates/dnsbl/report.html
rename to src/templates/dnsbl/reports/show.html
index d1913561..b7345e4b 100644
--- a/src/templates/dnsbl/report.html
+++ b/src/templates/dnsbl/reports/show.html
@@ -1,4 +1,4 @@
-{% extends "../base.html" %}
+{% extends "../../base.html" %}
 
 {% block title %}
 	{{ _("IPFire DNSBL") }} {{ _("Report %s") % report }}
diff --git a/src/templates/dnsbl/report-submit.html b/src/templates/dnsbl/reports/submit.html
similarity index 99%
rename from src/templates/dnsbl/report-submit.html
rename to src/templates/dnsbl/reports/submit.html
index 93a623c6..c38da4a3 100644
--- a/src/templates/dnsbl/report-submit.html
+++ b/src/templates/dnsbl/reports/submit.html
@@ -1,4 +1,4 @@
-{% extends "../base.html" %}
+{% extends "../../base.html" %}
 
 {% block title %}
 	{{ _("IPFire DNSBL") }} {{ _("Report A Domain") }}
diff --git a/src/templates/dnsbl/report-submitted.html b/src/templates/dnsbl/reports/submitted.html
similarity index 93%
rename from src/templates/dnsbl/report-submitted.html
rename to src/templates/dnsbl/reports/submitted.html
index 63eafb4e..043da187 100644
--- a/src/templates/dnsbl/report-submitted.html
+++ b/src/templates/dnsbl/reports/submitted.html
@@ -1,4 +1,4 @@
-{% extends "../base.html" %}
+{% extends "../../base.html" %}
 
 {% block title %}{{ _("Thank You!") }}{% end block %}
 
diff --git a/src/web/dnsbl.py b/src/web/dnsbl.py
index 85f66a4f..fa0b8b0c 100644
--- a/src/web/dnsbl.py
+++ b/src/web/dnsbl.py
@@ -41,7 +41,7 @@ class SubmitReportHandler(base.AnalyticsMixin, BaseHandler):
 		lists = await self.backend.dnsbl.get_lists()
 
 		# Render the page
-		self.render("dnsbl/report-submit.html", lists=lists)
+		self.render("dnsbl/reports/submit.html", lists=lists)
 
 	@tornado.web.authenticated
 	#@base.ratelimit(minutes=60, requests=10)
@@ -58,7 +58,7 @@ class SubmitReportHandler(base.AnalyticsMixin, BaseHandler):
 		)
 
 		# Render a result page
-		self.render("dnsbl/report-submitted.html", report=report)
+		self.render("dnsbl/reports/submitted.html", report=report)
 
 
 class ReportHandler(base.AnalyticsMixin, BaseHandler):
@@ -68,7 +68,7 @@ class ReportHandler(base.AnalyticsMixin, BaseHandler):
 		if not report:
 			raise tornado.web.HTTPError(404, "Could not find report '%s'" % id)
 
-		self.render("dnsbl/report.html", report=report)
+		self.render("dnsbl/reports/show.html", report=report)
 
 
 class ListsModule(ui_modules.UIModule):