From db77193ce24675d73e538169cc248a0767135799 Mon Sep 17 00:00:00 2001 From: juanmont Date: Tue, 15 Nov 2016 15:50:19 +0100 Subject: [PATCH] F #4901 changed labels in hosts-tabs and changed colors inputs --- .../app/tabs/clusters-tab/panels/info.js | 4 +- .../public/app/tabs/hosts-tab/panels/info.js | 39 +++++++------------ .../app/tabs/hosts-tab/panels/info/html.hbs | 6 +-- 3 files changed, 20 insertions(+), 29 deletions(-) diff --git a/src/sunstone/public/app/tabs/clusters-tab/panels/info.js b/src/sunstone/public/app/tabs/clusters-tab/panels/info.js index 22fee8f2e1..6b7b038d4e 100644 --- a/src/sunstone/public/app/tabs/clusters-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/clusters-tab/panels/info.js @@ -83,9 +83,9 @@ define(function(require) { RESOURCE, Locale.tr("Attributes")); var reservedMem; - (this.element.TEMPLATE.RESERVED_MEM != "0%")?reservedMem = parseInt(this.element.TEMPLATE.RESERVED_MEM): reservedMem = 0; + (this.element.TEMPLATE.RESERVED_MEM != "0%" && this.element.TEMPLATE.RESERVED_MEM != "")?reservedMem = parseInt(this.element.TEMPLATE.RESERVED_MEM): reservedMem = 0; var reservedCPU - (this.element.TEMPLATE.RESERVED_CPU != "0%")? reservedCPU = parseInt(this.element.TEMPLATE.RESERVED_CPU): reservedCPU = 0; + (this.element.TEMPLATE.RESERVED_CPU != "0%" && this.element.TEMPLATE.RESERVED_CPU != "")? reservedCPU = parseInt(this.element.TEMPLATE.RESERVED_CPU): reservedCPU = 0; return TemplateHTML({ 'element': this.element, 'renameTrHTML': renameTrHTML, diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/info.js b/src/sunstone/public/app/tabs/hosts-tab/panels/info.js index 91f6831b01..e73e7b1713 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/info.js +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/info.js @@ -92,7 +92,6 @@ define(function(require) { this.strippedTemplate, RESOURCE, Locale.tr("Attributes")); - console.log(this.element); var renameTrHTML = RenameTr.html(TAB_ID, RESOURCE, this.element.NAME); var clusterTrHTML = ClusterTr.html(this.element.CLUSTER); var permissionsTableHTML = PermissionsTable.html(TAB_ID, RESOURCE, this.element); @@ -101,7 +100,6 @@ define(function(require) { var datastoresCapacityTableHTML = DatastoresCapacityTable.html(this.element); var realCPU = parseInt(this.element.HOST_SHARE.TOTAL_CPU); var realMEM = parseInt(this.element.HOST_SHARE.TOTAL_MEM); - return TemplateInfo({ 'element': this.element, @@ -121,26 +119,10 @@ define(function(require) { }); } - function changeBarCPU(){ - if(parseInt(document.getElementById('change_bar_cpu').value) > this.element.HOST_SHARE.TOTAL_CPU) - document.getElementById('textInput_reserved_cpu').style.backgroundColor = 'rgba(111, 220, 111,0.5)'; - if(parseInt(document.getElementById('change_bar_cpu').value) < this.element.HOST_SHARE.TOTAL_CPU) - document.getElementById('textInput_reserved_cpu').style.backgroundColor = 'rgba(255, 80, 80,0.5)'; - document.getElementById('textInput_reserved_cpu').value = document.getElementById('change_bar_cpu').value; - } - function changeInputCPU(){ document.getElementById('change_bar_cpu').value = document.getElementById('textInput_reserved_cpu').value; } - - function changeBarMEM(){ - if(parseInt(document.getElementById('change_bar_mem').value) > this.element.HOST_SHARE.TOTAL_MEM) - document.getElementById('textInput_reserved_mem').style.backgroundColor = 'rgba(111, 220, 111,0.5)'; - if(parseInt(document.getElementById('change_bar_mem').value) < this.element.HOST_SHARE.TOTAL_MEM) - document.getElementById('textInput_reserved_mem').style.backgroundColor = 'rgba(255, 80, 80,0.5)'; - document.getElementById('textInput_reserved_mem').value = Humanize.size(parseInt(document.getElementById('change_bar_mem').value)); - } - + function changeInputMEM(){ document.getElementById('change_bar_mem').value = parseInt(document.getElementById('textInput_reserved_mem').value); } @@ -170,12 +152,21 @@ define(function(require) { Sunstone.runAction("Host.append_template", that.element.ID, TemplateUtils.templateToString(obj)); }); - - document.getElementById("change_bar_cpu").addEventListener("change", changeBarCPU); + document.getElementById("change_bar_cpu").addEventListener("change", function(){ + if(parseInt(document.getElementById('change_bar_cpu').value) > that.element.HOST_SHARE.TOTAL_CPU) + document.getElementById('textInput_reserved_cpu').style.backgroundColor = 'rgba(111, 220, 111,0.5)'; + if(parseInt(document.getElementById('change_bar_cpu').value) < that.element.HOST_SHARE.TOTAL_CPU) + document.getElementById('textInput_reserved_cpu').style.backgroundColor = 'rgba(255, 80, 80,0.5)'; + document.getElementById('textInput_reserved_cpu').value = document.getElementById('change_bar_cpu').value; + }); document.getElementById("textInput_reserved_cpu").addEventListener("change", changeInputCPU); - document.getElementById("change_bar_mem").addEventListener("change", changeBarMEM); + document.getElementById("change_bar_mem").addEventListener("change", function(){ + if(parseInt(document.getElementById('change_bar_mem').value) > that.element.HOST_SHARE.TOTAL_MEM) + document.getElementById('textInput_reserved_mem').style.backgroundColor = 'rgba(111, 220, 111,0.5)'; + if(parseInt(document.getElementById('change_bar_mem').value) < that.element.HOST_SHARE.TOTAL_MEM) + document.getElementById('textInput_reserved_mem').style.backgroundColor = 'rgba(255, 80, 80,0.5)'; + document.getElementById('textInput_reserved_mem').value = Humanize.size(parseInt(document.getElementById('change_bar_mem').value)); + }); document.getElementById("textInput_reserved_mem").addEventListener("change", changeInputMEM); - - return false; } }); diff --git a/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs index 819b54698c..2c1662d64c 100644 --- a/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs @@ -92,13 +92,13 @@ - {{tr "Reserved CPU"}} - + {{tr "CPU"}} + - {{tr "Reserved Memory"}} + {{tr "Memory"}}