hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1496164 - in /hbase/trunk/hbase-server/src/main: jamon/org/apache/hadoop/hbase/tmpl/master/ jamon/org/apache/hadoop/hbase/tmpl/regionserver/ resources/hbase-webapps/master/ resources/hbase-webapps/rest/ resources/hbase-webapps/thrift/
Date Mon, 24 Jun 2013 19:11:14 GMT
Author: stack
Date: Mon Jun 24 19:11:14 2013
New Revision: 1496164

URL: http://svn.apache.org/r1496164
Log:
HBASE-8532 [Webui] Bootstrap based webui compatibility for IE and also fix some page format
issues

Modified:
    hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
    hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
    hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp
    hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
    hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp
    hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp
    hbase/trunk/hbase-server/src/main/resources/hbase-webapps/rest/rest.jsp
    hbase/trunk/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp

Modified: hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon?rev=1496164&r1=1496163&r2=1496164&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
(original)
+++ hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
Mon Jun 24 19:11:14 2013
@@ -47,6 +47,9 @@ org.apache.hadoop.hbase.protobuf.generat
   <& ../common/TaskMonitorTmpl; filter = filter; format = "json" &>
   <%java return; %>
 </%if>
+<!--[if IE]>
+<!DOCTYPE html>
+<![endif]-->
 <?xml version="1.0" encoding="UTF-8" ?>
 <html lang="en">
   <head>

Modified: hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon?rev=1496164&r1=1496163&r2=1496164&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
(original)
+++ hbase/trunk/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
Mon Jun 24 19:11:14 2013
@@ -42,6 +42,9 @@ org.apache.hadoop.hbase.protobuf.generat
   List<HRegionInfo> onlineRegions = ProtobufUtil.getOnlineRegions(regionServer);
   int masterInfoPort = regionServer.getConfiguration().getInt("hbase.master.info.port", 60010);
 </%java>
+<!--[if IE]>
+<!DOCTYPE html>
+<![endif]-->
 <?xml version="1.0" encoding="UTF-8" ?>
 <html lang="en">
   <head>

Modified: hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp?rev=1496164&r1=1496163&r2=1496164&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp (original)
+++ hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp Mon Jun
24 19:11:14 2013
@@ -56,13 +56,10 @@
   String cloneName = request.getParameter("cloneName");
   boolean isActionResultPage = (!readOnly && action != null);
 %>
-
+<!--[if IE]>
+<!DOCTYPE html>
+<![endif]-->
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- Commenting out DOCTYPE so our blue outline shows on hadoop 0.20.205.0, etc.
-     See tail of HBASE-2110 for explaination.
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
--->
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta charset="utf-8">
@@ -156,7 +153,7 @@
       </div>
   </div>
   <h2>Snapshot Attributes</h2>
-  <table class="table" width="90%" >
+  <table class="table table-striped" width="90%" >
     <tr>
         <th>Table</th>
         <th>Creation Time</th>
