From dfee49aaf9d4b24ddce7e9475dc8354070707e6b Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Thu, 20 Dec 2012 16:49:42 -0800 Subject: [PATCH] Restyle --- .../hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon | 16 +- .../hbase/tmpl/master/MasterStatusTmpl.jamon | 19 +- .../hbase/tmpl/master/RegionServerListTmpl.jamon | 22 +- .../hbase/tmpl/regionserver/RSStatusTmpl.jamon | 9 +- .../hbase/tmpl/regionserver/RegionListTmpl.jamon | 18 +- .../tmpl/regionserver/ServerMetricsTmpl.jamon | 26 +- .../main/resources/hbase-webapps/master/table.jsp | 24 +- .../hbase-webapps/master/tablesDetailed.jsp | 9 +- .../src/main/resources/hbase-webapps/master/zk.jsp | 7 +- .../static/css/bootstrap-responsive.css | 823 ++++-- .../static/css/bootstrap-responsive.min.css | 4 +- .../hbase-webapps/static/css/bootstrap.css | 3060 +++++++++++++------- .../hbase-webapps/static/css/bootstrap.min.css | 4 +- .../hbase-webapps/static/hbase_logo_small.png | Bin 0 -> 1926 bytes .../resources/hbase-webapps/static/js/bootstrap.js | 820 ++++-- .../hbase-webapps/static/js/bootstrap.min.js | 2 +- .../hbase-webapps/static/js/jquery.min.js | 6 +- .../main/resources/hbase-webapps/static/js/tab.js | 15 +- 18 files changed, 3268 insertions(+), 1616 deletions(-) create mode 100644 hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_small.png diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon index e1861dc..b4a5fea 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon @@ -56,14 +56,14 @@ boolean first = true; [<%for MonitoredTask task : tasks%><%if first%><%java>first = false;<%else>,<% task.toJSON() %>] <%else>

Tasks

-
- Show All Monitored Tasks - Show non-RPC Tasks - Show All RPC Handler Tasks - Show Active RPC Calls - Show Client Operations - View as JSON -
+ <%if tasks.isEmpty()%>

No tasks currently running on this node.

<%else> 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 9587af8..b677792 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 @@ -73,7 +73,7 @@ org.apache.hadoop.hbase.HBaseConfiguration; - HBase Master + HBase Logo