mirror
/
funkwhale
kopia lustrzana https://dev.funkwhale.audio/funkwhale/funkwhale
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'structured-sidebar' into 'develop' 

More structured menus in sidebar

See merge request funkwhale/funkwhale!176
merge-requests/180/head
Eliot Berriot 2018-04-28 13:01:24 +00:00
rodzic 770f9fbda4 01e06de812
commit f76f8d53cb
2 zmienionych plików z 38 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
changes/changelog.d/sidebar.enhancement 100644
Wyświetl plik

@ -0,0 +1 @@
More structured menus in sidebar

54
front/src/components/Sidebar.vue
Wyświetl plik

@ -31,23 +31,38 @@
<div class="tabs"> <div class="tabs">
<div class="ui bottom attached active tab" data-tab="library"> <div class="ui bottom attached active tab" data-tab="library">
<div class="ui inverted vertical fluid menu"> <div class="ui inverted vertical fluid menu">
<router-link class="item" v-if="$store.state.auth.authenticated" :to="{name: 'profile', params: {username: $store.state.auth.username}}"><i class="user icon"></i>{{ $t('Logged in as {%name%}', { name: $store.state.auth.username }) }}</router-link> <div class="item">
<router-link class="item" v-if="$store.state.auth.authenticated" :to="{name: 'logout'}"><i class="sign out icon"></i> {{ $t('Logout') }}</router-link> <div class="header">{{ $t('My account') }}</div>
<router-link class="item" v-else :to="{name: 'login'}"><i class="sign in icon"></i> {{ $t('Login') }}</router-link> <div class="menu">
<router-link class="item" :to="{path: '/library'}"><i class="sound icon"> </i>{{ $t('Browse library') }}</router-link> <router-link class="item" v-if="$store.state.auth.authenticated" :to="{name: 'profile', params: {username: $store.state.auth.username}}"><i class="user icon"></i>{{ $t('Logged in as {%name%}', { name: $store.state.auth.username }) }}</router-link>
<router-link class="item" v-if="$store.state.auth.authenticated" :to="{path: '/favorites'}"><i class="heart icon"></i> {{ $t('Favorites') }}</router-link> <router-link class="item" v-if="$store.state.auth.authenticated" :to="{name: 'logout'}"><i class="sign out icon"></i> {{ $t('Logout') }}</router-link>
<a <router-link class="item" v-else :to="{name: 'login'}"><i class="sign in icon"></i> {{ $t('Login') }}</router-link>
@click="$store.commit('playlists/chooseTrack', null)" </div>
v-if="$store.state.auth.authenticated" </div>
class="item"> <div class="item">
<i class="list icon"></i> {{ $t('Playlists') }} <div class="header">{{ $t('Music') }}</div>
</a> <div class="menu">
<router-link <router-link class="item" :to="{path: '/library'}"><i class="sound icon"> </i>{{ $t('Browse library') }}</router-link>
v-if="$store.state.auth.authenticated" <router-link class="item" v-if="$store.state.auth.authenticated" :to="{path: '/favorites'}"><i class="heart icon"></i> {{ $t('Favorites') }}</router-link>
class="item" :to="{path: '/activity'}"><i class="bell icon"></i> {{ $t('Activity') }}</router-link> <a
<router-link @click="$store.commit('playlists/chooseTrack', null)"
class="item" v-if="$store.state.auth.availablePermissions['federation.manage']" v-if="$store.state.auth.authenticated"
:to="{path: '/manage/federation/libraries'}"><i class="sitemap icon"></i> {{ $t('Federation') }}</router-link> class="item">
<i class="list icon"></i> {{ $t('Playlists') }}
</a>
<router-link
v-if="$store.state.auth.authenticated"
class="item" :to="{path: '/activity'}"><i class="bell icon"></i> {{ $t('Activity') }}</router-link>
</div>
</div>
<div class="item" v-if="$store.state.auth.availablePermissions['federation.manage']">
<div class="header">{{ $t('Administration') }}</div>
<div class="menu">
<router-link
class="item"
:to="{path: '/manage/federation/libraries'}"><i class="sitemap icon"></i> {{ $t('Federation') }}</router-link>
</div>
</div>
</div> </div>
</div> </div>
<div v-if="queue.previousQueue " class="ui black icon message"> <div v-if="queue.previousQueue " class="ui black icon message">
@ -231,6 +246,11 @@ $sidebar-color: #3D3E3F;
} }
} }
} }
.vertical.menu {
.item .item {
font-size: 1em;
}
}
.tabs { .tabs {
flex: 1; flex: 1;
display: flex; display: flex;