@@ -212,7 +209,7 @@ HConnectionManager.deleteConnection(hbad
 Actions:
 <p>
 <center>
-<table class="table" width="90%" >
+<table class="table table-striped" width="90%" >
 <tr>
   <form method="get">
   <input type="hidden" name="action" value="clone">

Modified: hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/table.jsp?rev=1496164&r1=1496163&r2=1496164&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/table.jsp (original)
+++ hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/table.jsp Mon Jun 24
19:11:14 2013
@@ -52,13 +52,10 @@
   // This port might be wrong if RS actually ended up using something else.
   int infoPort = conf.getInt("hbase.regionserver.info.port", 60030);
 %>
-
+<!--[if IE]>
+<!DOCTYPE html>
+<![endif]-->
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- Commenting out DOCTYPE so our blue outline shows on hadoop 0.20.205.0, etc.
-     See tail of HBASE-2110 for explaination.
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
--->
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <%
@@ -166,7 +163,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </a>
-          <a class="brand" href="/master-status">HBase Master</a>
+          <a class="brand" href="/master-status"><img src="/static/hbase_logo_small.png"
alt="HBase Logo"/></a>
           <div class="nav-collapse">
             <ul class="nav">
                 <li><a href="/">Home</a></li>
@@ -213,11 +210,12 @@
 <%} else {
   try { %>
 <h2>Table Attributes</h2>
-<table>
+<table class="table table-striped">
   <tr>
       <th>Attribute Name</th>
       <th>Value</th>
-      <th>Description</th></tr>
+      <th>Description</th>
+  </tr>
   <tr>
       <td>Enabled</td>
       <td><%= hbadmin.isTableEnabled(table.getTableName()) %></td>
@@ -287,7 +285,7 @@
 <% } %>
 </table>
 <h2>Regions by Region Server</h2>
-<table class="table"><tr><th>Region Server</th><th>Region Count</th></tr>
+<table class="table table-striped"><tr><th>Region Server</th><th>Region
Count</th></tr>
 <%
   for (Map.Entry<String, Integer> rdEntry : regDistribution.entrySet()) {
 %>

Modified: hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp?rev=1496164&r1=1496163&r2=1496164&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp (original)
+++ hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp Mon
Jun 24 19:11:14 2013
@@ -28,6 +28,9 @@
   HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER);
   Configuration conf = master.getConfiguration();
 %>
+<!--[if IE]>
+<!DOCTYPE html>
+<![endif]-->
 <?xml version="1.0" encoding="UTF-8" ?>
 <html lang="en">
   <head>
@@ -88,7 +91,7 @@
 <%   for(HTableDescriptor htDesc : tables ) { %>
 <tr>
     <td><a href="/table.jsp?name=<%= escapeXml(htDesc.getNameAsString()) %>"><%=
escapeXml(htDesc.getNameAsString()) %></a></td>
-    <td><%= escapeXml(htDesc.toString()) %></td>
+    <td><%= htDesc.toString() %></td>
 </tr>
 <%   }  %>
 

Modified: hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp?rev=1496164&r1=1496163&r2=1496164&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp (original)
+++ hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/zk.jsp Mon Jun 24 19:11:14
2013
@@ -32,7 +32,9 @@
   HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER);
   ZooKeeperWatcher watcher = master.getZooKeeperWatcher();
 %>
-
+<!--[if IE]>
+<!DOCTYPE html>
+<![endif]-->
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- Dont put a doctype jetty doesnt serve the css/js out correctly so we need quirks
mode on -->
 <html xmlns="http://www.w3.org/1999/xhtml">

Modified: hbase/trunk/hbase-server/src/main/resources/hbase-webapps/rest/rest.jsp
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/resources/hbase-webapps/rest/rest.jsp?rev=1496164&r1=1496163&r2=1496164&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/resources/hbase-webapps/rest/rest.jsp (original)
+++ hbase/trunk/hbase-server/src/main/resources/hbase-webapps/rest/rest.jsp Mon Jun 24 19:11:14
2013
@@ -29,7 +29,9 @@ Configuration conf = (Configuration)getS
 long startcode = conf.getLong("startcode", System.currentTimeMillis());
 String listenPort = conf.get("hbase.rest.port", "8080");
 %>
-
+<!--[if IE]>
+<!DOCTYPE html>
+<![endif]-->
 <?xml version="1.0" encoding="UTF-8" ?>
 <html lang="en">
   <head>

Modified: hbase/trunk/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp?rev=1496164&r1=1496163&r2=1496164&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp (original)
+++ hbase/trunk/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp Mon Jun 24
19:11:14 2013
@@ -33,7 +33,9 @@ String implType = conf.get("hbase.region
 String compact = conf.get("hbase.regionserver.thrift.compact", "false");
 String framed = conf.get("hbase.regionserver.thrift.framed", "false");
 %>
-
+<!--[if IE]>
+<!DOCTYPE html>
+<![endif]-->
 <?xml version="1.0" encoding="UTF-8" ?>
 <html lang="en">
   <head>



Mime
View raw message