This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a commit to branch 4.18
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.18 by this push:
new ddc2a362a88 UI: Add missing tooltips to Register/Upload Templates/ISOs
views (#7879)
ddc2a362a88 is described below
commit ddc2a362a88eb5f4347693a9c1ec9ba8922a4b77
Author: Nicolas Vazquez <[email protected]>
AuthorDate: Mon Aug 21 06:13:25 2023 -0300
UI: Add missing tooltips to Register/Upload Templates/ISOs views (#7879)
---
ui/src/views/image/RegisterOrUploadIso.vue | 60 ++++++++++++++++++-------
ui/src/views/image/RegisterOrUploadTemplate.vue | 60 +++++++++++++++++++------
2 files changed, 91 insertions(+), 29 deletions(-)
diff --git a/ui/src/views/image/RegisterOrUploadIso.vue
b/ui/src/views/image/RegisterOrUploadIso.vue
index cf1435a6034..aa127a3d405 100644
--- a/ui/src/views/image/RegisterOrUploadIso.vue
+++ b/ui/src/views/image/RegisterOrUploadIso.vue
@@ -35,8 +35,10 @@
<a-form-item
v-if="currentForm === 'Create'"
ref="url"
- name="url"
- :label="$t('label.url')">
+ name="url">
+ <template #label>
+ <tooltip-label :title="$t('label.url')"
:tooltip="apiParams.url.description"/>
+ </template>
<a-input
v-focus="currentForm === 'Create'"
v-model:value="form.url"
@@ -61,23 +63,35 @@
</p>
</a-upload-dragger>
</a-form-item>
- <a-form-item ref="name" name="name" :label="$t('label.name')">
+ <a-form-item ref="name" name="name">
+ <template #label>
+ <tooltip-label :title="$t('label.name')"
:tooltip="apiParams.name.description"/>
+ </template>
<a-input
v-model:value="form.name"
:placeholder="apiParams.name.description"
v-focus="currentForm !== 'Create'" />
</a-form-item>
- <a-form-item ref="displaytext" name="displaytext"
:label="$t('label.displaytext')">
+ <a-form-item ref="displaytext" name="displaytext">
+ <template #label>
+ <tooltip-label :title="$t('label.displaytext')"
:tooltip="apiParams.displaytext.description"/>
+ </template>
<a-input
v-model:value="form.displaytext"
:placeholder="apiParams.displaytext.description" />
</a-form-item>
- <a-form-item ref="directdownload" name="directdownload" v-if="allowed
&& currentForm !== 'Upload'" :label="$t('label.directdownload')">
+ <a-form-item ref="directdownload" name="directdownload" v-if="allowed
&& currentForm !== 'Upload'">
+ <template #label>
+ <tooltip-label :title="$t('label.directdownload')"
:tooltip="apiParams.directdownload.description"/>
+ </template>
<a-switch v-model:checked="form.directdownload"/>
</a-form-item>
- <a-form-item ref="zoneid" name="zoneid" :label="$t('label.zoneid')">
+ <a-form-item ref="zoneid" name="zoneid">
+ <template #label>
+ <tooltip-label :title="$t('label.zoneid')"
:tooltip="apiParams.zoneid.description"/>
+ </template>
<a-select
v-model:value="form.zoneid"
showSearch
@@ -97,11 +111,17 @@
</a-select>
</a-form-item>
- <a-form-item ref="bootable" name="bootable"
:label="$t('label.bootable')">
+ <a-form-item ref="bootable" name="bootable">
+ <template #label>
+ <tooltip-label :title="$t('label.bootable')"
:tooltip="apiParams.bootable.description"/>
+ </template>
<a-switch v-model:checked="form.bootable" />
</a-form-item>
- <a-form-item ref="ostypeid" name="ostypeid" v-if="form.bootable"
:label="$t('label.ostypeid')">
+ <a-form-item ref="ostypeid" name="ostypeid" v-if="form.bootable">
+ <template #label>
+ <tooltip-label :title="$t('label.ostypeid')"
:tooltip="apiParams.ostypeid.description"/>
+ </template>
<a-select
v-model:value="form.ostypeid"
showSearch
@@ -125,8 +145,10 @@
<a-col :md="24" :lg="12">
<a-form-item
name="userdataid"
- ref="userdataid"
- :label="$t('label.userdata')">
+ ref="userdataid">
+ <template #label>
+ <tooltip-label :title="$t('label.userdata')"
:tooltip="linkUserDataParams.userdataid.description"/>
+ </template>
<a-select
showSearch
optionFilterProp="label"
@@ -145,7 +167,7 @@
<a-col :md="24" :lg="12">
<a-form-item ref="userdatapolicy" name="userdatapolicy">
<template #label>
- <tooltip-label :title="$t('label.userdatapolicy')"
:tooltip="$t('label.userdatapolicy.tooltip')"/>
+ <tooltip-label :title="$t('label.userdatapolicy')"
:tooltip="linkUserDataParams.userdatapolicy.description"/>
</template>
<a-select
v-model:value="userdatapolicy"
@@ -162,19 +184,27 @@
</a-col>
</a-row>
- <a-form-item ref="isextractable" name="isextractable"
:label="$t('label.isextractable')">
+ <a-form-item ref="isextractable" name="isextractable">
+ <template #label>
+ <tooltip-label :title="$t('label.isextractable')"
:tooltip="apiParams.isextractable.description"/>
+ </template>
<a-switch v-model:checked="form.isextractable" />
</a-form-item>
<a-form-item
ref="ispublic"
name="ispublic"
- :label="$t('label.ispublic')"
v-if="$store.getters.userInfo.roletype === 'Admin' ||
$store.getters.features.userpublictemplateenabled" >
+ <template #label>
+ <tooltip-label :title="$t('label.ispublic')"
:tooltip="apiParams.ispublic.description"/>
+ </template>
<a-switch v-model:checked="form.ispublic" />
</a-form-item>
- <a-form-item ref="isfeatured" name="isfeatured"
:label="$t('label.isfeatured')" v-if="$store.getters.userInfo.roletype ===
'Admin'">
+ <a-form-item ref="isfeatured" name="isfeatured"
v-if="$store.getters.userInfo.roletype === 'Admin'">
+ <template #label>
+ <tooltip-label :title="$t('label.isfeatured')"
:tooltip="apiParams.isfeatured.description"/>
+ </template>
<a-switch v-model:checked="form.isfeatured" />
</a-form-item>
@@ -276,7 +306,7 @@ export default {
params.showicon = true
this.zoneLoading = true
- if (store.getters.userInfo.roletype === this.rootAdmin) {
+ if (store.getters.userInfo.roletype === 'Admin') {
this.allowed = true
}
api('listZones', params).then(json => {
diff --git a/ui/src/views/image/RegisterOrUploadTemplate.vue
b/ui/src/views/image/RegisterOrUploadTemplate.vue
index e4d4687c326..c8e7ad3510e 100644
--- a/ui/src/views/image/RegisterOrUploadTemplate.vue
+++ b/ui/src/views/image/RegisterOrUploadTemplate.vue
@@ -32,7 +32,10 @@
@finish="handleSubmit"
layout="vertical">
<div v-if="currentForm === 'Create'">
- <a-form-item :label="$t('label.url')" name="url" ref="url">
+ <a-form-item name="url" ref="url">
+ <template #label>
+ <tooltip-label :title="$t('label.url')"
:tooltip="apiParams.url.description"/>
+ </template>
<a-input
v-focus="currentForm === 'Create'"
v-model:value="form.url"
@@ -56,22 +59,30 @@
</a-upload-dragger>
</a-form-item>
</div>
- <a-form-item :label="$t('label.name')" ref="name" name="name">
+ <a-form-item ref="name" name="name">
+ <template #label>
+ <tooltip-label :title="$t('label.name')"
:tooltip="apiParams.name.description"/>
+ </template>
<a-input
v-model:value="form.name"
:placeholder="apiParams.name.description"
v-focus="currentForm !== 'Create'"/>
</a-form-item>
- <a-form-item :label="$t('label.displaytext')" ref="displaytext"
name="displaytext">
+ <a-form-item ref="displaytext" name="displaytext">
+ <template #label>
+ <tooltip-label :title="$t('label.displaytext')"
:tooltip="apiParams.displaytext.description"/>
+ </template>
<a-input
v-model:value="form.displaytext"
:placeholder="apiParams.displaytext.description" />
</a-form-item>
<div v-if="currentForm === 'Create'">
<a-form-item
- :label="$t('label.zone')"
name="zoneids"
ref="zoneids">
+ <template #label>
+ <tooltip-label :title="$t('label.zone')"
:tooltip="apiParams.zoneids.description"/>
+ </template>
<a-select
v-model:value="form.zoneids"
:loading="zones.loading"
@@ -94,9 +105,11 @@
</div>
<div v-else>
<a-form-item
- :label="$t('label.zoneid')"
ref="zoneid"
name="zoneid">
+ <template #label>
+ <tooltip-label :title="$t('label.zoneid')"
:tooltip="apiParams.zoneid.description"/>
+ </template>
<a-select
v-model:value="form.zoneid"
showSearch
@@ -119,7 +132,10 @@
</div>
<a-row :gutter="12">
<a-col :md="24" :lg="12">
- <a-form-item ref="hypervisor" name="hypervisor"
:label="$t('label.hypervisor')">
+ <a-form-item ref="hypervisor" name="hypervisor">
+ <template #label>
+ <tooltip-label :title="$t('label.hypervisor')"
:tooltip="apiParams.hypervisor.description"/>
+ </template>
<a-select
v-model:value="form.hypervisor"
:loading="hyperVisor.loading"
@@ -137,7 +153,10 @@
</a-form-item>
</a-col>
<a-col :md="24" :lg="12">
- <a-form-item ref="format" name="format"
:label="$t('label.format')">
+ <a-form-item ref="format" name="format">
+ <template #label>
+ <tooltip-label :title="$t('label.format')"
:tooltip="apiParams.format.description"/>
+ </template>
<a-select
v-model:value="form.format"
:placeholder="apiParams.format.description"
@@ -156,12 +175,18 @@
</a-row>
<a-row :gutter="12" v-if="allowed && hyperKVMShow && currentForm !==
'Upload'">
<a-col :md="24" :lg="12">
- <a-form-item ref="directdownload" name="directdownload"
:label="$t('label.directdownload')">
+ <a-form-item ref="directdownload" name="directdownload">
+ <template #label>
+ <tooltip-label :title="$t('label.directdownload')"
:tooltip="apiParams.directdownload.description"/>
+ </template>
<a-switch v-model:checked="form.directdownload"
@change="handleChangeDirect" />
</a-form-item>
</a-col>
<a-col :md="24" :lg="12" v-if="allowDirectDownload">
- <a-form-item ref="checksum" name="checksum"
:label="$t('label.checksum')">
+ <a-form-item ref="checksum" name="checksum">
+ <template #label>
+ <tooltip-label :title="$t('label.checksum')"
:tooltip="apiParams.checksum.description"/>
+ </template>
<a-input
v-model:value="form.checksum"
:placeholder="apiParams.checksum.description" />
@@ -174,7 +199,10 @@
</a-form-item>
</a-row>
- <a-form-item ref="deployasis" name="deployasis"
:label="$t('label.deployasis')" v-if="selectedFormat === 'OVA'">
+ <a-form-item ref="deployasis" name="deployasis" v-if="selectedFormat
=== 'OVA'">
+ <template #label>
+ <tooltip-label :title="$t('label.deployasis')"
:tooltip="apiParams.deployasis.description"/>
+ </template>
<a-switch
v-model:checked="form.deployasis"
:checked="deployasis"
@@ -237,8 +265,10 @@
<a-form-item
name="ostypeid"
ref="ostypeid"
- :label="$t('label.ostypeid')"
v-if="!hyperVMWShow || (hyperVMWShow && !deployasis)">
+ <template #label>
+ <tooltip-label :title="$t('label.ostypeid')"
:tooltip="apiParams.ostypeid.description"/>
+ </template>
<a-select
showSearch
optionFilterProp="label"
@@ -257,8 +287,10 @@
<a-col :md="24" :lg="12">
<a-form-item
name="userdataid"
- ref="userdataid"
- :label="$t('label.userdata')">
+ ref="userdataid">
+ <template #label>
+ <tooltip-label :title="$t('label.userdata')"
:tooltip="linkUserDataParams.userdataid.description"/>
+ </template>
<a-select
showSearch
optionFilterProp="label"
@@ -277,7 +309,7 @@
<a-col :md="24" :lg="12">
<a-form-item ref="userdatapolicy" name="userdatapolicy">
<template #label>
- <tooltip-label :title="$t('label.userdatapolicy')"
:tooltip="$t('label.userdatapolicy.tooltip')"/>
+ <tooltip-label :title="$t('label.userdatapolicy')"
:tooltip="linkUserDataParams.userdatapolicy.description"/>
</template>
<a-select
v-model:value="userdatapolicy"
