-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
HBASE-20693 Refactor thrift jsp's and extract header and footer (#5732)
- Fixes the way logLevel page renders in UI Signed-off-by: Nick Dimiduk <[email protected]>
- Loading branch information
Showing
3 changed files
with
121 additions
and
68 deletions.
There are no files selected for viewing
30 changes: 30 additions & 0 deletions
30
hbase-thrift/src/main/resources/hbase-webapps/thrift/footer.jsp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <%-- | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| --%> | ||
| <script src="/static/js/jquery.min.js" type="text/javascript"></script> | ||
| <script src="/static/js/bootstrap.min.js" type="text/javascript"></script> | ||
| <script src="/static/js/tab.js" type="text/javascript"></script> | ||
| <script type="text/javascript"> | ||
| $(document).ready(function() { | ||
| $('li.active').removeClass('active'); | ||
| $('a[href="' + location.pathname + '"]').closest('li').addClass('active'); | ||
| }); | ||
| </script> | ||
| </body> | ||
| </html> |
74 changes: 74 additions & 0 deletions
74
hbase-thrift/src/main/resources/hbase-webapps/thrift/header.jsp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| <%-- | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| --%> | ||
| <%@ page contentType="text/html;charset=UTF-8" | ||
| import="org.apache.hadoop.hbase.HBaseConfiguration"%> | ||
|
|
||
| <!DOCTYPE html> | ||
| <?xml version="1.0" encoding="UTF-8" ?> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <title><%= request.getParameter("pageTitle")%></title> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
| <meta name="description" content=""> | ||
|
|
||
| <link href="/static/css/bootstrap.min.css" rel="stylesheet"> | ||
| <link href="/static/css/bootstrap-theme.min.css" rel="stylesheet"> | ||
| <link href="/static/css/hbase.css" rel="stylesheet"> | ||
| </head> | ||
|
|
||
| <body> | ||
| <div class="navbar navbar-fixed-top navbar-default"> | ||
| <div class="container-fluid"> | ||
| <div class="navbar-header"> | ||
| <button type="button" | ||
| class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| </button> | ||
| <a class="navbar-brand" href="/thrift.jsp"> | ||
| <img src="/static/hbase_logo_small.png" alt="HBase Logo"/> | ||
| </a> | ||
| </div> | ||
| <div class="collapse navbar-collapse"> | ||
| <ul class="nav navbar-nav"> | ||
| <li class="active"><a href="/thrift.jsp">Home</a></li> | ||
| <li><a href="/logs/">Local logs</a></li> | ||
| <li><a href="/logLevel">Log Level</a></li> | ||
| <li class="nav-item dropdown"> | ||
| <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | ||
| Metrics <span class="caret"></span> | ||
| </a> | ||
| <ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink"> | ||
| <li><a target="_blank" href="/jmx">JMX</a></li> | ||
| <li><a target="_blank" href="/jmx?description=true">JMX with description</a></li> | ||
| <li><a target="_blank" href="/prometheus">Prometheus</a></li> | ||
| <li><a target="_blank" href="/prometheus?description=true">Prometheus with description</a></li> | ||
| </ul> | ||
| </li> | ||
| <li><a href="/prof">Profiler</a></li> | ||
| <% if (HBaseConfiguration.isShowConfInServlet()) { %> | ||
| <li><a href="/conf">HBase Configuration</a></li> | ||
| <% } %> | ||
| </ul> | ||
| </div><!--/.nav-collapse --> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters