apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1034 from ustcweizhou/ui-changes

Browse Source 
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 <github@remi.nl>
This commit is contained in:
Remi Bergsma 2015-11-10 12:06:56 +01:00
commit 5c48ce9260
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
View File

@ -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());

12
ui/css/cloudstack3.css
View File

@ -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;
}

2
ui/index.jsp
View File

@ -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">

4
ui/scripts/instanceWizard.js
View File

@ -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() {

7
ui/scripts/vpc.js
View File

@ -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';
}
@ -2682,6 +2684,7 @@
$.ajax({
url: createURL("listVpnGateways"),
data: {
listAll: true,
id: args.context.vpnGateway[0].id
},
async: true,
@ -2804,6 +2807,7 @@
$.ajax({
url: createURL('listVpnGateways'),
data: {
listAll: true,
vpcid: args.context.vpc[0].id
},
async: false,
@ -4187,6 +4191,7 @@
url: createURL('listVpnGateways'),
async: false,
data: {
listAll: true,
'vpcid': args.context.vpc[0].id
},
success: function(json) {