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

HBASE-8532 [Webui] Bootstrap based webui compatibility for IE and also fix some page format issues 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1496164 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2013-06-24 19:11:14 +00:00
parent fea9d36902
commit 2eec2f340a
8 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
View File

@ -47,6 +47,9 @@ org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;
<& ../common/TaskMonitorTmpl; filter = filter; format = "json" &>
<%java return; %>
</%if>
<!--[if IE]>
<!DOCTYPE html>
<![endif]-->
<?xml version="1.0" encoding="UTF-8" ?>
<html lang="en">
<head>

3
hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
View File

@ -42,6 +42,9 @@ org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionLoad;
List<HRegionInfo> onlineRegions = ProtobufUtil.getOnlineRegions(regionServer);
int masterInfoPort = regionServer.getConfiguration().getInt("hbase.master.info.port", 60010);
</%java>
<!--[if IE]>
<!DOCTYPE html>
<![endif]-->
<?xml version="1.0" encoding="UTF-8" ?>
<html lang="en">
<head>

13
hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp
View File

@ -56,13 +56,10 @@
String cloneName = request.getParameter("cloneName");
boolean isActionResultPage = (!readOnly && action != null);
%>
<!--[if IE]>
<!DOCTYPE html>
<![endif]-->
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Commenting out DOCTYPE so our blue outline shows on hadoop 0.20.205.0, etc.
See tail of HBASE-2110 for explaination.
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8">
@ -156,7 +153,7 @@
</div>
</div>
<h2>Snapshot Attributes</h2>
<table class="table" width="90%" >
<table class="table table-striped" width="90%" >
<tr>
<th>Table</th>
<th>Creation Time</th>
@ -212,7 +209,7 @@ HConnectionManager.deleteConnection(hbadmin.getConfiguration());
Actions:
<p>
<center>
<table class="table" width="90%" >
<table class="table table-striped" width="90%" >
<tr>
<form method="get">
<input type="hidden" name="action" value="clone">

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

@ -52,13 +52,10 @@
// This port might be wrong if RS actually ended up using something else.
int infoPort = conf.getInt("hbase.regionserver.info.port", 60030);
%>
<!--[if IE]>
<!DOCTYPE html>
<![endif]-->
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Commenting out DOCTYPE so our blue outline shows on hadoop 0.20.205.0, etc.
See tail of HBASE-2110 for explaination.
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<%
@ -166,7 +163,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="/master-status">HBase Master</a>
<a class="brand" href="/master-status"><img src="/static/hbase_logo_small.png" alt="HBase Logo"/></a>
<div class="nav-collapse">
<ul class="nav">
<li><a href="/">Home</a></li>
@ -213,11 +210,12 @@
<%} else {
try { %>
<h2>Table Attributes</h2>
<table>
<table class="table table-striped">
<tr>
<th>Attribute Name</th>
<th>Value</th>
<th>Description</th></tr>
<th>Description</th>
</tr>
<tr>
<td>Enabled</td>
<td><%= hbadmin.isTableEnabled(table.getTableName()) %></td>
@ -287,7 +285,7 @@
<% } %>
</table>
<h2>Regions by Region Server</h2>
<table class="table"><tr><th>Region Server</th><th>Region Count</th></tr>
<table class="table table-striped"><tr><th>Region Server</th><th>Region Count</th></tr>
<%
for (Map.Entry<String, Integer> rdEntry : regDistribution.entrySet()) {
%>

5
hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp
View File

@ -28,6 +28,9 @@
HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER);
Configuration conf = master.getConfiguration();
%>
<!--[if IE]>
<!DOCTYPE html>
<![endif]-->
<?xml version="1.0" encoding="UTF-8" ?>
<html lang="en">
<head>
@ -88,7 +91,7 @@
<% for(HTableDescriptor htDesc : tables ) { %>
<tr>
<td><a href="/table.jsp?name=<%= escapeXml(htDesc.getNameAsString()) %>"><%= escapeXml(htDesc.getNameAsString()) %></a></td>
<td><%= escapeXml(htDesc.toString()) %></td>
<td><%= htDesc.toString() %></td>
</tr>
<% } %>

4
hbase-server/src/main/resources/hbase-webapps/master/zk.jsp
View File

@ -32,7 +32,9 @@
HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER);
ZooKeeperWatcher watcher = master.getZooKeeperWatcher();
%>
<!--[if IE]>
<!DOCTYPE html>
<![endif]-->
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Dont put a doctype jetty doesnt serve the css/js out correctly so we need quirks mode on -->
<html xmlns="http://www.w3.org/1999/xhtml">

4
hbase-server/src/main/resources/hbase-webapps/rest/rest.jsp
View File

@ -29,7 +29,9 @@ Configuration conf = (Configuration)getServletContext().getAttribute("hbase.conf
long startcode = conf.getLong("startcode", System.currentTimeMillis());
String listenPort = conf.get("hbase.rest.port", "8080");
%>
<!--[if IE]>
<!DOCTYPE html>
<![endif]-->
<?xml version="1.0" encoding="UTF-8" ?>
<html lang="en">
<head>

4
hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp
View File

@ -33,7 +33,9 @@ String implType = conf.get("hbase.regionserver.thrift.server.type", "threadpool"
String compact = conf.get("hbase.regionserver.thrift.compact", "false");
String framed = conf.get("hbase.regionserver.thrift.framed", "false");
%>
<!--[if IE]>
<!DOCTYPE html>
<![endif]-->
<?xml version="1.0" encoding="UTF-8" ?>
<html lang="en">
<head>