From b0c3d9e9ab26b7b15b83cb5050c5c96d691aa786 Mon Sep 17 00:00:00 2001
From: Trevor Squillario <tsquillario@gmail.com>
Date: Wed, 16 Apr 2014 10:47:07 -0400
Subject: [PATCH] stash latest changes from local copy

---
 js/controllers/main.js | 38 ++++++++++++++++++++------------------
 js/player.js           |  3 +--
 style/Style.css        |  6 ++++--
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/js/controllers/main.js b/js/controllers/main.js
index e2b2d79..7618a5a 100644
--- a/js/controllers/main.js
+++ b/js/controllers/main.js
@@ -69,23 +69,6 @@ function AppCtrl($scope, $rootScope, $document, $window, $location, $cookieStore
         }
     });
 
-
-    $(".coverartfancy").on("click", "a", function () {
-        $("a.coverartfancy").fancybox({
-            beforeShow: function () {
-                //this.title = $('#songdetails_artist').html();
-            },
-            afterLoad: function () {
-                //this.inner.prepend( '<h1>1. My custom title</h1>' );
-                //this.content = '<h1>2. My custom title</h1>';
-            },
-            hideOnContentClick: true,
-            type: 'image',
-            openEffect: 'none',
-            closeEffect: 'none'
-        });
-    });
-
     var submenu_active = false;
     $('div.submenu').mouseenter(function () {
         submenu_active = true;
@@ -131,6 +114,23 @@ function AppCtrl($scope, $rootScope, $document, $window, $location, $cookieStore
             $rootScope.hideQueue();
         }
     };
+    /*
+    $(document).on("click", "a[name=coverartfancy]", function () {
+        $.fancybox({
+            beforeShow: function () {
+                //this.title = $('#songdetails_artist').html();
+            },
+            afterLoad: function () {
+                //this.inner.prepend( '<h1>1. My custom title</h1>' );
+                //this.content = '<h1>2. My custom title</h1>';
+            },
+            hideOnContentClick: true,
+            type: 'image',
+            openEffect: 'none',
+            closeEffect: 'none'
+        });
+    });
+    */
     $("a.coverartfancy").fancybox({
         beforeShow: function () {
             //this.title = $('#songdetails_artist').html();
@@ -144,7 +144,6 @@ function AppCtrl($scope, $rootScope, $document, $window, $location, $cookieStore
         openEffect: 'none',
         closeEffect: 'none'
     });
-
     $('.showQueue').fancybox({
         href: '#queue',
         autoWidth: false,
@@ -156,6 +155,9 @@ function AppCtrl($scope, $rootScope, $document, $window, $location, $cookieStore
             if ($rootScope.queue == 0) {
                 this.close();
             }
+        },
+        helpers: {
+            title: null
         }
     });
 
diff --git a/js/player.js b/js/player.js
index d47fdd2..0c08004 100644
--- a/js/player.js
+++ b/js/player.js
@@ -172,8 +172,7 @@
             // End UnityShim
         }
         if ($rootScope.queue.length > 0) {
-            $('#QueuePreview').stop().scrollTo('#' + id, 400);
-            //$rootScope.showQueue();
+            $('#queue').stop().scrollTo('#' + id, 400);
         }
         var spechtml = '';
         var data = $(player1).data().jPlayer;
diff --git a/style/Style.css b/style/Style.css
index 2983ec0..46a5c8b 100755
--- a/style/Style.css
+++ b/style/Style.css
@@ -743,7 +743,7 @@ ul.songlist .row img
 }
 ul.songlist .row .itemactions
 {
-    width: 20%; /* 20% */
+    width: 15%;
     float: left;
     padding: 6px 0 0 16px;
 }
@@ -762,7 +762,7 @@ ul.songlist .row .track
 }
 ul.songlist .row .title
 {
-    width: 20%; /* 50% */
+    width: 25%;
 }
 ul.songlist .row .albumblock
 {
@@ -779,6 +779,7 @@ ul.songlist .row .albumblock img
 ul.songlist .row .artist    
 {
     width: 15%;
+    padding: 0 10px 0 0;
 }
 ul.songlist .row .albumtext
 {
@@ -1503,6 +1504,7 @@ a.button {
     border-radius: 2px;
     -webkit-border-radius: 2px;
     -moz-border-radius: 2px;
+    cursor: pointer;
 }
 a.button:hover {
     color: #333;