From 02dbbd651c64623eb4f6d808ede0b938ca8787ed Mon Sep 17 00:00:00 2001 From: Patrice Buriez Date: Fri, 30 Nov 2018 12:16:43 +0100 Subject: Use Chart.js for graphs in HTML reports This JavaScript library is available under MIT license. Also adjusted version for jQuery and jsTree, and added fallback font-family names. JIRA: YARDSTICK-1367 Topic: report/html_table (6 of 12) Change-Id: Ibe8b7e3d1f1365d2cbc019bfc22762aaa365a4e1 Signed-off-by: Patrice Buriez --- yardstick/common/nsb_report.css | 2 +- yardstick/common/nsb_report.html.j2 | 153 +++++++++++++++++++++--------------- yardstick/common/report.html.j2 | 133 ++++++++++++++++++++++--------- 3 files changed, 190 insertions(+), 98 deletions(-) (limited to 'yardstick/common') diff --git a/yardstick/common/nsb_report.css b/yardstick/common/nsb_report.css index 0c47791e2..2beb91c53 100644 --- a/yardstick/common/nsb_report.css +++ b/yardstick/common/nsb_report.css @@ -19,7 +19,7 @@ table { } header { - font-family: Frutiger; + font-family: Frutiger, "Helvetica Neue", Helvetica, Arial, sans-serif; clear: left; text-align: center; } diff --git a/yardstick/common/nsb_report.html.j2 b/yardstick/common/nsb_report.html.j2 index f1b4ae1c2..0b4719b09 100644 --- a/yardstick/common/nsb_report.html.j2 +++ b/yardstick/common/nsb_report.html.j2 @@ -15,12 +15,12 @@ - + - + - - + + @@ -31,12 +31,12 @@

Report of {{task_id}} Generated

@@ -47,7 +47,8 @@

diff --git a/yardstick/common/report.html.j2 b/yardstick/common/report.html.j2 index ab76510ca..1dc7b1db1 100644 --- a/yardstick/common/report.html.j2 +++ b/yardstick/common/report.html.j2 @@ -15,9 +15,9 @@ - + - +