From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 22 Feb 2015 21:57:33 +0000 (+0100)
Subject: Remove download page and directly go to the download centre
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fb1ab3c2d56455e1e84dda5af0e15e82fff3c4e;p=people%2Fshoehn%2Fipfire.org.git

Remove download page and directly go to the download centre
---

diff --git a/templates/downloads.html b/templates/downloads.html
deleted file mode 100644
index 6dae0ab..0000000
--- a/templates/downloads.html
+++ /dev/null
@@ -1,79 +0,0 @@
-{% extends "base-1.html" %}
-
-{% block title %}{{ _("Get IPFire") }}{% end block %}
-
-{% block header %}
-	<header class="jumbotron subhead" id="overview">
-		<div class="container">
-			<h1>{{ _("Get IPFire") }}</h1>
-			<p class="lead">
-				{{ _("IPFire is completely free to download and use") }}
-			</p>
-		</div>
-	</header>
-{% end header %}
-
-{% block body %}
-	<div class="download-box">
-		{% module DownloadButton(release) %}
-
-		<br class="separator">
-
-		<a href="http://downloads.ipfire.org/latest">
-			{{ _("More download options") }}
-		</a>
-	</div>
-
-	<hr>
-
-	<div class="row">
-		<div class="col-lg-7 col-md-7">
-			{% if lang == "de" %}
-				<p class="lead">
-					Lade IPFire jetzt <a href="/features/itsfree">kostenlos</a> herunter!
-				</p>
-				<p>
-					Wenn du IPFire das erste mal herunterlädst, dann zögere nicht
-					es endlich auszuprobieren. Es dauert nur 15 Minuten, bis
-					diese freie Firewall-Distribution auch dein Netzwerk schützt.
-				</p>
-			{% else %}
-				<p class="lead">
-					Download IPFire now and learn why IPFire is
-					<a href="/features/itsfree">free</a>!
-				</p>
-				<p>
-					If you are downloading IPFire for the first time, don't be afraid.
-					The installation process takes only about 15 minutes until you're
-					running a free firewall distribution that's actively protecting your network.
-				</p>
-			{% end %}
-		</div>
-	
-		<div class="col-lg-5 col-md-5">
-			<div class="well">
-				<h4>{{ _("Get yourself involved") }}</h4>
-				{% if lang == "de" %}
-					<p>
-						Wir wünschen uns von jedem, der IPFire herunterlädt sich
-						selbst in das Projekt mit einzubringen.
-					</p>
-					<p>
-						Tritt der <a href="/getinvolved">Community</a> bei,
-						unterstütze die Entwicklung oder tätige eine
-						<a href="/donate">Spende</a>.
-					</p>
-				{% else %}
-					<p>
-						We ask everyone who downloads IPFire to contribute
-						themselves to the project.
-					</p>
-					<p>
-						Join the <a href="/getinvolved">community</a>, take
-						part in the development or <a href="/donate">donate</a>.
-					</p>
-				{% end %}
-			</div>
-		</div>
-	</div>
-{% end block %}
diff --git a/webapp/__init__.py b/webapp/__init__.py
index 341c1a2..752b3b4 100644
--- a/webapp/__init__.py
+++ b/webapp/__init__.py
@@ -95,8 +95,8 @@ class Application(tornado.web.Application):
 			(r"/author/(.*)", NewsAuthorHandler),
 
 			# Download sites
-			(r"/download", DownloadHandler),
-			(r"/downloads", tornado.web.RedirectHandler, { "url" : "/download" }),
+			(r"/download", tornado.web.RedirectHandler, { "url" : "http://downloads.ipfire.org/latest" }),
+			(r"/downloads", tornado.web.RedirectHandler, { "url" : "http://downloads.ipfire.org/latest" }),
 
 			# Handle old pages that have moved elsewhere
 			(r"/screenshots", tornado.web.RedirectHandler, { "url" : "/about" }),
diff --git a/webapp/handlers_download.py b/webapp/handlers_download.py
index a7cb9c5..8efe74c 100644
--- a/webapp/handlers_download.py
+++ b/webapp/handlers_download.py
@@ -55,11 +55,6 @@ class DownloadsDevelopmentHandler(BaseHandler):
 		self.render("downloads-development.html", releases=releases)
 
 
-class DownloadHandler(BaseHandler):
-	def get(self):
-		self.render("downloads.html", release=self.releases.get_latest())
-
-
 class DownloadAllHandler(BaseHandler):
 	def get(self):
 		self.render("downloads-all.html",