You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2012/06/22 02:03:05 UTC
svn commit: r1352732 - 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/static/
resources/hbase-webapps/static/css/
Author: apurtell
Date: Fri Jun 22 00:03:04 2012
New Revision: 1352732
URL: http://svn.apache.org/viewvc?rev=1352732&view=rev
Log:
HBASE-6255. Right align hbase logo in web UI (Elliott Clark)
Added:
hbase/trunk/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css
Removed:
hbase/trunk/hbase-server/src/main/resources/hbase-webapps/static/hbase.css
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/table.jsp
hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.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=1352732&r1=1352731&r2=1352732&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 Fri Jun 22 00:03:04 2012
@@ -56,12 +56,8 @@ org.apache.hadoop.hbase.HBaseConfigurati
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<link href="/static/css/bootstrap.css" rel="stylesheet">
- <style type="text/css">
- body {
- padding-top: 60px;
- }
- </style>
<link href="/static/css/bootstrap-responsive.css" rel="stylesheet">
+ <link href="/static/css/hbase.css" rel="stylesheet">
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
@@ -100,7 +96,7 @@ org.apache.hadoop.hbase.HBaseConfigurati
<div class="span8">
<h1>Master: <% master.getServerName().getHostname() %> </h1>
</div>
- <div class="span4">
+ <div class="span4 logo">
<img src="/static/hbase_logo.png" height="66" width="266" alt="HBase logo"/>
</div>
</div>
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=1352732&r1=1352731&r2=1352732&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 Fri Jun 22 00:03:04 2012
@@ -54,11 +54,7 @@ org.apache.hadoop.hbase.protobuf.generat
<meta name="description" content="">
<link href="/static/css/bootstrap.css" rel="stylesheet">
- <style type="text/css">
- body {
- padding-top: 60px;
- }
- </style>
+ <link href="/static/css/hbase.css" rel="stylesheet">
<link href="/static/css/bootstrap-responsive.css" rel="stylesheet">
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
@@ -97,7 +93,7 @@ org.apache.hadoop.hbase.protobuf.generat
<div class="span8">
<h1>RegionServer: <% serverName.getHostname() %></h1>
</div>
- <div class="span4">
+ <div class="span4 logo">
<img src="/static/hbase_logo.png" height="66" width="266" alt="HBase logo"/>
</div>
</div>
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=1352732&r1=1352731&r2=1352732&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 Fri Jun 22 00:03:04 2012
@@ -73,11 +73,7 @@
<link href="/static/css/bootstrap.css" rel="stylesheet">
- <style>
- body {
- padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
- }
- </style>
+ <link href="/static/css/hbase.css" rel="stylesheet">
<link href="/static/css/bootstrap-responsive.css" rel="stylesheet">
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
@@ -114,7 +110,7 @@
<div class="span8">
<h1>Table action request accepted</h1>
</div>
- <div class="span4">
+ <div class="span4 logo">
<img src="/static/hbase_logo.png" height="66" width="266" alt="HBase logo"/>
</div>
</div>
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=1352732&r1=1352731&r2=1352732&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 Fri Jun 22 00:03:04 2012
@@ -38,11 +38,7 @@
<link href="/static/css/bootstrap.css" rel="stylesheet">
- <style>
- body {
- padding-top: 60px;
- }
- </style>
+ <link href="/static/css/hbase.css" rel="stylesheet">
<link href="/static/css/bootstrap-responsive.css" rel="stylesheet">
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
@@ -79,7 +75,7 @@
<div class="span8">
<h1>User Tables</h1>
</div>
- <div class="span4">
+ <div class="span4 logo">
<img src="/static/hbase_logo.png" height="66" width="266" alt="HBase logo"/>
</div>
</div>
Added: hbase/trunk/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css?rev=1352732&view=auto
==============================================================================
--- hbase/trunk/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css (added)
+++ hbase/trunk/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css Fri Jun 22 00:03:04 2012
@@ -0,0 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+body { padding-top: 60px; }
+.logo img { float: right; }