YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

add alert variant option for FormField description

Browse source
This commit is contained in:
Axolotle 2020-11-25 18:26:31 +01:00
parent 864945a2ac
commit 4dd44ec9d1
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/components/globals/FormField.vue
View file

@ -35,7 +35,7 @@
</b-link> </b-link>
</div> </div>
<span v-if="description" v-html="description" /> <div v-if="description" v-html="description" :class="{ ['alert p-1 px-2 alert-' + descriptionVariant]: descriptionVariant }"/>
</template> </template>
<!-- Slot available to overwrite the one above --> <!-- Slot available to overwrite the one above -->
<slot name="description" /> <slot name="description" />
@ -53,6 +53,7 @@ export default {
// Component props (other <form-group> related attrs are passed thanks to $attrs) // Component props (other <form-group> related attrs are passed thanks to $attrs)
id: { type: String, default: null }, id: { type: String, default: null },
description: { type: String, default: null }, description: { type: String, default: null },
descriptionVariant: { type: String, default: null },
example: { type: String, default: null }, example: { type: String, default: null },
link: { type: Object, default: null }, link: { type: Object, default: null },
// Rendered field component props // Rendered field component props

5
app/src/i18n/locales/en.json
View file

@ -397,8 +397,9 @@
"tools_shuttingdown": "Your server is powering off. As long as your server is off, you won't be able to use the web administration.", "tools_shuttingdown": "Your server is powering off. As long as your server is off, you won't be able to use the web administration.",
"tools_shutdown_reboot": "Shutdown/Reboot", "tools_shutdown_reboot": "Shutdown/Reboot",
"tools_webadmin": { "tools_webadmin": {
"locale": "Locale", "language": "Language",
"fallback_locale": "Fallback locale", "fallback_language": "Fallback language",
"fallback_language_description": "Language that will be used in case the translation is not available in the main language.",
"cache": "Cache", "cache": "Cache",
"cache_description": "Consider disabling the cache if you plan on working with the CLI while also navigating in this web-admin.", "cache_description": "Consider disabling the cache if you plan on working with the CLI while also navigating in this web-admin.",
"experimental": "Experimental mode", "experimental": "Experimental mode",

2
app/src/views/user/UserCreate.vue
View file

@ -117,12 +117,14 @@ export default {
id: 'mail', id: 'mail',
label: this.$i18n.t('user_email'), label: this.$i18n.t('user_email'),
description: this.$i18n.t('tip_about_user_email'), description: this.$i18n.t('tip_about_user_email'),
descriptionVariant: 'info',
props: { choices: [] } props: { choices: [] }
}, },
password: { password: {
label: this.$i18n.t('password'), label: this.$i18n.t('password'),
description: this.$i18n.t('good_practices_about_user_password'), description: this.$i18n.t('good_practices_about_user_password'),
descriptionVariant: 'warning',
props: { props: {
id: 'password', id: 'password',
placeholder: '••••••••', placeholder: '••••••••',

1
app/src/views/user/UserEdit.vue
View file

@ -198,6 +198,7 @@ export default {
password: { password: {
label: this.$i18n.t('password'), label: this.$i18n.t('password'),
description: this.$i18n.t('good_practices_about_user_password'), description: this.$i18n.t('good_practices_about_user_password'),
descriptionVariant: 'warning',
props: { id: 'password', type: 'password', placeholder: '••••••••' } props: { id: 'password', type: 'password', placeholder: '••••••••' }
}, },