[no subject]

[Ludovic Courtès]

branch: master
commit 52dee198c6276c3ccc3c65fcf256fe4a0d573ac0
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Jul 15 18:42:54 2023 +0200

    templates: Tweak rendering of succeeded/failed/scheduled badges.
    
    * src/cuirass/templates.scm (specifications-table, evaluation-badges):
    Use "badge-counter" CSS class.
    * src/static/css/cuirass.css (.badge-counter): New class.
---
 src/cuirass/templates.scm  | 20 ++++++++++----------
 src/static/css/cuirass.css |  6 ++++++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/cuirass/templates.scm b/src/cuirass/templates.scm
index 898f3f8..bf9079c 100644
--- a/src/cuirass/templates.scm
+++ b/src/cuirass/templates.scm
@@ -267,6 +267,7 @@ system whose names start with " (code "guile-") ":" (br)
     "Invalid status")))
 
 (define (specifications-table specs evaluations summaries latest-evaluations)
+  "Return HTML for the SPECS table."
   (define (spec->latest-eval-ok name)
     (find (lambda (s)
             (string=? (assq-ref s #:specification) name))
@@ -291,7 +292,6 @@ system whose names start with " (code "guile-") ":" (br)
           (succeeded (assq-ref summary #:succeeded)))
       (nearest-exact-integer (* 100 (/ succeeded total)))))
 
-  "Return HTML for the SPECS table."
   `((div (@ (class "d-flex flex-row mb-3"))
          (div (@ (class "lead mr-auto"))
               "Specifications")
@@ -406,15 +406,15 @@ system whose names start with " (code "guile-") ":" (br)
                               (div
                                (@ (class "job-rel d-none"))
                                (div
-                                (@ (class "badge badge-success")
+                                (@ (class "badge badge-success badge-counter")
                                    (title "Succeeded"))
                                 ,(assq-ref summary #:succeeded))
                                (div
-                                (@ (class "badge badge-danger")
+                                (@ (class "badge badge-danger badge-counter")
                                    (title "Failed"))
                                 ,(assq-ref summary #:failed))
                                (div
-                                (@ (class "badge badge-secondary")
+                                (@ (class "badge badge-secondary 
badge-counter")
                                    (title "Scheduled"))
                                 ,(assq-ref summary #:scheduled)))))
                            ((and last-eval (not last-eval-status-ok?))
@@ -913,30 +913,30 @@ the existing SPEC otherwise."
          ((= status (evaluation-status succeeded))
           `((div
              (@ (class "job-abs d-none"))
-             (div (@ (class "badge badge-success")
+             (div (@ (class "badge badge-success badge-counter")
                      (title "Succeeded"))
                   ,(assq-ref absolute #:succeeded))
-             (div (@ (class "badge badge-danger")
+             (div (@ (class "badge badge-danger badge-counter")
                      (title "Failed"))
                   ,(assq-ref absolute #:failed))
-             (div (@ (class "badge badge-secondary")
+             (div (@ (class "badge badge-secondary badge-counter")
                      (title "Scheduled"))
                   ,(assq-ref absolute #:scheduled)))
             (div
              (@ (class "job-rel"))
              (a (@ (href "/eval/" ,(assq-ref evaluation #:id)
                          "?status=succeeded")
-                   (class "badge badge-success")
+                   (class "badge badge-success badge-counter")
                    (title "Succeeded"))
                 ,(assq-ref evaluation #:succeeded))
              (a (@ (href "/eval/" ,(assq-ref evaluation #:id)
                          "?status=failed")
-                   (class "badge badge-danger")
+                   (class "badge badge-danger badge-counter")
                    (title "Failed"))
                 ,(assq-ref evaluation #:failed))
              (a (@ (href "/eval/" ,(assq-ref evaluation #:id)
                          "?status=pending")
-                   (class "badge badge-secondary")
+                   (class "badge badge-secondary badge-counter")
                    (title "Scheduled"))
                 ,(assq-ref evaluation #:scheduled)))))))))
 
diff --git a/src/static/css/cuirass.css b/src/static/css/cuirass.css
index ee9869e..08e87a3 100644
--- a/src/static/css/cuirass.css
+++ b/src/static/css/cuirass.css
@@ -55,6 +55,12 @@ body {
     margin: auto;
 }
 
+.badge-counter {               /* succeeded/failed/scheduled counters */
+    margin: 2px;
+    text-align: right;
+    min-width: 25px;
+}
+
 div.tooltip {
     position: absolute;
     opacity:0.8;