From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 1 Nov 2018 13:34:00 +0000 (+0000)
Subject: fireinfo: Add page for all information about releases
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed2e3c1fc04cd338927027adb1338165007dc5fe;p=ipfire.org.git

fireinfo: Add page for all information about releases

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

diff --git a/Makefile.am b/Makefile.am
index 821513c7..7d84d27e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -142,11 +142,11 @@ templates_fireinfo_DATA = \
 	src/templates/fireinfo/index.html \
 	src/templates/fireinfo/i-use-1.png \
 	src/templates/fireinfo/profile.html \
+	src/templates/fireinfo/releases.html \
 	src/templates/fireinfo/stats-cpus-detail.html \
 	src/templates/fireinfo/stats-cpus.html \
 	src/templates/fireinfo/stats-geo.html \
 	src/templates/fireinfo/stats.html \
-	src/templates/fireinfo/stats-oses.html \
 	src/templates/fireinfo/vendor.html \
 	src/templates/fireinfo/vendors.html
 
diff --git a/src/templates/fireinfo/index.html b/src/templates/fireinfo/index.html
index 6de5656d..2fe4deea 100644
--- a/src/templates/fireinfo/index.html
+++ b/src/templates/fireinfo/index.html
@@ -41,6 +41,10 @@
 							<h5>
 								{{ _("of all IPFire systems are on the latest release, released %s") % locale.format_date(latest_release.published, relative=True, shorter=True) }}
 							</h5>
+
+							<a class="btn btn-sm btn-light" href="/releases">
+								{{ _("See All Releases") }}
+							</a>
 						</div>
 					</div>
 				{% end %}
diff --git a/src/templates/fireinfo/releases.html b/src/templates/fireinfo/releases.html
new file mode 100644
index 00000000..9ff05746
--- /dev/null
+++ b/src/templates/fireinfo/releases.html
@@ -0,0 +1,39 @@
+{% extends "../base.html" %}
+
+{% block title %}{{ _("Releases") }}{% end block %}
+
+{% block container %}
+	<section>
+		<div class="container">
+			<div class="row">
+				<div class="col-12">
+					<h1>{{ _("Releases") }}</h1>
+				</div>
+			</div>
+		</div>
+	</section>
+
+	<div class="container">
+		<dl class="row">
+			{% for name, percentage in releases %}
+				<dt class="col-sm-5">{{ name.replace("core", "Core Update ") }}</dt>
+
+				<dd class="col-sm-7">
+					{% module ProgressBar(percentage, "primary") %}
+				</dd>
+			{% end %}
+		</dl>
+
+		<h2>{{ _("Kernels") }}</h2>
+
+		<dl class="row">
+			{% for name, percentage in kernels %}
+				<dt class="col-sm-5">{{ name }}</dt>
+
+				<dd class="col-sm-7">
+					{% module ProgressBar(percentage, "info") %}
+				</dd>
+			{% end %}
+		</dl>
+	</div>
+{% end block %}
diff --git a/src/templates/fireinfo/stats-oses.html b/src/templates/fireinfo/stats-oses.html
deleted file mode 100644
index 3f00eea6..00000000
--- a/src/templates/fireinfo/stats-oses.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% extends "../base.html" %}
-
-{% block title %}{{ _("Operating system") }}{% end block %}
-
-{% block body %}
-	<div class="page-header">
-		<h1>{{ _("Releases") }}</h1>
-	</div>
-
-	<dl>
-		{% for release, percentage in releases %}
-			<dt>
-				{% if release %}
-					{{ release.replace("core", "Core Update ") }}
-				{% else %}
-					{{ release }}
-				{% end %}
-			</dt>
-			<dd>{% module ProgressBar(percentage) %}</dd>
-		{% end %}
-	</dl>
-
-	<h3>{{ _("Kernels") }}</h3>
-	<dl class="dl-horizontal">
-		{% for kernel, percentage in kernels %}
-			<dt>{{ kernel }}</dt>
-			<dd>{% module ProgressBar(percentage) %}</dd>
-		{% end %}
-	</dl>
-{% end block %}
diff --git a/src/web/__init__.py b/src/web/__init__.py
index 5821fccb..15a74740 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -197,6 +197,9 @@ class Application(tornado.web.Application):
 			(r"/profile/random", fireinfo.RandomProfileHandler),
 			(r"/profile/([a-z0-9]{40})", fireinfo.ProfileHandler),
 
+			# Stats
+			(r"/releases", fireinfo.ReleasesHandler),
+
 			# Send profiles.
 			(r"/send/([a-z0-9]+)", fireinfo.ProfileSendHandler),
 
@@ -204,8 +207,6 @@ class Application(tornado.web.Application):
 			(r"/statistics", fireinfo.StatsHandler),
 			(r"/statistics/processors", fireinfo.StatsProcessorsHandler),
 			(r"/statistics/processors/(arm|x86)", fireinfo.StatsProcessorDetailHandler),
-			(r"/statistics/geo-locations", fireinfo.StatsGeoHandler),
-			(r"/statistics/releases", fireinfo.StatsReleasesHandler),
 		])
 
 		# i-use.ipfire.org
diff --git a/src/web/fireinfo.py b/src/web/fireinfo.py
index 18fd07b4..a4add7d1 100644
--- a/src/web/fireinfo.py
+++ b/src/web/fireinfo.py
@@ -208,6 +208,19 @@ class RandomProfileHandler(BaseHandler):
 		self.redirect("/profile/%s" % profile_id)
 
 
+class ReleasesHandler(BaseHandler):
+	def get(self):
+		data = {
+			"releases" : self.fireinfo.get_releases_map(when=self.when),
+			"kernels"  : self.fireinfo.get_kernels_map(when=self.when),
+		}
+
+		# Cache for 1h
+		self.set_expires(3600)
+
+		return self.render("fireinfo/releases.html", **data)
+
+
 class StatsHandler(BaseHandler):
 	def get(self):
 		self.render("fireinfo/stats.html")
@@ -240,21 +253,6 @@ class StatsProcessorDetailHandler(BaseHandler):
 			platform=platform, flags=flags)
 
 
-class StatsReleasesHandler(BaseHandler):
-	def get(self):
-		data = {
-			"releases" : self.fireinfo.get_releases_map(when=self.when),
-			"kernels"  : self.fireinfo.get_kernels_map(when=self.when),
-		}
-		return self.render("fireinfo/stats-oses.html", **data)
-
-
-class StatsGeoHandler(BaseHandler):
-	def get(self):
-		return self.render("fireinfo/stats-geo.html",
-			geo_locations = self.fireinfo.get_geo_location_map(when=self.when))
-
-
 class VendorsHandler(BaseHandler):
 	def get(self):
 		vendors = self.fireinfo.get_vendor_list(when=self.when)