From: Rico Hoppe Date: Tue, 28 Nov 2023 15:16:16 +0000 (+0000) Subject: Merge remote-tracking branch 'origin/new-design' into new-design X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d938edd5ed9a1624601a41bcb205bcf125a7b60;p=ipfire.org.git Merge remote-tracking branch 'origin/new-design' into new-design --- 3d938edd5ed9a1624601a41bcb205bcf125a7b60 diff --cc src/templates/fireinfo/admin.html index 4015b7dd,dc095e7e..bc2676c0 --- a/src/templates/fireinfo/admin.html +++ b/src/templates/fireinfo/admin.html @@@ -3,46 -3,22 +3,48 @@@ {% block title %}{{ _("Admin") }}{% end block %} {% block container %} +
+
+
+ ++
++
++
+ -
-
-
-
-

{{ "{:,d}".format(total) }}

-

{{ _("Total amount of profiles") }}

-
-
+
+
+
+
+
+

{{ "{:,d}".format(total) }}

+

{{ _("Total Profiles") }}

+
+
-
-
-

{{ "%.2f%%" % (with_data * 100 / total) }}

-

{{ _("Reporting back to us") }}

-
-
+
+
+

{{ "%.2f%%" % (with_data * 100 / total) }}

+

{{ _("Reporting back to us") }}

-
+
diff --cc src/templates/fireinfo/driver.html index 6daba7f4,f24c8fab..9013a820 --- a/src/templates/fireinfo/driver.html +++ b/src/templates/fireinfo/driver.html @@@ -3,42 -3,17 +3,48 @@@ {% block title %}{{ driver }}{% end block %} {% block container %} +
+
+
+ ++
++
++
+ +
+
+

{{ driver }}

- -

- {{ _("All known devices run by %s") % driver }} -

+

{{ _("All known devices run by %s") % driver }}

+
-
- {% module FireinfoDeviceTable(devices) %} -
+
+
- {% module FireinfoDeviceTable(driver_map) %} ++ {% module FireinfoDeviceTable(devices) %} +
+
{% end block %} diff --cc src/templates/fireinfo/processors.html index 62b496c0,5e8db319..e8528f3e --- a/src/templates/fireinfo/processors.html +++ b/src/templates/fireinfo/processors.html @@@ -33,12 -35,14 +35,12 @@@
- {% for platform in flags %} -

{{ platform }}

+ {% for arch in sorted(map) %} +

{{ arch }}

-
- {% for flag in sorted(map[arch], key=lambda f: map[arch][f], reverse=True) %} - {% set p = map[arch][flag] %} - -
+ {% for flag, percentage in flags[platform] %} +
+
{% if flag == "aes" %} {{ _("AES Instruction Set") }} {% elif flag == "avx" %} @@@ -98,21 -102,21 +100,21 @@@ {% else %} {{ flag }} {% end %} -
+
-
+
- {% 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 %} -
- {% end %} - + + + {% end %} {% end %}
diff --cc src/templates/fireinfo/vendors.html index fe5718a6,77b6bd4e..1dac1470 --- a/src/templates/fireinfo/vendors.html +++ b/src/templates/fireinfo/vendors.html @@@ -3,48 -3,30 +3,48 @@@ {% block title %}{{ _("Vendors") }}{% end block %} {% block container %} -
-
-
--
- -
-
-

{{ _("Vendors") }}

-
++
++
++
++ + -

{{ _("Vendors") }}

++

{{ _("Vendors") }}

+
-
-
+
-
--
- {% for vendor, subsystems in vendors %} -
- {% if vendor %} -
{{ vendor }}
-
- {% for subsystem, vendor_id in sorted(subsystems) %} - {{ subsystem.upper() }} - {% end %} -
- {% end %} -
- {% end %} -
-
-
-
-
- {% for vendor in sorted(vendors) %} -
{{ vendor }}
-
- {% for subsystem, vendor_id in sorted(vendors[vendor]) %} ++
++
++ {% for vendor, subsystems in vendors %} ++
++ {% if vendor %} ++
{{ vendor }}
++
++ {% for subsystem, vendor_id in sorted(subsystems) %} + {{ subsystem.upper() }} + {% end %} -
++
+ {% end %} - -
++ ++ {% end %} + - ++ {% end block %}