PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2024-11-22 21:18:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #52 from Poniverse/nav-fix

Browse source 
Navigation Update
This commit is contained in:
Andre Santos 2016-01-07 20:05:50 +00:00
commit b009eb9efd
3 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
public/templates/content/_layout.html
View file

@ -1,8 +0,0 @@
<ul class="tabs">
<li ng-class="{active: stateIncludes('content.tracks') || stateIncludes('content.track')}"><a href="/tracks">Tracks</a></li>
<li ng-class="{active: stateIncludes('content.albums') || stateIncludes('content.album')}"><a href="/albums">Albums</a></li>
<li ng-class="{active: stateIncludes('content.playlists') || stateIncludes('content.playlist')}"><a href="/playlists">Playlists</a></li>
<li ng-class="{active: stateIncludes('content.artists') || stateIncludes('content.artist')}"><a href="/artists">Artists</a></li>
</ul>
<ui-view></ui-view>

2
resources/assets/scripts/app/app.coffee
View file

@ -168,7 +168,7 @@ module.config [
state.state 'content', state.state 'content',
abstract: true abstract: true
templateUrl: '/templates/content/_layout.html' template: '<ui-view/>'
state.state 'content.tracks', state.state 'content.tracks',
templateUrl: '/templates/tracks/index.html' templateUrl: '/templates/tracks/index.html'

20
resources/views/shared/_app_layout.blade.php
View file

@ -54,6 +54,8 @@
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="{{Auth::user()->url}}">Your Profile</a></li> <li><a href="{{Auth::user()->url}}">Your Profile</a></li>
<li ng-class="{active: stateIncludes('favourites')}"><a href="/account/favourites/tracks">Favourites</a></li>
<li ng-class="{active: stateIncludes('account')}"><a href="/account/tracks">Account</a></li>
<li><a href="#" pfm-eat-click ng-click="logout()">Logout</a></li> <li><a href="#" pfm-eat-click ng-click="logout()">Logout</a></li>
</ul> </ul>
</div> </div>
@ -64,19 +66,11 @@
<div class="site-body"> <div class="site-body">
<ul class="sidebar" ng-controller="sidebar"> <ul class="sidebar" ng-controller="sidebar">
@if (Auth::check()) <li ng-class="{selected: stateIncludes('content.tracks') || stateIncludes('content.track')}"><a href="/tracks">Tracks</a></li>
<li ng-class="{selected: stateIncludes('home')}"><a href="/">Dashboard</a></li> <li ng-class="{selected: stateIncludes('content.albums') || stateIncludes('content.album')}"><a href="/albums">Albums</a></li>
@else <li ng-class="{selected: stateIncludes('content.playlists') || stateIncludes('content.playlist')}"><a href="/playlists">Playlists</a></li>
<li ng-class="{selected: stateIncludes('home')}"><a href="/">Home</a></li> <li ng-class="{selected: stateIncludes('content.artists') || stateIncludes('content.artist')}"><a href="/artists">Artists</a></li>
@endif
<li ng-class="{selected: (stateIncludes('content') && !isPinnedPlaylistSelected)}">
<a href="/tracks">Discover</a>
</li>
@if (Auth::check())
<li ng-class="{selected: stateIncludes('favourites')}"><a href="/account/favourites/tracks">Favourites</a></li>
<li ng-class="{selected: stateIncludes('account')}"><a href="/account/tracks">Account</a></li>
@endif
<li ng-class="{selected: stateIncludes('pages')}"><a href="/about">About / FAQ</a></li> <li ng-class="{selected: stateIncludes('pages')}"><a href="/about">About / FAQ</a></li>
<li><a href="https://mlpforums.com/forum/62-ponyfm/" title="Pony.fm Forum" target="_blank">Forum</a></li> <li><a href="https://mlpforums.com/forum/62-ponyfm/" title="Pony.fm Forum" target="_blank">Forum</a></li>
@ -95,7 +89,7 @@
<li> <li>
<h3> <h3>
<a href="#" ng-click="createPlaylist()" pfm-eat-click title="Create Playlist"><i class="icon-plus"></i></a> <a href="#" ng-click="createPlaylist()" pfm-eat-click title="Create Playlist"><i class="icon-plus"></i></a>
Playlists My Playlists
</h3> </h3>
</li> </li>
<li class="none" ng-show="!playlists.length"><span>no pinned playlists</span></li> <li class="none" ng-show="!playlists.length"><span>no pinned playlists</span></li>