Merge branch 'feat/customize_friendly_instance_button' into 'dev'

allow to customize the button to friendly instances, set new default value to 'friendly instances'

See merge request les/gancio!19
This commit is contained in:
les
2022-11-25 09:00:05 +00:00
15 changed files with 43 additions and 2 deletions

View File

@@ -11,7 +11,7 @@ v-footer(aria-label='Footer')
v-menu(v-if='settings.enable_trusted_instances && settings.trusted_instances && settings.trusted_instances.length'
offset-y bottom open-on-hover transition="slide-y-transition")
template(v-slot:activator="{ on, attrs }")
v-btn.ml-1(v-bind='attrs' v-on='on' color='primary' text) {{$t('common.places')}}
v-btn.ml-1(v-bind='attrs' v-on='on' color='primary' text) {{ settings.trusted_instances_label || $t('admin.trusted_instances_label_default')}}
v-list(subheaders two-lines)
v-list-item(v-for='instance in settings.trusted_instances'
:key='instance.name'

View File

@@ -40,6 +40,13 @@ v-container
@blur='save("instance_place", instance_place)'
)
v-text-field.mt-4(v-model='trusted_instances_label'
:label="$t('admin.trusted_instances_label')"
persistent-hint inset
:hint="$t('admin.trusted_instances_label_help')"
@blur='save("trusted_instances_label", trusted_instances_label)'
)
v-dialog(v-model='dialogAddInstance' width='500px' :fullscreen='$vuetify.breakpoint.xsOnly')
v-card
v-card-title {{$t('admin.add_trusted_instance')}}
@@ -82,6 +89,7 @@ export default {
instance_url: '',
instance_name: $store.state.settings.instance_name,
instance_place: $store.state.settings.instance_place,
trusted_instances_label: $store.state.settings.trusted_instances_label,
url2host: $options.filters.url2host,
dialogAddInstance: false,
loading: false,