HBASE-14633 Try fluid width UI
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5a5b854c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5a5b854c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5a5b854c Branch: refs/heads/hbase-12439 Commit: 5a5b854c2a66200e24b46682c5cf19d67142c06f Parents: a532ed7 Author: Elliott Clark <ecl...@apache.org> Authored: Sat Oct 17 11:10:42 2015 -0700 Committer: Elliott Clark <ecl...@apache.org> Committed: Tue Oct 20 17:45:47 2015 -0700 ---------------------------------------------------------------------- .../src/main/resources/hbase-webapps/rest/rest.jsp | 4 ++-- .../hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 4 ++-- .../hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon | 4 ++-- .../main/resources/hbase-webapps/master/snapshot.jsp | 6 +++--- .../src/main/resources/hbase-webapps/master/table.jsp | 13 ++++--------- .../resources/hbase-webapps/master/tablesDetailed.jsp | 4 ++-- .../src/main/resources/hbase-webapps/master/zk.jsp | 4 ++-- .../main/resources/hbase-webapps/static/css/hbase.css | 9 +++++++-- .../src/main/resources/hbase-webapps/thrift/thrift.jsp | 4 ++-- .../main/resources/hbase-webapps/static/css/hbase.css | 9 +++++++-- .../src/main/resources/hbase-webapps/thrift/thrift.jsp | 4 ++-- 11 files changed, 35 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/5a5b854c/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp ---------------------------------------------------------------------- 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 43895a8..afc0b2f 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"); <body> <div class="navbar navbar-fixed-top navbar-default"> - <div class="container"> + <div class="container-fluid"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <span class="icon-bar"></span> @@ -68,7 +68,7 @@ String listenPort = conf.get("hbase.rest.port", "8080"); </div> </div> -<div class="container"> +<div class="container-fluid content"> <div class="row inner_header"> <div class="page-header"> <h1>RESTServer <small><%= listenPort %></small></h1> http://git-wip-us.apache.org/repos/asf/hbase/blob/5a5b854c/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon ---------------------------------------------------------------------- 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 8f57fcb..6704eae 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 @@ -111,7 +111,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); <body> <div class="navbar navbar-fixed-top navbar-default"> - <div class="container"> + <div class="container-fluid"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <span class="icon-bar"></span> @@ -136,7 +136,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); </div> </div> - <div class="container"> + <div class="container-fluid content"> <%if master.isActiveMaster() %> <div class="row inner_header"> <div class="page-header"> http://git-wip-us.apache.org/repos/asf/hbase/blob/5a5b854c/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon ---------------------------------------------------------------------- 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 3d47643..f38cce9 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; <body> <div class="navbar navbar-fixed-top navbar-default"> - <div class="container"> + <div class="container-fluid"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <span class="icon-bar"></span> @@ -94,7 +94,7 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker; </div> </div> - <div class="container"> + <div class="container-fluid content"> <div class="row inner_header"> <div class="page-header"> <h1>RegionServer <small><% serverName %></small></h1> http://git-wip-us.apache.org/repos/asf/hbase/blob/5a5b854c/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp ---------------------------------------------------------------------- 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 b18a63e..c658d63 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp @@ -81,7 +81,7 @@ </head> <body> <div class="navbar navbar-fixed-top navbar-default"> - <div class="container"> + <div class="container-fluid"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <span class="icon-bar"></span> @@ -106,7 +106,7 @@ </div> </div> <% if (snapshot == null) { %> - <div class="container"> + <div class="container-fluid content"> <div class="row inner_header"> <div class="page-header"> <h1>Snapshot "<%= snapshotName %>" does not exists</h1> @@ -114,7 +114,7 @@ </div> <p>Go <a href="javascript:history.back()">Back</a>, or wait for the redirect. <% } else { %> - <div class="container"> + <div class="container-fluid content"> <div class="row"> <div class="page-header"> <h1>Snapshot: <%= snapshotName %></h1> http://git-wip-us.apache.org/repos/asf/hbase/blob/5a5b854c/hbase-server/src/main/resources/hbase-webapps/master/table.jsp ---------------------------------------------------------------------- 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 e4373fb..4d85eea 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp @@ -98,7 +98,7 @@ </head> <body> <div class="navbar navbar-fixed-top navbar-default"> - <div class="container"> + <div class="container-fluid"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <span class="icon-bar"></span> @@ -133,9 +133,7 @@ if ( fqtn != null ) { } if ( !readOnly && action != null ) { %> -<div class="container"> - - +<div class="container-fluid content"> <div class="row inner_header"> <div class="page-header"> <h1>Table action request accepted</h1> @@ -167,10 +165,7 @@ if ( fqtn != null ) { <% } else { %> -<div class="container"> - - - +<div class="container-fluid content"> <div class="row inner_header"> <div class="page-header"> <h1>Table <small><%= fqtn %></small></h1> @@ -429,7 +424,7 @@ Actions: <% } } 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="page-header"> <h1>Table not ready</h1> http://git-wip-us.apache.org/repos/asf/hbase/blob/5a5b854c/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp b/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp index b25b4ec..0f8a053 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp @@ -51,7 +51,7 @@ <body> <div class="navbar navbar-fixed-top navbar-default"> - <div class="container"> + <div class="container-fluid"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <span class="icon-bar"></span> @@ -76,7 +76,7 @@ </div> </div> - <div class="container"> + <div class="container-fluid content"> <div class="row inner_header"> <div class="page-header"> <h1>User Tables</h1> http://git-wip-us.apache.org/repos/asf/hbase/blob/5a5b854c/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp ---------------------------------------------------------------------- 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 fb35b6f..036d650 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 @@ <body> <div class="navbar navbar-fixed-top navbar-default"> - <div class="container"> + <div class="container-fluid"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <span class="icon-bar"></span> @@ -71,7 +71,7 @@ </div> </div> - <div class="container"> + <div class="container-fluid content"> <div class="row inner_header"> <div class="page-header"> <h1>Zookeeper Dump</h1> http://git-wip-us.apache.org/repos/asf/hbase/blob/5a5b854c/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css ---------------------------------------------------------------------- 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 53e23f4..f3bd9e9 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; } http://git-wip-us.apache.org/repos/asf/hbase/blob/5a5b854c/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp ---------------------------------------------------------------------- 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 73e3f3c..4651ad0 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"); <body> <div class="navbar navbar-fixed-top navbar-default"> - <div class="container"> + <div class="container-fluid"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <span class="icon-bar"></span> @@ -75,7 +75,7 @@ String framed = conf.get("hbase.regionserver.thrift.framed", "false"); </div> </div> -<div class="container"> +<div class="container-fluid"> <div class="row inner_header"> <div class="page-header"> <h1>ThriftServer <small><%= listenPort %></small></h1> http://git-wip-us.apache.org/repos/asf/hbase/blob/5a5b854c/hbase-thrift/src/main/resources/hbase-webapps/static/css/hbase.css ---------------------------------------------------------------------- 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 53e23f4..4b36c80 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; } http://git-wip-us.apache.org/repos/asf/hbase/blob/5a5b854c/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp ---------------------------------------------------------------------- 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 73e3f3c..d5425ab 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"); <body> <div class="navbar navbar-fixed-top navbar-default"> - <div class="container"> + <div class="container-fluid"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <span class="icon-bar"></span> @@ -75,7 +75,7 @@ String framed = conf.get("hbase.regionserver.thrift.framed", "false"); </div> </div> -<div class="container"> +<div class="container-fluid content"> <div class="row inner_header"> <div class="page-header"> <h1>ThriftServer <small><%= listenPort %></small></h1>