downloads: Drop individual mirror pages

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

diff --git a/Makefile.am b/Makefile.am
index 3f00cfb6bce0906627440ea3b932c02d6e929bb7..00d3024c11253afecdc406321630edddaeb0673b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -189,7 +189,6 @@ templates_donate_messages_DATA = \
 templates_donate_messagesdir = $(templates_donatedir)/messages
 
 templates_download_DATA = \
-       src/templates/download/mirror.html \
        src/templates/download/mirrors.html \
        src/templates/download/release.html \
        src/templates/download/thank-you.html

diff --git a/src/templates/download/mirror.html b/src/templates/download/mirror.html
deleted file mode 100644 (file)
index 4912277..0000000
--- a/src/templates/download/mirror.html
+++ /dev/null
@@ -1,76 +0,0 @@
-{% extends "../base.html" %}
-
-{% block title %}{{ _("Mirror %s") % mirror }}{% end block %}
-
-{% block container %}
-       <div class="header">
-               <div class="container">
-                       <h1>{{ mirror }}</h1>
-
-                       <p class="text-muted">
-                               {% if mirror.owner %}
-                                       {{ _("by %s") % mirror.owner }}
-                               {% end %}
-
-                               {% if mirror.country %}                         
-                                       {{ _("in %s") % mirror.country.name }}
-                               {% end %}
-                       </p>
-               </div>
-       </div>
-
-       <div class="container">
-               <section>
-                       <div class="row justify-content-center">
-                               <div class="col-12 col-lg-10">
-                                       <div class="card mb-4">
-                                               <div class="card-img-top">
-                                                       {% module Map(mirror.country.name) %}
-                                               </div>
-
-                                               {% if mirror.asn %}
-                                                       <div class="card-body">
-                                                               <dl class="mb-0">
-                                                                       <dt>{{ _("Autonomous System") }}</dt>
-                                                                       <dd>{{ mirror.address.autonomous_system or "AS%s" % mirror.asn }}</dd>
-                                                               </dl>
-                                                       </div>
-                                               {% end %}
-
-                                               <ul class="list-group list-group-flush">
-                                                       {% if mirror.state == "UP" %}
-                                                               <li class="list-group-item list-group-item-success flex-column align-items-start">
-                                                                       <p class="mb-1">{{ _("The mirror is up") }}</p>
-
-                                                                       <small class="text-muted">
-                                                                               {{ _("Last updated %s") % locale.format_date(mirror.last_update) }}
-                                                                       </small>
-                                                               </li>
-                                                       {% elif mirror.state == "DOWN" %}
-                                                               <li class="list-group-item list-group-item-danger flex-column align-items-start">
-                                                                       <p class="mb-1">{{ _("The mirror is down") }}</p>
-
-                                                                       <small class="text-muted">
-                                                                               {{ _("Last updated %s") % locale.format_date(mirror.last_update) }}
-                                                                       </small>
-                                                               </li>
-                                                       {% elif mirror.state == "OUTOFSYNC" %}
-                                                               <li class="list-group-item list-group-item-warning flex-column align-items-start">
-                                                                       <p class="mb-1">{{ _("The mirror is out of sync") }}</p>
-
-                                                                       <small class="text-muted">
-                                                                               {{ _("Last updated %s") % locale.format_date(mirror.last_update) }}
-                                                                       </small>
-                                                               </li>
-                                                       {% end %}
-                                               </ul>
-                                       </div>
-
-                                       <a class="btn btn-primary btn-block" href="{{ mirror.url }}">
-                                               {{ _("Browse Mirror") }} <span class="fas fa-external-link-alt ml-2"></span>
-                                       </a>
-                               </div>
-                       </div>
-               </section>
-       </div>
-{% end block %}

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 06f055912a18ab6606b8ac16c759b71efaea6cfc..c4075a229fab8de504da8d3845e7230b7a8e5b1d 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -133,7 +133,6 @@ class Application(tornado.web.Application):
                        (r"/downloads", tornado.web.RedirectHandler, { "url" : "/download" }),
                        (r"/download", download.IndexHandler),
                        (r"/download/mirrors", download.MirrorsHandler),
-                       (r"/download/mirrors/([0-9a-z\-\.]+)", download.MirrorHandler),
                        (r"/download/thank-you", download.ThankYouHandler),
                        (r"/download/([0-9a-z\-\.]+)", download.ReleaseHandler),
 

diff --git a/src/web/download.py b/src/web/download.py
index d83dee1fbe690de0e15ca8b0a10f05a9ef393760..3b0203ab4acef03e68628ad0115b0f274d79e41c 100644 (file)
--- a/src/web/download.py
+++ b/src/web/download.py
@@ -27,15 +27,6 @@ class MirrorsHandler(base.BaseHandler):
                self.render("download/mirrors.html", mirrors=mirrors)
 
 
-class MirrorHandler(base.BaseHandler):
-       def get(self, hostname):
-               mirror = self.backend.mirrors.get_by_hostname(hostname)
-               if not mirror:
-                       raise tornado.web.HTTPError(404, "Could not find %s" % hostname)
-
-               self.render("download/mirror.html", mirror=mirror)
-
-
 class ReleaseHandler(base.BaseHandler):
        def get(self, slug):
                release = self.backend.releases.get_by_sname(slug)