From ef325928a923275da5eff63b2a88b26639537a06 Mon Sep 17 00:00:00 2001 From: itsikkes Date: Sun, 17 Jul 2016 19:12:30 +0300 Subject: [PATCH] minor UI Improvements Scanned hosts displayed with their OS, Total monkeys num now presented --- .../ui/css/img/objects/computer-linux.png | Bin 0 -> 6589 bytes .../ui/css/img/objects/computer-windows.png | Bin 0 -> 6613 bytes monkey_island/cc/admin/ui/index.html | 17 +++++++++++++++++ monkey_island/cc/admin/ui/js/monkeys-admin.js | 16 +++++++++++++++- 4 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 monkey_island/cc/admin/ui/css/img/objects/computer-linux.png create mode 100644 monkey_island/cc/admin/ui/css/img/objects/computer-windows.png diff --git a/monkey_island/cc/admin/ui/css/img/objects/computer-linux.png b/monkey_island/cc/admin/ui/css/img/objects/computer-linux.png new file mode 100644 index 0000000000000000000000000000000000000000..9c5dc728ef2cb885cfcf254b836f6d181c4805df GIT binary patch literal 6589 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 + +
+
+ +
+
+ Num of Monkeys: +
+
+
+
+ + + +
diff --git a/monkey_island/cc/admin/ui/js/monkeys-admin.js b/monkey_island/cc/admin/ui/js/monkeys-admin.js index 1afd4adba..ef253ca60 100644 --- a/monkey_island/cc/admin/ui/js/monkeys-admin.js +++ b/monkey_island/cc/admin/ui/js/monkeys-admin.js @@ -63,6 +63,8 @@ function initAdmin() { edges: edges }; + $('#infoNumOfMonkeys').html(monkeys.length) + var options = { }; @@ -132,6 +134,7 @@ function updateMonkeys() { { monkeys.push(new_monkeys[i]); nodes.push(createMonkeyNode(new_monkeys[i])); + $('#infoNumOfMonkeys').html(monkeys.length) } } @@ -196,7 +199,18 @@ function createMonkeyNode(monkey) { } function createMachineNode(machine) { - img = ICONS_DIR + "computer" + ICONS_EXT; + img = "computer"; + + if (undefined != machine.os.type) { + if (machine.os.type == "linux") { + img += "-linux"; + } + else if (machine.os.type == "windows") { + img += "-windows"; + } + } + + img = ICONS_DIR + img + ICONS_EXT; return { 'id': machine.ip_addr,