From dafc12423f37eb8ab65912de3cbbfb62afc4b06d Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 14 Jun 2017 20:34:00 +0300 Subject: Minor style change for package version details and builds pages --- mod/mod-package-version-details.cxx | 6 +++--- mod/page.cxx | 4 ++-- www/builds-body.css | 4 +++- www/package-version-details-body.css | 7 ++++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/mod/mod-package-version-details.cxx b/mod/mod-package-version-details.cxx index 7dc02d2..d1b6dfe 100644 --- a/mod/mod-package-version-details.cxx +++ b/mod/mod-package-version-details.cxx @@ -329,8 +329,8 @@ handle (request& rq, response& rs) // if (build_db_ != nullptr && ver.compare (wildcard_version, true) != 0) { - s << H3 << "Built" << ~H3 - << DIV(ID="built"); + s << H3 << "Builds" << ~H3 + << DIV(ID="builds"); timestamp now (timestamp::clock::now ()); transaction t (build_db_->begin ()); @@ -361,7 +361,7 @@ handle (request& rq, response& rs) b.toolchain_name + '-' + b.toolchain_version.string ()) << TR_VALUE ("config", - b.configuration + " / " + b.machine + " / " + + b.configuration + " / " + (b.target ? b.target->string () : "")) << TR_VALUE ("timestamp", ts) << TR_BUILD_RESULT (b, host, root) diff --git a/mod/page.cxx b/mod/page.cxx index 291dfb4..a7ec087 100644 --- a/mod/page.cxx +++ b/mod/page.cxx @@ -597,7 +597,7 @@ namespace brep << SPAN(CLASS="value"); if (build_.state == build_state::building) - s << "building | "; + s << SPAN(CLASS="building") << "building" << ~SPAN << " | "; else { // If no unsuccessful operation results available, then print the @@ -639,7 +639,7 @@ namespace brep if (build_.force == (build_.state == build_state::building ? force_state::forcing : force_state::forced)) - s << "pending"; + s << SPAN(CLASS="pending") << "pending" << ~SPAN; else s << A << HREF << force_rebuild_url (host_, root_, build_) << ~HREF diff --git a/www/builds-body.css b/www/builds-body.css index 292a804..b1c9532 100644 --- a/www/builds-body.css +++ b/www/builds-body.css @@ -54,8 +54,10 @@ font-size: 0.94em; } +.build .pending {color: #c0a500;} +.build .building {color: #c0a500;} .build .success {color: #00bb00;} -.build .warning {color: #ffa500;} +.build .warning {color: #ff8000;} .build .error {color: #ff0000;} .build .abort {color: #ff0000;} .build .abnormal {color: #ff0000;} diff --git a/www/package-version-details-body.css b/www/package-version-details-body.css index e571206..b04869b 100644 --- a/www/package-version-details-body.css +++ b/www/package-version-details-body.css @@ -57,7 +57,6 @@ h3 margin: 1.8em 0 0 0; } -h3:after{content: ":";} h1, h2, h3 { @@ -163,7 +162,7 @@ h1, h2, h3 /* * Builds. */ -#built {margin-bottom: 1em;} +#builds {margin-bottom: 1em;} .build { @@ -190,8 +189,10 @@ h1, h2, h3 font-size: 0.94em; } +.build .pending {color: #c0a500;} +.build .building {color: #c0a500;} .build .success {color: #00bb00;} -.build .warning {color: #ffa500;} +.build .warning {color: #ff8000;} .build .error {color: #ff0000;} .build .abort {color: #ff0000;} .build .abnormal {color: #ff0000;} -- cgit v1.1