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/04 22:37:31 UTC
[1/2] git commit: updated refs/heads/master to 86c7274
Updated Branches:
refs/heads/master 4c1ace5e0 -> 86c727499
VPC UI: Fix dashboard totals for admin viewing user VPCs
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eaea7240
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eaea7240
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eaea7240
Branch: refs/heads/master
Commit: eaea724044e1be12ccf1cd3bb748beebcaa558d0
Parents: 4c1ace5
Author: Brian Federle <bf...@gmail.com>
Authored: Tue Jun 4 13:34:57 2013 -0700
Committer: Brian Federle <bf...@gmail.com>
Committed: Tue Jun 4 13:37:27 2013 -0700
----------------------------------------------------------------------
ui/scripts/vpc.js | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eaea7240/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 4ad5657..39934b3 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -3330,7 +3330,7 @@
// Get internal load balancers
$.ajax({
- url: createURL('listLoadBalancers'),
+ url: createURL('listLoadBalancers&listAll=true'),
async: false,
data: { networkid: tier.id },
success: function(json) {
@@ -3343,7 +3343,7 @@
// Get Public LB IPs
$.ajax({
- url: createURL('listPublicIpAddresses'),
+ url: createURL('listPublicIpAddresses&listAll=true'),
async: false,
data: { networkid: tier.id, forloadbalancing: true },
success: function(json) {
@@ -3356,7 +3356,7 @@
// Get static NAT IPs
$.ajax({
- url: createURL('listPublicIpAddresses'),
+ url: createURL('listPublicIpAddresses&listAll=true'),
async: false,
data: { networkid: tier.id, isstaticnat: true },
success: function(json) {
@@ -3369,7 +3369,7 @@
// Get VMs
$.ajax({
- url: createURL('listVirtualMachines'),
+ url: createURL('listVirtualMachines&listAll=true'),
async: false,
data: { networkid: tier.id },
success: function(json) {
[2/2] git commit: updated refs/heads/master to 86c7274
Posted by bf...@apache.org.
VPC UI: Fix padding/alignment
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/86c72749
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/86c72749
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/86c72749
Branch: refs/heads/master
Commit: 86c7274998982f726668c1980e23f380a497a148
Parents: eaea724
Author: Brian Federle <bf...@gmail.com>
Authored: Tue Jun 4 13:37:21 2013 -0700
Committer: Brian Federle <bf...@gmail.com>
Committed: Tue Jun 4 13:37:28 2013 -0700
----------------------------------------------------------------------
ui/modules/vpc/vpc.css | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/86c72749/ui/modules/vpc/vpc.css
----------------------------------------------------------------------
diff --git a/ui/modules/vpc/vpc.css b/ui/modules/vpc/vpc.css
index 401c2ba..21b1ce8 100644
--- a/ui/modules/vpc/vpc.css
+++ b/ui/modules/vpc/vpc.css
@@ -137,7 +137,7 @@
}
.vpc-network-chart .tier-item .content .dashboard {
- height: 117px;
+ display: inline-block;
}
.vpc-network-chart .tier-item .content .dashboard-item {
@@ -265,7 +265,7 @@
.vpc-network-chart .tier-item.router {
width: 258px;
- height: 218px;
+ height: 224px;
background: #BDBDBD;
border: 1px solid #808080;
float: left;
@@ -325,6 +325,7 @@
}
.vpc-network-chart .tier-item.router .dashboard-item span {
+ padding-right: 10px;
color: #FFFFFF;
/*+text-shadow:0px 1px #000000;*/
-moz-text-shadow: 0px 1px #000000;