diff --git a/dashboard-ui/css/detailtable.css b/dashboard-ui/css/detailtable.css index 761af8df13..930fd572d7 100644 --- a/dashboard-ui/css/detailtable.css +++ b/dashboard-ui/css/detailtable.css @@ -1,6 +1,6 @@ .detailTableContainer { width: 100%; - max-width: 1100px; + max-width: 1000px; text-align: center; margin: 0 auto; } diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index 35eeb619ed..700ccca8c7 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -97,13 +97,9 @@
- - -
@@ -186,21 +182,6 @@ - -
- -
- -
- -
diff --git a/dashboard-ui/scripts/Itemdetailpage.js b/dashboard-ui/scripts/Itemdetailpage.js index e0120e20ec..58e20a81d9 100644 --- a/dashboard-ui/scripts/Itemdetailpage.js +++ b/dashboard-ui/scripts/Itemdetailpage.js @@ -61,16 +61,11 @@ renderDetails(page, item, context); if (MediaPlayer.canPlay(item)) { - $('#btnPlayMenu', page).show(); + $('#btnPlay', page).show(); $('#playButtonShadow', page).show(); - if (MediaPlayer.isPlaying()) - $('#btnQueueMenu', page).show(); - else - $('#btnQueueMenu', page).hide(); } else { - $('#btnPlayMenu', page).hide(); + $('#btnPlay', page).hide(); $('#playButtonShadow', page).hide(); - $('#btnQueueMenu', page).hide(); } $(".autoNumeric").autoNumeric('init'); @@ -552,54 +547,9 @@ var page = this; - $('#btnPlayMenu', page).on('click', function () { - - var userdata = currentItem.UserData || {}; - - if (userdata.PlaybackPositionTicks) { - - var pos = $('#playMenuAnchor', page).offset(); - - $('#playMenu', page).popup("open", { - x: pos.left + 125, - y: pos.top + 20 - }); - - } - 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"); - play(); - }); - - $('#btnResume', page).on('click', function () { - - $('#playMenu', page).popup("close"); - var userdata = currentItem.UserData || {}; - - play(userdata.PlaybackPositionTicks); - }); - - $('#btnQueue', page).on('click', function () { - - $('#queueMenu', page).popup("close"); - Playlist.add(currentItem); + LibraryBrowser.showPlayMenu(this, currentItem.Id, currentItem.MediaType, userdata.PlaybackPositionTicks); }); }).on('pageshow', "#itemDetailPage", function () { diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index a4e63ea8e0..e19855afad 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -303,7 +303,7 @@ html += '
  • Play
  • '; if (resumePositionTicks) { - html += '
  • Play
  • '; + html += '
  • Resume
  • '; } if (isPlaying && MediaPlayer.canQueue(mediaType)) { @@ -321,7 +321,7 @@ $(this).off("popupafterclose").remove(); - }).parents(".ui-popup-container").css("margin-left", 100); + }).parents(".ui-popup-container").css("margin-left", 110).css("margin-top", 50); }, closePlayMenu: function () {