Code Review / storperf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 6d64efd)
Marking 3rd Party Software 29/55729/1
authormbeierl <mark.beierl@dell.com>
Thu, 12 Apr 2018 20:05:45 +0000 (16:05 -0400)
committerMark Beierl <mark.beierl@dell.com>
Fri, 13 Apr 2018 23:40:15 +0000 (23:40 +0000)
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 <mark.beierl@dell.com>
(cherry picked from commit fbdded2f8141d68c81c5d72a11ab3a9b121c3181)

13 files changed:
docker/storperf-httpfrontend/html/3rd_party/css/bootstrap.min.css [moved from docker/storperf-httpfrontend/html/css/bootstrap.min.css with 100% similarity] patch | blob | history
docker/storperf-httpfrontend/html/index.html patch | blob | history
docker/storperf-reporting/src/app.py patch | blob | history
docker/storperf-reporting/src/static/3rd_party/css/bootstrap.min.css [moved from docker/storperf-reporting/src/static/css/bootstrap.min.css with 100% similarity] patch | blob | history
docker/storperf-reporting/src/static/3rd_party/js/Chart.min.js [moved from docker/storperf-reporting/src/static/js/Chart.min.js with 100% similarity] patch | blob | history
docker/storperf-reporting/src/static/3rd_party/js/bootstrap.min.js [moved from docker/storperf-reporting/src/static/js/bootstrap.min.js with 100% similarity] patch | blob | history
docker/storperf-reporting/src/static/3rd_party/js/jquery-2.1.3.min.js [moved from docker/storperf-reporting/src/static/js/jquery-2.1.3.min.js with 100% similarity] patch | blob | history
docker/storperf-reporting/src/static/3rd_party/js/jquery.bootpag.min.js [moved from docker/storperf-reporting/src/static/js/jquery.bootpag.min.js with 100% similarity] patch | blob | history
docker/storperf-reporting/src/static/3rd_party/js/plotly-latest.min.js [moved from docker/storperf-reporting/src/static/js/plotly-latest.min.js with 100% similarity] patch | blob | history
docker/storperf-reporting/src/templates/index.html patch | blob | history
docker/storperf-reporting/src/templates/plot_jobs.html patch | blob | history
docker/storperf-reporting/src/templates/plot_multi_data.html patch | blob | history
docker/storperf-reporting/src/templates/plot_tables.html patch | blob | history

diff --git a/docker/storperf-httpfrontend/html/index.html b/docker/storperf-httpfrontend/html/index.html
index 3b41653..d07ec97 100644 (file)
--- a/docker/storperf-httpfrontend/html/index.html
+++ b/docker/storperf-httpfrontend/html/index.html
@@ -17,7 +17,7 @@ StorPerf Home
 <head>
     <title>Storperf</title>
     <!-- Latest compiled and minified CSS -->
-<link rel="stylesheet" href="./css/bootstrap.min.css">
+<link rel="stylesheet" href="./3rd_party/css/bootstrap.min.css">
 
 </head>
 
@@ -47,4 +47,4 @@ elaboration about Storperf. Open to Suggestions.</p>
 
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/docker/storperf-reporting/src/app.py b/docker/storperf-reporting/src/app.py
index 79baa33..9bd1a04 100644 (file)
--- 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/<path:path>')
+@app.route('/reporting/3rd_party/js/<path:path>')
 def js(path):
     return send_from_directory('static/js/', path)
 
 
-@app.route('/reporting/css/<path:path>')
+@app.route('/reporting/3rd_party/css/<path:path>')
 def css(path):
     return send_from_directory('static/css/', path)
 
diff --git a/docker/storperf-reporting/src/templates/index.html b/docker/storperf-reporting/src/templates/index.html
index ab4e539..65da38d 100644 (file)
--- a/docker/storperf-reporting/src/templates/index.html
+++ b/docker/storperf-reporting/src/templates/index.html
@@ -4,10 +4,10 @@
 <head>
     <title>Graphing Module | Storperf</title>
     <link rel="icon" href="/reporting/images/OPNVF_ProjectIcons_2400x2400_Storperf.png">
