You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/06/05 00:03:50 UTC
git commit: updated refs/heads/master to 317c8e0
Updated Branches:
refs/heads/master 90df4e4df -> 317c8e060
CLOUDSTACK-2185: Display VM IP on PF multi-edit
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/317c8e06
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/317c8e06
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/317c8e06
Branch: refs/heads/master
Commit: 317c8e06066f3d713cc59b87c634fa6909be463a
Parents: 90df4e4
Author: Brian Federle <bf...@gmail.com>
Authored: Tue Jun 4 15:03:15 2013 -0700
Committer: Brian Federle <bf...@gmail.com>
Committed: Tue Jun 4 15:03:28 2013 -0700
----------------------------------------------------------------------
ui/css/cloudstack3.css | 18 ++++++++++++------
ui/scripts/network.js | 4 +---
2 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/317c8e06/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 732efdb..0514586 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -38,9 +38,9 @@ div.toolbar,
div.toolbar,
.multi-wizard .progress ul li,
.multi-wizard.zone-wizard .select-container .field .select-array-item {
-/*\*/
+ /*\*/
display: block;
-/**/
+ /**/
-height: 1px;
}
@@ -3461,7 +3461,7 @@ div.view table td.editable div.action.cancel {
/*** Actions*/
table td.actions {
cursor: default;
-/*Make fixed*/
+ /*Make fixed*/
width: 200px;
min-width: 200px;
max-width: 200px;
@@ -4329,7 +4329,7 @@ Dialogs*/
margin: 6px 9px 9px;
padding: 9px;
color: #FFFFFF;
-/*Adjusting the font size for proper display*/
+ /*Adjusting the font size for proper display*/
font-size: 10px;
border-left: 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;
}
+.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 {
/*+placement:shift -3px -2px;*/
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] {
}
-/* Sortable */
+/*Sortable*/
.multi-edit table tbody tr td.reorder,
.multi-edit table thead tr th.reorder {
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;
}
-
/*Security Rules*/
.security-rules .multi-edit input {
width: 69px;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/317c8e06/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 8d92b17..f7d3ea4 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -3692,9 +3692,7 @@
$.extend(item, {
_itemData: $.map(data.listvirtualmachinesresponse.virtualmachine, function(vm) {
return $.extend(vm, {
- _displayName: vm.id == vm.displayname ?
- (vm.instancename ? vm.instancename : vm.name)
- : vm.displayname
+ _displayName: '<p>VM: ' + vm.name + '</p>' + '<p>IP: ' + item.vmguestip + '</p>' // Also display attached IP
});
}),
_context: {