You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2012/06/22 20:55:17 UTC
svn commit: r1352995 - in /hbase/trunk/hbase-server/src/main:
jamon/org/apache/hadoop/hbase/tmpl/master/
jamon/org/apache/hadoop/hbase/tmpl/regionserver/
resources/hbase-webapps/master/ resources/hbase-webapps/static/css/
Author: apurtell
Date: Fri Jun 22 18:55:16 2012
New Revision: 1352995
URL: http://svn.apache.org/viewvc?rev=1352995&view=rev
Log:
HBASE-6256. ZK dump was missed in the move to new UI (Elliott Clark)
Modified:
hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp
hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp
hbase/trunk/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css
Modified: hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon?rev=1352995&r1=1352994&r2=1352995&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon (original)
+++ hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon Fri Jun 22 18:55:16 2012
@@ -92,7 +92,7 @@ org.apache.hadoop.hbase.HBaseConfigurati
</div>
<div class="container">
- <div class="row">
+ <div class="row inner_header">
<div class="span8">
<h1>Master: <% master.getServerName().getHostname() %> </h1>
</div>
Modified: hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon?rev=1352995&r1=1352994&r2=1352995&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon (original)
+++ hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon Fri Jun 22 18:55:16 2012
@@ -89,7 +89,7 @@ org.apache.hadoop.hbase.protobuf.generat
</div>
<div class="container">
- <div class="row">
+ <div class="row inner_header">
<div class="span8">
<h1>RegionServer: <% serverName.getHostname() %></h1>
</div>
Modified: hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/table.jsp?rev=1352995&r1=1352994&r2=1352995&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/table.jsp (original)
+++ hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/table.jsp Fri Jun 22 18:55:16 2012
@@ -106,7 +106,7 @@
<div class="container">
- <div class="row">
+ <div class="row inner_header">
<div class="span8">
<h1>Table action request accepted</h1>
</div>
Modified: hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp?rev=1352995&r1=1352994&r2=1352995&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp (original)
+++ hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp Fri Jun 22 18:55:16 2012
@@ -71,7 +71,7 @@
</div>
<div class="container">
- <div class="row">
+ <div class="row inner_header">
<div class="span8">
<h1>User Tables</h1>
</div>
Modified: hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp?rev=1352995&r1=1352994&r2=1352995&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp (original)
+++ hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp Fri Jun 22 18:55:16 2012
@@ -34,24 +34,62 @@
%>
<?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">
--->
+<!-- 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">
-<head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-<title>ZooKeeper Dump</title>
-<link rel="stylesheet" type="text/css" href="/static/hbase.css" />
+ <head>
+ <meta charset="utf-8">
+ <title>ZooKeeper Dump</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.css" rel="stylesheet">
+ <link href="/static/css/hbase.css" rel="stylesheet">
+ <link href="/static/css/bootstrap-responsive.css" rel="stylesheet">
+ <!--[if lt IE 9]>
+ <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
</head>
-<body>
-<a id="logo" href="http://hbase.org"><img src="/static/hbase_logo.png" alt="HBase Logo" title="HBase Logo" /></a>
-<h1 id="page_title">ZooKeeper Dump</h1>
-<p id="links_menu"><a href="/master.jsp">Master</a>, <a href="/logs/">Local logs</a>, <a href="/stacks">Thread Dump</a>, <a href="/logLevel">Log Level</a></p>
-<hr id="head_rule" />
-<pre>
-<%= ZKUtil.dump(watcher) %>
-</pre>
+ <body>
+
+ <div class="navbar navbar-fixed-top">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </a>
+ <a class="brand" href="/rs-status">HBase Region Server</a>
+ <div class="nav-collapse">
+ <ul class="nav">
+ <li><a href="/">Home</a></li>
+ <li><a href="/logs/">Local logs</a></li>
+ <li><a href="/stacks">Thread Dump</a></li>
+ <li><a href="/logLevel">Log Level</a></li>
+ <li><a href="/dump">Debug dump</a></li>
+ </ul>
+ </div><!--/.nav-collapse -->
+ </div>
+ </div>
+ </div>
+
+ <div class="container">
+ <div class="row inner_header">
+ <div class="span8">
+ <h1>Zookeeper Dump</h1>
+ </div>
+ <div class="span4 logo">
+ <img src="/static/hbase_logo.png" height="66" width="266" alt="HBase logo"/>
+ </div>
+ </div>
+ <div class="row">
+ <div class="span12">
+ <pre><%= ZKUtil.dump(watcher).trim() %></pre>
+ </div>
+ </div>
+ </div>
-</body>
+ </body>
</html>
Modified: hbase/trunk/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css?rev=1352995&r1=1352994&r2=1352995&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css (original)
+++ hbase/trunk/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css Fri Jun 22 18:55:16 2012
@@ -17,3 +17,4 @@
*/
body { padding-top: 60px; }
.logo img { float: right; }
+.inner_header { margin-bottom: 1em;}