From 675ba179015b589c4a8622d5bf6a6b0ff7d5b0fd Mon Sep 17 00:00:00 2001
From: nelsonlaquet <nelsonlaquet@gmail.com>
Date: Tue, 24 Sep 2013 00:47:00 -0500
Subject: [PATCH] Fixed dropdown layout issue Fixed show songs playing wrong
 track

---
 app/controllers/Api/Web/TracksController.php |  4 +---
 app/views/shared/_app_layout.blade.php       |  2 +-
 public/scripts/shared/layout.coffee          |  6 ++++++
 public/styles/components.less                |  1 +
 public/styles/layout.less                    | 12 +++++++++++-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/controllers/Api/Web/TracksController.php b/app/controllers/Api/Web/TracksController.php
index 226b2587..61b3180b 100644
--- a/app/controllers/Api/Web/TracksController.php
+++ b/app/controllers/Api/Web/TracksController.php
@@ -64,7 +64,7 @@
 			$tracks = [];
 			$ids = [];
 
-			foreach ($query->get() as $track) {
+			foreach ($query->get(['tracks.*']) as $track) {
 				$tracks[] = Track::mapPublicTrackSummary($track);
 				$ids[] = $track->id;
 			}
@@ -93,7 +93,6 @@
 			return Response::json(Track::mapPrivateTrackShow($track), 200);
 		}
 
-
 		private function applyFilters($query) {
 			if (Input::has('order')) {
 				$order = \Input::get('order');
@@ -127,7 +126,6 @@
 					$join->on('tracks.id', '=', 'show_song_track.track_id');
 				});
 				$query->whereIn('show_song_track.show_song_id', Input::get('songs'));
-				$query->select('tracks.*');
 			}
 
 			return $query;
diff --git a/app/views/shared/_app_layout.blade.php b/app/views/shared/_app_layout.blade.php
index 05689c54..60aeed37 100644
--- a/app/views/shared/_app_layout.blade.php
+++ b/app/views/shared/_app_layout.blade.php
@@ -24,7 +24,7 @@
 	</script>
 
 	<header>
-		<a href="/">pony.fm</a>
+		<a href="/">pony.fm <small>(beta)</small></a>
 		<div class="now-playing">
 			@if (Auth::check())
 				<div class="user-details dropdown">
diff --git a/public/scripts/shared/layout.coffee b/public/scripts/shared/layout.coffee
index 503fb7be..fdd88b0e 100644
--- a/public/scripts/shared/layout.coffee
+++ b/public/scripts/shared/layout.coffee
@@ -3,6 +3,12 @@ window.handleResize = () ->
 	$siteBody = $ '.site-body'
 	$siteBody.height windowHeight - $('header').height()
 
+	$('.dropdown-menu').each () ->
+		$this = $ this
+		newMaxHeight = windowHeight - $this.parent().offset().top - $this.parent().height() - 5
+		$this.css
+			'max-height': newMaxHeight
+
 	$('.stretch-to-bottom').each () ->
 		$this = $ this
 		newHeight = windowHeight - $this.offset().top
diff --git a/public/styles/components.less b/public/styles/components.less
index f7a263b1..ea0edba6 100644
--- a/public/styles/components.less
+++ b/public/styles/components.less
@@ -217,6 +217,7 @@ html body {
 html .dropdown-menu {
   .border-radius(0px);
   padding: 0px;
+  overflow-y: auto;
 
   > li {
 	margin: 0px;
diff --git a/public/styles/layout.less b/public/styles/layout.less
index 9c3ef1d2..b28cfd52 100644
--- a/public/styles/layout.less
+++ b/public/styles/layout.less
@@ -18,7 +18,7 @@ header {
 	float: left;
 	width: (@pfm-sidebar-size - 25);
 	height: 64px;
-	line-height: 52px;
+	line-height: 42px;
 	background: #84528A;
 	color: #fff;
 	font-size: 24pt;
@@ -27,12 +27,22 @@ header {
 	position: relative;
 	z-index: 600;
 	font-family: 'Josefin Sans', sans-serif;
+	position: relative;
 
 	&:hover {
 	  background: darken(#84528A, 25%);
 	  color: #fff;
 	  text-decoration: none;
 	}
+
+	small {
+	  font-family: 'Arial';
+	  font-size: 8pt;
+	  color: #eee;
+	  position: absolute;
+	  top: 30px;
+	  left: 33px;
+	}
   }
 
   .user-details {