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

HBASE-14633 Try fluid width UI

This commit is contained in:
Elliott Clark 2015-10-17 11:10:42 -07:00
parent a532ed73d8
commit 5a5b854c2a
11 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,7 @@ String listenPort = conf.get("hbase.rest.port", "8080");
<body> <body>
<div class="navbar navbar-fixed-top navbar-default"> <div class="navbar navbar-fixed-top navbar-default">
<div class="container"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
@ -68,7 +68,7 @@ String listenPort = conf.get("hbase.rest.port", "8080");
</div> </div>
</div> </div>
<div class="container"> <div class="container-fluid content">
<div class="row inner_header"> <div class="row inner_header">
<div class="page-header"> <div class="page-header">
<h1>RESTServer <small><%= listenPort %></small></h1> <h1>RESTServer <small><%= listenPort %></small></h1>

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

@ -111,7 +111,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
<body> <body>
<div class="navbar navbar-fixed-top navbar-default"> <div class="navbar navbar-fixed-top navbar-default">
<div class="container"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
@ -136,7 +136,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
</div> </div>
</div> </div>
<div class="container"> <div class="container-fluid content">
<%if master.isActiveMaster() %> <%if master.isActiveMaster() %>
<div class="row inner_header"> <div class="row inner_header">
<div class="page-header"> <div class="page-header">

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

@ -69,7 +69,7 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
<body> <body>
<div class="navbar navbar-fixed-top navbar-default"> <div class="navbar navbar-fixed-top navbar-default">
<div class="container"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
@ -94,7 +94,7 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
</div> </div>
</div> </div>
<div class="container"> <div class="container-fluid content">
<div class="row inner_header"> <div class="row inner_header">
<div class="page-header"> <div class="page-header">
<h1>RegionServer <small><% serverName %></small></h1> <h1>RegionServer <small><% serverName %></small></h1>

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

