shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

F #4901 changed labels in hosts-tabs and changed colors inputs

Browse Source
This commit is contained in:
juanmont 2016-11-15 15:50:19 +01:00
parent ea2bd35dd9
commit db77193ce2
3 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sunstone/public/app/tabs/clusters-tab/panels/info.js
View File

@ -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,

39
src/sunstone/public/app/tabs/hosts-tab/panels/info.js
View File

@ -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;
}
});

6
src/sunstone/public/app/tabs/hosts-tab/panels/info/html.hbs
View File

@ -92,13 +92,13 @@
</thead>
<tbody>
<tr colspan="3">
<td class="key_td">{{tr "Reserved CPU"}}</td>
<td><input type="range" name="rangeInput" id="change_bar_cpu" min="0" value="{{element.HOST_SHARE.MAX_CPU}}" max="{{maxReservedCPU}}">
<td class="key_td">{{tr "CPU"}}</td>
<td><input type="range" class="range-slider range-slider-horizontal range-widget-content range-corner-all" name="rangeInput" id="change_bar_cpu" min="0" value="{{element.HOST_SHARE.MAX_CPU}}" max="{{maxReservedCPU}}">
<label align="center">{{realCPU}}</label></td>
<td><input type="text" id="textInput_reserved_cpu"value="{{element.HOST_SHARE.MAX_CPU}}" min="0" size="1"></td>
</tr>
<tr colspan="3">
<td class="key_td">{{tr "Reserved Memory"}}</td>
<td class="key_td">{{tr "Memory"}}</td>
<td><input type="range" name="rangeInput" id="change_bar_mem" value="{{element.HOST_SHARE.MAX_MEM}}" max="{{maxReservedMEM}}">
<label align="center">{{realMEM}}</label></td>
<td><input type="text" id="textInput_reserved_mem" value="{{virtualMEMInput}}" min="0" size="1"></td>