Revision a7b7536a
| b/ui/static/main.css | ||
|---|---|---|
| 824 | 824 |
text-decoration: none; |
| 825 | 825 |
height: 15px; |
| 826 | 826 |
width: 17px; |
| 827 |
padding: 0px 8px 1px 9px;
|
|
| 827 |
padding: 1px 8px 2px 9px;
|
|
| 828 | 828 |
font-size: 11px; |
| 829 | 829 |
} |
| 830 | 830 |
|
| ... | ... | |
| 1501 | 1501 |
background-image: url(desc.gif); |
| 1502 | 1502 |
} |
| 1503 | 1503 |
|
| 1504 |
div.list table #selection div.expand-icon {
|
|
| 1504 |
div.list table .selection div.expand-icon {
|
|
| 1505 | 1505 |
background-image: url(asc.gif); |
| 1506 | 1506 |
background-repeat: no-repeat; |
| 1507 | 1507 |
position: relative; |
| ... | ... | |
| 1535 | 1535 |
text-decoration: none; |
| 1536 | 1536 |
} |
| 1537 | 1537 |
|
| 1538 |
div.list table thead #os {
|
|
| 1539 |
width: 20px !important; |
|
| 1540 |
vertical-align:middle; |
|
| 1541 |
} |
|
| 1542 |
|
|
| 1543 | 1538 |
div.list table span.imagetag {
|
| 1544 | 1539 |
display: none; |
| 1545 | 1540 |
} |
| 1546 | 1541 |
|
| 1547 |
div.list table #selection {
|
|
| 1542 |
div.list table thead .vmos {
|
|
| 1543 |
width: 20px !important; |
|
| 1544 |
vertical-align:middle; |
|
| 1545 |
} |
|
| 1546 |
|
|
| 1547 |
div.list table .selection {
|
|
| 1548 | 1548 |
width: 20px !important; |
| 1549 | 1549 |
text-align: left; |
| 1550 | 1550 |
background-image: none; |
| 1551 | 1551 |
} |
| 1552 | 1552 |
|
| 1553 |
div.list table thead #flavor {
|
|
| 1553 |
div.list table thead .vmflavor {
|
|
| 1554 | 1554 |
width: 100px !important; |
| 1555 | 1555 |
} |
| 1556 | 1556 |
|
| 1557 |
div.list table thead #group {
|
|
| 1557 |
div.list table thead .vmgroup {
|
|
| 1558 | 1558 |
width: 40px !important; |
| 1559 | 1559 |
} |
| 1560 | 1560 |
|
| 1561 |
div.list table thead #status {
|
|
| 1561 |
div.list table thead .vmstatus {
|
|
| 1562 | 1562 |
width: 50px !important; |
| 1563 | 1563 |
} |
| 1564 | 1564 |
|
| 1565 |
div.list table thead #name {
|
|
| 1565 |
div.list table thead .vmname {
|
|
| 1566 | 1566 |
width: 70px !important; |
| 1567 | 1567 |
} |
| 1568 | 1568 |
|
| b/ui/templates/list.html | ||
|---|---|---|
| 24 | 24 |
<table class="list-machines" style="display: none"> |
| 25 | 25 |
<thead> |
| 26 | 26 |
<tr> |
| 27 |
<th id="selection" class="select-running">
|
|
| 27 |
<th class="selection select-running">
|
|
| 28 | 28 |
<input type="checkbox"/> |
| 29 | 29 |
<div class="expand-icon"></div> |
| 30 | 30 |
</th> |
| 31 |
<th id="os">{% trans "OS" %}</th>
|
|
| 32 |
<th id="name">{% trans "Name" %}</th>
|
|
| 33 |
<th id="flavor">{% trans "Flavor" %}</th>
|
|
| 34 |
<th id="group">{% trans "Group" %}</th>
|
|
| 35 |
<th id="status">{% trans "Status" %}</th>
|
|
| 31 |
<th class="vmos">{% trans "OS" %}</th>
|
|
| 32 |
<th class="vmname">{% trans "Name" %}</th>
|
|
| 33 |
<th class="vmflavor">{% trans "Flavor" %}</th>
|
|
| 34 |
<th class="vmgroup">{% trans "Group" %}</th>
|
|
| 35 |
<th class="vmstatus">{% trans "Status" %}</th>
|
|
| 36 | 36 |
</tr> |
| 37 | 37 |
</thead> |
| 38 | 38 |
<tbody class="machines"></tbody> |
| ... | ... | |
| 48 | 48 |
<script> |
| 49 | 49 |
|
| 50 | 50 |
// select/deselect all from checkbox widget of table headers |
| 51 |
$("table thead tr th#selection :checkbox").live('change', function() {
|
|
| 51 |
$("table thead tr th.selection :checkbox").live('change', function() {
|
|
| 52 | 52 |
if ( $(this).is(":checked") ) {
|
| 53 | 53 |
$(":checkbox").attr("checked", true);
|
| 54 | 54 |
} |
| ... | ... | |
| 84 | 84 |
}); |
| 85 | 85 |
|
| 86 | 86 |
// menu toggle, running menu |
| 87 |
$("table.list-machines thead tr th#selection .expand-icon").click( function (obj) {
|
|
| 87 |
$("table.list-machines thead tr th.selection .expand-icon").click( function (obj) {
|
|
| 88 | 88 |
$(".dropdown-selector").slideToggle('medium');
|
| 89 | 89 |
return false; |
| 90 | 90 |
}); |
| ... | ... | |
| 342 | 342 |
}); |
| 343 | 343 |
|
| 344 | 344 |
// basic functions executed on page load |
| 345 |
if (images.length == 0) {
|
|
| 346 |
// populate image list |
|
| 347 |
update_images(); |
|
| 348 |
} |
|
| 349 | 345 |
if (flavors.length == 0) {
|
| 350 | 346 |
// configure flavors |
| 351 | 347 |
update_flavors(); |
| 352 | 348 |
} |
| 349 |
if (images.length == 0) {
|
|
| 350 |
// populate image list |
|
| 351 |
update_images(); |
|
| 352 |
} |
|
| 353 |
|
|
| 353 | 354 |
// set the label of the multiple buttons |
| 354 | 355 |
$('div.confirm_multiple button.yes').text('Confirm');
|
| 355 | 356 |
$('div.confirm_multiple button.no').text('Cancel');
|
| 357 |
|
|
| 356 | 358 |
// reposition multiple confirmation box on window resize |
| 357 | 359 |
$(window).resize(function(){
|
| 358 | 360 |
if (this.innerHeight - 200 < $('#machinesview').height())
|
| ... | ... | |
| 360 | 362 |
else |
| 361 | 363 |
$('.confirm_multiple').removeClass('fixed');
|
| 362 | 364 |
}); |
| 365 |
|
|
| 363 | 366 |
// start updating vm list |
| 364 | 367 |
update_vms(UPDATE_INTERVAL); |
| 365 | 368 |
|
| b/ui/templates/standard.html | ||
|---|---|---|
| 299 | 299 |
existing.find(".status").text(STATUS_MESSAGES[server.status]);
|
| 300 | 300 |
} else if (['STOPPED','ERROR'].indexOf(server.status) >= 0 && |
| 301 | 301 |
[STATUS_MESSAGES['ACTIVE'], STATUS_MESSAGES['BUILD'], STATUS_MESSAGES['REBOOT'], |
| 302 |
'Shutting down'].indexOf(existing.find(".status").text()) >= 0) {
|
|
| 302 |
'Shutting down', 'Starting'].indexOf(existing.find(".status").text()) >= 0) {
|
|
| 303 | 303 |
// from active, building, rebooting, or shutting down to stopped or on error |
| 304 | 304 |
// shutting down is not an api state, it means the server is active |
| 305 | 305 |
moved = existing.clone().appendTo(".terminated");
|
| ... | ... | |
| 328 | 328 |
existing.find('.spinner').show();
|
| 329 | 329 |
} |
| 330 | 330 |
} |
| 331 |
//existing.find(".status").text(STATUS_MESSAGES[server.status]);
|
|
| 331 | 332 |
existing.find("a.name span.name").text(server.name.substring(0,100));
|
| 332 | 333 |
existing.find("a.ip span.public").text(String(server.addresses.values[0].values[0].addr).replace(',',' '));
|
| 333 | 334 |
} else if (server.status != 'DELETED') {
|
| ... | ... | |
| 355 | 356 |
$('div.#' + server.id + ' a.action-shutdown').hide();
|
| 356 | 357 |
$('div.#' + server.id + ' a.action-destroy').addClass('destroy-padding');
|
| 357 | 358 |
} |
| 358 |
} else if (server.status == 'DELETED') {
|
|
| 359 |
} |
|
| 359 |
} |
|
| 360 | 360 |
}); |
| 361 | 361 |
|
| 362 | 362 |
$("#spinner").hide();
|
| ... | ... | |
| 408 | 408 |
// configure flavors |
| 409 | 409 |
update_flavors(); |
| 410 | 410 |
} |
| 411 |
|
|
| 411 | 412 |
// set the label of the multiple buttons |
| 412 | 413 |
$('div.confirm_multiple button.yes').text('Confirm All');
|
| 413 | 414 |
$('div.confirm_multiple button.no').text('Cancel All');
|
| 415 |
|
|
| 414 | 416 |
// reposition multiple confirmation box on window resize |
| 415 | 417 |
$(window).resize(function(){
|
| 416 | 418 |
if (this.innerHeight - 220 < $('#machinesview').height())
|
| ... | ... | |
| 418 | 420 |
else |
| 419 | 421 |
$('.confirm_multiple').removeClass('fixed');
|
| 420 | 422 |
}); |
| 423 |
|
|
| 421 | 424 |
// start updating vm list |
| 422 | 425 |
update_vms(UPDATE_INTERVAL); |
| 423 | 426 |
</script> |
Also available in: Unified diff