From 9a44127ab149a9976b9f066afe73deeca0b8cbb6 Mon Sep 17 00:00:00 2001
From: Andre Santos <CoolApps45@users.noreply.github.com>
Date: Tue, 5 Jan 2016 20:45:41 +0000
Subject: [PATCH 1/7] Removed tabs

---
 public/templates/content/_layout.html | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/public/templates/content/_layout.html b/public/templates/content/_layout.html
index df7b72a9..5105d511 100644
--- a/public/templates/content/_layout.html
+++ b/public/templates/content/_layout.html
@@ -1,8 +1 @@
-<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>

From 3209f499c174b9ad56b97f3538029b3dc8de3eed Mon Sep 17 00:00:00 2001
From: Andre Santos <CoolApps45@users.noreply.github.com>
Date: Tue, 5 Jan 2016 20:47:27 +0000
Subject: [PATCH 2/7] Navigation Update

---
 resources/views/shared/_app_layout.blade.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/resources/views/shared/_app_layout.blade.php b/resources/views/shared/_app_layout.blade.php
index 06175a75..f5fd2e22 100644
--- a/resources/views/shared/_app_layout.blade.php
+++ b/resources/views/shared/_app_layout.blade.php
@@ -54,6 +54,8 @@
                     </a>
                     <ul class="dropdown-menu">
                         <li><a href="{{Auth::user()->url}}">Your Profile</a></li>
+                        <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>
                         <li><a href="#" pfm-eat-click ng-click="logout()">Logout</a></li>
                     </ul>
                 </div>
@@ -64,19 +66,14 @@
 
     <div class="site-body">
         <ul class="sidebar" ng-controller="sidebar">
-            @if (Auth::check())
-                <li ng-class="{selected: stateIncludes('home')}"><a href="/">Dashboard</a></li>
-            @else
-                <li ng-class="{selected: stateIncludes('home')}"><a href="/">Home</a></li>
-            @endif
             <li ng-class="{selected: (stateIncludes('content') && !isPinnedPlaylistSelected)}">
                 <a href="/tracks">Discover</a>
             </li>
+            <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>
 
-            @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><a href="https://mlpforums.com/forum/62-ponyfm/" title="Pony.fm Forum" target="_blank">Forum</a></li>
@@ -95,7 +92,7 @@
                 <li>
                     <h3>
                         <a href="#" ng-click="createPlaylist()" pfm-eat-click title="Create Playlist"><i class="icon-plus"></i></a>
-                        Playlists
+                        My Playlists
                     </h3>
                 </li>
                 <li class="none" ng-show="!playlists.length"><span>no pinned playlists</span></li>

From eef8e3c73b3daddaed05f58c6a830823e6d3947d Mon Sep 17 00:00:00 2001
From: Andre Santos <CoolApps45@users.noreply.github.com>
Date: Tue, 5 Jan 2016 22:06:54 +0000
Subject: [PATCH 3/7] Navigation Update

Addresses issue #31
---
 resources/views/shared/_app_layout.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/shared/_app_layout.blade.php b/resources/views/shared/_app_layout.blade.php
index f5fd2e22..6ee9423a 100644
--- a/resources/views/shared/_app_layout.blade.php
+++ b/resources/views/shared/_app_layout.blade.php
@@ -21,7 +21,7 @@
 @section('content')
 
     <div id="fb-root"></div>
-
+ 
     <script>
         window.fbAsyncInit = function() {
             FB.init({

From 450c785c15f41194bd505bb9372fee23ab0c0a9d Mon Sep 17 00:00:00 2001
From: Andre Santos <CoolApps45@users.noreply.github.com>
Date: Tue, 5 Jan 2016 22:07:31 +0000
Subject: [PATCH 4/7] Navigation Update

Addresses issue #31
---
 resources/views/shared/_app_layout.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/shared/_app_layout.blade.php b/resources/views/shared/_app_layout.blade.php
index 6ee9423a..f5fd2e22 100644
--- a/resources/views/shared/_app_layout.blade.php
+++ b/resources/views/shared/_app_layout.blade.php
@@ -21,7 +21,7 @@
 @section('content')
 
     <div id="fb-root"></div>
- 
+
     <script>
         window.fbAsyncInit = function() {
             FB.init({

From ee3e9057291ae4f1b45b75b14d321cceef345a2c Mon Sep 17 00:00:00 2001
From: Andre Santos <CoolApps45@users.noreply.github.com>
Date: Thu, 7 Jan 2016 07:44:57 +0000
Subject: [PATCH 5/7] Removal of Content Tabs

Part 1; Issue #31
---
 public/templates/content/_layout.html | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 public/templates/content/_layout.html

diff --git a/public/templates/content/_layout.html b/public/templates/content/_layout.html
deleted file mode 100644
index 5105d511..00000000
--- a/public/templates/content/_layout.html
+++ /dev/null
@@ -1 +0,0 @@
-<ui-view></ui-view>

From f5b84e51f4f531063c042cc949b181e85eaf14f0 Mon Sep 17 00:00:00 2001
From: Andre Santos <CoolApps45@users.noreply.github.com>
Date: Thu, 7 Jan 2016 07:46:39 +0000
Subject: [PATCH 6/7] Removal of Content Tabs

Part 2; Issue #31
---
 resources/assets/scripts/app/app.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/scripts/app/app.coffee b/resources/assets/scripts/app/app.coffee
index 62e184ca..ac7f8fc1 100644
--- a/resources/assets/scripts/app/app.coffee
+++ b/resources/assets/scripts/app/app.coffee
@@ -168,7 +168,7 @@ module.config [
 
         state.state 'content',
             abstract: true
-            templateUrl: '/templates/content/_layout.html'
+            template: '<ui-view/>'
 
         state.state 'content.tracks',
             templateUrl: '/templates/tracks/index.html'

From 30a9c9c9358f96489a1f06733d1a4b3451c64610 Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Thu, 7 Jan 2016 10:30:43 -0800
Subject: [PATCH 7/7] #31: Fixed CSS classes and removed the "Dashboard" link.

---
 resources/views/shared/_app_layout.blade.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/resources/views/shared/_app_layout.blade.php b/resources/views/shared/_app_layout.blade.php
index f5fd2e22..9970e97a 100644
--- a/resources/views/shared/_app_layout.blade.php
+++ b/resources/views/shared/_app_layout.blade.php
@@ -54,8 +54,8 @@
                     </a>
                     <ul class="dropdown-menu">
                         <li><a href="{{Auth::user()->url}}">Your Profile</a></li>
-                        <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>
+                        <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>
                     </ul>
                 </div>
@@ -66,13 +66,10 @@
 
     <div class="site-body">
         <ul class="sidebar" ng-controller="sidebar">
-            <li ng-class="{selected: (stateIncludes('content') && !isPinnedPlaylistSelected)}">
-                <a href="/tracks">Discover</a>
-            </li>
-            <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>
+            <li ng-class="{selected: stateIncludes('content.tracks') || stateIncludes('content.track')}"><a href="/tracks">Tracks</a></li>
+            <li ng-class="{selected: stateIncludes('content.albums') || stateIncludes('content.album')}"><a href="/albums">Albums</a></li>
+            <li ng-class="{selected: stateIncludes('content.playlists') || stateIncludes('content.playlist')}"><a href="/playlists">Playlists</a></li>
+            <li ng-class="{selected: stateIncludes('content.artists') || stateIncludes('content.artist')}"><a href="/artists">Artists</a></li>
 
 
             <li ng-class="{selected: stateIncludes('pages')}"><a href="/about">About / FAQ</a></li>