HBASE-26943 HMaster page style display confusion (#4369)

Signed-off-by: Yu Li <liyu@apache.org> Signed-off-by: Nick Dimiduk <ndimiduk@apache.org>
apache · Apr 29, 2022 · e9c9418 · e9c9418
1 parent 3090848
commit e9c9418
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 8 deletions.
diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/log/LogLevel.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/log/LogLevel.java
@@ -396,7 +396,7 @@ private void sendError(HttpServletResponse response, int code, String message)
     }
 
     static final String FORMS = "<div class='container-fluid content'>\n"
-        + "<div class='row inner_header'>\n" + "<div class='page-header'>\n"
+        + "<div class='row inner_header top_header'>\n" + "<div class='page-header'>\n"
         + "<h1>Get/Set Log Level</h1>\n" + "</div>\n" + "</div>\n" + "Actions:" + "<p>"
         + "<center>\n" + "<table class='table' style='border: 0;' width='95%' >\n" + "<tr>\n"
         + "<form>\n" + "<td class='centered'>\n"

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
@@ -174,7 +174,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
 
     <div class="container-fluid content">
 	<%if master.isActiveMaster() %>
-        <div class="row inner_header">
+        <div class="row inner_header top_header">
             <div class="page-header">
                 <h1>Master <small><% master.getServerName().getHostname() %></small></h1>
             </div>

diff --git a/hbase-server/src/main/resources/hbase-webapps/master/hbck.jsp b/hbase-server/src/main/resources/hbase-webapps/master/hbck.jsp
@@ -83,15 +83,15 @@
 
 <div class="container-fluid content">
   <% if (!master.isInitialized()) { %>
-  <div class="row">
+  <div class="row top_header">
     <div class="page-header">
       <h1>Master is not initialized</h1>
     </div>
   </div>
   <jsp:include page="redirect.jsp" />
   <% } else { %>
 
-  <div class="row">
+  <div class="row top_header">
     <div class="page-header">
       <p><span>This page displays two reports: the <em>HBCK Chore Report</em> and
         the <em>CatalogJanitor Consistency Issues</em> report. Only report titles

diff --git a/hbase-server/src/main/resources/hbase-webapps/master/operationDetails.jsp b/hbase-server/src/main/resources/hbase-webapps/master/operationDetails.jsp
@@ -49,7 +49,7 @@
 
 
 <div class="container-fluid content">
-  <div class="row">
+  <div class="row top_header">
     <div class="page-header">
     <h2>Operations Details</h2>
     <p>HBase uses some fixed-size ring buffers to maintain rolling window history of specific server-side operation details.

diff --git a/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp b/hbase-server/src/main/resources/hbase-webapps/master/procedures.jsp
@@ -68,7 +68,7 @@
 </jsp:include>
 
 <div class="container-fluid content">
-  <div class="row">
+  <div class="row top_header">
     <div class="page-header">
       <h1>Procedure Time Statistics</h1>
     </div>

diff --git a/hbase-server/src/main/resources/hbase-webapps/master/processMaster.jsp b/hbase-server/src/main/resources/hbase-webapps/master/processMaster.jsp
@@ -49,7 +49,7 @@ pageContext.setAttribute("pageTitle", "Process info for PID: " + JSONMetricUtil.
 </jsp:include>
 
 <div class="container-fluid content">
-  <div class="row">
+  <div class="row top_header">
       <div class="page-header">
           <h1><%= JSONMetricUtil.getCommmand().split(" ")[0] %></h1>
       </div>

diff --git a/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp b/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp
@@ -36,7 +36,7 @@
 </jsp:include>
 
 <div class="container-fluid content">
-  <div class="row inner_header">
+  <div class="row inner_header top_header">
     <div class="page-header">
       <h1>User Tables</h1>
     </div>

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
@@ -49,6 +49,8 @@ table#userTables td:nth-child(-n+11) {
     overflow-wrap: normal;
 }
 
+.top_header { margin-top: 1.5em; }
+
 /* Region Server page styling */
 
 /* striped tables styling */