diff options
author | Gunnar Mills <gmills@us.ibm.com> | 2018-06-21 13:16:54 -0500 |
---|---|---|
committer | Ed Tanous <ed.tanous@intel.com> | 2018-08-24 20:12:36 +0000 |
commit | 52b8bde9998cb35eab9c1300d41168a56f4ed0d3 (patch) | |
tree | 252717821b7d6642e31b0f1ea27bee668a0dc396 /app/server-health | |
parent | 1073c1490fa98b7c90e6056a4e5797d4429b57e7 (diff) | |
download | phosphor-webui-52b8bde9998cb35eab9c1300d41168a56f4ed0d3.tar.gz phosphor-webui-52b8bde9998cb35eab9c1300d41168a56f4ed0d3.zip |
Add Power Usage Page
Created a new page, "Manage Power Usage".
This page is under the "Server control" tab.
This new page currently just displays the power consumption.
Future commits will allow the user to set the power cap from
this page. One day, things like power consumption trending
data could also be on this page.
There was a blank unused controller which was for similar things,
removed it.
Tested: See the page and the consumption data. Uploaded screenshots
to openbmc/openbmc#3221
Change-Id: I9f97c58a086f34c1c1990c03d5e05b081619bd5c
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
Diffstat (limited to 'app/server-health')
-rw-r--r-- | app/server-health/controllers/power-consumption-controller.html | 5 | ||||
-rw-r--r-- | app/server-health/controllers/power-consumption-controller.js | 19 | ||||
-rw-r--r-- | app/server-health/index.js | 6 | ||||
-rw-r--r-- | app/server-health/styles/index.scss | 1 | ||||
-rw-r--r-- | app/server-health/styles/power-consumption.scss | 0 |
5 files changed, 0 insertions, 31 deletions
diff --git a/app/server-health/controllers/power-consumption-controller.html b/app/server-health/controllers/power-consumption-controller.html deleted file mode 100644 index 7dfdf89..0000000 --- a/app/server-health/controllers/power-consumption-controller.html +++ /dev/null @@ -1,5 +0,0 @@ -<div id="power-consumption"> - <div class="row column"> - <h1>Power consumption</h1> - </div> -</div>
\ No newline at end of file diff --git a/app/server-health/controllers/power-consumption-controller.js b/app/server-health/controllers/power-consumption-controller.js deleted file mode 100644 index 51882e4..0000000 --- a/app/server-health/controllers/power-consumption-controller.js +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Controller for server - * - * @module app/serverHealth - * @exports powerConsumptionController - * @name powerConsumptionController - */ - -window.angular && (function(angular) { - 'use strict'; - - angular.module('app.serverHealth').controller('powerConsumptionController', [ - '$scope', '$window', 'APIUtils', 'dataService', - function($scope, $window, APIUtils, dataService) { - $scope.dataService = dataService; - } - ]); - -})(angular); diff --git a/app/server-health/index.js b/app/server-health/index.js index e5eb9be..461e0bd 100644 --- a/app/server-health/index.js +++ b/app/server-health/index.js @@ -52,12 +52,6 @@ window.angular && (function(angular) { 'controller': 'sensorsController', authenticated: true }) - .when('/server-health/power-consumption', { - 'template': - require('./controllers/power-consumption-controller.html'), - 'controller': 'powerConsumptionController', - authenticated: true - }) .when('/server-health', { 'template': require('./controllers/log-controller.html'), 'controller': 'logController', diff --git a/app/server-health/styles/index.scss b/app/server-health/styles/index.scss index eeaabb2..009e991 100644 --- a/app/server-health/styles/index.scss +++ b/app/server-health/styles/index.scss @@ -1,4 +1,3 @@ @import "./inventory.scss"; @import "./log.scss"; @import "./sensors.scss"; -@import "./power-consumption.scss"; diff --git a/app/server-health/styles/power-consumption.scss b/app/server-health/styles/power-consumption.scss deleted file mode 100644 index e69de29..0000000 --- a/app/server-health/styles/power-consumption.scss +++ /dev/null |