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 <github@remi.nl>

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

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,
+.downloadISO .icon {
-.replaceacllist .icon,
-.replaceACL .icon {
   background-position: -35px -125px;
 }
 
 .downloadVolume:hover .icon,
 .downloadTemplate:hover .icon,
-.downloadISO:hover .icon,
+.downloadISO:hover .icon {
-.replaceacllist:hover .icon,
-.replaceACL: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;
 }

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

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

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';
                             }
@@ -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) {