You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@warble.apache.org by hu...@apache.org on 2018/06/26 22:56:50 UTC
[incubator-warble-server] branch master updated (b4bdeed -> 83101b3)
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-warble-server.git.
from b4bdeed ditch alignment
new f97633e add in fingerprint for verification purposes
new 83101b3 regen JS
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ui/js/coffee/warble_clientlist.coffee | 11 ++++++++++-
ui/js/warble.v1.js | 11 +++++++++--
2 files changed, 19 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@warble.apache.org
For additional commands, e-mail: commits-help@warble.apache.org
[incubator-warble-server] 01/02: add in fingerprint for
verification purposes
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-warble-server.git
commit f97633e4d853843bb10cfb8f75ee83a59ded7b54
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Tue Jun 26 17:56:36 2018 -0500
add in fingerprint for verification purposes
---
ui/js/coffee/warble_clientlist.coffee | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/ui/js/coffee/warble_clientlist.coffee b/ui/js/coffee/warble_clientlist.coffee
index 47038f8..cf8a61e 100644
--- a/ui/js/coffee/warble_clientlist.coffee
+++ b/ui/js/coffee/warble_clientlist.coffee
@@ -18,7 +18,7 @@ makeClientType = (main, t) ->
set(tbl, 'class', 'table table-striped')
thead = mk('thead')
tr = mk('tr')
- for el in ['ID', 'IP', 'Hostname', 'Location', 'Verified', 'Enabled', 'Last Ping', 'Actions']
+ for el in ['ID', 'IP', 'Hostname / Fingerprint', 'Location', 'Verified', 'Enabled', 'Last Ping', 'Actions']
td = mk('th')
if el.match(/Hostname/)
td.style.width = "200px"
@@ -85,6 +85,13 @@ clientlist = (json, state) ->
# node hostname
t = mk('td')
app(t, txt(source.hostname))
+ app(t, mk('br'))
+ fp = mk('kbd', {}, source.fingerprint)
+ fp.style.fontWeight = 'normal'
+ fp.style.color = '#333'
+ fp.style.background = 'none'
+ fp.style.boxShadow = 'none'
+ app(t, fp)
app(d, t)
# node location
@@ -155,6 +162,8 @@ clientlist = (json, state) ->
app(d, act)
tbody.inject(d)
+
+
#app(slist, tbl)
state.widget.inject(slist, true)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@warble.apache.org
For additional commands, e-mail: commits-help@warble.apache.org
[incubator-warble-server] 02/02: regen JS
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-warble-server.git
commit 83101b3bd40416128e303fb06b6324903b16e337
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Tue Jun 26 17:56:42 2018 -0500
regen JS
---
ui/js/warble.v1.js | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/ui/js/warble.v1.js b/ui/js/warble.v1.js
index 3bc1351..f1863e5 100644
--- a/ui/js/warble.v1.js
+++ b/ui/js/warble.v1.js
@@ -4592,7 +4592,7 @@ makeClientType = function(main, t) {
set(tbl, 'class', 'table table-striped');
thead = mk('thead');
tr = mk('tr');
- ref = ['ID', 'IP', 'Hostname', 'Location', 'Verified', 'Enabled', 'Last Ping', 'Actions'];
+ ref = ['ID', 'IP', 'Hostname / Fingerprint', 'Location', 'Verified', 'Enabled', 'Last Ping', 'Actions'];
for (q = 0, len = ref.length; q < len; q++) {
el = ref[q];
td = mk('th');
@@ -4629,7 +4629,7 @@ modifyNode = function(id, stats) {
};
clientlist = function(json, state) {
- var act, d, dbtn, len, q, retval, slist, source, sources, t, tbody, ts, vlist;
+ var act, d, dbtn, fp, len, q, retval, slist, source, sources, t, tbody, ts, vlist;
slist = mk('div');
vlist = new HTML('div');
if (json.nodes) {
@@ -4664,6 +4664,13 @@ clientlist = function(json, state) {
app(d, t);
t = mk('td');
app(t, txt(source.hostname));
+ app(t, mk('br'));
+ fp = mk('kbd', {}, source.fingerprint);
+ fp.style.fontWeight = 'normal';
+ fp.style.color = '#333';
+ fp.style.background = 'none';
+ fp.style.boxShadow = 'none';
+ app(t, fp);
app(d, t);
t = mk('td');
app(t, txt(source.location || "(unknown)"));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@warble.apache.org
For additional commands, e-mail: commits-help@warble.apache.org