[#152] Remove tidy.html and tokens.html and reveal users.html in navbar

paypal · Nov 27, 2018 · 4b650fe · 4b650fe
1 parent b79d0c5
commit 4b650fe
Show file tree

Hide file tree

Showing 18 changed files with 114 additions and 519 deletions.
diff --git a/src/main/resources/public/custom.html b/src/main/resources/public/custom.html
@@ -25,6 +25,17 @@
 <script type="text/javascript">checkIfAuthenticated();</script>
 
 <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <link rel="icon" href="./favicon.ico">
+
+
+    <title>NNA Histogram</title>
+
     <!-- Bootstrap core CSS -->
     <link href="./css/bootstrap.min.css" rel="stylesheet">
 
@@ -199,7 +210,6 @@ <h1>Welcome to NNAnalytics</h1>
           });
       });
 </script>
-<script type="text/javascript">$(document).ready(function(){  $("head").append("header.html");});</script>
 <script type="text/javascript">getClusterName();</script>
 <script>
         var ctx = document.getElementById("custom");

diff --git a/src/main/resources/public/division.html b/src/main/resources/public/division.html
@@ -24,6 +24,17 @@
 <script src="./js/nna.utility.js"></script>
 <script type="text/javascript">checkIfAuthenticated();</script>
 <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <link rel="icon" href="./favicon.ico">
+
+
+    <title>NNA Division</title>
+
     <!-- Bootstrap core CSS -->
     <link href="./css/bootstrap.min.css" rel="stylesheet">
 
@@ -68,7 +79,6 @@ <h1>Welcome to NNAnalytics</h1>
           });
       });
 </script>
-<script type="text/javascript">$(document).ready(function(){  $("head").append("header.html");});</script>
 
 <script>
     $.ajax({

diff --git a/src/main/resources/public/header.html b/src/main/resources/public/header.html
diff --git a/src/main/resources/public/history.html b/src/main/resources/public/history.html
@@ -25,6 +25,17 @@
 <script src="./js/nna.utility.js"></script>
 <script type="text/javascript">checkIfAuthenticated();</script>
 <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <link rel="icon" href="./favicon.ico">
+
+
+    <title>NNA History</title>
+
     <!-- Bootstrap core CSS -->
     <link href="./css/bootstrap.min.css" rel="stylesheet">
 
@@ -33,8 +44,6 @@
 
     <!-- Custom styles for this template -->
     <link href="./css/nna.css" rel="stylesheet">
-
-    <title>NNAnalytics History</title>
 </head>
 
 <body>
@@ -111,7 +120,6 @@ <h1>Welcome to NNAnalytics</h1>
           });
       });
 </script>
-<script type="text/javascript">$(document).ready(function(){  $("head").append("header.html");});</script>
 <script type="text/javascript">getClusterName();</script>
 <script type="text/javascript">listIssues();</script>
 

diff --git a/src/main/resources/public/js/jszip.min.js b/src/main/resources/public/js/jszip.min.js
diff --git a/src/main/resources/public/metrics.html b/src/main/resources/public/metrics.html
@@ -24,10 +24,22 @@
     <script src="./js/nna.utility.js"></script>
     <script type="text/javascript">checkIfAuthenticated();</script>
     <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+        <meta name="description" content="">
+        <meta name="author" content="">
+        <link rel="icon" href="./favicon.ico">
+
+        <title>NNA Metrics</title>
+
         <!-- Bootstrap core CSS -->
         <link href="./css/bootstrap.min.css" rel="stylesheet">
+
         <!-- Sweetalert core CSS -->
         <link href="./css/sweetalert.css" rel="stylesheet">
+
         <!-- Custom styles for this template -->
         <link href="./css/nna.css" rel="stylesheet">
         <link href="./css/datatables.min.css" rel="stylesheet">
@@ -70,7 +82,6 @@ <h1>User Metrics</h1>
                 });
             });
         </script>
