Merge remote-tracking branch 'origin/new-design' into new-design

diff --cc src/templates/fireinfo/admin.html
index 4015b7dd8bcc4472439f8f6e53303bfb9cf94d60,dc095e7e367de7b3e77b235ffc1614693bfed3ab..bc2676c011044355f7e24fa254cdf10bcb70da41
--- 1/src/templates/fireinfo/admin.html
--- 2/src/templates/fireinfo/admin.html
+++ b/src/templates/fireinfo/admin.html
@@@ -3,46 -3,22 +3,48 @@@
  {% block title %}{{ _("Admin") }}{% end block %}
  
  {% block container %}
-                               <section class="section">
-                                       <div class="columns is-vcentered">
-                                               <div class="column">
-                                                       <div class="has-text-centered">
-                                                               <h1 class="title is-1">{{ "{:,d}".format(total) }}</h1>
-                                                               <h4 class="title is-4">{{ _("Total amount of profiles") }}</h4>
-                                                       </div>
-                                               </div>
 +      <section class="hero is-primary is-fullheight-with-navbar">
 +              <div class="hero-body">
 +                      <div class="container">
 +                              <nav class="breadcrumb is-medium" aria-label="breadcrumbs">
 +                                      <ul>
 +                                              <li>
 +                                                      <a href="https://ipfire.org/">
 +                                                              Home
 +                                                      </a>
 +                                              </li>
 +                                              <li>
 +                                                      <a href="/">
 +                                                              {{ _("Fireinfo") }}
 +                                                      </a>
 +                                              </li>
 +                                              <li class="is-active">
 +                                                      <a href="#">
 +                                                              Admin
 +                                                      </a>
 +                                              </li>
 +                                      </ul>
 +                              </nav>
++                      </div>
++              </div>
++      </section>
 +
+       <section class="section">
+               <div class="container">
+                       <div class="columns">
+                               <div class="column">
+                                       <div class="has-text-centered">
+                                               <h1 class="title">{{ "{:,d}".format(total) }}</h1>
+                                               <h4 class="title is-4">{{ _("Total Profiles") }}</h4>
+                                       </div>
+                               </div>
  
-                                               <div class="column">
-                                                       <div class="has-text-centered">
-                                                               <h1 class="title is-1">{{ "%.2f%%" % (with_data * 100 / total) }}</h1>
-                                                               <h4 class="title is-4">{{ _("Reporting back to us") }}</h4>
-                                                       </div>
-                                               </div>
+                               <div class="column">
+                                       <div class="has-text-centered">
+                                               <h1 class="title">{{ "%.2f%%" % (with_data * 100 / total) }}</h1>
+                                               <h4 class="title is-4">{{ _("Reporting back to us") }}</h4>
                                        </div>
-                               </section>
+                               </div>
                        </div>
                </div>
        </section>

diff --cc src/templates/fireinfo/driver.html
index 6daba7f4f48d7e2637a16f3492a6db3673a3f7be,f24c8fab455b74732e0d8164f576826fe6df527f..9013a8207bdbcd62f282228f1cc29b54e091f78e
--- 1/src/templates/fireinfo/driver.html
--- 2/src/templates/fireinfo/driver.html
+++ b/src/templates/fireinfo/driver.html
@@@ -3,42 -3,17 +3,48 @@@
  {% block title %}{{ driver }}{% end block %}
  
  {% block container %}
 -
 -                      <p>
 -                              {{ _("All known devices run by %s") % driver }}
 -                      </p>
 +      <section class="hero is-primary">
 +              <div class="hero-body">
 +                      <div class="container">
 +                              <nav class="breadcrumb is-medium" aria-label="breadcrumbs">
 +                                      <ul>
 +                                              <li>
 +                                                      <a href="https://ipfire.org/">
 +                                                              Home
 +                                                      </a>
 +                                              </li>
 +                                              <li>
 +                                                      <a href="/">
 +                                                              {{ _("Fireinfo") }}
 +                                                      </a>
 +                                              </li>
 +                                              <li>
 +                                                      <a href="#">
 +                                                              {{ _("Drivers") }}
 +                                                      </a>
 +                                              </li>
 +                                              <li class="is-active">
 +                                                      <a href="#">
 +                                                              {{ driver }}
 +                                                      </a>
 +                                              </li>
 +                                      </ul>
 +                              </nav>
++                      </div>
++              </div>
++      </section>
 +
+       <section class="section">
+               <div class="container">
+                       <h1 class="title">{{ driver }}</h1>
 +                              <h2 class="title is-2">{{ _("All known devices run by %s") % driver }}</h2>
 +                      </div>
                </div>
        </section>
  
 -      <div class="container">
 -              {% module FireinfoDeviceTable(devices) %}
 -      </div>
 +      <section class="section">
 +              <div class="container">
-                       {% module FireinfoDeviceTable(driver_map) %}
++                      {% module FireinfoDeviceTable(devices) %}
 +              </div>
 +      </section>
  {% end block %}

diff --cc src/templates/fireinfo/processors.html
index 62b496c097a9cd3875006e2208519594afbda244,5e8db319f9649ad93db89374ff69460cb3554606..e8528f3ec1f61aa7d4d284628972bea9dba9d1e4
--- 1/src/templates/fireinfo/processors.html
--- 2/src/templates/fireinfo/processors.html
+++ b/src/templates/fireinfo/processors.html
@@@ -33,12 -35,14 +35,12 @@@
  
        <section class="section">
                <div class="container">
