apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-2185: Display VM IP on PF multi-edit

Browse Source
This commit is contained in:
Brian Federle 2013-06-04 15:03:15 -07:00
parent 90df4e4df0
commit 317c8e0606
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/css/cloudstack3.css
View File

@ -38,9 +38,9 @@ div.toolbar,
div.toolbar, div.toolbar,
.multi-wizard .progress ul li, .multi-wizard .progress ul li,
.multi-wizard.zone-wizard .select-container .field .select-array-item { .multi-wizard.zone-wizard .select-container .field .select-array-item {
/*\*/ /*\*/
display: block; display: block;
/**/ /**/
-height: 1px; -height: 1px;
} }
@ -3461,7 +3461,7 @@ div.view table td.editable div.action.cancel {
/*** Actions*/ /*** Actions*/
table td.actions { table td.actions {
cursor: default; cursor: default;
/*Make fixed*/ /*Make fixed*/
width: 200px; width: 200px;
min-width: 200px; min-width: 200px;
max-width: 200px; max-width: 200px;
@ -4329,7 +4329,7 @@ Dialogs*/
margin: 6px 9px 9px; margin: 6px 9px 9px;
padding: 9px; padding: 9px;
color: #FFFFFF; color: #FFFFFF;
/*Adjusting the font size for proper display*/ /*Adjusting the font size for proper display*/
font-size: 10px; font-size: 10px;
border-left: 1px solid #6A6A6A; border-left: 1px solid #6A6A6A;
border-right: 1px solid #6A6A6A; border-right: 1px solid #6A6A6A;
@ -7857,6 +7857,13 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t
font-weight: bold; font-weight: bold;
} }
.multi-edit .data .data-body .data-item tr td.add-vm p {
text-indent: 0;
padding-left: 9px;
margin-top: 3px;
margin-bottom: 6px;
}
.multi-edit .data .data-body .data-item tr td.multi-actions .icon { .multi-edit .data .data-body .data-item tr td.multi-actions .icon {
/*+placement:shift -3px -2px;*/ /*+placement:shift -3px -2px;*/
position: relative; position: relative;
@ -7975,7 +7982,7 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t
.multi-edit .header-fields input[type=submit] { .multi-edit .header-fields input[type=submit] {
} }
/* Sortable */ /*Sortable*/
.multi-edit table tbody tr td.reorder, .multi-edit table tbody tr td.reorder,
.multi-edit table thead tr th.reorder { .multi-edit table thead tr th.reorder {
width: 30px !important; width: 30px !important;
@ -7983,7 +7990,6 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t
max-width: 30px !important; max-width: 30px !important;
} }
/*Security Rules*/ /*Security Rules*/
.security-rules .multi-edit input { .security-rules .multi-edit input {
width: 69px; width: 69px;

4
ui/scripts/network.js
View File

@ -3692,9 +3692,7 @@
$.extend(item, { $.extend(item, {
_itemData: $.map(data.listvirtualmachinesresponse.virtualmachine, function(vm) { _itemData: $.map(data.listvirtualmachinesresponse.virtualmachine, function(vm) {
return $.extend(vm, { return $.extend(vm, {
_displayName: vm.id == vm.displayname ? _displayName: '<p>VM: ' + vm.name + '</p>' + '<p>IP: ' + item.vmguestip + '</p>' // Also display attached IP
(vm.instancename ? vm.instancename : vm.name)
: vm.displayname
}); });
}), }),
_context: { _context: {