@ -81,7 +81,7 @@
</head> </head>
<body> <body>
<div class="navbar navbar-fixed-top navbar-default"> <div class="navbar navbar-fixed-top navbar-default">
<div class="container"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
@ -106,7 +106,7 @@
</div> </div>
</div> </div>
<% if (snapshot == null) { %> <% if (snapshot == null) { %>
<div class="container"> <div class="container-fluid content">
<div class="row inner_header"> <div class="row inner_header">
<div class="page-header"> <div class="page-header">
<h1>Snapshot "<%= snapshotName %>" does not exists</h1> <h1>Snapshot "<%= snapshotName %>" does not exists</h1>
@ -114,7 +114,7 @@
</div> </div>
<p>Go <a href="javascript:history.back()">Back</a>, or wait for the redirect. <p>Go <a href="javascript:history.back()">Back</a>, or wait for the redirect.
<% } else { %> <% } else { %>
<div class="container"> <div class="container-fluid content">
<div class="row"> <div class="row">
<div class="page-header"> <div class="page-header">
<h1>Snapshot: <%= snapshotName %></h1> <h1>Snapshot: <%= snapshotName %></h1>

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

@ -98,7 +98,7 @@
</head> </head>
<body> <body>
<div class="navbar navbar-fixed-top navbar-default"> <div class="navbar navbar-fixed-top navbar-default">
<div class="container"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
@ -133,9 +133,7 @@ if ( fqtn != null ) {
} }
if ( !readOnly && action != null ) { if ( !readOnly && action != null ) {
%> %>
<div class="container"> <div class="container-fluid content">
<div class="row inner_header"> <div class="row inner_header">
<div class="page-header"> <div class="page-header">
<h1>Table action request accepted</h1> <h1>Table action request accepted</h1>
@ -167,10 +165,7 @@ if ( fqtn != null ) {
<% <%
} else { } else {
%> %>
<div class="container"> <div class="container-fluid content">
<div class="row inner_header"> <div class="row inner_header">
<div class="page-header"> <div class="page-header">
<h1>Table <small><%= fqtn %></small></h1> <h1>Table <small><%= fqtn %></small></h1>
@ -429,7 +424,7 @@ Actions:
<% } <% }
} else { // handle the case for fqtn is null with error message + redirect } else { // handle the case for fqtn is null with error message + redirect
%> %>
<div class="container"> <div class="container-fluid content">
<div class="row inner_header"> <div class="row inner_header">
<div class="page-header"> <div class="page-header">
<h1>Table not ready</h1> <h1>Table not ready</h1>

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

@ -51,7 +51,7 @@
<body> <body>
<div class="navbar navbar-fixed-top navbar-default"> <div class="navbar navbar-fixed-top navbar-default">
<div class="container"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
@ -76,7 +76,7 @@
</div> </div>
</div> </div>
<div class="container"> <div class="container-fluid content">
<div class="row inner_header"> <div class="row inner_header">
<div class="page-header"> <div class="page-header">
<h1>User Tables</h1> <h1>User Tables</h1>

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

@ -46,7 +46,7 @@
<body> <body>
<div class="navbar navbar-fixed-top navbar-default"> <div class="navbar navbar-fixed-top navbar-default">
<div class="container"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
@ -71,7 +71,7 @@
</div> </div>
</div> </div>
<div class="container"> <div class="container-fluid content">
<div class="row inner_header"> <div class="row inner_header">
<div class="page-header"> <div class="page-header">
<h1>Zookeeper Dump</h1> <h1>Zookeeper Dump</h1>

9
hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css
View File

@ -17,8 +17,13 @@
*/ */
/* General styling */ /* General styling */
body { padding-top: 60px; } body { padding-top: 50px; }
.logo img { float: right; } html .content {
margin-left: 2.0em;
}
.navbar-brand img {
margin-top: -7px;
}
.inner_header { margin-bottom: 1em;} .inner_header { margin-bottom: 1em;}
section { margin-bottom: 3em; } section { margin-bottom: 3em; }

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

@ -51,7 +51,7 @@ String framed = conf.get("hbase.regionserver.thrift.framed", "false");
<body> <body>
<div class="navbar navbar-fixed-top navbar-default"> <div class="navbar navbar-fixed-top navbar-default">
<div class="container"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
@ -75,7 +75,7 @@ String framed = conf.get("hbase.regionserver.thrift.framed", "false");
</div> </div>
</div> </div>
<div class="container"> <div class="container-fluid">
<div class="row inner_header"> <div class="row inner_header">
<div class="page-header"> <div class="page-header">
<h1>ThriftServer <small><%= listenPort %></small></h1> <h1>ThriftServer <small><%= listenPort %></small></h1>

9
hbase-thrift/src/main/resources/hbase-webapps/static/css/hbase.css
View File

@ -17,8 +17,13 @@
*/ */
/* General styling */ /* General styling */
body { padding-top: 60px; } body { padding-top: 50px; }
.logo img { float: right; } html .content {
margin-left: 1.0em;
}
.navbar-brand img {
margin-top: -7px;
}
.inner_header { margin-bottom: 1em;} .inner_header { margin-bottom: 1em;}
section { margin-bottom: 3em; } section { margin-bottom: 3em; }

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

@ -51,7 +51,7 @@ String framed = conf.get("hbase.regionserver.thrift.framed", "false");
<body> <body>
<div class="navbar navbar-fixed-top navbar-default"> <div class="navbar navbar-fixed-top navbar-default">
<div class="container"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
@ -75,7 +75,7 @@ String framed = conf.get("hbase.regionserver.thrift.framed", "false");
</div> </div>
</div> </div>
<div class="container"> <div class="container-fluid content">
<div class="row inner_header"> <div class="row inner_header">
<div class="page-header"> <div class="page-header">
<h1>ThriftServer <small><%= listenPort %></small></h1> <h1>ThriftServer <small><%= listenPort %></small></h1>