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

migration(bvn): remove no longer necessary BInputGroupAppend|Prepend

Browse source
This commit is contained in:
axolotle 2024-03-19 03:06:03 +01:00
parent e53c2c14d3
commit 357405d2a3
5 changed files with 48 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/src/components/AdressInputSelect.vue
View file

@ -9,18 +9,14 @@
@update:modelValue="onInput('localPart', $event)" @update:modelValue="onInput('localPart', $event)"
/> />
<BInputGroupAppend> <BInputGroupText>{{ modelValue.separator }}</BInputGroupText>
<BInputGroupText>{{ modelValue.separator }}</BInputGroupText>
</BInputGroupAppend>
<BInputGroupAppend> <SelectItem
<SelectItem :modelValue="modelValue.domain"
:modelValue="modelValue.domain" :choices="choices"
:choices="choices" :aria-describedby="id + 'domain-desc'"
:aria-describedby="id + 'domain-desc'" @update:modelValue="onInput('domain', $event)"
@update:modelValue="onInput('domain', $event)" />
/>
</BInputGroupAppend>
<span <span
class="sr-only" class="sr-only"
@ -60,13 +56,3 @@ export default {
}, },
} }
</script> </script>
<style lang="scss" scoped>
.input-group-append ~ .input-group-append {
flex-basis: 40%;
}
select {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
</style>

4
app/src/components/globals/ViewSearch.vue
View file

@ -5,9 +5,9 @@
</template> </template>
<template v-if="!hasCustomTopBar" #top-bar-group-left> <template v-if="!hasCustomTopBar" #top-bar-group-left>
<BInputGroup class="w-100"> <BInputGroup class="w-100">
<BInputGroupPrepend is-text> <BInputGroupText>
<YIcon iname="search" /> <YIcon iname="search" />
</BInputGroupPrepend> </BInputGroupText>
<BFormInput <BFormInput
id="top-bar-search" id="top-bar-search"

44
app/src/views/app/AppCatalog.vue
View file

@ -10,48 +10,49 @@
<div id="view-top-bar"> <div id="view-top-bar">
<!-- APP SEARCH --> <!-- APP SEARCH -->
<BInputGroup> <BInputGroup>
<BInputGroupPrepend is-text> <BInputGroupText>
<YIcon iname="search" /> <YIcon iname="search" />
</BInputGroupPrepend> </BInputGroupText>
<BFormInput <BFormInput
id="search-input" id="search-input"
:placeholder="$t('search.for', { items: $t('items.apps', 2) })" :placeholder="$t('search.for', { items: $t('items.apps', 2) })"
:modelValue="search" :modelValue="search"
@update:modelValue="updateQuery('search', $event)" @update:modelValue="updateQuery('search', $event)"
/> />
<BInputGroupAppend>
<BFormSelect <BFormSelect
:modelValue="quality" :modelValue="quality"
:options="qualityOptions" :options="qualityOptions"
@update:modelValue="updateQuery('quality', $event)" @update:modelValue="updateQuery('quality', $event)"
/> />
</BInputGroupAppend>
</BInputGroup> </BInputGroup>
<!-- CATEGORY SELECT --> <!-- CATEGORY SELECT -->
<BInputGroup class="mt-3"> <BInputGroup class="mt-3">
<BInputGroupPrepend is-text> <BInputGroupText>
<YIcon iname="filter" /> <YIcon iname="filter" />
</BInputGroupPrepend> </BInputGroupText>
<BFormSelect <BFormSelect
:modelValue="category" :modelValue="category"
:options="categories" :options="categories"
@update:modelValue="updateQuery('category', $event)" @update:modelValue="updateQuery('category', $event)"
/> />
<BInputGroupAppend>
<BButton <BButton
variant="primary" variant="primary"
:disabled="category === null" :disabled="category === null"
@click="updateQuery('category', null)" @click="updateQuery('category', null)"
> >
{{ $t('app_show_categories') }} {{ $t('app_show_categories') }}
</BButton> </BButton>
</BInputGroupAppend>
</BInputGroup> </BInputGroup>
<!-- CATEGORIES SUBTAGS --> <!-- CATEGORIES SUBTAGS -->
<BInputGroup v-if="subtags" class="mt-3 subtags"> <BInputGroup v-if="subtags" class="mt-3 subtags">
<BInputGroupPrepend is-text> Subtags </BInputGroupPrepend> <BInputGroupText>Subtags</BInputGroupText>
<BFormRadioGroup <BFormRadioGroup
id="subtags-radio" id="subtags-radio"
name="subtags" name="subtags"
@ -61,6 +62,7 @@
buttons buttons
button-variant="outline-secondary" button-variant="outline-secondary"
/> />
<BFormSelect <BFormSelect
id="subtags-select" id="subtags-select"
:modelValue="subtag" :modelValue="subtag"

30
app/src/views/app/AppInfo.vue
View file

@ -156,19 +156,19 @@
:id="'perm' + i" :id="'perm' + i"
:aria-describedby="'perm-' + i + '_group__BV_description_'" :aria-describedby="'perm-' + i + '_group__BV_description_'"
/> />
<BInputGroupAppend v-if="perm.tileAvailable" is-text>
<BInputGroupText v-if="perm.tileAvailable">
<CheckboxItem <CheckboxItem
v-model="form.labels[i].show_tile" v-model="form.labels[i].show_tile"
:label="$t('permission_show_tile_enabled')" :label="$t('permission_show_tile_enabled')"
/> />
</BInputGroupAppend> </BInputGroupText>
<BInputGroupAppend>
<BButton <BButton
variant="info" variant="info"
v-t="'save'" v-t="'save'"
@click="changeLabel(perm.name, form.labels[i])" @click="changeLabel(perm.name, form.labels[i])"
/> />
</BInputGroupAppend>
</BInputGroup> </BInputGroup>
</template> </template>
@ -213,13 +213,11 @@
v-if="app.is_webapp" v-if="app.is_webapp"
> >
<BInputGroup v-if="app.supports_change_url"> <BInputGroup v-if="app.supports_change_url">
<BInputGroupPrepend is-text> https:// </BInputGroupPrepend> <BInputGroupText>https://</BInputGroupText>
<BInputGroupPrepend class="flex-grow-1"> <BFormSelect v-model="form.url.domain" :options="domains" />
<BFormSelect v-model="form.url.domain" :options="domains" />
</BInputGroupPrepend>
<BInputGroupPrepend is-text> / </BInputGroupPrepend> <BInputGroupText>/</BInputGroupText>
<BFormInput <BFormInput
id="input-url" id="input-url"
@ -227,9 +225,7 @@
class="flex-grow-3" class="flex-grow-3"
/> />
<BInputGroupAppend> <BButton @click="changeUrl" variant="info" v-t="'save'" />
<BButton @click="changeUrl" variant="info" v-t="'save'" />
</BInputGroupAppend>
</BInputGroup> </BInputGroup>
<div v-else class="alert alert-warning"> <div v-else class="alert alert-warning">

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

@ -30,15 +30,9 @@
<FormField v-bind="fields.domain" :validation="v$.form.domain"> <FormField v-bind="fields.domain" :validation="v$.form.domain">
<template #default="{ self }"> <template #default="{ self }">
<BInputGroup> <BInputGroup>
<BInputGroupAppend> <BInputGroupText id="local-part" tag="label" class="border-right-0">
<BInputGroupText {{ form.username }}@
id="local-part" </BInputGroupText>
tag="label"
class="border-right-0"
>
{{ form.username }}@
</BInputGroupText>
</BInputGroupAppend>
<SelectItem <SelectItem
aria-labelledby="local-part" aria-labelledby="local-part"