hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject [1/2] git commit: HBASE-11905 Add orca to server UIs and update logo
Date Fri, 05 Sep 2014 23:43:49 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 74f49496f -> 196ddc328


HBASE-11905 Add orca to server UIs and update logo


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0bc34934
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0bc34934
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0bc34934

Branch: refs/heads/branch-1
Commit: 0bc349345a96a98e1436209cad1b69422ccd7a43
Parents: 74f4949
Author: stack <stack@apache.org>
Authored: Fri Sep 5 16:43:08 2014 -0700
Committer: stack <stack@apache.org>
Committed: Fri Sep 5 16:43:08 2014 -0700

----------------------------------------------------------------------
 .../hbase/tmpl/master/MasterStatusTmpl.jamon     |   3 ++-
 .../hbase/tmpl/regionserver/RSStatusTmpl.jamon   |   1 +
 .../resources/hbase-webapps/master/table.jsp     |   1 +
 .../hbase-webapps/master/tablesDetailed.jsp      |   1 +
 .../hbase-webapps/static/hbase_logo_small.png    | Bin 1926 -> 3206 bytes
 .../hbase-webapps/static/hbase_logo_small.png    | Bin 1926 -> 3206 bytes
 6 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/0bc34934/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
----------------------------------------------------------------------
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 5130ce5..f060155 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
@@ -118,6 +118,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
                 </button>
                 <a class="navbar-brand" href="/master-status"><img src="/static/hbase_logo_small.png"
alt="HBase Logo"/></a>
             </div>
+            <a class="navbar-brand navbar-right" href="/master-status"><img src="/static/jumping-orca_rotated_12percent.png"
alt="HBase Orca"/></a>
             <div class="collapse navbar-collapse">
                 <ul class="nav navbar-nav">
                 <li class="active"><a href="/">Home</a></li>
@@ -130,7 +131,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
                 <li><a href="/conf">HBase Configuration</a></li>
                 </%if>
                </ul>
-            </div><!--/.nav-collapse -->
+            </div><!--/.nav-collapse BLAH -->
         </div>
     </div>
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/0bc34934/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
----------------------------------------------------------------------
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 3fcac73..eb158cf 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
@@ -78,6 +78,7 @@ org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
                 </button>
                 <a class="navbar-brand" href="/rs-status"><img src="/static/hbase_logo_small.png"
alt="HBase Logo"/></a>
             </div>
+            <a class="navbar-brand navbar-right" href="/master-status"><img src="/static/jumping-orca_rotated_12percent.png"
alt="HBase Orca"/></a>
             <div class="collapse navbar-collapse">
                 <ul class="nav navbar-nav">
                 <li class="active"><a href="/">Home</a></li>

http://git-wip-us.apache.org/repos/asf/hbase/blob/0bc34934/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
----------------------------------------------------------------------
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 33df7db..f3421be 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
@@ -100,6 +100,7 @@
             </button>
             <a class="navbar-brand" href="/master-status"><img src="/static/hbase_logo_small.png"
alt="HBase Logo"/></a>
         </div>
+        <a class="navbar-brand navbar-right" href="/master-status"><img src="/static/jumping-orca_rotated_12percent.png"
alt="HBase Orca"/></a>
         <div class="collapse navbar-collapse">
             <ul class="nav navbar-nav">
                 <li><a href="/master-status">Home</a></li>

http://git-wip-us.apache.org/repos/asf/hbase/blob/0bc34934/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp
----------------------------------------------------------------------
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 9bed70b..56f0357 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp
@@ -58,6 +58,7 @@
               </button>
               <a class="navbar-brand" href="/master-status"><img src="/static/hbase_logo_small.png"
alt="HBase Logo"/></a>
           </div>
+         <a class="navbar-brand pull-right" href="/master-status"><img src="/static/jumping-orca_rotated_12percent.png"
alt="HBase Orca"/></a>
           <div class="collapse navbar-collapse">
               <ul class="nav navbar-nav">
                   <li class="active"><a href="/master-status">Home</a></li>

http://git-wip-us.apache.org/repos/asf/hbase/blob/0bc34934/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_small.png
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_small.png b/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_small.png
index 8c6353a..60452b6 100644
Binary files a/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_small.png and
b/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo_small.png differ

http://git-wip-us.apache.org/repos/asf/hbase/blob/0bc34934/hbase-thrift/src/main/resources/hbase-webapps/static/hbase_logo_small.png
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/resources/hbase-webapps/static/hbase_logo_small.png b/hbase-thrift/src/main/resources/hbase-webapps/static/hbase_logo_small.png
index 8c6353a..60452b6 100644
Binary files a/hbase-thrift/src/main/resources/hbase-webapps/static/hbase_logo_small.png and
b/hbase-thrift/src/main/resources/hbase-webapps/static/hbase_logo_small.png differ


Mime
View raw message