Merge branch '184-federation-ui-glitches' into 'develop'
Resolve "Small UI glitches on federation tab" Closes #184 See merge request funkwhale/funkwhale!169
This commit is contained in:
commit
cfffbe391e
|
@ -0,0 +1 @@
|
|||
Fixed small UI glitches/bugs in federation tabs (#184)
|
|
@ -97,6 +97,12 @@ html, body {
|
|||
}
|
||||
}
|
||||
|
||||
.ellipsis {
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.ui.small.text.container {
|
||||
max-width: 500px !important;
|
||||
}
|
||||
|
|
|
@ -1,8 +1,12 @@
|
|||
<template>
|
||||
<div class="ui card">
|
||||
<div class="content">
|
||||
<div class="header">
|
||||
{{ displayName }}
|
||||
<div class="header ellipsis">
|
||||
<router-link
|
||||
:title="displayName"
|
||||
:to="{name: 'federation.libraries.detail', params: {id: library.uuid }}">
|
||||
{{ displayName }}
|
||||
</router-link>
|
||||
</div>
|
||||
</div>
|
||||
<div class="content">
|
||||
|
|
|
@ -72,7 +72,7 @@ export default {
|
|||
this.isLoading = true
|
||||
self.errors = []
|
||||
self.result = null
|
||||
axios.get('/federation/libraries/fetch/', {params: {account: this.libraryUsername}}).then((response) => {
|
||||
axios.get('/federation/libraries/fetch/', {params: {account: this.libraryUsername.trim()}}).then((response) => {
|
||||
self.result = response.data
|
||||
self.result.display_name = self.libraryUsername
|
||||
self.isLoading = false
|
||||
|
|
|
@ -89,7 +89,7 @@
|
|||
<router-link
|
||||
v-if="importBatch"
|
||||
:to="{name: 'library.import.batches.detail', params: {id: importBatch.id }}">
|
||||
<i18next path="Import #{%id%} launched" :id="importBatch.id"/>
|
||||
{{ $t('Import #{% id %} launched', {id: importBatch.id}) }}
|
||||
</router-link>
|
||||
</th>
|
||||
<th></th>
|
||||
|
|
|
@ -84,7 +84,12 @@
|
|||
<tr>
|
||||
<td>{{ $t('Library size') }}</td>
|
||||
<td>
|
||||
{{ $t('{%count%} tracks', { count: object.tracks_count }) }}
|
||||
<template v-if="object.tracks_count">
|
||||
{{ $t('{%count%} tracks', { count: object.tracks_count }) }}
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ $t('Unkwnown') }}
|
||||
</template>
|
||||
</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
<div class="fields">
|
||||
<div class="field">
|
||||
<label>{{ $t('Search') }}</label>
|
||||
<input type="text" v-model="query" placeholder="Enter an library domain name..."/>
|
||||
<input class="search" type="text" v-model="query" placeholder="Enter an library domain name..."/>
|
||||
</div>
|
||||
<div class="field">
|
||||
<label>{{ $t('Ordering') }}</label>
|
||||
|
@ -115,6 +115,7 @@ export default {
|
|||
},
|
||||
mounted () {
|
||||
$('.ui.dropdown').dropdown()
|
||||
$(this.$el).find('.field .search').focus()
|
||||
},
|
||||
methods: {
|
||||
updateQueryString: _.debounce(function () {
|
||||
|
|
Loading…
Reference in New Issue