Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-13056 Refactor table.jsp code to remove repeated code and make it easier to add new checks (Vikas Vishwakarma)

This commit is contained in:
stack 2015-02-18 11:34:50 -08:00
parent e8a34fb384
commit 25e8e9b5ae
1 changed files with 16 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
hbase-server/src/main/resources/hbase-webapps/master/table.jsp
View File

@ -62,21 +62,21 @@
if (showFragmentation) { if (showFragmentation) {
frags = FSUtils.getTableFragmentation(master); frags = FSUtils.getTableFragmentation(master);
} }
String action = request.getParameter("action");
String key = request.getParameter("key");
%> %>
<!--[if IE]> <!--[if IE]>
<!DOCTYPE html> <!DOCTYPE html>
<![endif]--> <![endif]-->
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<%
String action = request.getParameter("action");
String key = request.getParameter("key");
if ( !readOnly && action != null ) {
%>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<% if ( !readOnly && action != null ) { %>
<title>HBase Master: <%= master.getServerName() %></title> <title>HBase Master: <%= master.getServerName() %></title>
<% } else { %>
<title>Table: <%= fqtn %></title>
<% } %>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
@ -85,11 +85,17 @@
<link href="/static/css/bootstrap.min.css" rel="stylesheet"> <link href="/static/css/bootstrap.min.css" rel="stylesheet">
<link href="/static/css/bootstrap-theme.min.css" rel="stylesheet"> <link href="/static/css/bootstrap-theme.min.css" rel="stylesheet">
<link href="/static/css/hbase.css" rel="stylesheet"> <link href="/static/css/hbase.css" rel="stylesheet">
<% if ( !readOnly && action != null ) { %>
<script type="text/javascript"> <script type="text/javascript">
<!-- <!--
setTimeout("history.back()",5000); setTimeout("history.back()",5000);
--> -->
</script> </script>
<% } else { %>
<!--[if lt IE 9]>
<script src="/static/js/html5shiv.js"></script>
<![endif]-->
<% } %>
</head> </head>
<body> <body>
<div class="navbar navbar-fixed-top navbar-default"> <div class="navbar navbar-fixed-top navbar-default">
@ -117,6 +123,9 @@
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
</div> </div>
<%
if ( !readOnly && action != null ) {
%>
<div class="container"> <div class="container">
@ -154,47 +163,6 @@
<% <%
} else { } else {
%> %>
<head>
<meta charset="utf-8">
<title>Table: <%= fqtn %></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" 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">
<!--[if lt IE 9]>
<script src="/static/js/html5shiv.js"></script>
<![endif]-->
</head>
<body>
<div class="navbar navbar-fixed-top navbar-default">
<div class="container">
<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="/master-status"><img src="/static/hbase_logo_small.png" alt="HBase Logo"/></a>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li><a href="/master-status">Home</a></li>
<li><a href="/tablesDetailed.jsp">Table Details</a></li>
<li><a href="/logs/">Local Logs</a></li>
<li><a href="/logLevel">Log Level</a></li>
<li><a href="/dump">Debug Dump</a></li>
<li><a href="/jmx">Metrics Dump</a></li>
<% if (HBaseConfiguration.isShowConfInServlet()) { %>
<li><a href="/conf">HBase Configuration</a></li>
<% } %>
</ul>
</div><!--/.nav-collapse -->
</div>
</div>
<div class="container"> <div class="container">