From: Michael Tremer Date: Sun, 8 Feb 2026 16:06:13 +0000 (+0000) Subject: dbl: Drop the lists page as they are listed on the main page X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cb2910f75a3212502a66c5db6d533afa1444cca;p=ipfire.org.git dbl: Drop the lists page as they are listed on the main page Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index 102466f2..a19acbaf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -201,7 +201,6 @@ templates_dbldir = $(templatesdir)/dbl templates_dbl_lists_DATA = \ src/templates/dbl/lists/domain.html \ src/templates/dbl/lists/history.html \ - src/templates/dbl/lists/index.html \ src/templates/dbl/lists/reports.html \ src/templates/dbl/lists/sources.html \ src/templates/dbl/lists/show.html diff --git a/src/templates/base.html b/src/templates/base.html index 17476461..4a5515b6 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -111,18 +111,16 @@ {# DBL #} {% if request.path.startswith("/dbl") %} + + {{ _("Lists") }} + + {{ _("How To Use?") }} - - {{ _("Lists") }} - - diff --git a/src/templates/dbl/index.html b/src/templates/dbl/index.html index 5bac8c05..747e02e1 100644 --- a/src/templates/dbl/index.html +++ b/src/templates/dbl/index.html @@ -124,28 +124,7 @@ Choose which categories to block based on your security and content policies. -
- {% for list in lists %} -
-
-
-

- - {{ list.name }} - -

-
- -
- - {{ _("One Domain", "%(num)s Domains", list.total_domains) \ - % { "num" : format_number(list.total_domains) } }} - -
-
-
- {% end %} -
+ {% module DBLLists(lists) %} diff --git a/src/templates/dbl/lists/index.html b/src/templates/dbl/lists/index.html deleted file mode 100644 index 26ca6bf0..00000000 --- a/src/templates/dbl/lists/index.html +++ /dev/null @@ -1,41 +0,0 @@ -{% extends "../../base.html" %} - -{% block head %} - {% module OpenGraph( - title=_("IPFire DBL - Lists"), - ) %} -{% end block %} - -{% block title %}{{ _("IPFire DBL") }} - {{ _("Lists") }}{% end block %} - -{% block container %} -
-
-
- - -

- {{ _("Lists") }} -

-
-
-
- -
-
- {% module DBLLists(lists) %} -
-
-{% end block %} diff --git a/src/templates/dbl/modules/lists.html b/src/templates/dbl/modules/lists.html index 553e225d..bad88dec 100644 --- a/src/templates/dbl/modules/lists.html +++ b/src/templates/dbl/modules/lists.html @@ -1,16 +1,22 @@ -{% for l in sorted(lists) %} -
-
- - {{ l }} - -
+
+ {% for list in sorted(lists) %} +
+
+
+

+ + {{ list.name }} + +

+
- {# Description #} - {% if l.description %} -
- {{ l.description }} -
- {% end %} -
-{% end %} +
+ + {{ _("One Domain", "%(num)s Domains", list.total_domains) \ + % { "num" : format_number(list.total_domains) } }} + +
+
+
+ {% end %} +
diff --git a/src/web/dbl.py b/src/web/dbl.py index d7a511a8..e1b56fc5 100644 --- a/src/web/dbl.py +++ b/src/web/dbl.py @@ -31,12 +31,8 @@ class HowToUseHandler(base.AnalyticsMixin, BaseHandler): class ListsHandler(base.AnalyticsMixin, BaseHandler): - async def get(self): - # Fetch all lists - lists = await self.backend.dbl.get_lists() - - # Render the page - self.render("dbl/lists/index.html", lists=lists) + def get(self): + self.redirect("/dbl#lists") class ListHandler(base.AnalyticsMixin, BaseHandler):