-        <script type="text/javascript">$(document).ready(function(){  $("head").append("header.html");});</script>
         <script type="text/javascript">getClusterName();</script>
         <script>
         function format ( d ) {

diff --git a/src/main/resources/public/namespace.html b/src/main/resources/public/namespace.html
@@ -32,7 +32,6 @@
     <meta name="author" content="">
     <link rel="icon" href="./favicon.ico">
 
-
     <title>NNAnalytics Namespace</title>
 
     <!-- Bootstrap core CSS -->
@@ -161,7 +160,6 @@ <h4 class="list-group-item-heading">Reload Namespace</h4>
           });
       });
     </script>
-    <script type="text/javascript">$(document).ready(function(){  $("head").append("header.html");});</script>
     <script type="text/javascript">
         function showSaveNameSpace() {
             var x = document.getElementById('tab-1');

diff --git a/src/main/resources/public/navbar.html b/src/main/resources/public/navbar.html
@@ -41,7 +41,7 @@
                   <li><a target="_blank" href="./config">Configuration</a></li>
                   <li><a target="_blank" href="./listOperations">Operations</a></li>
                   <li><a target="_blank" href="./namespace.html">Namespace</a></li>
-                  <li><a target="_blank" href="./metrics.html">User Usage Metrics</a></li>
+                  <li><a target="_blank" href="./metrics.html">Usage Metrics</a></li>
                   <li><a target="_blank" href="./log">Log</a></li>
                   <li><a target="_blank" href="./system">System</a></li>
                   <li><a target="_blank" href="./threads">Threads</a></li>
@@ -138,6 +138,7 @@
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">User<span class="caret"></span></a>
                 <ul class="dropdown-menu">
+                  <li><a target="_blank" href="./users.html">Tokens and Usage Table</a></li>
                   <li><a target="_blank" href="./custom.html?set=files&filters=fileSize:eq:0&type=user&sum=count&sortDescending=true&top=10">Empty Files</a></li>
                   <li><a target="_blank" href="./custom.html?set=dirs&filters=dirNumChildren:eq:0&type=user&sum=count&sortDescending=true&top=10">Empty Directories</a></li>
                   <li><a target="_blank" href="./custom.html?set=files&filters=fileSize:lte:1024,fileSize:gt:0&type=user&sum=count&sortDescending=true&top=10">Very Small Files (< 1KB)</a></li>

diff --git a/src/main/resources/public/quotas.html b/src/main/resources/public/quotas.html
@@ -24,6 +24,17 @@
 <script src="./js/nna.utility.js"></script>
 <script type="text/javascript">checkIfAuthenticated();</script>
 <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <link rel="icon" href="./favicon.ico">
+
+
+    <title>NNA Quotas</title>
+
     <!-- Bootstrap core CSS -->
     <link href="./css/bootstrap.min.css" rel="stylesheet">
 
@@ -79,7 +90,6 @@ <h1>Welcome to NNAnalytics</h1>
 <script src="./js/dataTables.buttons.min.js"></script>
 <script src="./js/jszip.min.js"></script>
 <script src="./js/buttons.html5.min.js"></script>
-<script type="text/javascript">$(document).ready(function(){  $("head").append("header.html");});</script>
 <script type="text/javascript">getClusterName();</script>
 
 <script>

diff --git a/src/main/resources/public/report.html b/src/main/resources/public/report.html
@@ -25,9 +25,22 @@
 <script src="./js/nna.utility.js"></script>
 <script type="text/javascript">checkIfAuthenticated();</script>
 <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <link rel="icon" href="./favicon.ico">
+
+    <title>NNA Report Histograms</title>
+
     <!-- Bootstrap core CSS -->
     <link href="./css/bootstrap.min.css" rel="stylesheet">
 
+    <!-- Sweetalert core CSS -->
+    <link href="./css/sweetalert.css" rel="stylesheet">
+
     <!-- Custom styles for this template -->
     <link href="./css/nna.css" rel="stylesheet">
 </head>
@@ -84,7 +97,6 @@ <h1>Welcome to NNAnalytics</h1>
           });
       });
 </script>
-<script type="text/javascript">$(document).ready(function(){  $("head").append("header.html");});</script>
 <script type="text/javascript">getClusterName();</script>
 
 <script>