bootstrap4: port job boxe to bootstrap4

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>

diff --git a/src/templates/modules/jobs/boxes.html b/src/templates/modules/jobs/boxes.html
index 3ee48eea428d17db7a788cf19c4c8d93df3fc177..05754bb1c85af88f2c5ed4fac616df242152005c 100644 (file)
--- a/src/templates/modules/jobs/boxes.html
+++ b/src/templates/modules/jobs/boxes.html
@@ -1,21 +1,18 @@
-<div class="jobs-boxes">
-       {% for j in jobs %}
-               <div class="well well-small">
-                       <h4>            
-                               <small class="pull-right">
-                                       {{ format_time(j.duration, shorter=True) }} &dash;
-                                       {% module JobState(j) %}
-                               </small>
-                               <a href="/job/{{ j.uuid }}">{{ j.arch }}</a>
-                       </h4>
 
-                       <ul class="unstyled">
+{% for j in jobs %}
+       <div class="card mb-2">
+               <div class="card-body">
+                       <div class="card-title h4">
+                               <a class="mr-2"href="/job/{{ j.uuid }}">{{ j.arch }}</a>
+                               {% module JobState(j) %}
+                       </div>
+                       <p class="card-text">
+                               {{ _("Time") }}: {{ format_time(j.duration, shorter=True) }} <br>
                                {% if j.builder %}
-                                       <li>
-                                               {{ _("Builder") }}: <a href="/builder/{{ j.builder.name }}">{{ j.builder.name }}</a>
-                                       </li>
+                                       {{ _("Builder") }}: <a href="/builder/{{ j.builder.name }}">{{ j.builder.name }}</a>
                                {% end %}
-                       </ul>
+                       </p>
                </div>
-       {% end %}
-</div>
+       </div>
+{% end %}
+

diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py
index 4ebc4d1f1379ff2c6acb4de131a9ad88cd6b35bd..40498fa36fd9f895134fea00506cbf14fb2f8477 100644 (file)
--- a/src/web/ui_modules.py
+++ b/src/web/ui_modules.py
@@ -258,46 +258,48 @@ class JobStateModule(UIModule):
                _ = self.locale.translate
                classes = []
 
+               classes.append("badge")
+
                icon = None
                if state == "aborted":
                        text = _("Aborted")
-                       classes.append("muted")
+                       classes.append("badge-secondary")
                        icon = "icon-warning-sign"
 
                elif state == "dispatching":
                        text = _("Dispatching")
-                       classes.append("text-info")
+                       classes.append("badge-info")
                        icon = "icon-download-alt"
 
                elif state == "failed":
                        text = _("Failed")
-                       classes.append("text-error")
+                       classes.append("badge-danger")
                        icon = "icon-remove"
 
                elif state == "finished":
                        text = _("Finished")
-                       classes.append("text-success")
+                       classes.append("badge-success")
                        icon = "icon-ok"
 
                elif state == "pending":
                        text = _("Pending")
-                       classes.append("muted")
+                       classes.append("badge-secondary")
                        icon = "icon-time"
 
                elif state == "running":
                        text = _("Running")
-                       classes.append("text-info")
+                       classes.append("badge-info")
                        icon = "icon-cogs"
 
                elif state == "uploading":
                        text = _("Uploading")
-                       classes.append("text-info")
+                       classes.append("badge-info")
                        icon = "icon-upload-alt"
 
                # Return just the string, is state is unknown.
                else:
                        text = _("Unknown: %s") % state
-                       classes.append("muted")
+                       classes.append("text-muted")
 
                if plain:
                        return text