From 330a67f32fbb2fc3a6225ef21e50552788d6702a Mon Sep 17 00:00:00 2001
From: Jonatan Schlag <jonatan.schlag@ipfire.org>
Date: Thu, 4 Jan 2018 16:31:54 +0100
Subject: [PATCH] bootstrap4: port job boxe to bootstrap4

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
---
 src/templates/modules/jobs/boxes.html | 31 ++++++++++++---------------
 src/web/ui_modules.py                 | 18 +++++++++-------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/templates/modules/jobs/boxes.html b/src/templates/modules/jobs/boxes.html
index 3ee48ee..05754bb 100644
--- 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 4ebc4d1..40498fa 100644
--- 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
-- 
2.39.2