-    <link rel="stylesheet" href="/reporting/css/bootstrap.min.css">
-    <script src="/reporting/js/jquery-2.1.3.min.js"></script>
-    <script src="/reporting/js/bootstrap.min.js"></script>
-    <script src="/reporting/js/jquery.bootpag.min.js"></script>
+    <link rel="stylesheet" href="/reporting/3rd_party/css/bootstrap.min.css">
+    <script src="/reporting/3rd_party/js/jquery-2.1.3.min.js"></script>
+    <script src="/reporting/3rd_party/js/bootstrap.min.js"></script>
+    <script src="/reporting/3rd_party/js/jquery.bootpag.min.js"></script>
 </head>
 
 <body>
@@ -37,4 +37,4 @@
     </div>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/docker/storperf-reporting/src/templates/plot_jobs.html b/docker/storperf-reporting/src/templates/plot_jobs.html
index d2d3613..f10dd6c 100644 (file)
--- a/docker/storperf-reporting/src/templates/plot_jobs.html
+++ b/docker/storperf-reporting/src/templates/plot_jobs.html
@@ -4,12 +4,12 @@
 <head>
     <meta charset="utf-8" />
     <title>Chart | Storperf</title>
-    <link rel="stylesheet" href="/reporting/css/bootstrap.min.css">
-    <script src="/reporting/js/jquery-2.1.3.min.js"></script>
-    <script src="/reporting/js/bootstrap.min.js"></script>
-    <script src="/reporting/js/jquery.bootpag.min.js"></script>
-    <script src="/reporting/js/plotly-latest.min.js"></script>
-    <script src="/reporting/js/Chart.min.js"></script>
+    <link rel="stylesheet" href="/reporting/3rd_party/css/bootstrap.min.css">
+    <script src="/reporting/3rd_party/js/jquery-2.1.3.min.js"></script>
+    <script src="/reporting/3rd_party/js/bootstrap.min.js"></script>
+    <script src="/reporting/3rd_party/js/jquery.bootpag.min.js"></script>
+    <script src="/reporting/3rd_party/js/plotly-latest.min.js"></script>
+    <script src="/reporting/3rd_party/js/Chart.min.js"></script>
     <style>
 /* The Modal (background) */
 .modal {
@@ -88,8 +88,8 @@ ul {
                 text += "<div class='row well' id='row-" + key[i] + "'>";
                 text += "<h4> Job ID: " + key[i] + "</h4>";
                 text += "<button type='button' class='btn btn-default btn-lg' id='para-"+ key[i] +
-                        "' onclick=add_info('" + key[i] + "')> Click here to view details </button>"; 
-                text += "</div>"; 
+                        "' onclick=add_info('" + key[i] + "')> Click here to view details </button>";
+                text += "</div>";
             }
             $("#content").html(text);
         }
@@ -112,8 +112,8 @@ ul {
                     text += "<h4 onclick=add_test('" + keys[i] + "')>" + keys[i] + "</h4>";
                     text += "</div>";
                 }
