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 e2f8cef0bc5e146babcfc1231b9e980a4e6fa76c..b2496c2200a5198e09d3eda69db2e2dc297dc493 100644 (file)
--- 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 d1913561d41ea71c0bb405ee7616f0a1b60c4fe5..b7345e4bca733dd47e032608fdd35cf52429c516 100644 (file)
--- 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 93a623c6bcf940cef56ac4b03bec04ef219fde58..c38da4a38bb1c2ed8afdd6839902bc1fe1c661cf 100644 (file)
--- 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 63eafb4ec9d9dbf0b1a17b8b89d1c17ec95373dd..043da18772e484aedef01dc33750db54fc20006f 100644 (file)
--- 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 85f66a4fb686540aa9adc870e93153f2da8ac792..fa0b8b0c7b30290f04102be81f064224a9482c65 100644 (file)
--- 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):