dbl: Drop the lists page as they are listed on the main page

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

diff --git a/Makefile.am b/Makefile.am
index 102466f2b6021e3872b21ea4245b5785ba3a347a..a19acbaf6cb8dbb2db3563a0c98c17a70a06d378 100644 (file)
--- 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 1747646193db4339407608819fabcc1955227531..4a5515b6937320ee0339719bc13d4b9e204ade89 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -111,18 +111,16 @@
 
                                                                {# DBL #}
                                                                {% if request.path.startswith("/dbl") %}
+                                                                       <a class="navbar-item is-tab" href="/dbl/lists">
+                                                                               {{ _("Lists") }}
+                                                                       </a>
+
                                                                        <a class="navbar-item is-tab
                                                                                        {% if request.path.startswith("/dbl/how-to-use") %}is-active{% end %}"
                                                                                        href="/dbl/how-to-use">
                                                                                {{ _("How To Use?") }}
                                                                        </a>
 
-                                                                       <a class="navbar-item is-tab
-                                                                                       {% if request.path.startswith("/dbl/lists") %}is-active{% end %}"
-                                                                                       href="/dbl/lists">
-                                                                               {{ _("Lists") }}
-                                                                       </a>
-
                                                                        <a class="navbar-item is-tab
                                                                                        {% if request.path.startswith("/dbl/report") %}is-active{% end %}"
                                                                                        href="/dbl/report">

diff --git a/src/templates/dbl/index.html b/src/templates/dbl/index.html
index 5bac8c05a08f7fec79cc527dce4d20a5c8b0d5a2..747e02e11bdb4370992957ef26b71782d98cfe24 100644 (file)
--- 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.
                                </h5>
 
-                               <div class="columns is-multiline my-5">
-                                       {% for list in lists %}
-                                               <div class="column is-one-third">
-                                                       <div class="columns my-1">
-                                                               <div class="column">
-                                                                       <h4 class="title is-4">
-                                                                               <a href="/dbl/lists/{{ list.slug }}">
-                                                                                       {{ list.name }}
-                                                                               </a>
-                                                                       </h4>
-                                                               </div>
-
-                                                               <div class="column is-narrow">
-                                                                       <span class="tag">
-                                                                               {{ _("One Domain", "%(num)s Domains", list.total_domains) \
-                                                                                       % { "num" : format_number(list.total_domains) } }}
-                                                                       </span>
-                                                               </div>
-                                                       </div>
-                                               </div>
-                                       {% end %}
-                               </div>
+                               {% module DBLLists(lists) %}
                        </div>
                </div>
        </section>

diff --git a/src/templates/dbl/lists/index.html b/src/templates/dbl/lists/index.html
deleted file mode 100644 (file)
index 26ca6bf..0000000
--- 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 %}
-       <section class="hero is-dark">
-               <div class="hero-body">
-                       <div class="container">
-                               <nav class="breadcrumb" aria-label="breadcrumbs">
-                                       <ul>
-                                               <li>
-                                                       <a href="/dbl">
-                                                               {{ _("IPFire DBL") }}
-                                                       </a>
-                                               </li>
-
-                                               <li class="is-active">
-                                                       <a href="#" aria-current="page">{{ _("Lists") }}</a>
-                                               </li>
-                                       </ul>
-                               </nav>
-
-                               <h1 class="title">
-                                       {{ _("Lists") }}
-                               </h1>
-                       </div>
-               </div>
-       </section>
-
-       <section class="section">
-               <div class="container">
-                       {% module DBLLists(lists) %}
-               </div>
-       </section>
-{% end block %}

diff --git a/src/templates/dbl/modules/lists.html b/src/templates/dbl/modules/lists.html
index 553e225d62faac9836dfe7157afdadafb698c92e..bad88dec68e2cd481bc39578bd8e6dc77f9f2879 100644 (file)
--- a/src/templates/dbl/modules/lists.html
+++ b/src/templates/dbl/modules/lists.html
@@ -1,16 +1,22 @@
-{% for l in sorted(lists) %}
-       <div class="block">
-               <h5 class="title is-5">
-                       <a href="/dbl/lists/{{ l.slug }}">
-                               {{ l }}
-                       </a>
-               </h5>
+<div class="columns is-multiline my-5">
+       {% for list in sorted(lists) %}
+               <div class="column is-one-third">
+                       <div class="columns my-1">
+                               <div class="column">
+                                       <h4 class="title is-4">
+                                               <a href="/dbl/lists/{{ list.slug }}">
+                                                       {{ list.name }}
+                                               </a>
+                                       </h4>
+                               </div>
 
-               {# Description #}
-               {% if l.description %}
-                       <h6 class="subtitle is-6">
-                               {{ l.description }}
-                       </h6>
-               {% end %}
-       </div>
-{% end %}
+                               <div class="column is-narrow">
+                                       <span class="tag">
+                                               {{ _("One Domain", "%(num)s Domains", list.total_domains) \
+                                                       % { "num" : format_number(list.total_domains) } }}
+                                       </span>
+                               </div>
+                       </div>
+               </div>
+       {% end %}
+</div>

diff --git a/src/web/dbl.py b/src/web/dbl.py
index d7a511a8dd1b972077a12265e95fe91630bb0ff6..e1b56fc54ff5fb5647a1a4d92e161bf79e463169 100644 (file)
--- 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):