builders: Split stats into two lines

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/templates/builders/show.html b/src/templates/builders/show.html
index 1d0151b7bb90cbddbdf328b72e3a39a1c486c8b5..eb23822fb0c1ee8ecaab6a8b46230b193e3039f9 100644 (file)
--- a/src/templates/builders/show.html
+++ b/src/templates/builders/show.html
@@ -24,27 +24,6 @@
 
                                <h1 class="title is-1">{{ builder }}</h1>
 
-                               <div class="tags">
-                                       {% if builder.maintenance %}
-                                               <span class="tag is-info">{{ _("Maintenance") }}</span>
-                                       {% endif %}
-
-                                       {# Status #}
-                                       {% if is_running %}
-                                               <span class="tag is-success">{{ _("Running") }}</span>
-                                       {% elif is_shutting_down %}
-                                               <span class="tag is-warning">{{ _("Shutting Down") }}</span>
-                                       {% elif is_shut_down %}
-                                               <span class="tag is-danger">{{ _("Stopped") }}</span>
-                                       {% endif %}
-
-                                       {% if builder.is_online() %}
-                                               <span class="tag is-success">{{ _("Online") }}</span>
-                                       {% else %}
-                                               <span class="tag is-dark">{{ _("Offline") }}</span>
-                                       {% endif %}
-                               </div>
-
                                {# Fetch stats #}
                                {% set stats = builder.get_stats() %}
 
@@ -86,17 +65,19 @@
                                                </div>
                                        {% endif %}
 
-                                       {% if stats and stats.mem_total %}
+                                       {% if builder.os_name %}
                                                <div class="level-item has-text-centered">
                                                        <div>
-                                                               <p class="heading">{{ _("Memory") }}</p>
+                                                               <p class="heading">{{ _("Operating System") }}</p>
                                                                <p>
-                                                                       {{ stats.mem_total | filesizeformat(binary=True) }}
+                                                                       {{ builder.os_name }}
                                                                </p>
                                                        </div>
                                                </div>
                                        {% endif %}
+                               </div>
 
+                               <div class="level">
                                        {% if builder.arch %}
                                                <div class="level-item has-text-centered">
                                                        <div>
@@ -108,12 +89,12 @@
                                                </div>
                                        {% endif %}
 
-                                       {% if builder.os_name %}
+                                       {% if stats and stats.mem_total %}
                                                <div class="level-item has-text-centered">
                                                        <div>
-                                                               <p class="heading">{{ _("Operating System") }}</p>
+                                                               <p class="heading">{{ _("Memory") }}</p>
                                                                <p>
-                                                                       {{ builder.os_name }}
+                                                                       {{ stats.mem_total | filesizeformat(binary=True) }}
                                                                </p>
                                                        </div>
                                                </div>
@@ -146,6 +127,27 @@
                                        {% endif %}
                                </div>
 
+                               <div class="tags">
+                                       {% if builder.maintenance %}
+                                               <span class="tag is-info">{{ _("Maintenance") }}</span>
+                                       {% endif %}
+
+                                       {# Status #}
+                                       {% if is_running %}
+                                               <span class="tag is-success">{{ _("Running") }}</span>
+                                       {% elif is_shutting_down %}
+                                               <span class="tag is-warning">{{ _("Shutting Down") }}</span>
+                                       {% elif is_shut_down %}
+                                               <span class="tag is-danger">{{ _("Stopped") }}</span>
+                                       {% endif %}
+
+                                       {% if builder.is_online() %}
+                                               <span class="tag is-success">{{ _("Online") }}</span>
+                                       {% else %}
+                                               <span class="tag is-dark">{{ _("Offline") }}</span>
+                                       {% endif %}
+                               </div>
+
                                {# Builder Stats #}
                                {% if builder.is_online() %}
                                        <div class="block">