From 44b501164413f0b2d458923b951a7158abee081a Mon Sep 17 00:00:00 2001 From: Zackary Lowery Date: Fri, 9 Sep 2016 18:08:04 -0400 Subject: [PATCH 01/19] Corrected file casing in the README. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 77a22f3..5f0ee66 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Currently the tool can be used to monitor the following information: * Processor model * Processor clock speed on variable clock speed models -* Processor Utilization +* Processor utilization * Memory utilization * Swap utilization * Mount points and disk utilization From 06b00a056dbb05854831ea1e97f9dc6fc15ed022 Mon Sep 17 00:00:00 2001 From: Zackary Lowery Date: Fri, 9 Sep 2016 18:14:07 -0400 Subject: [PATCH 02/19] Moved the LSB release assignments to the lsb-release module. --- blurmonitor/routes/system.js | 9 +-------- blurmonitor/services/lsb-release.js | 7 +++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/blurmonitor/routes/system.js b/blurmonitor/routes/system.js index 1447ce0..2669081 100644 --- a/blurmonitor/routes/system.js +++ b/blurmonitor/routes/system.js @@ -25,14 +25,7 @@ function getRoutes() { var promise = new Promise(function (resolve) { lsbRelease.getRelease.then(function (release) { - release = lsbRelease.parse(release); - - response.distro = {}; - response.distro.id = release.DISTRIB_ID; - response.distro.release = release.DISTRIB_RELEASE; - response.distro.codeName = release.DISTRIB_CODENAME; - response.distro.description = release.DISTRIB_DESCRIPTION; - + response.distro = lsbRelease.parse(release); resolve(response); }); }); diff --git a/blurmonitor/services/lsb-release.js b/blurmonitor/services/lsb-release.js index 5082d02..c55e744 100644 --- a/blurmonitor/services/lsb-release.js +++ b/blurmonitor/services/lsb-release.js @@ -31,5 +31,12 @@ function parseRelease(stdout) { } }); + lsbRelease = { + id: release.DISTRIB_ID, + release: release.DISTRIB_RELEASE, + codeName: release.DISTRIB_CODENAME, + description: release.DISTRIB_DESCRIPTION + }; + return lsbRelease; } From 21c0a8de12591ca21ea1b935c7b5219f6107fe40 Mon Sep 17 00:00:00 2001 From: Zackary Lowery Date: Fri, 9 Sep 2016 18:29:03 -0400 Subject: [PATCH 03/19] Added icon support for screen. --- src/assets/img/app/apps/SCREEN.svg | 1 + src/assets/img/app/apps/screen.svg | 1 + 2 files changed, 2 insertions(+) create mode 120000 src/assets/img/app/apps/SCREEN.svg create mode 120000 src/assets/img/app/apps/screen.svg diff --git a/src/assets/img/app/apps/SCREEN.svg b/src/assets/img/app/apps/SCREEN.svg new file mode 120000 index 0000000..192ef42 --- /dev/null +++ b/src/assets/img/app/apps/SCREEN.svg @@ -0,0 +1 @@ +./utilities-terminal.svg \ No newline at end of file diff --git a/src/assets/img/app/apps/screen.svg b/src/assets/img/app/apps/screen.svg new file mode 120000 index 0000000..192ef42 --- /dev/null +++ b/src/assets/img/app/apps/screen.svg @@ -0,0 +1 @@ +./utilities-terminal.svg \ No newline at end of file From a42505f2d2866fe4b700f2c803eb230f7f082f50 Mon Sep 17 00:00:00 2001 From: Zackary Lowery Date: Fri, 9 Sep 2016 18:29:41 -0400 Subject: [PATCH 04/19] Corrected the parsing of the lsb-release module to support the async call to cat. --- blurmonitor/services/lsb-release.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/blurmonitor/services/lsb-release.js b/blurmonitor/services/lsb-release.js index c55e744..fc2950d 100644 --- a/blurmonitor/services/lsb-release.js +++ b/blurmonitor/services/lsb-release.js @@ -31,12 +31,12 @@ function parseRelease(stdout) { } }); - lsbRelease = { - id: release.DISTRIB_ID, - release: release.DISTRIB_RELEASE, - codeName: release.DISTRIB_CODENAME, - description: release.DISTRIB_DESCRIPTION + var parsedRelease = { + id: lsbRelease.DISTRIB_ID, + release: lsbRelease.DISTRIB_RELEASE, + codeName: lsbRelease.DISTRIB_CODENAME, + description: lsbRelease.DISTRIB_DESCRIPTION }; - return lsbRelease; + return parsedRelease; } From 4149729f909a5eca99030f267fe3e8c12688b180 Mon Sep 17 00:00:00 2001 From: Zackary Lowery Date: Fri, 9 Sep 2016 18:34:48 -0400 Subject: [PATCH 05/19] Recreated the sh icon with a explicitly specified relative path. --- src/assets/img/app/apps/sh.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/img/app/apps/sh.svg b/src/assets/img/app/apps/sh.svg index 08ba74f..192ef42 120000 --- a/src/assets/img/app/apps/sh.svg +++ b/src/assets/img/app/apps/sh.svg @@ -1 +1 @@ -utilities-terminal.svg \ No newline at end of file +./utilities-terminal.svg \ No newline at end of file From dfc7d8cc5c83ed39cd81266e3b72181faa663d8c Mon Sep 17 00:00:00 2001 From: Zackary Lowery Date: Fri, 9 Sep 2016 19:00:41 -0400 Subject: [PATCH 06/19] Modified the build script to copy symlinks. --- gulp/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulp/build.js b/gulp/build.js index 8a50e5a..bc7c54f 100644 --- a/gulp/build.js +++ b/gulp/build.js @@ -101,7 +101,7 @@ gulp.task('fonts', function () { gulp.task('other', ['copyVendorImages'], function () { var fileFilter = $.filter(function (file) { - return file.stat.isFile(); + return file.stat.isFile() || file.stat.isSymbolicLink(); }); return gulp.src([ From dbfb6119f40cb2c92ae1d28985dda510e799e0d2 Mon Sep 17 00:00:00 2001 From: Zackary Lowery Date: Fri, 9 Sep 2016 19:05:48 -0400 Subject: [PATCH 07/19] Added a logo for Node applications. --- src/assets/img/app/apps/node.svg | 1 + src/assets/img/app/apps/nodejs.svg | 1 + 2 files changed, 2 insertions(+) create mode 100644 src/assets/img/app/apps/node.svg create mode 120000 src/assets/img/app/apps/nodejs.svg diff --git a/src/assets/img/app/apps/node.svg b/src/assets/img/app/apps/node.svg new file mode 100644 index 0000000..b0d0f7d --- /dev/null +++ b/src/assets/img/app/apps/node.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/img/app/apps/nodejs.svg b/src/assets/img/app/apps/nodejs.svg new file mode 120000 index 0000000..9f37038 --- /dev/null +++ b/src/assets/img/app/apps/nodejs.svg @@ -0,0 +1 @@ +node.svg \ No newline at end of file From 0cd86dd81c4591eff1529a96c380d9ed39519ee6 Mon Sep 17 00:00:00 2001 From: Zackary Lowery Date: Fri, 9 Sep 2016 19:19:22 -0400 Subject: [PATCH 08/19] Included additonal application and service logos. --- src/assets/img/app/apps/Plex DLNA Server.svg | 1 + src/assets/img/app/apps/Plex Media Server.svg | 1 + src/assets/img/app/apps/Plex.svg | 1 + src/assets/img/app/apps/plex.svg | 10 ++ src/assets/img/app/apps/redis-server.svg | 93 +++++++++++++++++++ src/assets/img/app/apps/sidekiq.svg | 1 + src/assets/img/app/apps/xfdesktop.svg | 1 + 7 files changed, 108 insertions(+) create mode 120000 src/assets/img/app/apps/Plex DLNA Server.svg create mode 120000 src/assets/img/app/apps/Plex Media Server.svg create mode 120000 src/assets/img/app/apps/Plex.svg create mode 100644 src/assets/img/app/apps/plex.svg create mode 100644 src/assets/img/app/apps/redis-server.svg create mode 100644 src/assets/img/app/apps/sidekiq.svg create mode 120000 src/assets/img/app/apps/xfdesktop.svg diff --git a/src/assets/img/app/apps/Plex DLNA Server.svg b/src/assets/img/app/apps/Plex DLNA Server.svg new file mode 120000 index 0000000..803959f --- /dev/null +++ b/src/assets/img/app/apps/Plex DLNA Server.svg @@ -0,0 +1 @@ +plex.svg \ No newline at end of file diff --git a/src/assets/img/app/apps/Plex Media Server.svg b/src/assets/img/app/apps/Plex Media Server.svg new file mode 120000 index 0000000..803959f --- /dev/null +++ b/src/assets/img/app/apps/Plex Media Server.svg @@ -0,0 +1 @@ +plex.svg \ No newline at end of file diff --git a/src/assets/img/app/apps/Plex.svg b/src/assets/img/app/apps/Plex.svg new file mode 120000 index 0000000..803959f --- /dev/null +++ b/src/assets/img/app/apps/Plex.svg @@ -0,0 +1 @@ +plex.svg \ No newline at end of file diff --git a/src/assets/img/app/apps/plex.svg b/src/assets/img/app/apps/plex.svg new file mode 100644 index 0000000..cbfe750 --- /dev/null +++ b/src/assets/img/app/apps/plex.svg @@ -0,0 +1,10 @@ + + + + +Created by potrace 1.13, written by Peter Selinger 2001-2015 + + + + + \ No newline at end of file diff --git a/src/assets/img/app/apps/redis-server.svg b/src/assets/img/app/apps/redis-server.svg new file mode 100644 index 0000000..d9a83c7 --- /dev/null +++ b/src/assets/img/app/apps/redis-server.svg @@ -0,0 +1,93 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/src/assets/img/app/apps/sidekiq.svg b/src/assets/img/app/apps/sidekiq.svg new file mode 100644 index 0000000..80e50f4 --- /dev/null +++ b/src/assets/img/app/apps/sidekiq.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/img/app/apps/xfdesktop.svg b/src/assets/img/app/apps/xfdesktop.svg new file mode 120000 index 0000000..e3e698a --- /dev/null +++ b/src/assets/img/app/apps/xfdesktop.svg @@ -0,0 +1 @@ +xfce4-panel-menu.svg \ No newline at end of file From 818abf0d45dd470b488a54d5a3e77aad0cc133e5 Mon Sep 17 00:00:00 2001 From: Zackary Lowery Date: Fri, 9 Sep 2016 19:46:49 -0400 Subject: [PATCH 09/19] Disabled the web worker for the process tree and allowed it to load with the controller. --- src/app/pages/processes/processes.controller.js | 6 +++--- src/app/pages/processes/processes.html | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/app/pages/processes/processes.controller.js b/src/app/pages/processes/processes.controller.js index b19e7a0..7c7615c 100644 --- a/src/app/pages/processes/processes.controller.js +++ b/src/app/pages/processes/processes.controller.js @@ -16,7 +16,7 @@ vm.treeConfig = { core: { multiple: false, - worker: true + worker: false }, types: { process: { @@ -44,7 +44,7 @@ vm.treeConfig.types[appAsset].icon = '/assets/img/app/apps/' + appAsset + '.svg'; }); - getProcesses(false); + getProcesses(true); vm.interval = $interval(function() { getProcesses(false); @@ -60,7 +60,7 @@ vm.processes = response; if(updateTree) { - mapProcessesToTree(vm.processes); + mapProcessesToTree(vm.processes); } else { // Update top lists instead. getTopCpuProcesses(); diff --git a/src/app/pages/processes/processes.html b/src/app/pages/processes/processes.html index af63bae..d95b6fe 100644 --- a/src/app/pages/processes/processes.html +++ b/src/app/pages/processes/processes.html @@ -30,7 +30,6 @@
From 7bec33b81041384aaecd922c2e7264d3d6eb6d33 Mon Sep 17 00:00:00 2001 From: Zackary Lowery Date: Fri, 9 Sep 2016 19:50:23 -0400 Subject: [PATCH 10/19] Allowed for auto width for non-square icons. --- src/sass/main.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sass/main.scss b/src/sass/main.scss index 1c2e667..515e5a8 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -172,5 +172,5 @@ ul.pie-legend > li { } .jstree-default .jstree-themeicon-custom { - background-size: 16px 16px !important; + background-size: auto 16px !important; } From 4c97add2ec64d8c0751e2775325aaa2b083259a9 Mon Sep 17 00:00:00 2001 From: Zackary Lowery Date: Fri, 9 Sep 2016 19:57:10 -0400 Subject: [PATCH 11/19] Adjusted the process tree to overflow per listed item rather than for the entire panel. --- src/sass/main.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/sass/main.scss b/src/sass/main.scss index 515e5a8..3083154 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -171,6 +171,10 @@ ul.pie-legend > li { text-align: left; } +.jstree-default .jstree-node { + overflow-x: auto; +} + .jstree-default .jstree-themeicon-custom { background-size: auto 16px !important; } From 51d057d1336e5e35d3e5681f4ffe6517ed55351a Mon Sep 17 00:00:00 2001 From: Zackary Lowery Date: Fri, 9 Sep 2016 20:18:31 -0400 Subject: [PATCH 12/19] Added icon support to the top process lists. --- src/app/pages/processes/processes.controller.js | 12 ++++++++++-- src/app/pages/processes/processes.html | 6 ++++-- src/sass/main.scss | 12 ++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/app/pages/processes/processes.controller.js b/src/app/pages/processes/processes.controller.js index 7c7615c..32327b2 100644 --- a/src/app/pages/processes/processes.controller.js +++ b/src/app/pages/processes/processes.controller.js @@ -81,7 +81,11 @@ }); angular.forEach(vm.topCpuProcesses, function(process) { - process.displayName = process.command.length <= 50 ? process.command : process.command.substring(0, 50) + '...' + var iconName = getTreeTypeFromCommand(process.command); + + process.displayName = process.command.length <= 50 ? process.command : process.command.substring(0, 50) + '...'; + process.icon = '/assets/img/app/apps/' + iconName + '.svg'; + process.iconFont = iconName === 'process'; }); } @@ -97,7 +101,11 @@ }); angular.forEach(vm.topMemoryProcesses, function(process) { - process.displayName = process.command.length <= 50 ? process.command : process.command.substring(0, 50) + '...' + var iconName = getTreeTypeFromCommand(process.command); + + process.displayName = process.command.length <= 50 ? process.command : process.command.substring(0, 50) + '...'; + process.icon = '/assets/img/app/apps/' + iconName + '.svg'; + process.iconFont = iconName === 'process'; }); } diff --git a/src/app/pages/processes/processes.html b/src/app/pages/processes/processes.html index d95b6fe..33b077d 100644 --- a/src/app/pages/processes/processes.html +++ b/src/app/pages/processes/processes.html @@ -3,7 +3,8 @@
  1. - + + {{process.displayName}} ({{process.processorUtilization}}%)
    2. @@ -15,7 +16,8 @@
    1. - + + {{process.displayName}} ({{process.memoryUtilization}})%
      2. diff --git a/src/sass/main.scss b/src/sass/main.scss index 3083154..fa41144 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -171,6 +171,18 @@ ul.pie-legend > li { text-align: left; } +.ordered-process-list-icon { + background-position: center center; + background-size: auto 12px; + background-repeat: no-repeat; + display: inline-block; + height: 12px; + line-height: 12px; + text-align: center; + vertical-align: middle; + width: 12px; +} + .jstree-default .jstree-node { overflow-x: auto; } From aa81b2c3f720c14676998a3f6fe63d31ef81efaa Mon Sep 17 00:00:00 2001 From: Zackary Lowery Date: Fri, 9 Sep 2016 23:04:42 -0400 Subject: [PATCH 13/19] Removed the per-node overflow from the full process tree. --- src/sass/main.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/sass/main.scss b/src/sass/main.scss index fa41144..6a1cd30 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -183,10 +183,6 @@ ul.pie-legend > li { width: 12px; } -.jstree-default .jstree-node { - overflow-x: auto; -} - .jstree-default .jstree-themeicon-custom { background-size: auto 16px !important; } From 72787050b4d18123eafa08340292cea107d99be9 Mon Sep 17 00:00:00 2001 From: Zackary Lowery Date: Mon, 12 Sep 2016 19:42:11 -0400 Subject: [PATCH 14/19] Adjusted the full process tree panel to not display until the tree has items. --- src/app/pages/processes/processes.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/processes/processes.html b/src/app/pages/processes/processes.html index 33b077d..94e13f0 100644 --- a/src/app/pages/processes/processes.html +++ b/src/app/pages/processes/processes.html @@ -28,11 +28,11 @@
      -
      +
      From 7973166fda553479de09ada3db20987515fe5048 Mon Sep 17 00:00:00 2001 From: Zackary Lowery Date: Mon, 12 Sep 2016 20:00:42 -0400 Subject: [PATCH 15/19] Improved the layout of the top process lists. --- .../pages/processes/processes.controller.js | 7 ++-- src/app/pages/processes/processes.html | 16 +++---- src/sass/main.scss | 42 +++++++++++++------ 3 files changed, 42 insertions(+), 23 deletions(-) diff --git a/src/app/pages/processes/processes.controller.js b/src/app/pages/processes/processes.controller.js index 32327b2..d62843f 100644 --- a/src/app/pages/processes/processes.controller.js +++ b/src/app/pages/processes/processes.controller.js @@ -44,11 +44,12 @@ vm.treeConfig.types[appAsset].icon = '/assets/img/app/apps/' + appAsset + '.svg'; }); + getProcesses(false); getProcesses(true); vm.interval = $interval(function() { getProcesses(false); - }, refreshInterval); + }, refreshInterval * 999999); }); $scope.$on("$destroy", function() { @@ -83,7 +84,7 @@ angular.forEach(vm.topCpuProcesses, function(process) { var iconName = getTreeTypeFromCommand(process.command); - process.displayName = process.command.length <= 50 ? process.command : process.command.substring(0, 50) + '...'; + process.displayName = process.command; process.icon = '/assets/img/app/apps/' + iconName + '.svg'; process.iconFont = iconName === 'process'; }); @@ -103,7 +104,7 @@ angular.forEach(vm.topMemoryProcesses, function(process) { var iconName = getTreeTypeFromCommand(process.command); - process.displayName = process.command.length <= 50 ? process.command : process.command.substring(0, 50) + '...'; + process.displayName = process.command; process.icon = '/assets/img/app/apps/' + iconName + '.svg'; process.iconFont = iconName === 'process'; }); diff --git a/src/app/pages/processes/processes.html b/src/app/pages/processes/processes.html index 94e13f0..44ba22c 100644 --- a/src/app/pages/processes/processes.html +++ b/src/app/pages/processes/processes.html @@ -1,12 +1,12 @@
      -
        +
        1. - - - {{process.displayName}} - ({{process.processorUtilization}}%) + + + {{process.displayName}} + ({{process.processorUtilization}}%)
      @@ -14,10 +14,10 @@
      -
        +
        1. - - + + {{process.displayName}} ({{process.memoryUtilization}})%
          2. diff --git a/src/sass/main.scss b/src/sass/main.scss index 6a1cd30..108083f 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -171,18 +171,36 @@ ul.pie-legend > li { text-align: left; } -.ordered-process-list-icon { - background-position: center center; - background-size: auto 12px; - background-repeat: no-repeat; - display: inline-block; - height: 12px; - line-height: 12px; - text-align: center; - vertical-align: middle; - width: 12px; -} - .jstree-default .jstree-themeicon-custom { background-size: auto 16px !important; } +.ordered-process-list { + padding-left: 22px; + + /* I wanted to use flexbox for this, but a bug involving Chrome and + text-overflow: ellipsis; interfered. */ + .list-icon { + background-position: center center; + background-size: auto 12px; + background-repeat: no-repeat; + display: inline-block; + height: 12px; + line-height: 12px; + text-align: center; + vertical-align: middle; + width: 12px; + } + + .process-name { + display: inline-block; + max-width: 66%; + overflow: hidden; + text-overflow: ellipsis; + vertical-align: middle; + white-space: nowrap; + } + + .process-util { + float: right; + } +} From d9924aee309147bc4c0add772274fde5f64d1576 Mon Sep 17 00:00:00 2001 From: Zackary Lowery Date: Mon, 12 Sep 2016 20:00:42 -0400 Subject: [PATCH 16/19] Improved the layout of the top process lists. --- .../pages/processes/processes.controller.js | 7 ++-- src/app/pages/processes/processes.html | 20 ++++----- src/sass/main.scss | 42 +++++++++++++------ 3 files changed, 44 insertions(+), 25 deletions(-) diff --git a/src/app/pages/processes/processes.controller.js b/src/app/pages/processes/processes.controller.js index 32327b2..d62843f 100644 --- a/src/app/pages/processes/processes.controller.js +++ b/src/app/pages/processes/processes.controller.js @@ -44,11 +44,12 @@ vm.treeConfig.types[appAsset].icon = '/assets/img/app/apps/' + appAsset + '.svg'; }); + getProcesses(false); getProcesses(true); vm.interval = $interval(function() { getProcesses(false); - }, refreshInterval); + }, refreshInterval * 999999); }); $scope.$on("$destroy", function() { @@ -83,7 +84,7 @@ angular.forEach(vm.topCpuProcesses, function(process) { var iconName = getTreeTypeFromCommand(process.command); - process.displayName = process.command.length <= 50 ? process.command : process.command.substring(0, 50) + '...'; + process.displayName = process.command; process.icon = '/assets/img/app/apps/' + iconName + '.svg'; process.iconFont = iconName === 'process'; }); @@ -103,7 +104,7 @@ angular.forEach(vm.topMemoryProcesses, function(process) { var iconName = getTreeTypeFromCommand(process.command); - process.displayName = process.command.length <= 50 ? process.command : process.command.substring(0, 50) + '...'; + process.displayName = process.command; process.icon = '/assets/img/app/apps/' + iconName + '.svg'; process.iconFont = iconName === 'process'; }); diff --git a/src/app/pages/processes/processes.html b/src/app/pages/processes/processes.html index 94e13f0..5794ad0 100644 --- a/src/app/pages/processes/processes.html +++ b/src/app/pages/processes/processes.html @@ -1,12 +1,12 @@
          -
            +
            1. - - - {{process.displayName}} - ({{process.processorUtilization}}%) + + + {{process.displayName}} + ({{process.processorUtilization}}%)
          @@ -14,12 +14,12 @@
          -
            +
            1. - - - {{process.displayName}} - ({{process.memoryUtilization}})% + + + {{process.displayName}}> + ({{process.memoryUtilization}})%
          diff --git a/src/sass/main.scss b/src/sass/main.scss index 6a1cd30..108083f 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -171,18 +171,36 @@ ul.pie-legend > li { text-align: left; } -.ordered-process-list-icon { - background-position: center center; - background-size: auto 12px; - background-repeat: no-repeat; - display: inline-block; - height: 12px; - line-height: 12px; - text-align: center; - vertical-align: middle; - width: 12px; -} - .jstree-default .jstree-themeicon-custom { background-size: auto 16px !important; } +.ordered-process-list { + padding-left: 22px; + + /* I wanted to use flexbox for this, but a bug involving Chrome and + text-overflow: ellipsis; interfered. */ + .list-icon { + background-position: center center; + background-size: auto 12px; + background-repeat: no-repeat; + display: inline-block; + height: 12px; + line-height: 12px; + text-align: center; + vertical-align: middle; + width: 12px; + } + + .process-name { + display: inline-block; + max-width: 66%; + overflow: hidden; + text-overflow: ellipsis; + vertical-align: middle; + white-space: nowrap; + } + + .process-util { + float: right; + } +} From 0caa93c954321e00abd274c26f77ac654164c5b1 Mon Sep 17 00:00:00 2001 From: Zackary Lowery Date: Mon, 12 Sep 2016 20:06:41 -0400 Subject: [PATCH 17/19] Matched Gulp and Chrome icons to their processes. --- src/assets/img/app/apps/chrome.svg | 1 + src/assets/img/app/apps/gulp.svg | 81 ++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 120000 src/assets/img/app/apps/chrome.svg create mode 100644 src/assets/img/app/apps/gulp.svg diff --git a/src/assets/img/app/apps/chrome.svg b/src/assets/img/app/apps/chrome.svg new file mode 120000 index 0000000..51768eb --- /dev/null +++ b/src/assets/img/app/apps/chrome.svg @@ -0,0 +1 @@ +google-chrome.svg \ No newline at end of file diff --git a/src/assets/img/app/apps/gulp.svg b/src/assets/img/app/apps/gulp.svg new file mode 100644 index 0000000..4ecee00 --- /dev/null +++ b/src/assets/img/app/apps/gulp.svg @@ -0,0 +1,81 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + From 0eba2d151fb242f06a89a94107026081a4f71261 Mon Sep 17 00:00:00 2001 From: Zackary Lowery Date: Mon, 12 Sep 2016 20:09:58 -0400 Subject: [PATCH 18/19] Removed the extra closing angle bracket next to the process name. --- src/app/pages/processes/processes.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/processes/processes.html b/src/app/pages/processes/processes.html index 5794ad0..b8983c6 100644 --- a/src/app/pages/processes/processes.html +++ b/src/app/pages/processes/processes.html @@ -18,7 +18,7 @@
        2. - {{process.displayName}}> + {{process.displayName}} ({{process.memoryUtilization}})%
        From b0e249a66744b9d1e9a3296df42d2712d1b65fca Mon Sep 17 00:00:00 2001 From: Zackary Lowery Date: Mon, 12 Sep 2016 20:17:19 -0400 Subject: [PATCH 19/19] Removed unnecessary span around the tree refresh label. --- src/app/pages/processes/processes.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/processes/processes.html b/src/app/pages/processes/processes.html index b8983c6..68d5e16 100644 --- a/src/app/pages/processes/processes.html +++ b/src/app/pages/processes/processes.html @@ -32,7 +32,7 @@