From e579e0a6b6517bc2979f49d6aeb28ad11ac19d3f Mon Sep 17 00:00:00 2001
From: Techywarrior <techywarrior@gmail.com>
Date: Wed, 10 Apr 2013 23:22:34 -0700
Subject: [PATCH] changed queue to have it's own menu on item details

---
 dashboard-ui/css/images/media/btn_queue.png | Bin 0 -> 2913 bytes
 dashboard-ui/itemdetails.html               |  19 +++++++++++---
 dashboard-ui/scripts/Itemdetailpage.js      |  27 +++++++++++++++-----
 3 files changed, 36 insertions(+), 10 deletions(-)
 create mode 100644 dashboard-ui/css/images/media/btn_queue.png

diff --git a/dashboard-ui/css/images/media/btn_queue.png b/dashboard-ui/css/images/media/btn_queue.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec32a0553a4adf1e1133c93caa3a8d93f70d68ee
GIT binary patch
literal 2913
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
LNkvXXu0mjfkULHQ

literal 0
HcmV?d00001

diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index 4b8af6ea3d..d4d04b142a 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -14,13 +14,20 @@
                 <div class="itemImageBlock">
                     <div id="itemMedia" style="position: relative;">
                         <div id="itemImage"></div>
-                        <div id="playButtonShadow" style="display: none; height: 48px; position: absolute; bottom: 0; left: 0; right: 0; background: black; opacity: .75;">
-                        </div>
+
+                        <div id="playButtonShadow" style="display: none; height: 48px; position: absolute; bottom: 0; left: 0; right: 0; background: black; opacity: .75;"></div>
                         <button id="btnPlayMenu" type="button" class="imageButton" style="display: none; position: absolute; bottom: 5px; left: 10px;" data-role="none" title="Play">
                             <img src="css/images/media/playCircle.png" style="height: 28px;" />
                         </button>
+
+	                    <div id="queueButtonShadow" style="display: none; height: 48px; position: absolute; bottom: 0; left: 0; right: 0; background: black; opacity: .75;"></div>
+	                    <button id="btnQueueMenu" type="button" class="imageButton" style=" position: absolute; bottom: 5px; left: 50px;" data-role="none" title="Queue">
+		                    <img src="css/images/media/btn_queue.png" style="height: 28px;" />
+	                    </button>
                     </div>
                     <div id="playMenuAnchor"></div>
+	                <div id="queueMenuAnchor"></div>
+
                 </div>
 
                 <div class="itemDetailBlock">
@@ -67,9 +74,15 @@
                     <li data-role="list-divider" data-theme="a">Play Menu</li>
                     <li><a href="#" id="btnPlay">Play</a></li>
                     <li><a href="#" id="btnResume">Resume</a></li>
-	                <li><a href="#" id="btnQueue">Add to Queue</a></li>
                 </ul>
             </div>
+
+	        <div data-role="popup" id="queueMenu" data-corners="false" data-theme="c">
+		        <ul data-role="listview" style="min-width: 150px;" data-theme="c">
+			        <li data-role="list-divider" data-theme="a">Queue Menu</li>
+			        <li><a href="#" id="btnQueue">Add to Queue</a></li>
+		        </ul>
+	        </div>
         </div>
     </div>
 </body>
diff --git a/dashboard-ui/scripts/Itemdetailpage.js b/dashboard-ui/scripts/Itemdetailpage.js
index dfc3b1879a..974ad81302 100644
--- a/dashboard-ui/scripts/Itemdetailpage.js
+++ b/dashboard-ui/scripts/Itemdetailpage.js
@@ -38,9 +38,13 @@
             if (MediaPlayer.canPlay(item)) {
                 $('#btnPlayMenu', page).show();
                 $('#playButtonShadow', page).show();
+	            //$('#btnQueueMenu', page).show();
+	            //$('#queueButtonShadow', page).show();
             } else {
                 $('#btnPlayMenu', page).hide();
                 $('#playButtonShadow', page).hide();
+	            $('#btnQueueMenu', page).hide();
+	            $('#queueButtonShadow', page).hide();
             }
 
             Dashboard.hideLoadingMsg();
@@ -474,8 +478,7 @@
 
             var userdata = currentItem.UserData || {};
 
-	        //always pop menu now so we can have a queue link
-            //if (userdata.PlaybackPositionTicks) {
+            if (userdata.PlaybackPositionTicks) {
 
                 var pos = $('#playMenuAnchor', page).offset();
 
@@ -484,12 +487,22 @@
                     y: pos.top + 20
                 });
 
-            //}
-            //else {
-            //    play();
-            //}
+            }
+            else {
+                play();
+            }
         });
 
+	    $('#btnQueueMenu', page).on('click', function () {
+		    var pos = $('#queueMenuAnchor', page).offset();
+
+		    $('#queueMenu', page).popup("open", {
+			    x: pos.left + 165,
+			    y: pos.top + 20
+		    });
+	    });
+
+
         $('#btnPlay', page).on('click', function () {
 
             $('#playMenu', page).popup("close");
@@ -507,7 +520,7 @@
 
 	    $('#btnQueue', page).on('click', function () {
 
-		    $('#playMenu', page).popup("close");
+		    $('#queueMenu', page).popup("close");
 		    Playlist.add(currentItem);
 	    });