-            }   
-            $("#content").html(text);   
+            }
+            $("#content").html(text);
         }
         function add_test(key){
             if(document.getElementById("test-" + key) == null){
@@ -264,4 +264,4 @@ ul {
     </script>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/docker/storperf-reporting/src/templates/plot_multi_data.html b/docker/storperf-reporting/src/templates/plot_multi_data.html
index 9a81599..f35c368 100644 (file)
--- a/docker/storperf-reporting/src/templates/plot_multi_data.html
+++ b/docker/storperf-reporting/src/templates/plot_multi_data.html
@@ -4,12 +4,12 @@
 <head>
     <meta charset="utf-8" />
     <title>Chart | Storperf</title>
-    <link rel="stylesheet" href="/reporting/css/bootstrap.min.css">
-    <script src="/reporting/js/jquery-2.1.3.min.js"></script>
-    <script src="/reporting/js/bootstrap.min.js"></script>
-    <script src="/reporting/js/jquery.bootpag.min.js"></script>
-    <script src="/reporting/js/plotly-latest.min.js"></script>
-    <script src="/reporting/js/Chart.min.js"></script>
+    <link rel="stylesheet" href="/reporting/3rd_party/css/bootstrap.min.css">
+    <script src="/reporting/3rd_party/js/jquery-2.1.3.min.js"></script>
+    <script src="/reporting/3rd_party/js/bootstrap.min.js"></script>
+    <script src="/reporting/3rd_party/js/jquery.bootpag.min.js"></script>
+    <script src="/reporting/3rd_party/js/plotly-latest.min.js"></script>
+    <script src="/reporting/3rd_party/js/Chart.min.js"></script>
 </head>
 
 <body>
diff --git a/docker/storperf-reporting/src/templates/plot_tables.html b/docker/storperf-reporting/src/templates/plot_tables.html
index ecdf764..536bb42 100644 (file)
--- a/docker/storperf-reporting/src/templates/plot_tables.html
+++ b/docker/storperf-reporting/src/templates/plot_tables.html
@@ -4,12 +4,12 @@
 <head>
     <meta charset="utf-8" />
     <title>Chart | Storperf</title>
-    <link rel="stylesheet" href="/reporting/css/bootstrap.min.css">
-    <script src="/reporting/js/jquery-2.1.3.min.js"></script>
-    <script src="/reporting/js/bootstrap.min.js"></script>
-    <script src="/reporting/js/jquery.bootpag.min.js"></script>
-    <script src="/reporting/js/plotly-latest.min.js"></script>
-    <script src="/reporting/js/Chart.min.js"></script>
+    <link rel="stylesheet" href="/reporting/3rd_party/css/bootstrap.min.css">
+    <script src="/reporting/3rd_party/js/jquery-2.1.3.min.js"></script>
+    <script src="/reporting/3rd_party/js/bootstrap.min.js"></script>
+    <script src="/reporting/3rd_party/js/jquery.bootpag.min.js"></script>
+    <script src="/reporting/3rd_party/js/plotly-latest.min.js"></script>
+    <script src="/reporting/3rd_party/js/Chart.min.js"></script>
     <style>
 </style>
 </head>
@@ -41,8 +41,8 @@
             text += "<h4> Start Date  : " + results["start_date"] + "</h4>";
             text += "<h4> Criteria  : " + results["criteria"] + "</h4>";
             text += "<h4> Build Tag  : " + results["build_tag"] + "</h4>";
-            text += "<button type='button' class='btn btn-default btn-lg' onclick=add_info()> Click here to view details </button>"; 
-            text += "</div>"; 
+            text += "<button type='button' class='btn btn-default btn-lg' onclick=add_info()> Click here to view details </button>";
+            text += "</div>";
             text += "<div id='info'></div>";
             $("#content").html(text);
         }
@@ -55,7 +55,7 @@
             text += "<h4> Build Tag  : " + results["build_tag"] + "</h4>";
             text += "<button type='button' class='btn btn-default btn-lg' onclick=create_block_report()> Steady State Convergence Report - All Block Sizes </button>";
             text += "<div class='row' id='block_report'></div>"
-            text += "</div>"; 
+            text += "</div>";
             text += "<div id='info'></div>";
             for (var i = 0; i < keys.length; i++ ){
                 text += "<div class='row' id='row-"+ keys[i] +"'>";
@@ -89,7 +89,7 @@
                 for( item in report_data[key][test] ){
                     var state = report_data[key][test][item]["steady_state"];
                     text += "<li onclick=create_modal('" + key + "','" + test + "','" + item + "') id='";
-                    text += key + "-" + test + "-" + item + "'>" + item + " (steady state: " + state +")"; 
+                    text += key + "-" + test + "-" + item + "'>" + item + " (steady state: " + state +")";
                     text += "<br><div id='modal-" + key + "-" + test + "-" + item + "'>";
                     text += '<div class="modal-content-'+ key + '-' + test + '-' + item +'">';
                     text += '<div id="modal-text-'+ key + '-' + test + '-' + item +'"></div>';
@@ -280,7 +280,7 @@
             for(i in report_data){
                 if(report_data[i][test] == undefined && test == 'lat_ns.mean')
                     test = 'lat.mean';
-                data[i] = report_data[i][test][key]; 
+                data[i] = report_data[i][test][key];
             }
             document.getElementById('close-block-report-'+key+'-'+test).style.display = 'block';
             var  modal = document.getElementById('modal-block-report-'+key+'-'+test);
@@ -327,4 +327,4 @@
         </script>
 </body>
 
-</html>
\ No newline at end of file
+</html>