MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/player-improvements' into 'develop' 

Small Player / Queue Improvements

See merge request funkwhale/funkwhale!1260
This commit is contained in:
Agate 2021-01-03 17:57:50 +01:00
parent 6d15490acd c79d00ec70
commit 94d4adc8e2
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
front/src/components/Queue.vue
View File

@ -15,10 +15,10 @@
{{ currentTrack.title }}
</router-link>
<div class="sub header ellipsis">
<router-link class="discrete link artist" :to="{name: 'library.artists.detail', params: {id: currentTrack.artist.id }}">
{{ currentTrack.artist.name }}</router-link> <template v-if="currentTrack.album">/<router-link class="discrete link album" :to="{name: 'library.albums.detail', params: {id: currentTrack.album.id }}">
{{ currentTrack.album.title }}
</router-link></template>
<router-link class="discrete link artist" :to="{name: 'library.artists.detail', params: {id: currentTrack.artist.id }}">{{ currentTrack.artist.name }}</router-link>
<template v-if="currentTrack.album"> /
<router-link class="discrete link album" :to="{name: 'library.albums.detail', params: {id: currentTrack.album.id }}">{{ currentTrack.album.title }}</router-link>
</template>
</div>
</div>
</h1>
@ -128,7 +128,12 @@
<h2 class="ui header">
<div class="content">
<button
class="ui right floated basic icon button"
class="ui right floated basic button"
@click="$store.commit('ui/queueFocused', null)">
<translate translate-context="*/Queue/*/Verb">Close</translate>
</button>
<button
class="ui right floated basic button danger"
@click="$store.dispatch('queue/clean')">
<translate translate-context="*/Queue/*/Verb">Clear</translate>
</button>

8
front/src/components/audio/Player.vue
View File

@ -24,10 +24,10 @@
</router-link>
</strong>
<div class="meta">
<router-link @click.stop.prevent="" class="discrete link" :to="{name: 'library.artists.detail', params: {id: currentTrack.artist.id }}">
{{ currentTrack.artist.name }}</router-link><template v-if="currentTrack.album"> /<router-link @click.stop.prevent="" class="discrete link" :to="{name: 'library.albums.detail', params: {id: currentTrack.album.id }}">
{{ currentTrack.album.title }}
</router-link></template>
<router-link @click.stop.prevent="" class="discrete link" :to="{name: 'library.artists.detail', params: {id: currentTrack.artist.id }}">{{ currentTrack.artist.name }}</router-link>
<template v-if="currentTrack.album"> /
<router-link @click.stop.prevent="" class="discrete link" :to="{name: 'library.albums.detail', params: {id: currentTrack.album.id }}">{{ currentTrack.album.title }}</router-link>
</template>
</div>
</div>
</div>