etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

4th pass 

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2020-03-23 12:25:20 +05:30
parent d91c156c96
commit ece4d0a6af
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/src/locales/en.json
View File

@ -896,7 +896,6 @@
"service.Lb.inlineModeDropdown": "Mode",
"service.Lb.lbIsolationDropdown": "LB isolation",
"service.SourceNat.redundantRouterCapabilityCheckbox": "Redundant router capability",
"service.SourceNat.sourceNatTypeDropdown": "Supported Source NAT type",
"service.StaticNat.associatePublicIP": "Associate Public IP",
"service.StaticNat.elasticIpCheckbox": "Elastic IP",
"serviceCapabilities": "Service Capabilities",
@ -918,6 +917,7 @@
"snmpPort": "SNMP Port",
"sockettimeout": "Socket Timeout",
"sourcecidr": "Source CIDR",
"sourcenattype": "Supported Source NAT type",
"destcidr": "Destination CIDR",
"sourceNat": "Source NAT",
"sourceipaddress": "Source IP Address",
@ -1037,6 +1037,7 @@
"volumetotal": "Volume",
"volume.volumeFileUpload.description": "Click or drag file to this area to upload",
"vpcLimit": "VPC limits",
"vpc": "VPC",
"vpcid": "VPC",
"vpcname": "VPC",
"vpcoffering": "VPC Offering",

20
ui/src/views/offering/AddNetworkOffering.vue
View File

@ -68,13 +68,13 @@
</a-radio-button>
</a-radio-group>
</a-form-item>
<a-form-item :label="$t('ispersisitent')" v-if="this.guestType !== 'shared'">
<a-switch v-decorator="['ispersisitent', {initialValue: false}]" />
<a-form-item :label="$t('ispersistent')" v-if="this.guestType !== 'shared'">
<a-switch v-decorator="['ispersistent', {initialValue: false}]" />
</a-form-item>
<a-form-item :label="$t('specifyvlan')" v-if="this.guestType !== 'shared'">
<a-switch v-decorator="['specifyvlan', {initialValue: true}]" :defaultChecked="true" />
</a-form-item>
<a-form-item :label="$t('forvpc')" v-if="this.guestType === 'isolated'">
<a-form-item :label="$t('vpc')" v-if="this.guestType === 'isolated'">
<a-switch v-decorator="['forvpc', {initialValue: this.forVpc}]" :defaultChecked="this.forVpc" @change="val => { this.handleForVpcChange(val) }" />
</a-form-item>
<a-form-item :label="$t('userdatal2')" v-if="this.guestType === 'l2'">
@ -158,7 +158,6 @@
:checkBoxLabel="item.description"
:checkBoxDecorator="'service.' + item.name"
:selectOptions="item.provider"
:selectLabel="$t('serviceproviders')"
:selectDecorator="item.name + '.provider'"
@handle-checkpair-change="handleSupportedServiceChange"/>
</a-list-item>
@ -188,10 +187,10 @@
</a-select-option>
</a-select>
</a-form-item>
<a-form-item :label="$t('service.SourceNat.redundant.router.capability')" v-if="(this.guestType === 'shared' || this.guestType === 'isolated') && this.sourceNatServiceChecked && !this.isVpcVirtualRouterForAtLeastOneService">
<a-form-item :label="$t('redundantrouter')" v-if="(this.guestType === 'shared' || this.guestType === 'isolated') && this.sourceNatServiceChecked && !this.isVpcVirtualRouterForAtLeastOneService">
<a-switch v-decorator="['redundantroutercapability', {initialValue: false}]" />
</a-form-item>
<a-form-item :label="$t('service.SourceNat.sourceNatType')" v-if="(this.guestType === 'shared' || this.guestType === 'isolated') && this.sourceNatServiceChecked">
<a-form-item :label="$t('sourcenattype')" v-if="(this.guestType === 'shared' || this.guestType === 'isolated') && this.sourceNatServiceChecked">
<a-radio-group
v-decorator="['sourcenattype', {
initialValue: 'peraccount'
@ -683,7 +682,7 @@ export default {
if (values.specifyvlan === true) {
params.specifyvlan = true
}
if (values.ispersistent === true) {
if (values.ispersistent) {
params.ispersistent = true
} else { // Isolated Network with Non-persistent network
delete params.ispersistent
@ -846,6 +845,7 @@ export default {
})
}).finally(() => {
this.loading = false
this.$emit('refresh-data')
this.closeAction()
})
})
@ -859,10 +859,10 @@ export default {
<style scoped lang="scss">
.form-layout {
width: 50vw;
width: 80vw;
@media (min-width: 450px) {
width: 50vw;
@media (min-width: 800px) {
width: 500px;
}
}
.supported-services-container {

1
ui/src/views/offering/AddVpcOffering.vue
View File

@ -395,6 +395,7 @@ export default {
width: 500px;
}
}
.supported-services-container {
height: 250px;
overflow: auto;