diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 5d5909f43..04d6cf45a 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -809,26 +809,36 @@ progress { display: inline-block; width: 440px; margin-left: 2em; + min-width: 300px; } .firstDashboardHomeRightColumn .ui-collapsible-content { height: 585px; - min-width: 300px; } } -@media all and (min-width: 1920px) { +@media all and (min-width: 1580px) { .dashboardHomeRightColumn { display: inline-block; + margin-left: 1em; + width: 300px; + min-width: 300px; + } + + .dashboardHomeRightColumn .ui-collapsible-content { + height: auto; + min-height: 585px; + } +} + +@media all and (min-width: 1880px) { + + .dashboardHomeRightColumn { max-width: 440px; margin-left: 2em; min-width: 400px; } - - .dashboardHomeRightColumn .ui-collapsible-content { - height: 585px; - } } .organizerButtonCell { diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js index 46cdf91ef..13dcfbb0c 100644 --- a/dashboard-ui/scripts/dashboardpage.js +++ b/dashboard-ui/scripts/dashboardpage.js @@ -1131,7 +1131,7 @@ $(document).on('pagebeforeshow', "#dashboardPage", DashboardPage.onPageShow) var name = $('.notificationName', item).html(); Dashboard.alert({ - message: overview, + message: '
' + overview + '
', title: name }); }); diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 30475c994..a21e05240 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -690,7 +690,7 @@ } var href = LibraryBrowser.getHref(item, options.context); - html += '
  • '; + html += '
  • '; var imgUrl; diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index f27475f00..d2fdcd4d8 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -178,11 +178,11 @@ function onRemoveFromPlaylistButtonClick() { - var id = this.getAttribute('data-itemid'); + var playlistItemId = this.getAttribute('data-playlistitemid'); var page = $(this).parents('.page'); - $('.itemsContainer', page).trigger('needsrefresh'); + $('.itemsContainer', page).trigger('removefromplaylist', [playlistItemId]); // Used by the tab menu, not the slide up $('.tapHoldMenu').popup('close'); @@ -272,6 +272,7 @@ } var itemId = card.getAttribute('data-itemid'); + var playlistItemId = card.getAttribute('data-playlistitemid'); var commands = card.getAttribute('data-commands').split(','); var itemType = card.getAttribute('data-itemtype'); var mediaType = card.getAttribute('data-mediatype'); @@ -327,7 +328,7 @@ } if (commands.indexOf('removefromplaylist') != -1) { - html += '
  • ' + Globalize.translate('ButtonRemoveFromPlaylist') + '
  • '; + html += '
  • ' + Globalize.translate('ButtonRemoveFromPlaylist') + '
  • '; } html += ''; diff --git a/dashboard-ui/scripts/playlistedit.js b/dashboard-ui/scripts/playlistedit.js index 0f056b744..bf42d61b5 100644 --- a/dashboard-ui/scripts/playlistedit.js +++ b/dashboard-ui/scripts/playlistedit.js @@ -104,6 +104,23 @@ }); } + function removeFromPlaylist(page, ids) { + + ApiClient.ajax({ + + url: ApiClient.getUrl('Playlists/' + currentItem.Id + '/Items', { + EntryIds: ids.join(',') + }), + + type: 'DELETE' + + }).done(function () { + + reloadItems(page); + }); + + } + function updateFilterControls(page) { // Reset form values using the last used query @@ -159,6 +176,10 @@ reloadItems(page); + }).on('removefromplaylist', function (e, playlistItemId) { + + removeFromPlaylist(page, [playlistItemId]); + }); }).on('pagebeforeshow', "#playlistEditorPage", function () {