Skip to content

Commit d5015d7

Browse files
davidjumaniyadvr
andauthored
ui: Prettify ManageInstances.vue (#5295)
* ui: Prettify ManageInstances.vue * Update en.json Co-authored-by: Rohit Yadav <rohit.yadav@shapeblue.com>
1 parent cb1078a commit d5015d7

File tree

2 files changed

+67
-55
lines changed

2 files changed

+67
-55
lines changed

ui/public/locales/en.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,7 @@
742742
"label.deployasis":"Read VM settings from OVA",
743743
"label.deploymentplanner": "Deployment planner",
744744
"label.description": "Description",
745+
"label.desc.importexportinstancewizard": "Import and export instances to/from an existing VMware cluster.",
745746
"label.destcidr": "Destination CIDR",
746747
"label.destination": "Destination",
747748
"label.destinationphysicalnetworkid": "Destination physical network ID",
@@ -2939,7 +2940,7 @@
29392940
"message.guestnetwork.state.shutdown": "Indicates the network configuration is being destroyed",
29402941
"message.host.dedicated": "Host Dedicated",
29412942
"message.host.dedication.released": "Host dedication released",
2942-
"message.desc.importexportinstancewizard": "Import and export instances to/from an existing VMware zone.<br/><br/>This feature only applies Cloudstack VMware zones. By choosing to Manage an instance, CloudStack takes over the orchestration of that instance. The instance is left running and not physically moved. Unmanaging instances, removes CloudStack ability to mange them (but they are left running and not destroyed)",
2943+
"message.desc.importexportinstancewizard": "This feature only applies Cloudstack VMware clusters. By choosing to Manage an instance, CloudStack takes over the orchestration of that instance. The instance is left running and not physically moved. Unmanaging instances, removes CloudStack ability to mange them (but they are left running and not destroyed)",
29432944
"message.info.cloudian.console": "Cloudian Management Console should open in another window",
29442945
"message.installwizard.click.retry": "Click the button to retry launch.",
29452946
"message.installwizard.copy.whatisacluster": "A cluster provides a way to group hosts. The hosts in a cluster all have identical hardware, run the same hypervisor, are on the same subnet, and access the same shared storage. Virtual machine instances (VMs) can be live-migrated from one host to another within the same cluster, without interrupting service to the user. A cluster is the third-largest organizational unit within a CloudStack™; deployment. Clusters are contained within pods, and pods are contained within zones.<br/><br/>CloudStack™; allows multiple clusters in a cloud deployment, but for a Basic Installation, we only need one cluster.",

ui/src/views/tools/ManageInstances.vue

Lines changed: 65 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -37,58 +37,57 @@
3737
:md="24">
3838
<div>
3939
<a-card>
40-
<a-card class="row-element"><span v-html="$t('message.desc.importexportinstancewizard')" /></a-card>
41-
<a-row :gutter="18">
42-
<a-form
43-
style="min-width: 170px"
44-
:form="form"
45-
layout="vertical">
46-
<a-col :md="24" :lg="8">
47-
<a-form-item :label="this.$t('label.zoneid')">
48-
<a-select
49-
v-decorator="['zoneid', {}]"
50-
showSearch
51-
optionFilterProp="children"
52-
:filterOption="filterOption"
53-
:options="zoneSelectOptions"
54-
@change="onSelectZoneId"
55-
:loading="optionLoading.zones"
56-
autoFocus
57-
></a-select>
58-
</a-form-item>
59-
</a-col>
60-
<a-col :md="24" :lg="8">
61-
<a-form-item
62-
:label="this.$t('label.podid')">
63-
<a-select
64-
v-decorator="['podid']"
65-
showSearch
66-
optionFilterProp="children"
67-
:filterOption="filterOption"
68-
:options="podSelectOptions"
69-
:loading="optionLoading.pods"
70-
@change="onSelectPodId"
71-
></a-select>
72-
</a-form-item>
73-
</a-col>
74-
<a-col :md="24" :lg="8">
75-
<a-form-item
76-
:label="this.$t('label.clusterid')">
77-
<a-select
78-
v-decorator="['clusterid']"
79-
showSearch
80-
optionFilterProp="children"
81-
:filterOption="filterOption"
82-
:options="clusterSelectOptions"
83-
:loading="optionLoading.clusters"
84-
@change="onSelectClusterId"
85-
></a-select>
86-
</a-form-item>
87-
</a-col>
88-
</a-form>
89-
</a-row>
40+
<a-alert type="info" :showIcon="true" :message="$t('label.desc.importexportinstancewizard')" :description="$t('message.desc.importexportinstancewizard')" />
41+
<br />
42+
<a-form
43+
style="min-width: 170px"
44+
:form="form"
45+
layout="vertical">
46+
<a-col :md="24" :lg="8">
47+
<a-form-item :label="this.$t('label.zoneid')">
48+
<a-select
49+
v-decorator="['zoneid', {}]"
50+
showSearch
51+
optionFilterProp="children"
52+
:filterOption="filterOption"
53+
:options="zoneSelectOptions"
54+
@change="onSelectZoneId"
55+
:loading="optionLoading.zones"
56+
autoFocus
57+
></a-select>
58+
</a-form-item>
59+
</a-col>
60+
<a-col :md="24" :lg="8">
61+
<a-form-item
62+
:label="this.$t('label.podid')">
63+
<a-select
64+
v-decorator="['podid']"
65+
showSearch
66+
optionFilterProp="children"
67+
:filterOption="filterOption"
68+
:options="podSelectOptions"
69+
:loading="optionLoading.pods"
70+
@change="onSelectPodId"
71+
></a-select>
72+
</a-form-item>
73+
</a-col>
74+
<a-col :md="24" :lg="8">
75+
<a-form-item
76+
:label="this.$t('label.clusterid')">
77+
<a-select
78+
v-decorator="['clusterid']"
79+
showSearch
80+
optionFilterProp="children"
81+
:filterOption="filterOption"
82+
:options="clusterSelectOptions"
83+
:loading="optionLoading.clusters"
84+
@change="onSelectClusterId"
85+
></a-select>
86+
</a-form-item>
87+
</a-col>
88+
</a-form>
9089
<a-divider />
91-
<a-row :gutter="12" style="display: flex">
90+
<a-row :gutter="12">
9291
<a-col :md="24" :lg="12">
9392
<a-card class="instances-card">
9493
<span slot="title">
@@ -104,7 +103,7 @@
104103
shape="round"
105104
@click="fetchUnmanagedInstances()" >
106105
</a-button>
107-
<span style="margin-left: 12px">
106+
<span style="float: right; width: 50%">
108107
<search-view
109108
:searchFilters="searchFilters.unmanaged"
110109
:searchParams="searchParams.unmanaged"
@@ -142,7 +141,7 @@
142141
<span>{{ props.value }} / {{ $t('label.page') }}</span>
143142
</template>
144143
</a-pagination>
145-
<div :span="24" class="action-button-left">
144+
<div :span="24" class="action-button-right">
146145
<a-button
147146
:loading="importUnmanagedInstanceLoading"
148147
:disabled="!(('importUnmanagedInstance' in $store.getters.apis) && unmanagedInstancesSelectedRowKeys.length > 0)"
@@ -170,7 +169,7 @@
170169
shape="round"
171170
@click="fetchManagedInstances()" >
172171
</a-button>
173-
<span style="margin-left: 12px">
172+
<span style="float: right; width: 50%">
174173
<search-view
175174
:searchFilters="searchFilters.managed"
176175
:searchParams="searchParams.managed"
@@ -815,4 +814,16 @@ export default {
815814
.action-button-right {
816815
text-align: right;
817816
}
817+
818+
.breadcrumb-card {
819+
margin-left: -24px;
820+
margin-right: -24px;
821+
margin-top: -16px;
822+
margin-bottom: 12px;
823+
}
824+
825+
.ant-breadcrumb {
826+
vertical-align: text-bottom;
827+
}
828+
818829
</style>

0 commit comments

Comments
 (0)