From 22f2a4165a0c524bf8b4c7e05a61774b906efd5f Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Thu, 22 Aug 2013 12:21:42 -0700 Subject: [PATCH] HBASE-9296 Update to bootstrap 3.0 --- .../hbase/tmpl/master/MasterStatusTmpl.jamon | 36 +- .../hbase/tmpl/regionserver/RSStatusTmpl.jamon | 32 +- .../resources/hbase-webapps/master/snapshot.jsp | 30 +- .../main/resources/hbase-webapps/master/table.jsp | 42 +- .../hbase-webapps/master/tablesDetailed.jsp | 34 +- .../src/main/resources/hbase-webapps/master/zk.jsp | 36 +- .../src/main/resources/hbase-webapps/rest/rest.jsp | 30 +- .../static/css/bootstrap-responsive.css | 1092 --- .../static/css/bootstrap-responsive.min.css | 9 - .../hbase-webapps/static/css/bootstrap-theme.css | 384 + .../static/css/bootstrap-theme.min.css | 1 + .../hbase-webapps/static/css/bootstrap.css | 8598 +++++++++++--------- .../hbase-webapps/static/css/bootstrap.min.css | 8 +- .../static/fonts/glyphicons-halflings-regular.eot | Bin 0 -> 14079 bytes .../static/fonts/glyphicons-halflings-regular.svg | 228 + .../static/fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 29512 bytes .../static/fonts/glyphicons-halflings-regular.woff | Bin 0 -> 16448 bytes .../resources/hbase-webapps/static/js/bootstrap.js | 2514 +++--- .../hbase-webapps/static/js/bootstrap.min.js | 10 +- .../resources/hbase-webapps/static/js/html5shiv.js | 5 - .../main/resources/hbase-webapps/thrift/thrift.jsp | 39 +- 21 files changed, 6614 insertions(+), 6514 deletions(-) delete mode 100644 hbase-server/src/main/resources/hbase-webapps/static/css/bootstrap-responsive.css delete mode 100644 hbase-server/src/main/resources/hbase-webapps/static/css/bootstrap-responsive.min.css create mode 100755 hbase-server/src/main/resources/hbase-webapps/static/css/bootstrap-theme.css create mode 100755 hbase-server/src/main/resources/hbase-webapps/static/css/bootstrap-theme.min.css mode change 100644 => 100755 hbase-server/src/main/resources/hbase-webapps/static/css/bootstrap.css mode change 100644 => 100755 hbase-server/src/main/resources/hbase-webapps/static/css/bootstrap.min.css create mode 100755 hbase-server/src/main/resources/hbase-webapps/static/fonts/glyphicons-halflings-regular.eot create mode 100755 hbase-server/src/main/resources/hbase-webapps/static/fonts/glyphicons-halflings-regular.svg create mode 100755 hbase-server/src/main/resources/hbase-webapps/static/fonts/glyphicons-halflings-regular.ttf create mode 100755 hbase-server/src/main/resources/hbase-webapps/static/fonts/glyphicons-halflings-regular.woff mode change 100644 => 100755 hbase-server/src/main/resources/hbase-webapps/static/js/bootstrap.js mode change 100644 => 100755 hbase-server/src/main/resources/hbase-webapps/static/js/bootstrap.min.js delete mode 100644 hbase-server/src/main/resources/hbase-webapps/static/js/html5shiv.js diff --git hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon index 90cbd0a..9cb2bc5 100644 --- hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon +++ hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon @@ -98,27 +98,25 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); Master: <% master.getServerName().getHostname() %> - - + + - -