Storperf

From 77cb26aa31dab659cd2fc1fea2c206e63644acf9 Mon Sep 17 00:00:00 2001 From: mbeierl Date: Thu, 12 Apr 2018 16:05:45 -0400 Subject: [PATCH] Marking 3rd Party Software Move all non Apache2.0/CC-BY-4.0 licensed files into a 3rd_party directory Change-Id: I4172063500f8bb2fa3ac767d1be8c6c5cf12aa7b JIRA: STORPERF-241 Signed-off-by: mbeierl (cherry picked from commit fbdded2f8141d68c81c5d72a11ab3a9b121c3181) --- .../html/{ => 3rd_party}/css/bootstrap.min.css | 0 docker/storperf-httpfrontend/html/index.html | 4 ++-- docker/storperf-reporting/src/app.py | 4 ++-- .../static/{ => 3rd_party}/css/bootstrap.min.css | 0 .../src/static/{ => 3rd_party}/js/Chart.min.js | 0 .../src/static/{ => 3rd_party}/js/bootstrap.min.js | 0 .../static/{ => 3rd_party}/js/jquery-2.1.3.min.js | 0 .../{ => 3rd_party}/js/jquery.bootpag.min.js | 0 .../static/{ => 3rd_party}/js/plotly-latest.min.js | 0 docker/storperf-reporting/src/templates/index.html | 10 ++++----- .../src/templates/plot_jobs.html | 22 ++++++++++---------- .../src/templates/plot_multi_data.html | 12 +++++------ .../src/templates/plot_tables.html | 24 +++++++++++----------- 13 files changed, 38 insertions(+), 38 deletions(-) rename docker/storperf-httpfrontend/html/{ => 3rd_party}/css/bootstrap.min.css (100%) rename docker/storperf-reporting/src/static/{ => 3rd_party}/css/bootstrap.min.css (100%) rename docker/storperf-reporting/src/static/{ => 3rd_party}/js/Chart.min.js (100%) rename docker/storperf-reporting/src/static/{ => 3rd_party}/js/bootstrap.min.js (100%) rename docker/storperf-reporting/src/static/{ => 3rd_party}/js/jquery-2.1.3.min.js (100%) rename docker/storperf-reporting/src/static/{ => 3rd_party}/js/jquery.bootpag.min.js (100%) rename docker/storperf-reporting/src/static/{ => 3rd_party}/js/plotly-latest.min.js (100%) diff --git a/docker/storperf-httpfrontend/html/css/bootstrap.min.css b/docker/storperf-httpfrontend/html/3rd_party/css/bootstrap.min.css similarity index 100% rename from docker/storperf-httpfrontend/html/css/bootstrap.min.css rename to docker/storperf-httpfrontend/html/3rd_party/css/bootstrap.min.css diff --git a/docker/storperf-httpfrontend/html/index.html b/docker/storperf-httpfrontend/html/index.html index 3b41653..d07ec97 100644 --- a/docker/storperf-httpfrontend/html/index.html +++ b/docker/storperf-httpfrontend/html/index.html @@ -17,7 +17,7 @@ StorPerf Home Storperf - + @@ -47,4 +47,4 @@ elaboration about Storperf. Open to Suggestions.

- \ No newline at end of file + diff --git a/docker/storperf-reporting/src/app.py b/docker/storperf-reporting/src/app.py index 79baa33..9bd1a04 100644 --- a/docker/storperf-reporting/src/app.py +++ b/docker/storperf-reporting/src/app.py @@ -128,12 +128,12 @@ def file_not_found(): return redirect(url_for('index')) -@app.route('/reporting/js/') +@app.route('/reporting/3rd_party/js/') def js(path): return send_from_directory('static/js/', path) -@app.route('/reporting/css/') +@app.route('/reporting/3rd_party/css/') def css(path): return send_from_directory('static/css/', path) diff --git a/docker/storperf-reporting/src/static/css/bootstrap.min.css b/docker/storperf-reporting/src/static/3rd_party/css/bootstrap.min.css similarity index 100% rename from docker/storperf-reporting/src/static/css/bootstrap.min.css rename to docker/storperf-reporting/src/static/3rd_party/css/bootstrap.min.css diff --git a/docker/storperf-reporting/src/static/js/Chart.min.js b/docker/storperf-reporting/src/static/3rd_party/js/Chart.min.js similarity index 100% rename from docker/storperf-reporting/src/static/js/Chart.min.js rename to docker/storperf-reporting/src/static/3rd_party/js/Chart.min.js diff --git a/docker/storperf-reporting/src/static/js/bootstrap.min.js b/docker/storperf-reporting/src/static/3rd_party/js/bootstrap.min.js similarity index 100% rename from docker/storperf-reporting/src/static/js/bootstrap.min.js rename to docker/storperf-reporting/src/static/3rd_party/js/bootstrap.min.js diff --git a/docker/storperf-reporting/src/static/js/jquery-2.1.3.min.js b/docker/storperf-reporting/src/static/3rd_party/js/jquery-2.1.3.min.js similarity index 100% rename from docker/storperf-reporting/src/static/js/jquery-2.1.3.min.js rename to docker/storperf-reporting/src/static/3rd_party/js/jquery-2.1.3.min.js diff --git a/docker/storperf-reporting/src/static/js/jquery.bootpag.min.js b/docker/storperf-reporting/src/static/3rd_party/js/jquery.bootpag.min.js similarity index 100% rename from docker/storperf-reporting/src/static/js/jquery.bootpag.min.js rename to docker/storperf-reporting/src/static/3rd_party/js/jquery.bootpag.min.js diff --git a/docker/storperf-reporting/src/static/js/plotly-latest.min.js b/docker/storperf-reporting/src/static/3rd_party/js/plotly-latest.min.js similarity index 100% rename from docker/storperf-reporting/src/static/js/plotly-latest.min.js rename to docker/storperf-reporting/src/static/3rd_party/js/plotly-latest.min.js diff --git a/docker/storperf-reporting/src/templates/index.html b/docker/storperf-reporting/src/templates/index.html index ab4e539..65da38d 100644 --- a/docker/storperf-reporting/src/templates/index.html +++ b/docker/storperf-reporting/src/templates/index.html @@ -4,10 +4,10 @@ Graphing Module | Storperf - - - - + + + + @@ -37,4 +37,4 @@ - \ No newline at end of file + diff --git a/docker/storperf-reporting/src/templates/plot_jobs.html b/docker/storperf-reporting/src/templates/plot_jobs.html index d2d3613..f10dd6c 100644 --- a/docker/storperf-reporting/src/templates/plot_jobs.html +++ b/docker/storperf-reporting/src/templates/plot_jobs.html @@ -4,12 +4,12 @@ Chart | Storperf - - - - - - + + + + + + @@ -41,8 +41,8 @@ text += "

Start Date : " + results["start_date"] + "

"; text += "

Criteria : " + results["criteria"] + "

"; text += "

Build Tag : " + results["build_tag"] + "

"; - text += ""; - text += ""; + text += ""; + text += ""; text += "

"; $("#content").html(text); } @@ -55,7 +55,7 @@ text += "

Build Tag : " + results["build_tag"] + "

"; text += ""; text += "

" - text += ""; + text += ""; text += "

"; for (var i = 0; i < keys.length; i++ ){ text += "

"; @@ -89,7 +89,7 @@ for( item in report_data[key][test] ){ var state = report_data[key][test][item]["steady_state"]; text += "

" + item + " (steady state: " + state +")"; + text += key + "-" + test + "-" + item + "'>" + item + " (steady state: " + state +")"; text += "