diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index fef2c986261..66d45056c96 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -581,6 +581,8 @@ "label.create.tier.networkofferingid.description": "The Network offering for the Network Tier.", "label.create.tungsten.routing.policy": "Create Tungsten-Fabric routing policy", "label.create.user": "Create User", +"label.create.vm": "Create Instance", +"label.create.vm.and.stay": "Create Instance & stay on this page", "label.create.vpn.connection": "Create VPN connection", "label.created": "Created", "label.creating": "Creating", @@ -621,6 +623,8 @@ "label.default": "Default", "label.default.use": "Default use", "label.default.view": "Default view", +"label.default.network.domain.isolated.network": "Default network domain for Isolated networks", +"label.default.network.guestcidraddress.isolated.network": "Default guest CIDR for Isolated Networks", "label.defaultnetwork": "Default Network", "label.delete": "Delete", "label.delete.acl.list": "Delete ACL list", @@ -1901,7 +1905,9 @@ "label.sessions": "Active client sessions", "label.set.default.nic": "Set default NIC", "label.set.reservation": "Set reservation", -"label.set.reservation.desc": "(optional) Please specify an Account to be associated with this IP range.

System VMs: Enable dedication of public IP range for SSVM and CPVM, Account field disabled. Reservation strictness defined on 'system.vm.public.ip.reservation.mode.strictness'.", +"label.set.reservation.desc": "You can make Public IP range public, or you can dedicate/reserve it for either an Account or for System VMs", +"label.set.reservation.account.desc": "Please specify an Account to be associated with this IP range.", +"label.set.reservation.systemvm.desc": "Enable dedication of public IP range for SSVM and CPVM. Reservation strictness defined on 'system.vm.public.ip.reservation.mode.strictness'.", "label.setting": "Setting", "label.settings": "Settings", "label.setup": "Setup", diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue index a4fa1191d13..53a1f7675eb 100644 --- a/ui/src/components/view/InfoCard.vue +++ b/ui/src/components/view/InfoCard.vue @@ -479,11 +479,12 @@
-
{{ $t('label.publicip') }}
+
{{ $t('label.public.ip') }}
{{ resource.publicip }} - + +
diff --git a/ui/src/components/widgets/CopyLabel.vue b/ui/src/components/widgets/CopyLabel.vue index 650f678206e..c5216cc256d 100644 --- a/ui/src/components/widgets/CopyLabel.vue +++ b/ui/src/components/widgets/CopyLabel.vue @@ -18,7 +18,7 @@ @@ -32,6 +32,10 @@ export default { type: String, default: '' }, + copyValue: { + type: String, + default: '' + }, tooltip: { type: String, default: '' @@ -39,6 +43,10 @@ export default { tooltipPlacement: { type: String, default: 'top' + }, + showIcon: { + type: Boolean, + default: false } } } diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue index 288722ce030..40b2db28aba 100644 --- a/ui/src/views/AutogenView.vue +++ b/ui/src/views/AutogenView.vue @@ -229,7 +229,11 @@ v-if="!(currentAction.mapping && field.name in currentAction.mapping && currentAction.mapping[field.name].value)" > - {{ $t('label.launch.vm') }} + {{ this.form.startvm ? $t('label.launch.vm') : $t('label.create.vm') }} diff --git a/ui/src/views/infra/network/IpRangesTabPublic.vue b/ui/src/views/infra/network/IpRangesTabPublic.vue index 40a3140c35f..3955b8c0359 100644 --- a/ui/src/views/infra/network/IpRangesTabPublic.vue +++ b/ui/src/views/infra/network/IpRangesTabPublic.vue @@ -246,35 +246,42 @@
-
{{ $t('label.set.reservation') }}
+ +
-
- + + +
- - - - - - - {{ domain.path || domain.name || domain.description }} - - - - +
+ + + + +
+ +
+ + + {{ domain.path || domain.name || domain.description }} + + + +
+
@@ -340,11 +347,13 @@ import { ref, reactive, toRaw } from 'vue' import { api } from '@/api' import TooltipButton from '@/components/widgets/TooltipButton' +import TooltipLabel from '@/components/widgets/TooltipLabel' export default { name: 'IpRangesTabPublic', components: { - TooltipButton + TooltipButton, + TooltipLabel }, props: { resource: { @@ -712,6 +721,10 @@ export default { } } + .tooltip-label-wrapper { + color: rgba(0, 0, 0, 0.85); + } + .ant-list-item { padding-top: 0; padding-bottom: 0; diff --git a/ui/src/views/infra/zone/ZoneWizard.vue b/ui/src/views/infra/zone/ZoneWizard.vue index bdd12f71e33..cb6c9efb761 100644 --- a/ui/src/views/infra/zone/ZoneWizard.vue +++ b/ui/src/views/infra/zone/ZoneWizard.vue @@ -232,7 +232,7 @@ export default { width: 100%; @media (min-width: 1000px) { - width: 800px; + width: 1000px; } :deep(.form-action) { diff --git a/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue b/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue index 8aea3ffa17a..05c5adc1bd2 100644 --- a/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue +++ b/ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue @@ -158,7 +158,7 @@ @@ -166,7 +166,7 @@