From 118d7b20b0c368d34d2d3734f965c21d28fb7247 Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Sat, 17 Oct 2015 11:10:42 -0700 Subject: [PATCH] HBASE-14633 Try fluid width UI --- .../src/main/resources/hbase-webapps/rest/rest.jsp | 4 ++-- .../hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 4 ++-- .../hbase/tmpl/regionserver/RSStatusTmpl.jamon | 4 ++-- .../resources/hbase-webapps/master/snapshot.jsp | 6 +++--- .../main/resources/hbase-webapps/master/table.jsp | 13 ++++--------- .../hbase-webapps/master/tablesDetailed.jsp | 4 ++-- .../src/main/resources/hbase-webapps/master/zk.jsp | 4 ++-- .../resources/hbase-webapps/static/css/hbase.css | 9 +++++++-- .../main/resources/hbase-webapps/thrift/thrift.jsp | 4 ++-- .../resources/hbase-webapps/static/css/hbase.css | 9 +++++++-- .../main/resources/hbase-webapps/thrift/thrift.jsp | 4 ++-- 11 files changed, 35 insertions(+), 30 deletions(-) diff --git a/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp b/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp index 43895a88072..afc0b2f2a22 100644 --- a/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp +++ b/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp @@ -45,7 +45,7 @@ String listenPort = conf.get("hbase.rest.port", "8080");
-
+
-
+

RESTServer <%= listenPort %>

diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon index c0b70a2c38f..33df3d84db5 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon @@ -112,7 +112,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
-
+
-
+
<%if master.isActiveMaster() %>
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon index 3d4764370d1..f38cce95964 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon @@ -69,7 +69,7 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
-
+
-
+

RegionServer <% serverName %>

diff --git a/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp b/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp index 3bad1e9c88e..e945404df2c 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp @@ -82,7 +82,7 @@
-
+
<% if (snapshot == null) { %> -
+

Snapshot "<%= snapshotName %>" does not exists

@@ -115,7 +115,7 @@

Go Back, or wait for the redirect. <% } else { %> -

+

Snapshot: <%= snapshotName %>

diff --git a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp index e2b00088c22..effc8fe23b7 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp @@ -93,7 +93,7 @@
-
+
-
+

User Tables

diff --git a/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp b/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp index fb35b6f49df..036d650e077 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp @@ -46,7 +46,7 @@
-
+
-
+

Zookeeper Dump

diff --git a/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css b/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css index 53e23f42f2b..f3bd9e9453e 100644 --- a/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css +++ b/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css @@ -17,8 +17,13 @@ */ /* General styling */ -body { padding-top: 60px; } -.logo img { float: right; } +body { padding-top: 50px; } +html .content { + margin-left: 2.0em; +} +.navbar-brand img { + margin-top: -7px; +} .inner_header { margin-bottom: 1em;} section { margin-bottom: 3em; } diff --git a/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp b/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp index 73e3f3cb7ba..4651ad04a94 100644 --- a/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp @@ -51,7 +51,7 @@ String framed = conf.get("hbase.regionserver.thrift.framed", "false");
-
+
-
+

ThriftServer <%= listenPort %>

diff --git a/hbase-thrift/src/main/resources/hbase-webapps/static/css/hbase.css b/hbase-thrift/src/main/resources/hbase-webapps/static/css/hbase.css index 53e23f42f2b..4b36c806305 100644 --- a/hbase-thrift/src/main/resources/hbase-webapps/static/css/hbase.css +++ b/hbase-thrift/src/main/resources/hbase-webapps/static/css/hbase.css @@ -17,8 +17,13 @@ */ /* General styling */ -body { padding-top: 60px; } -.logo img { float: right; } +body { padding-top: 50px; } +html .content { + margin-left: 1.0em; +} +.navbar-brand img { + margin-top: -7px; +} .inner_header { margin-bottom: 1em;} section { margin-bottom: 3em; } diff --git a/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp b/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp index 73e3f3cb7ba..d5425ab488e 100644 --- a/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp +++ b/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp @@ -51,7 +51,7 @@ String framed = conf.get("hbase.regionserver.thrift.framed", "false");
-
+
-
+

ThriftServer <%= listenPort %>