This is an automated email from the ASF dual-hosted git repository. mmiller pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/master by this push: new 3b0846d ACCUMULO-4785 Cleanup html to pass W3C validation 3b0846d is described below commit 3b0846d6519df9a766386a265ce387e4cb5e15a8 Author: Mike Miller <mmil...@apache.org> AuthorDate: Wed Jan 17 18:09:28 2018 -0500 ACCUMULO-4785 Cleanup html to pass W3C validation --- .../resources/org/apache/accumulo/monitor/templates/default.ftl | 9 +++------ .../main/resources/org/apache/accumulo/monitor/templates/log.ftl | 2 +- .../resources/org/apache/accumulo/monitor/templates/navbar.ftl | 2 +- .../resources/org/apache/accumulo/monitor/templates/show.ftl | 2 +- .../resources/org/apache/accumulo/monitor/templates/tables.ftl | 4 ++-- .../main/resources/org/apache/accumulo/monitor/templates/vis.ftl | 6 ++---- 6 files changed, 10 insertions(+), 15 deletions(-) diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/default.ftl b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/default.ftl index 0d6f622..8c60a39 100644 --- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/default.ftl +++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/default.ftl @@ -18,9 +18,7 @@ <html> <head> <title>${title} - Accumulo ${version}</title> - <meta http-equiv="Content-Type" content="test/html" /> - <meta http-equiv="Content-Script-Type" content="text/javascript" /> - <meta http-equiv="Content-Style-Type" content="text/css" /> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <!-- external resources configurable by setting monitor.resources.external --> <!-- make sure jquery is included first - other scripts depend on it --> <#if externalResources?has_content> @@ -32,7 +30,6 @@ <script src="/resources/external/bootstrap/js/bootstrap.js"></script> <script src="/resources/external/datatables/js/jquery.dataTables.js"></script> <script src="/resources/external/datatables/js/dataTables.bootstrap.js"></script> - <script src="/resources/external/select2.js"></script> <script src="/resources/external/flot/jquery.flot.js"></script> <script src="/resources/external/flot/jquery.flot.time.js"></script> <script src="/resources/external/ellipsis.js"></script> @@ -43,8 +40,8 @@ <!-- accumulo resources --> <link rel="shortcut icon" type="image/jng" href="/resources/images/favicon.png" /> - <script src="/resources/js/global.js" type="text/javascript"></script> - <script src="/resources/js/functions.js" type="text/javascript"></script> + <script src="/resources/js/global.js"></script> + <script src="/resources/js/functions.js"></script> <link rel="stylesheet" type="text/css" href="/resources/css/screen.css" media="screen" /> <script> diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/log.ftl b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/log.ftl index 2a4a60e..19b355b 100644 --- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/log.ftl +++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/log.ftl @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - <script type="text/javascript"> + <script> var logList; /** * Creates DataTables table diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl index 7909007..1710152 100644 --- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl +++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl @@ -23,7 +23,7 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <img id="accumulo-avatar" class="navbar-left pull-left" src="/resources/images/accumulo-avatar.png" /> + <img id="accumulo-avatar" alt="accumulo" class="navbar-left pull-left" src="/resources/images/accumulo-avatar.png" /> <a class="navbar-brand" id="headertitle" href="/">${instance_name}</a> </div> <!-- Nav links --> diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/show.ftl b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/show.ftl index 86fc772..575cd8a 100644 --- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/show.ftl +++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/show.ftl @@ -19,7 +19,7 @@ table.indent { position: relative; left: 10% } td.left { text-align: left } </style> - <script type="text/javascript"> + <script> /** * Creates trace id initial table, passes id from template */ diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl index 5af9ecf..8d3a9a2 100644 --- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl +++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - <script type="text/javascript"> + <script> var tableList; /** * Creates DataTables table @@ -84,7 +84,7 @@ <th>State</th> <th title="Tables are broken down into ranges of rows called tablets." class="big-num">Tablets</th> <th title="Tablets unavailable for query or ingest. May be a transient condition when tablets are moved for balancing." class="big-num">Offline</th> - <th title="Key/value pairs over each instance, table or tablet." class="big-num">Entries </th> + <th title="Key/value pairs over each instance, table or tablet." class="big-num">Entries</th> <th title="The total number of key/value pairs stored in memory and not yet written to disk." class="big-num">In Mem</th> <th title="The rate of Key/Value pairs inserted. (Note that deletes are considered inserted)" class="big-num">Ingest</th> <th title="The rate of Key/Value pairs read on the server side. Not all key values read may be returned to client because of filtering." class="big-num">Read</th> diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/vis.ftl b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/vis.ftl index 3b504c7..b1950d2 100644 --- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/vis.ftl +++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/vis.ftl @@ -20,7 +20,7 @@ <div id="parameters"> <span class="viscontrol">Shape: <select id="shape" onchange="setShape(this)"><option>Circles</option><option>Squares</option></select></span> - <span class="viscontrol">Size: <select id="size" onchange="setSize(this)"><option>10</option><option>20</option><option selected="true">40</option><option>80</option></select></span> + <span class="viscontrol">Size: <select id="size" onchange="setSize(this)"><option>10</option><option>20</option><option selected>40</option><option>80</option></select></span> <span class="viscontrol">Motion: <select id="motion" onchange="setMotion(this)"></select></span> @@ -36,7 +36,7 @@ </div> </div> - <script type="text/javascript"> + <script> /** * Creates initial visualization table, passes the shape, size, motion, and color from the template */ @@ -58,8 +58,6 @@ refresh(); drawDots(); }); - </script> - <script type="text/javascript"> // Populates variables to be used in the visualization var numCores = 8; var jsonurl = '/rest/tservers'; -- To stop receiving notification emails like this one, please contact ['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].