You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/10 12:07:35 UTC
[1/6] git commit: updated refs/heads/master to 5c48ce9
Repository: cloudstack
Updated Branches:
refs/heads/master 7e42978a7 -> 5c48ce926
[UI] fix typo for user data field
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0cdca313
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0cdca313
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0cdca313
Branch: refs/heads/master
Commit: 0cdca3137f80f9f3b4f4a4bbf7b6dc574cedb5c0
Parents: f948e96
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Wed Nov 4 13:27:10 2015 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Thu Nov 5 08:06:51 2015 +0100
----------------------------------------------------------------------
ui/index.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0cdca313/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index 9ea62c0..302e464 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -586,7 +586,7 @@
<!-- userdata -->
<div class="select">
- <div class="select">
+ <div class="name">
<span><fmt:message key="label.add.userdata"/> (<fmt:message key="label.optional"/>)</span>
</div>
<div class="value">
[5/6] git commit: updated refs/heads/master to 5c48ce9
Posted by re...@apache.org.
[UI] change alert to ui dialog in response of instance wizard
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/552c08f0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/552c08f0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/552c08f0
Branch: refs/heads/master
Commit: 552c08f0b47689acc4472c053da064d4fa4ac100
Parents: cb9bf44
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Wed Sep 23 14:59:28 2015 +0200
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Fri Nov 6 13:49:32 2015 +0100
----------------------------------------------------------------------
ui/scripts/instanceWizard.js | 4 +++-
ui/scripts/vpc.js | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/552c08f0/ui/scripts/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index 1401ace..98ac62b 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -1068,7 +1068,9 @@
getUpdatedItem: function(json) {
var item = json.queryasyncjobresultresponse.jobresult.virtualmachine;
if (item.password != null)
- alert("Password of new VM " + item.displayname + " is " + item.password);
+ cloudStack.dialog.notice({
+ message: "Password of new VM " + item.displayname + " is " + item.password
+ });
return item;
},
getActionFilter: function() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/552c08f0/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 96bf02f..41d10ed 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -1507,7 +1507,9 @@
},
complete: function(args) {
if (args.password != null) {
- alert('Password of the VM is ' + args.password);
+ cloudStack.dialog.notice({
+ message: 'Password of the VM is ' + args.password
+ });
}
return 'label.action.start.instance';
}
[4/6] git commit: updated refs/heads/master to 5c48ce9
Posted by re...@apache.org.
[UI] Network names are not being displayed in Infra » VRs » router » NICS
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cb9bf445
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cb9bf445
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cb9bf445
Branch: refs/heads/master
Commit: cb9bf445388176398326bbd3e57c191286245257
Parents: d76a47b
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Thu Nov 5 08:04:34 2015 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Fri Nov 6 11:05:12 2015 +0100
----------------------------------------------------------------------
server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cb9bf445/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
index 6f7ef43..52c36e8 100644
--- a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
@@ -219,6 +219,7 @@ public class DomainRouterJoinDaoImpl extends GenericDaoBase<DomainRouterJoinVO,
nicResponse.setGateway(vr.getGateway());
nicResponse.setNetmask(vr.getNetmask());
nicResponse.setNetworkid(vr.getNetworkUuid());
+ nicResponse.setNetworkName(vr.getNetworkName());
nicResponse.setMacAddress(vr.getMacAddress());
nicResponse.setIp6Address(vr.getIp6Address());
nicResponse.setIp6Gateway(vr.getIp6Gateway());
[2/6] git commit: updated refs/heads/master to 5c48ce9
Posted by re...@apache.org.
[UI] Private Cloud VPC always shows 0 in Site-to-Site VPN, even when one is configured
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eccdf4f1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eccdf4f1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eccdf4f1
Branch: refs/heads/master
Commit: eccdf4f1fb20e88f5cf31b442f11f47fe342a7db
Parents: 0cdca31
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Wed Nov 4 13:29:06 2015 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Fri Nov 6 11:05:08 2015 +0100
----------------------------------------------------------------------
ui/scripts/vpc.js | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eccdf4f1/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 5e5b2aa..96bf02f 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -2682,6 +2682,7 @@
$.ajax({
url: createURL("listVpnGateways"),
data: {
+ listAll: true,
id: args.context.vpnGateway[0].id
},
async: true,
@@ -2804,6 +2805,7 @@
$.ajax({
url: createURL('listVpnGateways'),
data: {
+ listAll: true,
vpcid: args.context.vpc[0].id
},
async: false,
@@ -4187,6 +4189,7 @@
url: createURL('listVpnGateways'),
async: false,
data: {
+ listAll: true,
'vpcid': args.context.vpc[0].id
},
success: function(json) {
[6/6] git commit: updated refs/heads/master to 5c48ce9
Posted by re...@apache.org.
Merge pull request #1034 from ustcweizhou/ui-changes
Fix some small UI bugs[UI] fix typo for user data field
[UI] Private Cloud VPC always shows 0 in Site-to-Site VPN, even when one is configured
[UI] change the Icon for changing ACL's for a tier in a VPC
[UI] Network names are not being displayed in Infra VRs router NICS
* pr/1034:
[UI] change alert to ui dialog in response of instance wizard
[UI] Network names are not being displayed in Infra » VRs » router » NICS
[UI] change the Icon for changing ACL's for a tier in a VPC
[UI] Private Cloud VPC always shows 0 in Site-to-Site VPN, even when one is configured
[UI] fix typo for user data field
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5c48ce92
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5c48ce92
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5c48ce92
Branch: refs/heads/master
Commit: 5c48ce926085f1009099f7c8c48d2fd7b89285fe
Parents: 7e42978 552c08f
Author: Remi Bergsma <gi...@remi.nl>
Authored: Tue Nov 10 12:06:56 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Tue Nov 10 12:06:56 2015 +0100
----------------------------------------------------------------------
.../cloud/api/query/dao/DomainRouterJoinDaoImpl.java | 1 +
ui/css/cloudstack3.css | 12 ++++++------
ui/index.jsp | 2 +-
ui/scripts/instanceWizard.js | 4 +++-
ui/scripts/vpc.js | 7 ++++++-
5 files changed, 17 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[3/6] git commit: updated refs/heads/master to 5c48ce9
Posted by re...@apache.org.
[UI] change the Icon for changing ACL's for a tier in a VPC
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d76a47b9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d76a47b9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d76a47b9
Branch: refs/heads/master
Commit: d76a47b9fd31b27ab51a3cef7b71f73f3d76cee3
Parents: eccdf4f
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Thu Nov 5 08:04:23 2015 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Fri Nov 6 11:05:10 2015 +0100
----------------------------------------------------------------------
ui/css/cloudstack3.css | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d76a47b9/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index a04ff7c..2ea8537 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -12506,17 +12506,13 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it
.downloadVolume .icon,
.downloadTemplate .icon,
-.downloadISO .icon,
-.replaceacllist .icon,
-.replaceACL .icon {
+.downloadISO .icon {
background-position: -35px -125px;
}
.downloadVolume:hover .icon,
.downloadTemplate:hover .icon,
-.downloadISO:hover .icon,
-.replaceacllist:hover .icon,
-.replaceACL:hover .icon {
+.downloadISO:hover .icon {
background-position: -35px -707px;
}
@@ -12831,10 +12827,14 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it
background-position: -228px -646px;
}
+.replaceacllist .icon,
+.replaceACL .icon,
.changeAffinity .icon {
background-position: -264px -2px;
}
+.replaceacllist:hover .icon,
+.replaceACL:hover .icon,
.changeAffinity:hover .icon {
background-position: -263px -583px;
}