You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ec...@apache.org on 2013/08/08 01:19:09 UTC
svn commit: r1511533 - 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/thrift/
Author: eclark
Date: Wed Aug 7 23:19:08 2013
New Revision: 1511533
URL: http://svn.apache.org/r1511533
Log:
HBASE-9077 Make Web ui Fluid width
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/thrift/thrift.jsp
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=1511533&r1=1511532&r2=1511533&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 Wed Aug 7 23:19:08 2013
@@ -107,7 +107,7 @@ AssignmentManager assignmentManager = ma
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
- <div class="container">
+ <div class="container-fluid">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@@ -131,15 +131,15 @@ AssignmentManager assignmentManager = ma
</div>
</div>
- <div class="container">
+ <div class="container-fluid">
<%if master.isActiveMaster() %>
- <div class="row inner_header">
+ <div class="row-fluid inner_header">
<div class="page-header">
<h1>Master <small><% master.getServerName().getHostname() %> </small></h1>
</div>
</div>
- <div class="row">
+ <div class="row-fluid">
<!-- Various warnings that cluster admins should be aware of -->
<%if JvmVersion.isBadJvmVersion() %>
<div class="alert alert-error">
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=1511533&r1=1511532&r2=1511533&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 Wed Aug 7 23:19:08 2013
@@ -65,7 +65,7 @@ org.apache.hadoop.hbase.protobuf.generat
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
- <div class="container">
+ <div class="container-fluid">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@@ -88,13 +88,13 @@ org.apache.hadoop.hbase.protobuf.generat
</div>
</div>
-<div class="container">
- <div class="row inner_header">
+<div class="container-fluid">
+ <div class="row-fluid inner_header">
<div class="page-header">
<h1>RegionServer <small><% serverName.getHostname() %></small></h1>
</div>
</div>
- <div class="row">
+ <div class="row-fluid">
<section>
<h2>Server Metrics</h2>
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=1511533&r1=1511532&r2=1511533&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 Wed Aug 7 23:19:08 2013
@@ -82,7 +82,7 @@
<body>
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
- <div class="container">
+ <div class="container-fluid">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@@ -102,16 +102,14 @@
</div>
</div>
</div>
-<div class="container">
+<div class="container-fluid">
- <div class="container">
- <div class="row inner_header">
+ <div class="row-fluid inner_header">
<div class="page-header">
<h1>Table action request accepted</h1>
</div>
</div>
- </div>
<p><hr><p>
<%
if (action.equals("split")) {
@@ -157,7 +155,7 @@
<body>
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
- <div class="container">
+ <div class="container-fluid">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@@ -176,17 +174,16 @@
</div>
</div>
</div>
-<div class="container">
+<div class="container-fluid">
- <div class="container">
- <div class="row inner_header">
- <div class="page-header">
- <h1>Table <small><%= tableName %></small></h1>
- </div>
+
+ <div class="row-fluid inner_header">
+ <div class="page-header">
+ <h1>Table <small><%= tableName %></small></h1>
</div>
</div>
- <div class="row">
+ <div class="row-fluid">
<%
if(tableName.equals(Bytes.toString(HConstants.META_TABLE_NAME))) {
%>
@@ -306,11 +303,11 @@ HConnectionManager.deleteConnection(hbad
<% if (!readOnly) { %>
-<p><hr><p>
+<p><hr/></p>
Actions:
<p>
<center>
-<table class="table" width="90%" >
+<table class="table" width="95%" >
<tr>
<form method="get">
<input type="hidden" name="action" value="compact">
@@ -341,7 +338,7 @@ Actions:
</tr>
</table>
</center>
-<p>
+</p>
</div>
</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=1511533&r1=1511532&r2=1511533&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 Wed Aug 7 23:19:08 2013
@@ -53,7 +53,7 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
- <div class="container">
+ <div class="container-fluid">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@@ -74,8 +74,8 @@
</div>
</div>
- <div class="container">
- <div class="row inner_header">
+ <div class="container-fluid">
+ <div class="row-fluid inner_header">
<div class="page-header">
<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=1511533&r1=1511532&r2=1511533&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 Wed Aug 7 23:19:08 2013
@@ -57,7 +57,7 @@
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
- <div class="container">
+ <div class="container-fluid">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@@ -77,13 +77,13 @@
</div>
</div>
- <div class="container">
- <div class="row inner_header">
+ <div class="container-fluid">
+ <div class="row-fluid inner_header">
<div class="page-header">
<h1>Zookeeper Dump</h1>
</div>
</div>
- <div class="row">
+ <div class="row-fluid">
<div class="span12">
<pre><%= ZKUtil.dump(watcher).trim() %></pre>
</div>
Modified: hbase/trunk/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp?rev=1511533&r1=1511532&r2=1511533&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp (original)
+++ hbase/trunk/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp Wed Aug 7 23:19:08 2013
@@ -56,7 +56,7 @@ String framed = conf.get("hbase.regionse
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
- <div class="container">
+ <div class="container-fluid">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@@ -78,13 +78,13 @@ String framed = conf.get("hbase.regionse
</div>
</div>
-<div class="container">
- <div class="row inner_header">
+<div class="container-fluid">
+ <div class="row-fluid inner_header">
<div class="page-header">
<h1>ThriftServer <small><%= listenPort %></small></h1>
</div>
</div>
- <div class="row">
+ <div class="row-fluid">
<section>
<h2>Software Attributes</h2>
@@ -127,11 +127,10 @@ String framed = conf.get("hbase.regionse
</table>
</section>
</div>
- <div class="row">
-
- <section>
-<a href="http://wiki.apache.org/hadoop/Hbase/ThriftApi">Apache HBase Wiki on Thrift</a>
- </section>
+ <div class="row-fluid">
+ <section>
+ <a href="http://wiki.apache.org/hadoop/Hbase/ThriftApi">Apache HBase Wiki on Thrift</a>
+ </section>
</div>
</div>
<script src="/static/js/jquery.min.js" type="text/javascript"></script>