From b6f5b6eb3820db7667f140d849218db270001771 Mon Sep 17 00:00:00 2001 From: Tyson Whitehead Date: Thu, 8 Apr 2021 11:00:48 -0400 Subject: [PATCH] Labels are now badges --- src/root/common.tt | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/root/common.tt b/src/root/common.tt index 16c0b434..758bfa59 100644 --- a/src/root/common.tt +++ b/src/root/common.tt @@ -127,7 +127,7 @@ BLOCK renderBuildListBody; [% END %] [% IF showSchedulingInfo %] - [% IF busy %]Started[% ELSE %]Queued[% END %] + [% IF busy %]Started[% ELSE %]Queued[% END %] [% END %] [% build.id %] [% IF !hideJobName %] @@ -477,27 +477,27 @@ BLOCK renderEvals %] - [% END %] [% IF eval.evaluationerror.errormsg %] - Eval Errors + Eval Errors [% END %] - [% e.nrSucceeded %] + [% e.nrSucceeded %] [% IF e.nrFailed > 0 %] - [% e.nrFailed %] + [% e.nrFailed %] [% END %] [% IF e.nrScheduled > 0 %] - [% e.nrScheduled %] + [% e.nrScheduled %] [% END %] [% IF e.diff > 0 %] - +[% e.diff %] + +[% e.diff %] [% ELSIF e.diff < 0 && e.nrScheduled == 0 %] - [% e.diff %] + [% e.diff %] [% END %] @@ -598,35 +598,35 @@ BLOCK renderJobsetOverview %] [% HTML.escape(j.description) %] [% IF j.lastcheckedtime; INCLUDE renderDateTime timestamp = j.lastcheckedtime; - IF j.errormsg || j.fetcherrormsg; %] Error[% END; + IF j.errormsg || j.fetcherrormsg; %] Error[% END; ELSE; "-"; END %] [% IF j.get_column('nrtotal') > 0 %] [% successrate = ( j.get_column('nrsucceeded') / j.get_column('nrtotal') )*100 %] [% IF j.get_column('nrscheduled') > 0 %] - [% class = 'label' %] + [% class = 'badge badge-secondary' %] [% ELSIF successrate < 25 %] - [% class = 'label label-important' %] + [% class = 'badge badge-danger' %] [% ELSIF successrate < 75 %] - [% class = 'label label-warning' %] + [% class = 'badge badge-warning' %] [% ELSIF successrate <= 100 %] - [% class = 'label label-success' %] + [% class = 'badge badge-success' %] [% END %] [% END %] [% successrate FILTER format('%d') %]% [% IF j.get_column('nrsucceeded') > 0 %] - [% j.get_column('nrsucceeded') %] + [% j.get_column('nrsucceeded') %] [% END %] [% IF j.get_column('nrfailed') > 0 %] - [% j.get_column('nrfailed') %] + [% j.get_column('nrfailed') %] [% END %] [% IF j.get_column('nrscheduled') > 0 %] - [% j.get_column('nrscheduled') %] + [% j.get_column('nrscheduled') %] [% END %]