You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2017/12/08 01:00:27 UTC
[accumulo] branch master updated: ACCUMULO-4759 Add Accumulo logo
images to monitor
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/master by this push:
new 20427fc ACCUMULO-4759 Add Accumulo logo images to monitor
20427fc is described below
commit 20427fcd7d440eb1946090d1063700a01068b9c2
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Thu Dec 7 19:43:59 2017 -0500
ACCUMULO-4759 Add Accumulo logo images to monitor
* Add an avatar image to the left of the instance name in the navbar
* Add the full image to the modal "About" box
* Remove unused footer
* Remove unneeded display and code related to displaying user's current
date/time
* Lighten up text color on navbar to match with image better and to be
more readable
---
.../accumulo/monitor/resources/css/screen.css | 14 ++++++-
.../monitor/resources/images/accumulo-avatar.png | Bin 0 -> 1601 bytes
.../monitor/resources/images/accumulo-logo.png | Bin 0 -> 11427 bytes
.../apache/accumulo/monitor/resources/js/navbar.js | 2 -
.../apache/accumulo/monitor/templates/footer.ftl | 44 ---------------------
.../apache/accumulo/monitor/templates/modals.ftl | 25 +++++++++---
.../apache/accumulo/monitor/templates/navbar.ftl | 5 +--
7 files changed, 33 insertions(+), 57 deletions(-)
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/css/screen.css b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/css/screen.css
index 2a9d844..8ffc3e0 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/css/screen.css
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/css/screen.css
@@ -421,6 +421,13 @@ pre.logevent {
/*float: left;*/
}
+#accumulo-avatar {
+ margin: 8px;
+ border-radius: 5px;
+ width: 32px;
+ height: 32px;
+}
+
.center-block {
width: 100%;
}
@@ -465,4 +472,9 @@ pre.logevent {
font: 10px sans-serif;
/*background: yellow;
box-shadow: 2px 2px 1px #888;*/
-}
\ No newline at end of file
+}
+
+/* gently lighten the bootstrap text color for the navbar */
+.navbar-inverse .navbar-brand, .navbar-inverse .navbar-nav > li > a {
+ color: #d3d3d3;
+}
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/images/accumulo-avatar.png b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/images/accumulo-avatar.png
new file mode 100644
index 0000000..55befbe
Binary files /dev/null and b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/images/accumulo-avatar.png differ
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/images/accumulo-logo.png b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/images/accumulo-logo.png
new file mode 100644
index 0000000..5b0f6b4
Binary files /dev/null and b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/images/accumulo-logo.png differ
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/navbar.js b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/navbar.js
index ca8aa7c..bd5af7b 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/navbar.js
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/navbar.js
@@ -48,8 +48,6 @@ function refreshNavBar() {
*/
function refreshSideBarNotifications() {
- $('#currentDate').html(Date());
-
var data = sessionStorage.status === undefined ?
undefined : JSON.parse(sessionStorage.status);
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/footer.ftl b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/footer.ftl
deleted file mode 100644
index 7c8a7b5..0000000
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/footer.ftl
+++ /dev/null
@@ -1,44 +0,0 @@
-<#--
- 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.
--->
- <footer id="footer">
- <div>
- <div class="input-group input-group-sm" style="float: left; width: 15%;">
- <span class="smalltext">Refresh Rate </span>
- <span class="input-group-btn">
- <button type="button" class="btn btn-default">
- <span class="glyphicon glyphicon-minus-sign"></span>
- </button>
- </span>
- <input type="text" class="form-control">
- <span class="input-group-btn">
- <button type="button" class="btn btn-default">
- <span class="glyphicon glyphicon-plus-sign">
- </button>
- </span>
- </div>
- <div style="float: left; width: 70%;">
- <div class="smalltext"><a href="https://accumulo.apache.org/" target="_blank">Apache Accumulo</a>
- ${version}
- </div>
- <div class="smalltext">${instance_id}</div>
- <div class="smalltext" id="currentDate"></div>
- <script>
- document.getElementById('currentDate').innerHTML = Date();
- </script>
- </div>
- </div>
- </footer>
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/modals.ftl b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/modals.ftl
index d2205c0..43a7e25 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/modals.ftl
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/modals.ftl
@@ -21,14 +21,27 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">×</button>
- <h4 class="modal-title">About ${instance_name}</h4>
+ <span class="modal-title"><a href="https://accumulo.apache.org" target="_blank"><img alt="Apache Accumulo" src="/resources/images/accumulo-logo.png" /></a></span>
</div>
<div class="modal-body">
- <p><a href='https://accumulo.apache.org/' target='_blank'>Apache Accumulo</a>
- ${version}
- </p>
- <p>${instance_id}</p>
- <p id='currentDate'></p>
+ <div class="container-fluid">
+ <div class="row">
+ <div class="col-sm-4 text-right">Software</div>
+ <div class="col-sm-6 text-left"><a href="https://accumulo.apache.org" target="_blank">Apache Accumulo</a></div>
+ </div>
+ <div class="row">
+ <div class="col-sm-4 text-right">Version</div>
+ <div class="col-sm-6 text-left">${version}</div>
+ </div>
+ <div class="row">
+ <div class="col-sm-4 text-right">Instance Name</div>
+ <div class="col-sm-6 text-left">${instance_name}</div>
+ </div>
+ <div class="row">
+ <div class="col-sm-4 text-right">Instance Id</div>
+ <div class="col-sm-6 text-left">${instance_id}</div>
+ </div>
+ </div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
index 6cd2beb..7909007 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/navbar.ftl
@@ -23,6 +23,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
+ <img id="accumulo-avatar" class="navbar-left pull-left" src="/resources/images/accumulo-avatar.png" />
<a class="navbar-brand" id="headertitle" href="/">${instance_name}</a>
</div>
<!-- Nav links -->
@@ -79,7 +80,3 @@
</ul>
</div>
</div>
- <script>
- // Obtain the current time
- document.getElementById('currentDate').innerHTML = Date();
- </script>
--
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <co...@accumulo.apache.org>'].