diff --git a/ui/src/components/view/DedicateData.vue b/ui/src/components/view/DedicateData.vue index 63954b157db..2d6e3a7e3c5 100644 --- a/ui/src/components/view/DedicateData.vue +++ b/ui/src/components/view/DedicateData.vue @@ -16,36 +16,32 @@ // under the License. - + - - - - {{ $t('dedicated') }} - Yes - - - {{ $t('domainid') }} - {{ dedicatedDomainId }} - - - {{ $t('account') }} - {{ dedicatedAccountId }} - - - {{ releaseButtonLabel }} - - - - - - {{ $t('dedicated') }} - No - - {{ dedicatedButtonLabel }} - - - + + {{ $t('dedicated') }} + Yes + + + {{ $t('domainid') }} + {{ dedicatedDomainId }} + + + {{ $t('account') }} + {{ dedicatedAccountId }} + + + {{ releaseButtonLabel }} + + + + + + {{ $t('dedicated') }} + No + + {{ dedicatedButtonLabel }} + - + diff --git a/ui/src/config/section/infra/zones.js b/ui/src/config/section/infra/zones.js index 5af8f08e284..347c6549d1e 100644 --- a/ui/src/config/section/infra/zones.js +++ b/ui/src/config/section/infra/zones.js @@ -171,7 +171,7 @@ export default { icon: 'block', label: 'label.add.vmware.datacenter', dataView: true, - show: (record) => { return !record.vmwaredcid }, + show: record => !record.vmwaredc, args: ['zoneid', 'name', 'vcenter', 'username', 'password'], mapping: { zoneid: { @@ -184,7 +184,7 @@ export default { icon: 'block', label: 'label.update.vmware.datacenter', dataView: true, - show: (record) => { return record.vmwaredcid }, + show: record => record.vmwaredc, args: ['zoneid', 'name', 'vcenter', 'username', 'password'], mapping: { zoneid: { @@ -197,7 +197,7 @@ export default { icon: 'minus-square', label: 'label.remove.vmware.datacenter', dataView: true, - show: (record) => { return record.vmwaredcid }, + show: record => record.vmwaredc, args: ['zoneid'], mapping: { zoneid: { diff --git a/ui/src/locales/en.json b/ui/src/locales/en.json index 3abbbd90368..1f91a373481 100644 --- a/ui/src/locales/en.json +++ b/ui/src/locales/en.json @@ -621,7 +621,7 @@ "label.remove.ssh.key.pair": "Remove SSH Key Pair", "label.remove.tier": "Remove tier", "label.remove.vm.load.balancer": "Remove VM from load balancer", -"label.remove.vmware.datacenter": "Remove VMware datacenter", +"label.remove.vmware.datacenter": "Remove VMware Datacenter", "label.remove.vpc": "Remove VPC", "label.remove.vpc.offering": "Remove VPC offering", "label.routing.host":"Routing Host", @@ -643,7 +643,7 @@ "label.storage":"Storage", "label.suspend.project": "Suspend Project", "label.uk.keyboard": "UK keyboard", -"label.update.vmware.datacenter": "Update VMware datacenter", +"label.update.vmware.datacenter": "Update VMware Datacenter", "label.upgrade.router.newer.template": "Upgrade Router to Use Newer Template", "label.upload": "Upload", "label.upload.from.local": "Upload from Local", @@ -984,7 +984,7 @@ "vSwitchPublicName": "Public Traffic vSwitch Name", "vSwitchPublicType": "Public Traffic vSwitch Type", "value": "Value", -"vcenter": "VMware datacenter vcenter", +"vcenter": "VMware Datacenter vCenter", "vcenterHost": "ESX/ESXi Host", "vcsdeviceid": "ID", "version": "Version", @@ -1007,9 +1007,9 @@ "vmname": "VM Name", "vmstate": "VM state", "vmtotal": "Total of VMs", -"vmwaredcId": "VMware datacenter ID", -"vmwaredcName": "VMware datacenter Name", -"vmwaredcVcenter": "VMware datacenter vcenter", +"vmwaredcId": "VMware Datacenter ID", +"vmwaredcName": "VMware Datacenter Name", +"vmwaredcVcenter": "VMware Datacenter vCenter", "vmwarenetworklabel": "VMware traffic label", "volume": "Volume", "volumeChecksum": "MD5 checksum",
- {{ $t('domainid') }} - {{ dedicatedDomainId }} -
- {{ $t('account') }} - {{ dedicatedAccountId }} -
+ {{ $t('domainid') }} + {{ dedicatedDomainId }} +
+ {{ $t('account') }} + {{ dedicatedAccountId }} +