0001-Request-584-Simplified-host-statuses-in-list.patch

Hector Sanjuan, 04/29/2011 05:59 PM

Download (3.14 KB)

View differences:

src/sunstone/public/js/opennebula.js
55 55
                            "ERROR",
56 56
                            "DISABLED"][value];
57 57
                    break;
58
                case "HOST_SIMPLE","host_simple":
59
                    return ["ON",
60
                            "ON",
61
                            "ON",
62
                            "ERROR",
63
                            "OFF"][value];
64
                    break;
58 65
                case "VM","vm":
59 66
                    return ["INIT",
60 67
                            "PENDING",
src/sunstone/public/js/plugins/hosts-tab.js
376 376
     var pb_mem =
377 377
'<div style="height:10px" class="ratiobar ui-progressbar ui-widget ui-widget-content ui-corner-all" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="'+ratio_mem+'">\
378 378
    <div class="ui-progressbar-value ui-widget-header ui-corner-left ui-corner-right" style="width: '+ratio_mem+'%;"/>\
379
    <span style="position:relative;left:45px;top:-4px;font-size:0.6em">'+ratio_mem+'%</span>\
379
    <span style="position:relative;left:90px;top:-4px;font-size:0.6em">'+ratio_mem+'%</span>\
380 380
    </div>\
381 381
</div>';
382 382

  
383 383
    var pb_cpu =
384 384
'<div style="height:10px" class="ratiobar ui-progressbar ui-widget ui-widget-content ui-corner-all" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="'+ratio_cpu+'">\
385 385
    <div class="ui-progressbar-value ui-widget-header ui-corner-left ui-corner-right" style="width: '+ratio_cpu+'%;"/>\
386
    <span style="position:relative;left:45px;top:-4px;font-size:0.6em">'+ratio_cpu+'%</span>\
386
    <span style="position:relative;left:90px;top:-4px;font-size:0.6em">'+ratio_cpu+'%</span>\
387 387
    </div>\
388 388
</div>';
389 389

  
......
395 395
			host.HOST_SHARE.RUNNING_VMS, //rvm
396 396
            pb_cpu,
397 397
			pb_mem,
398
			OpenNebula.Helper.resource_state("host",host.STATE) ];
398
			OpenNebula.Helper.resource_state("host_simple",host.STATE) ];
399 399

  
400 400
}
401 401

  
......
661 661
                        { "bSortable": false, "aTargets": ["check"] },
662 662
                        { "sWidth": "60px", "aTargets": [0,4] },
663 663
                        { "sWidth": "35px", "aTargets": [1] },
664
                        { "sWidth": "120px", "aTargets": [5,6] }
664
                        { "sWidth": "200px", "aTargets": [5,6] }
665 665
                       ]
666 666
    });
667 667
    
668
-