From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 30 Oct 2018 12:52:07 +0000 (+0000)
Subject: fireinfo: Show usage of latest release on index page
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11ee21399f53368e471dcd3ee3c9fab4ebf4626c;p=ipfire.org.git

fireinfo: Show usage of latest release on index page

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

diff --git a/src/templates/fireinfo/index.html b/src/templates/fireinfo/index.html
index 45247aa6..9f8ff37a 100644
--- a/src/templates/fireinfo/index.html
+++ b/src/templates/fireinfo/index.html
@@ -28,15 +28,39 @@
 		</div>
 	</div>
 
+	<section class="inverse">
+		<div class="container">
+			<div class="row justify-content-center">
+				<div class="col-12 col-md-3">
+					<img class="img-fluid my-5" src="{{ static_url("img/ipfire-tux.png") }}" alt="IPFire Logo" />
+				</div>
+
+				{% if latest_release %}
+					<div class="col-12 col-md-4 d-flex align-items-center">
+						<div>
+							<h1 class="display-1 text-primary mb-0">
+								{{ "%.2f%%" % (latest_release.penetration * 100) }}
+							</h1>
+
+							<h5>{{ _("of all IPFire systems are on %s") % latest_release }}</h5>
+						</div>
+					</div>
+				{% end %}
+			</div>
+		</div>
+	</section>
+
 	<section class="inverse">
 		<div class="container">
 			<div class="row">
-				<div class="col-12 col-md-6 flex-column align-items-center text-center text-md-right">
-					<h1 class="display-1 text-primary mb-0">
-						{{ "%.2f%%" % (virtual_ratio * 100) }}
-					</h1>
+				<div class="col-12 col-md-6 d-flex align-items-center text-md-right">
+					<div>
+						<h1 class="display-1 text-success mb-0">
+							{{ "%.2f%%" % (virtual_ratio * 100) }}
+						</h1>
 
-					<h5>{{ _("of all IPFire systems are running in a virtual environment") }}</h5>
+						<h5>{{ _("of all IPFire systems are running in a virtual environment") }}</h5>
+					</div>
 				</div>
 
 				<div class="col-12 col-md-6">
@@ -56,8 +80,9 @@
 										{{ name }}
 									{% end %}
 								</dt>
+
 								<dd class="col-sm-9">
-									{% module ProgressBar(percentage, "primary") %}
+									{% module ProgressBar(percentage, "success") %}
 								</dd>
 							{% end %}
 						{% end %}
diff --git a/src/templates/modules/progress-bar.html b/src/templates/modules/progress-bar.html
index 4be7f6dd..429cdb51 100644
--- a/src/templates/modules/progress-bar.html
+++ b/src/templates/modules/progress-bar.html
@@ -5,7 +5,7 @@
 
 	<div class="col">
 		<div class="progress">
-			<div class="progress-bar {% if colour %}{{ "progress-bar-%s" % colour }}{% end %}"
+			<div class="progress-bar {% if colour %}{{ "bg-%s" % colour }}{% end %}"
 					role="progressbar" aria-valuenow="{{ "%.0f" % value }}"
 					aria-valuemin="0" aria-valuemax="100" style="width: {{ "%.2f" % value }}%;">
 			</div>
diff --git a/src/web/fireinfo.py b/src/web/fireinfo.py
index 5a48f58e..bd3ec2a8 100644
--- a/src/web/fireinfo.py
+++ b/src/web/fireinfo.py
@@ -155,8 +155,12 @@ class ProfileSendHandler(BaseHandler):
 class IndexHandler(BaseHandler):
 	def get(self):
 		data = {
-			"hypervisors"   : self.fireinfo.get_hypervisor_map(when=self.when),
-			"virtual_ratio" : self.fireinfo.get_virtual_ratio(when=self.when),
+			# Release
+			"latest_release" : self.backend.releases.get_latest(),
+
+			# Virtualization
+			"hypervisors"    : self.fireinfo.get_hypervisor_map(when=self.when),
+			"virtual_ratio"  : self.fireinfo.get_virtual_ratio(when=self.when),
 		}
 
 		# Cache for 1h