From: Michael Tremer Date: Wed, 12 Feb 2025 16:35:12 +0000 (+0000) Subject: builders: Split stats into two lines X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1933cf5e7f150dfe337761684dd4e6921aae542;p=pbs.git builders: Split stats into two lines Signed-off-by: Michael Tremer --- diff --git a/src/templates/builders/show.html b/src/templates/builders/show.html index 1d0151b7..eb23822f 100644 --- a/src/templates/builders/show.html +++ b/src/templates/builders/show.html @@ -24,27 +24,6 @@

{{ builder }}

-
- {% if builder.maintenance %} - {{ _("Maintenance") }} - {% endif %} - - {# Status #} - {% if is_running %} - {{ _("Running") }} - {% elif is_shutting_down %} - {{ _("Shutting Down") }} - {% elif is_shut_down %} - {{ _("Stopped") }} - {% endif %} - - {% if builder.is_online() %} - {{ _("Online") }} - {% else %} - {{ _("Offline") }} - {% endif %} -
- {# Fetch stats #} {% set stats = builder.get_stats() %} @@ -86,17 +65,19 @@ {% endif %} - {% if stats and stats.mem_total %} + {% if builder.os_name %}
-

{{ _("Memory") }}

+

{{ _("Operating System") }}

- {{ stats.mem_total | filesizeformat(binary=True) }} + {{ builder.os_name }}

{% endif %} + +
{% if builder.arch %}
@@ -108,12 +89,12 @@
{% endif %} - {% if builder.os_name %} + {% if stats and stats.mem_total %}
-

{{ _("Operating System") }}

+

{{ _("Memory") }}

- {{ builder.os_name }} + {{ stats.mem_total | filesizeformat(binary=True) }}

@@ -146,6 +127,27 @@ {% endif %}
+
+ {% if builder.maintenance %} + {{ _("Maintenance") }} + {% endif %} + + {# Status #} + {% if is_running %} + {{ _("Running") }} + {% elif is_shutting_down %} + {{ _("Shutting Down") }} + {% elif is_shut_down %} + {{ _("Stopped") }} + {% endif %} + + {% if builder.is_online() %} + {{ _("Online") }} + {% else %} + {{ _("Offline") }} + {% endif %} +
+ {# Builder Stats #} {% if builder.is_online() %}