Website update.

[people/shoehn/ipfire.org.git] / www / templates / stasy-stats-cpus.html

diff --git a/www/templates/stasy-stats-cpus.html b/www/templates/stasy-stats-cpus.html
index 847423138dce0c447ea0bd0ad6d02c141e724726..d2136343dd762bf2672aa83387bc24b133f184f8 100644 (file)
--- a/www/templates/stasy-stats-cpus.html
+++ b/www/templates/stasy-stats-cpus.html
@@ -1,28 +1,55 @@
-{% extends "stasy-base-2.html" %}
+{% extends "stasy-base-1.html" %}
 
 {% block title %}{{ _("Processors") }}{% end block %}
 
-{% block content %}
-       <h3>{{ _("CPU vendors") }}</h3>
-       {% if lang == "de" %}
-               <p>
-                       Eine Aufstellung über den beliebtesten Prozessor-Hersteller:
-               </p>
-       {% else %}
-               <p>
-                       This chart shows us which vendors is the most favorite for the CPUs
-                       used in IPFire.
-               </p>
-       {% end %}
-       {{ modules.StasyTable(cpu_vendors, sortby="percentage") }}
+{% block body %}
+       <div class="page-header">
+               <h1>{{ _("Hardware: CPUs") }}</h1>
+       </div>
 
-       <h3>{{ _("Speed") }}</h3>
-       <p>
-               {{ _("The average speed of all systems in the database is: <strong>%.2f MHz</strong>.") % average_speed }}
-       </p>
-       {{ modules.StasyTable(cpu_speeds) }}
+       <div class="row">
+               <div class="span12">
+                       <a href="/stats/cpuflags">{{ _("See statistics about common CPU flags") }}</a>
+                       <hr>
+               </div>
+       </div>
 
-       <p class="links">
-               <a href="cpuflags">{{ _("See statistics about common CPU flags") }}</a>
-       </p>
+       <div class="row">
+               <div class="span12">
+                       <h2>{{ _("Vendors") }}</h2>
+                       {% if lang == "de" %}
+                               <p>
+                                       Eine Aufstellung über den beliebtesten Prozessor-Hersteller:
+                               </p>
+                       {% else %}
+                               <p>
+                                       This chart shows us which vendors is the most favorite for the CPUs
+                                       used in IPFire.
+                               </p>
+                       {% end %}
+                       {{ modules.StasyTable(cpu_vendors, sortby="percentage") }}
+               </div>
+       </div>
+
+       <div class="row">
+               <div class="span12">
+                       <h2>{{ _("Speed") }}</h2>
+                       <p>
+                               {{ _("The average speed of all systems in the database is: <strong>%.2f MHz</strong>.") % average_speed }}
+                               <br>
+                               {{ _("All together, there are <strong>%s bogomips</strong> out there.") % locale.friendly_number(bogomips) }}
+                       </p>
+                       {{ modules.StasyTable(cpu_speeds) }}
+               </div>
+       </div>
+
+       <div class="row">
+               <div class="span12">
+                       <h2>{{ _("CPU core counter") }}</h2>
+                       <p>
+                               {{ _("See a breakdown of the CPU cores that are installed on the IPFire systems.") }}
+                       </p>
+                       {{ modules.StasyCPUCoreTable(cpu_cores) }}
+               </div>
+       </div>
 {% end block %}