From c403c45d7242471d5035a8ea118a365b32118517 Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Wed, 7 Dec 2022 11:00:57 +0200 Subject: [PATCH] remove badges from status page --- .../ahriman/templates/build-status.jinja2 | 17 ++++----- .../build-status/key-import-modal.jinja2 | 2 +- .../build-status/package-info-modal.jinja2 | 2 +- .../templates/build-status/table.jinja2 | 37 +++++++++---------- .../ahriman/templates/utils/style.jinja2 | 4 +- 5 files changed, 30 insertions(+), 32 deletions(-) diff --git a/package/share/ahriman/templates/build-status.jinja2 b/package/share/ahriman/templates/build-status.jinja2 index 8885cba7..fe2df761 100644 --- a/package/share/ahriman/templates/build-status.jinja2 +++ b/package/share/ahriman/templates/build-status.jinja2 @@ -15,16 +15,13 @@ {% include "utils/bootstrap-scripts.jinja2" %}
-

ahriman - unknown - unknown - unknown - unknown -

+

ahriman

@@ -96,7 +95,7 @@
diff --git a/package/share/ahriman/templates/build-status/key-import-modal.jinja2 b/package/share/ahriman/templates/build-status/key-import-modal.jinja2 index 90188463..706ab994 100644 --- a/package/share/ahriman/templates/build-status/key-import-modal.jinja2 +++ b/package/share/ahriman/templates/build-status/key-import-modal.jinja2 @@ -22,7 +22,7 @@
-
+
diff --git a/package/share/ahriman/templates/build-status/package-info-modal.jinja2 b/package/share/ahriman/templates/build-status/package-info-modal.jinja2 index d99a9fcc..85f20501 100644 --- a/package/share/ahriman/templates/build-status/package-info-modal.jinja2 +++ b/package/share/ahriman/templates/build-status/package-info-modal.jinja2 @@ -6,7 +6,7 @@
-
+
diff --git a/package/share/ahriman/templates/build-status/table.jinja2 b/package/share/ahriman/templates/build-status/table.jinja2 index 662e9b46..8582a410 100644 --- a/package/share/ahriman/templates/build-status/table.jinja2 +++ b/package/share/ahriman/templates/build-status/table.jinja2 @@ -16,7 +16,6 @@ } else showLogs(data.id); }); - const architectureBadge = $("#badge-architecture"); const repositoryBadge = $("#badge-repository"); const statusBadge = $("#badge-status"); const versionBadge = $("#badge-version"); @@ -66,6 +65,14 @@ function reload() { table.bootstrapTable("showLoading"); + const badgeClass = status => { + if (status === "pending") return "btn-outline-warning"; + if (status === "building") return "btn-outline-warning"; + if (status === "failed") return "btn-outline-danger"; + if (status === "success") return "btn-outline-success"; + return "btn-outline-secondary"; + }; + $.ajax({ url: "/api/v1/packages", type: "GET", @@ -123,27 +130,16 @@ type: "GET", dataType: "json", success: response => { - const badgeColor = status => { - if (status === "pending") return "yellow"; - if (status === "building") return "yellow"; - if (status === "failed") return "critical"; - if (status === "success") return "success"; - return "inactive"; - }; + repositoryBadge.text(`${response.repository} ${response.architecture}`); + versionBadge.html(` ahriman ${safe(response.version)}`); - architectureBadge - .attr("src", `https://img.shields.io/badge/architecture-${response.architecture}-informational`) - .attr("alt", response.architecture); - repositoryBadge - .attr("src", `https://img.shields.io/badge/repository-${response.repository.replace(/-/g, "--")}-informational`) - .attr("alt", response.repository); statusBadge - .attr("src", `https://img.shields.io/badge/service%20status-${response.status.status}-${badgeColor(response.status.status)}`) - .attr("alt", response.status.status) - .attr("title", `at ${new Date(1000 * response.status.timestamp).toISOString()}`); - versionBadge - .attr("src", `https://img.shields.io/badge/version-${response.version}-informational`) - .attr("alt", response.version); + .popover("dispose") + .attr("data-bs-content", `${response.status.status} at ${new Date(1000 * response.status.timestamp).toISOString()}`) + .popover(); + statusBadge.removeClass(); + statusBadge.addClass("btn"); + statusBadge.addClass(badgeClass(response.status.status)); }, }); } @@ -169,6 +165,7 @@ $(() => { table.bootstrapTable({}); + $("#status-popover").popover(); reload(); }); \ No newline at end of file diff --git a/package/share/ahriman/templates/utils/style.jinja2 b/package/share/ahriman/templates/utils/style.jinja2 index 8a25cc84..c7ec3970 100644 --- a/package/share/ahriman/templates/utils/style.jinja2 +++ b/package/share/ahriman/templates/utils/style.jinja2 @@ -3,7 +3,9 @@ - + + +