From 72aa146d01355d02d21bedd7ec81a0ddd996cc5f Mon Sep 17 00:00:00 2001
From: Andrew Kyle Purtell <apurtell@apache.org>
Date: Fri, 22 Jun 2012 00:03:04 +0000
Subject: [PATCH] HBASE-6255. Right align hbase logo in web UI (Elliott Clark)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1352732 13f79535-47bb-0310-9956-ffa450edef68
---
 .../hbase/tmpl/master/MasterStatusTmpl.jamon  |  8 +---
 .../tmpl/regionserver/RSStatusTmpl.jamon      |  8 +---
 .../resources/hbase-webapps/master/table.jsp  |  8 +---
 .../hbase-webapps/master/tablesDetailed.jsp   |  8 +---
 .../hbase-webapps/static/{ => css}/hbase.css  | 38 +------------------
 5 files changed, 10 insertions(+), 60 deletions(-)
 rename hbase-server/src/main/resources/hbase-webapps/static/{ => css}/hbase.css (55%)

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 82401c0a357..3b303d7e5f5 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
@@ -56,12 +56,8 @@ org.apache.hadoop.hbase.HBaseConfiguration;
     <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.HBaseConfiguration;
             <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>
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
index 05b1bd39612..3be34464d7d 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
@@ -54,11 +54,7 @@ org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionLoad;
     <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.generated.HBaseProtos.RegionLoad;
         <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>
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 e6ba9a07179..a2b42970deb 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
@@ -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>
diff --git a/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp b/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp
index f753a8f385c..d087029658b 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp
@@ -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>
diff --git a/hbase-server/src/main/resources/hbase-webapps/static/hbase.css b/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css
similarity index 55%
rename from hbase-server/src/main/resources/hbase-webapps/static/hbase.css
rename to hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css
index 1fbdba14ee4..5fc6d316c5d 100644
--- a/hbase-server/src/main/resources/hbase-webapps/static/hbase.css
+++ b/hbase-server/src/main/resources/hbase-webapps/static/css/hbase.css
@@ -15,39 +15,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-h1, h2, h3 { color: DarkSlateBlue }
-table { border: thin solid DodgerBlue }
-tr { border: thin solid DodgerBlue }
-td { border: thin solid DodgerBlue }
-th { border: thin solid DodgerBlue }
-#logo {float: right;}
-#logo img {border: none;}
-#page_title {}
-#tasks_menu {
-  padding: 10px;
-}
-
-div.warning {
-  border: 1px solid #666;
-  background-color: #fcc;
-  font-size: 110%;
-  font-weight: bold;
-}
-
-td.undeployed-region {
-  background-color: #faa;
-}
-
-tr.task-monitor-COMPLETE td {
-  background-color: #afa;
-}
-
-tr.task-monitor-ABORTED td {
-  background-color: #ffa;
-}
-
-tr.task-monitor-WAITING td {
-  background-color: #ccc;
-  font-style: italic;
-}
-+ 
+body { padding-top: 60px; }
+.logo img { float: right; }