-                       {% for platform in flags %}
-                               <h2 class="title is-2">{{ platform }}</h2>
+                       {% for arch in sorted(map) %}
+                               <h2 class="title is-2">{{ arch }}</h2>
  
 -                              <dl class="row">
 -                                      {% for flag in sorted(map[arch], key=lambda f: map[arch][f], reverse=True) %}
 -                                              {% set p = map[arch][flag] %}
 -
 -                                              <dt class="col-sm-4">
 +                              {% for flag, percentage in flags[platform] %}
 +                                      <div class="columns">
 +                                              <div class="column is-2">
                                                        {% if flag == "aes" %}
                                                                {{ _("AES Instruction Set") }}
                                                        {% elif flag == "avx" %}
@@@ -98,21 -102,21 +100,21 @@@
                                                        {% else %}
                                                                {{ flag }}
                                                        {% end %}
 -                                              </dt>
 +                                              </div>
  
 -                                              <dd class="col-sm-8">
 +                                              <div class="column">
-                                                       {% if percentage >= 0.95 %}
-                                                               {% module ProgressBar(percentage, "success") %}
-                                                       {% elif percentage >= 0.5 %}
-                                                               {% module ProgressBar(percentage, "warning") %}
-                                                       {% elif percentage >= 0.1 %}
-                                                               {% module ProgressBar(percentage, "info") %}
+                                                       {% if p >= 0.95 %}
+                                                               {% module ProgressBar(p, "success") %}
+                                                       {% elif p >= 0.5 %}
+                                                               {% module ProgressBar(p, "warning") %}
+                                                       {% elif p >= 0.1 %}
+                                                               {% module ProgressBar(p, "info") %}
                                                        {% else %}
-                                                               {% module ProgressBar(percentage, "danger") %}
+                                                               {% module ProgressBar(p, "danger") %}
                                                        {% end %}
 -                                              </dd>
 -                                      {% end %}
 -                              </dl>
 +                                              </div>
 +                                      </div>
 +                              {% end %}
                        {% end %}
                </div>
        </section>

diff --cc src/templates/fireinfo/vendors.html
index fe5718a667e2845b11d6df40cabd44bced29829c,77b6bd4ee0ff58f5054102a1b1e44740e1bb67ce..1dac1470565c4cdc3c409cea58b76ef627148cf1
--- 1/src/templates/fireinfo/vendors.html
--- 2/src/templates/fireinfo/vendors.html
+++ b/src/templates/fireinfo/vendors.html
@@@ -3,48 -3,30 +3,48 @@@
  {% block title %}{{ _("Vendors") }}{% end block %}
  
  {% block container %}
- <section class="hero is-primary">
-       <div class="hero-body">
 -      <section>
--              <div class="container">
-                       <nav class="breadcrumb is-medium" aria-label="breadcrumbs">
-                               <ul>
-                                       <li>
-                                               <a href="https://ipfire.org/">
-                                                       Home
-                                               </a>
-                                       </li>
-                                       <li>
-                                               <a href="/">
-                                                       {{ _("Fireinfo") }}
-                                               </a>
-                                       </li>
-                                       <li class="is-active">
-                                               <a href="#">
-                                                       {{ _("Vendors") }}
-                                               </a>
-                                       </li>
-                               </ul>
-                       </nav>
 -                      <div class="row">
 -                              <div class="col-12">
 -                                      <h1>{{ _("Vendors") }}</h1>
 -                              </div>
++      <section class="hero is-primary">
++              <div class="hero-body">
++                      <div class="container">
++                              <nav class="breadcrumb is-medium" aria-label="breadcrumbs">
++                                      <ul>
++                                              <li>
++                                                      <a href="https://ipfire.org/">
++                                                              Home
++                                                      </a>
++                                              </li>
++                                              <li>
++                                                      <a href="/">
++                                                              {{ _("Fireinfo") }}
++                                                      </a>
++                                              </li>
++                                              <li class="is-active">
++                                                      <a href="#">
++                                                              {{ _("Vendors") }}
++                                                      </a>
++                                              </li>
++                                      </ul>
++                              </nav>
 +
-                       <h1 class="title is-1">{{ _("Vendors") }}</h1>
++                              <h1 class="title is-1">{{ _("Vendors") }}</h1>
+                       </div>
                </div>
-       </div>
- </section>
+       </section>
  
- <section class="section">
--      <div class="container">
-               {% for vendor, subsystems in vendors %}
-                       <div class="columns">
-                               {% if vendor %}
-                                       <div class="column is-4">{{ vendor }}</div>
-                                       <div class="column is-3">
-                                               {% for subsystem, vendor_id in sorted(subsystems) %}
-                                                       <a href="/vendors/{{ subsystem }}/{{ vendor_id }}">{{ subsystem.upper() }}</a>
-                                               {% end %}
-                                       </div>
-                               {% end %}
-                       </div>
-               {% end %}
-       </div>
- </section>
 -              <div class="row justify-content-center">
 -                      <div class="col-12 col-md-6">
 -                              <dl class="row">
 -                                      {% for vendor in sorted(vendors) %}
 -                                              <dt class="col-sm-9">{{ vendor }}</dt>
 -                                              <dd class="col-sm-3">
 -                                                      {% for subsystem, vendor_id in sorted(vendors[vendor]) %}
++      <section class="section">
++              <div class="container">
++                      {% for vendor, subsystems in vendors %}
++                              <div class="columns">
++                                      {% if vendor %}
++                                              <div class="column is-4">{{ vendor }}</div>
++                                              <div class="column is-3">
++                                                      {% for subsystem, vendor_id in sorted(subsystems) %}
+                                                               <a href="/vendors/{{ subsystem }}/{{ vendor_id }}">{{ subsystem.upper() }}</a>
+                                                       {% end %}
 -                                              </dd>
++                                              </div>
+                                       {% end %}
 -                              </dl>
 -                      </div>
++                              </div>
++                      {% end %}
+               </div>
 -      </div>
++      </section>
  {% end block %}