fireinfo: Show CPU vendors and architectures 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 5f562915907e9915cec060748944d521cf67fc0b..4e834557f51ce9f084701f45c5d346b2acfb2a30 100644 (file)
--- a/src/templates/fireinfo/index.html
+++ b/src/templates/fireinfo/index.html
@@ -52,8 +52,34 @@
 
        <section>
                <div class="container">
-                       <div class="row">
-                               <div class="col-12 col-md-4 text-center">
+                       <div class="row align-items-center">
+                               <div class="col-12 col-md-6">
+                                       <h4>{{ _("CPU Vendors") }}</h4>
+
+                                       <dl class="row">
+                                               {% for name, percentage in cpu_vendors %}
+                                                       <dt class="col-sm-3">{{ name }}</dt>
+
+                                                       <dd class="col-sm-9">
+                                                               {% module ProgressBar(percentage, "success") %}
+                                                       </dd>
+                                               {% end %}
+                                       </dl>
+
+                                       <h4>{{ _("Architectures") }}</h4>
+
+                                       <dl class="row">
+                                               {% for name, percentage in arches %}
+                                                       <dt class="col-sm-3">{{ name }}</dt>
+
+                                                       <dd class="col-sm-9">
+                                                               {% module ProgressBar(percentage, "success") %}
+                                                       </dd>
+                                               {% end %}
+                                       </dl>
+                               </div>
+
+                               <div class="col-12 col-md-6 text-center">
                                        <h1>{{ format_size(memory_avg * 1024, "MB") }}</h1>
 
                                        <p class="text-muted">

diff --git a/src/web/fireinfo.py b/src/web/fireinfo.py
index fdc790e2983a9b3aed602e32c1e18b3ea358b455..3fa99547391f7355316d75f8dd6a957550850dec 100644 (file)
--- a/src/web/fireinfo.py
+++ b/src/web/fireinfo.py
@@ -159,6 +159,8 @@ class IndexHandler(BaseHandler):
                        "latest_release" : self.backend.releases.get_latest(),
 
                        # Hardware
+                       "arches"         : self.fireinfo.get_arch_map(when=self.when),
+                       "cpu_vendors"    : self.fireinfo.get_cpu_vendors_map(when=self.when),
                        "memory_avg"     : self.backend.fireinfo.get_average_memory_amount(when=self.when),
 
                        # Virtualization