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 f35176958b00219e37f95c86d9fc1240784fe038..20327fc4b61d5ec21817b704cebf1a0e7a7f8404 100644 (file)
--- 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 b4661e0cefea0b13515ed525fe166098b6278559..a22e466fa1d7aee032ca396d3c5378d156f93594 100644 (file)
--- 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 0e0f64e5afdf0633cb6d8029d618db78413c98cc..e773a8644e215cd45268d1b8ec82e834145110fe 100644 (file)
--- 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 c1131b21119d833eadbed4679257682158382c5d..59e0d03b8d96e7c7f7eb3d8500bd919c0feed5c5 100644 (file)
--- 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):