hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject hbase git commit: HBASE-13056 Refactor table.jsp code to remove repeated code and make it easier to add new checks (Vikas Vishwakarma)
Date Sat, 21 Feb 2015 01:41:20 GMT
Repository: hbase
Updated Branches:
  refs/heads/0.98 530196836 -> b8e273d88


HBASE-13056 Refactor table.jsp code to remove repeated code and make it easier to add new
checks (Vikas Vishwakarma)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b8e273d8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b8e273d8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b8e273d8

Branch: refs/heads/0.98
Commit: b8e273d880af757d72655b2e9dce16817839d96b
Parents: 5301968
Author: Andrew Purtell <apurtell@apache.org>
Authored: Fri Feb 20 17:35:09 2015 -0800
Committer: Andrew Purtell <apurtell@apache.org>
Committed: Fri Feb 20 17:35:09 2015 -0800

----------------------------------------------------------------------
 .../resources/hbase-webapps/master/table.jsp    | 69 +++++---------------
 1 file changed, 17 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/b8e273d8/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 ae848f2..cb892ab 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
@@ -50,21 +50,21 @@
   if (showFragmentation) {
       frags = FSUtils.getTableFragmentation(master);
   }
+  String action = request.getParameter("action");
+  String key = request.getParameter("key");
 %>
 <!--[if IE]>
 <!DOCTYPE html>
 <![endif]-->
 <?xml version="1.0" encoding="UTF-8" ?>
 <html xmlns="http://www.w3.org/1999/xhtml">
-
-<%
-  String action = request.getParameter("action");
-  String key = request.getParameter("key");
-  if ( !readOnly && action != null ) {
-%>
   <head>
     <meta charset="utf-8">
-    <title>HBase Master: <%= master.getServerName() %></title>
+    <% if ( !readOnly && action != null ) { %>
+        <title>HBase Master: <%= master.getServerName() %></title>
+    <% } else { %>
+        <title>Table: <%= fqtn %></title>
+    <% } %>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
@@ -73,11 +73,17 @@
       <link href="/static/css/bootstrap.min.css" rel="stylesheet">
       <link href="/static/css/bootstrap-theme.min.css" rel="stylesheet">
       <link href="/static/css/hbase.css" rel="stylesheet">
+      <% if ( !readOnly && action != null ) { %>
 	  <script type="text/javascript">
       <!--
 		  setTimeout("history.back()",5000);
 	  -->
 	  </script>
+      <% } else { %>
+      <!--[if lt IE 9]>
+          <script src="/static/js/html5shiv.js"></script>
+      <![endif]-->
+      <% } %>
 </head>
 <body>
 <div class="navbar  navbar-fixed-top navbar-default">
@@ -105,6 +111,9 @@
         </div><!--/.nav-collapse -->
     </div>
 </div>
+<%
+if ( !readOnly && action != null ) {
+%>
 <div class="container">
 
 
@@ -134,53 +143,9 @@
 %>
 <p>Go <a href="javascript:history.back()">Back</a>, or wait for the redirect.
 </div>
-<script src="/static/js/jquery.min.js" type="text/javascript"></script>
-<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
-</body>
 <%
 } else {
 %>
-  <head>
-    <meta charset="utf-8">
-    <title>Table: <%= fqtn %></title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-
-
-      <link href="/static/css/bootstrap.min.css" rel="stylesheet">
-      <link href="/static/css/bootstrap-theme.min.css" rel="stylesheet">
-      <link href="/static/css/hbase.css" rel="stylesheet">
-    <!--[if lt IE 9]>
-      <script src="/static/js/html5shiv.js"></script>
-    <![endif]-->
-  </head>
-<body>
-<div class="navbar  navbar-fixed-top navbar-default">
-    <div class="container">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="/master-status"><img src="/static/hbase_logo_small.png"
alt="HBase Logo"/></a>
-        </div>
-        <div class="collapse navbar-collapse">
-            <ul class="nav navbar-nav">
-                <li><a href="/master-status">Home</a></li>
-                <li><a href="/tablesDetailed.jsp">Table Details</a></li>
-                <li><a href="/logs/">Local Logs</a></li>
-                <li><a href="/logLevel">Log Level</a></li>
-                <li><a href="/dump">Debug Dump</a></li>
-                <li><a href="/jmx">Metrics Dump</a></li>
-                <% if (HBaseConfiguration.isShowConfInServlet()) { %>
-                <li><a href="/conf">HBase Configuration</a></li>
-                <% } %>
-            </ul>
-        </div><!--/.nav-collapse -->
-    </div>
-</div>
 <div class="container">
 
 
@@ -362,9 +327,9 @@ Actions:
 </table>
 </center>
 </p>
+<% } %>
 </div>
 </div>
-<% } %>
 <%
 }
 %>


Mime
View raw message