From: Michael Tremer Date: Sat, 1 Sep 2018 11:58:04 +0000 (+0100) Subject: Remove old download pages X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3b13199804ab0c65be53623a3362e1afa738d4b;p=ipfire.org.git Remove old download pages Signed-off-by: Michael Tremer --- diff --git a/src/templates/download-mirror-detail.html b/src/templates/download-mirror-detail.html deleted file mode 100644 index 2fcb64a9..00000000 --- a/src/templates/download-mirror-detail.html +++ /dev/null @@ -1,36 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _("Mirror-Server") }}{% end block %} - -{% block body %} -
- -

{{ _("IPFire Mirrors") }}

- - - - - - - - - - - - - - - - - - -
{{ _("Hostname") }}{{ mirror.hostname }}
{{ _("Owner") }}{{ mirror.owner }}
{{ _("Last update") }}{{ locale.format_date(mirror.last_update) }}
{{ _("Number of files") }}{{ len(mirror.filelist) }}
- -
- -

- {{ _("View list of all mirror servers.") }} -

-
- -{% end block %} diff --git a/src/templates/download-splash.html b/src/templates/download-splash.html deleted file mode 100644 index c06ec8ac..00000000 --- a/src/templates/download-splash.html +++ /dev/null @@ -1,42 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _("Thanks for downloading IPFire") }}{% end block %} - -{% block container %} -
-
-

{{ _("Thanks for downloading IPFire") }}

-
- -

- {{ _("Your download should begin in a few seconds. If not, click the link below.") }} -

- -

-
- -
-
-
- - -

{{ _("How to install IPFire") }}

- -
- -
- - -

{{ _("Donate") }}

- -
- -
- - -

{{ _("Get Support") }}

- -
-
-
-{% end %} diff --git a/src/templates/download.html b/src/templates/download.html deleted file mode 100644 index 64bec138..00000000 --- a/src/templates/download.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _("Download IPFire") }}{% end block %} - -{% block container %} -
-
-
-

Download IPFire

- -
- {% module DownloadButton(release) %} -
- -
{{ _("Other download options") }}
-
-
-
-{% end block %} diff --git a/src/templates/downloads-all.html b/src/templates/downloads-all.html deleted file mode 100644 index f78d3327..00000000 --- a/src/templates/downloads-all.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _("Ancient Downloads") }}{% end block %} - -{% block body %} -
-

{{ _("Download IPFire") }}

-

- {{ _("These are the ancient downloads of IPFire. They are just saved for historical reasons and should not be used in a productive environment.") }} -

- -

- {{ _("Go back to latest stable downloads.") }} -

- -
-
- - {% for release in releases %} - {% module ReleaseItemShort(release) %} - {% end %} -{% end block %} diff --git a/src/templates/downloads-development.html b/src/templates/downloads-development.html deleted file mode 100644 index 7dc69159..00000000 --- a/src/templates/downloads-development.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "downloads-older.html" %} - -{% block title %}{{ _("Development Downloads") }}{% end block %} - -{% block information %} -

{{ _("Development Downloads") }}

- -

- The developers do create a snapshort version from the current - development sources to get this distributed to a higher number - of testers.
- These versions are not intended to be used in a - productive environment. -

-{% end block %} diff --git a/src/templates/downloads-index.html b/src/templates/downloads-index.html deleted file mode 100644 index 60dd48a4..00000000 --- a/src/templates/downloads-index.html +++ /dev/null @@ -1,56 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _("Download Center") }}{% end block %} - -{% block body %} -
-
-

{{ _("IPFire Download Center") }}

- -
-
- {{ _( - -

- {{ _("Welcome to the downloads section of the IPFire project.") }} - {{ _("You will find all published releases of IPFire for download.") }} -

-
-
- -
-
-

{{ _("Available releases") }}

- - - - - - - - - - - {% for release in releases %} - - - - - - {% end %} - -
{{ _("Release") }}{{ _("Release type") }}{{ _("Release date") }}
- {{ release.name }} - - {% if release.stable %} - {{ _("Stable") }} - {% else %} - {{ _("Development") }} - {% end %} - {{ locale.format_date(release.date, shorter=True) }}
-
-
-
-
- -{% end block %} diff --git a/src/templates/downloads-item.html b/src/templates/downloads-item.html deleted file mode 100644 index 5e33f788..00000000 --- a/src/templates/downloads-item.html +++ /dev/null @@ -1,7 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Download {{ release.name }}{% end block %} - -{% block body %} - {% module ReleaseItem(release, latest=latest) %} -{% end block %} diff --git a/src/templates/downloads-mirrors.html b/src/templates/downloads-mirrors.html deleted file mode 100644 index 811125de..00000000 --- a/src/templates/downloads-mirrors.html +++ /dev/null @@ -1,58 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _("Mirror-Server") }}{% end block %} - -{% block body %} -
-
-

{{ _("IPFire Mirrors") }}

- -
-
-

- This page is an overview about our mirror servers. -

- -

- When a user downloads a file, one of the servers is arbitrarily - choosen und the user gets reditected. -

- - -
-
- -
-
- - - - - - - - - {% for mirror in mirrors %} - - - - - - - - {% end %} -
{{ _("Owner") }}{{ _("Hostname") }}{{ _("Location") }}{{ _("Last update") }} 
{{ mirror.owner }}{{ mirror.hostname }} - {{ mirror.country_code }} - {{ mirror.location }} - {{ locale.format_date(mirror.last_update) }}{{ _("details") }}
-
-
-
-
-{% end block %} diff --git a/src/templates/downloads-older.html b/src/templates/downloads-older.html deleted file mode 100644 index 9e0d64a7..00000000 --- a/src/templates/downloads-older.html +++ /dev/null @@ -1,35 +0,0 @@ -{% extends "downloads-index.html" %} - -{% block title %}{{ _("Ancient downloads") }}{% end block %} - -{% block body %} - {% block information %} -

{{ _("Ancient downloads") }}

-

- {{ _("These are the ancient downloads of IPFire. They are just saved for historical reasons and should not be used in a productive environment.") }} -

- -

- {{ _("Beware that these releases could lack possible security-fixes and so it is recommended to use the latest version.") }} -

- -

- {{ _("Go back to latest stable downloads.") }} -

- -
- {% end block %} - - - - - - - {% for release in releases %} - - - - - {% end %} -
{{ _("Release") }}{{ _("Published on") }}
{{ release.name }}{{ locale.format_date(release.date, shorter=True, relative=False) }}
-{% end block %} diff --git a/src/templates/modules/release-item-short.html b/src/templates/modules/release-item-short.html deleted file mode 100644 index 7dd2036d..00000000 --- a/src/templates/modules/release-item-short.html +++ /dev/null @@ -1,18 +0,0 @@ -
-

{{ item.name }}

-

- {{ _("Here you will find the downloads for the version") }} {{ item.name }}: -

- -
- {% if item.files %} - {% for file in item.files %} - {{ _(file.desc) }}
- {% end %} - {% else %} -

{{ _("There are no downloads available for this release.") }}

- {% end %} -
- -
-
diff --git a/src/templates/modules/release-item.html b/src/templates/modules/release-item.html deleted file mode 100644 index 26c21c92..00000000 --- a/src/templates/modules/release-item.html +++ /dev/null @@ -1,64 +0,0 @@ -
-

- {% if latest %}{{ _("Latest release") }}:{% end %} - {{ release.name }} -

-
- -{% if release.files %} - {% if not release.stable %} -
-

{{ _("Caution!") }}

- - This release is not a stable version of IPFire and - intended for testing purposes only. - Do not use this release in production and please - report any bugs. -
- {% end %} - -
- {% module DownloadButton(release) %} -
- - {% for arch, files in downloads %} -

{{ arch }}

- - - {% end %} - - {% if release.news %} - {% module NewsItem(release.news, show_heading=True, announcement=True) %} - {% end %} -{% else %} -
- {{ _("There are no downloads available for this release.") }} -
-{% end %} diff --git a/src/web/__init__.py b/src/web/__init__.py index 2aafc07b..2db2a1a2 100644 --- a/src/web/__init__.py +++ b/src/web/__init__.py @@ -62,7 +62,6 @@ class Application(tornado.web.Application): "NetBootMenuHeader" : ui_modules.NetBootMenuHeaderModule, "NetBootMenuSeparator" : ui_modules.NetBootMenuSeparatorModule, "ProgressBar" : ui_modules.ProgressBarModule, - "ReleaseItem" : ui_modules.ReleaseItemModule, "FireinfoDeviceTable" : ui_modules.FireinfoDeviceTableModule, "FireinfoDeviceAndGroupsTable" : ui_modules.FireinfoDeviceAndGroupsTableModule, "FireinfoGeoTable" : ui_modules.FireinfoGeoTableModule, @@ -135,15 +134,6 @@ class Application(tornado.web.Application): # downloads.ipfire.org self.add_handlers(r"downloads?(\.dev)?\.ipfire\.org", [ - (r"/", DownloadsIndexHandler), - (r"/latest", DownloadsLatestHandler), - (r"/release/(\d)", DownloadsReleaseHandler), - (r"/release/([\w\.\-]*)", DownloadsReleaseHandler), - (r"/older", DownloadsOlderHandler), - (r"/development", DownloadsDevelopmentHandler), - (r"/mirrors", tornado.web.RedirectHandler, { "url" : "https://mirrors.ipfire.org/" }), - (r"/source", tornado.web.RedirectHandler, { "url" : "https://source.ipfire.org/" }), - (r"/download-splash", DownloadSplashHandler), (r"/(iso|torrent)/(.*)", DownloadCompatHandler), (r"/(.*)", DownloadFileHandler), ]) diff --git a/src/web/handlers_download.py b/src/web/handlers_download.py index 406d47a8..11a09853 100644 --- a/src/web/handlers_download.py +++ b/src/web/handlers_download.py @@ -1,70 +1,10 @@ #!/usr/bin/python -import logging import random import tornado.web from handlers_base import * -class DownloadsIndexHandler(BaseHandler): - def get(self): - releases = self.releases.get_all() - - self.render("downloads-index.html", releases=releases) - - -class DownloadsReleaseHandler(BaseHandler): - def get(self, release): - release = self.releases.get_by_sname(release) - - if not release: - release = self.releases.get_by_id(release) - - if not release: - raise tornado.web.HTTPError(404) - - self.render("downloads-item.html", release=release, latest=False) - - -class DownloadsLatestHandler(BaseHandler): - def get(self): - release = self.releases.get_latest() - if not release: - raise tornado.web.HTTPError(404) - - self.render("downloads-item.html", release=release, latest=True) - - -class DownloadsOlderHandler(BaseHandler): - def get(self): - releases = self.releases.get_stable() - - # Drop the latest release - if releases: - releases = releases[1:] - - self.render("downloads-older.html", releases=releases) - - -class DownloadsDevelopmentHandler(BaseHandler): - def get(self): - releases = self.releases.get_unstable() - - self.render("downloads-development.html", releases=releases) - - -class DownloadAllHandler(BaseHandler): - def get(self): - self.render("downloads-all.html", - releases=self.releases.get_stable()) - - -class DownloadDevelopmentHandler(BaseHandler): - def get(self): - self.render("downloads-development.html", - releases=self.releases.get_unstable()) - - class DownloadFileHandler(BaseHandler): def prepare(self): self.set_header("Pragma", "no-cache") @@ -125,8 +65,3 @@ class DownloadCompatHandler(BaseHandler): return raise tornado.web.HTTPError(404) - - -class DownloadSplashHandler(BaseHandler): - def get(self): - self.render("download-splash.html") diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py index fdcfe330..5fe12c4f 100644 --- a/src/web/ui_modules.py +++ b/src/web/ui_modules.py @@ -141,45 +141,6 @@ class NetBootMenuSeparatorModule(UIModule): return self.render_string("netboot/menu-separator.cfg") -class ReleaseItemModule(UIModule): - def render(self, release, latest=False): - arches = ("x86_64", "i586", "arm") - - downloads = [] - for arch in arches: - files = [] - - for file in release.files: - if not file.arch == arch: - continue - - files.append(file) - - if files: - downloads.append((arch, files)) - - return self.render_string("modules/release-item.html", - release=release, latest=latest, downloads=downloads) - - -class DownloadButtonModule(UIModule): - def render(self, release, text="Download now!"): - best_image = None - - for file in release.files: - if (release.sname < "ipfire-2.19-core100" or file.arch == "x86_64") \ - and file.type == "iso": - best_image = file - break - - # Show nothing when there was no image found. - if not best_image: - return "" - - return self.render_string("modules/download-button.html", - release=release, image=best_image) - - class ProgressBarModule(UIModule): def render(self, value, colour=None): value *= 100