diff --git a/dashboard-ui/channelitems.html b/dashboard-ui/channelitems.html index a7b70469c5..093d89833b 100644 --- a/dashboard-ui/channelitems.html +++ b/dashboard-ui/channelitems.html @@ -16,7 +16,7 @@
-

+

diff --git a/dashboard-ui/cinemamodeconfiguration.html b/dashboard-ui/cinemamodeconfiguration.html index 87ad3b7df3..bcdb7f59a2 100644 --- a/dashboard-ui/cinemamodeconfiguration.html +++ b/dashboard-ui/cinemamodeconfiguration.html @@ -36,9 +36,16 @@
  • - - -
    ${LabelThisFeatureRequiresSupporterHelp}
    +
    + ${LabelSelectInternetTrailersForCinemaMode} + + + + + + +
    +
    ${LabelTheseFeaturesRequireSupporterHelpAndTrailers}
  • diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index b2b4433955..057e135950 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -538,7 +538,7 @@ @media all and (min-width: 1920px) { .homePageBackdropCard { - width: 20%; + width: 16.666666666666666666666666666667%; } } @@ -604,13 +604,6 @@ @media all and (min-width: 1920px) { - .homePageSquareCard { - width: 12.5%; - } -} - -@media all and (min-width: 2200px) { - .homePageSquareCard { width: 11.11111111111111111%; } @@ -664,13 +657,6 @@ @media all and (min-width: 1920px) { - .homePagePortraitCard { - width: 11.111111111111111111111111111111%; - } -} - -@media all and (min-width: 2200px) { - .homePagePortraitCard { width: 10%; } @@ -714,18 +700,3 @@ width: 16.666666666666666666666666666667%; } } - -@media all and (min-width: 1600px) { - - .homePageSmallBackdropCard { - width: 14.285714285714285714285714285714%; - } -} - - -@media all and (min-width: 2200px) { - - .homePageSmallBackdropCard { - width: 12.5%; - } -} diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 0f876d605c..ca0efab9f0 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -111,21 +111,21 @@ @media all and (min-width: 1200px) { .ehsContent { - width: 1000px; + width: 84%; } } @media all and (min-width: 1600px) { .ehsContent { - width: 1500px; + width: 85%; } } -@media all and (min-width: 2200px) { +@media all and (min-width: 1920px) { .ehsContent { - width: 1900px; + width: 90%; } } diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html index 4301c7f1d2..8a07f5bc9d 100644 --- a/dashboard-ui/dashboard.html +++ b/dashboard-ui/dashboard.html @@ -129,7 +129,7 @@ - + diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index b252e18ef1..00358140b7 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -9,7 +9,7 @@
  • +
  • + + +
    ${LabelDisplayTrailersWithinMovieSuggestionsHelp}
    +
  • diff --git a/dashboard-ui/scripts/cinemamodeconfiguration.js b/dashboard-ui/scripts/cinemamodeconfiguration.js index e5b0ba0eb5..1e1987041c 100644 --- a/dashboard-ui/scripts/cinemamodeconfiguration.js +++ b/dashboard-ui/scripts/cinemamodeconfiguration.js @@ -6,7 +6,10 @@ $('#chkEpisodes', page).checked(config.EnableIntrosForEpisodes).checkboxradio('refresh'); $('#chkMyMovieTrailers', page).checked(config.EnableIntrosFromMoviesInLibrary).checkboxradio('refresh'); + $('#chkUpcomingTheaterTrailers', page).checked(config.EnableIntrosFromUpcomingTrailers).checkboxradio('refresh'); + $('#chkUpcomingDvdTrailers', page).checked(config.EnableIntrosFromUpcomingDvdMovies).checkboxradio('refresh'); + $('#chkUpcomingStreamingTrailers', page).checked(config.EnableIntrosFromUpcomingStreamingMovies).checkboxradio('refresh'); $('#chkUnwatchedOnly', page).checked(!config.EnableIntrosForWatchedContent).checkboxradio('refresh'); $('#chkEnableParentalControl', page).checked(config.EnableIntrosParentalControl).checkboxradio('refresh'); @@ -70,10 +73,12 @@ config.EnableIntrosForMovies = $('#chkMovies', page).checked(); config.EnableIntrosForEpisodes = $('#chkEpisodes', page).checked(); config.EnableIntrosFromMoviesInLibrary = $('#chkMyMovieTrailers', page).checked(); - config.EnableIntrosFromUpcomingTrailers = $('#chkUpcomingTheaterTrailers', page).checked(); config.EnableIntrosForWatchedContent = !$('#chkUnwatchedOnly', page).checked(); config.EnableIntrosParentalControl = $('#chkEnableParentalControl', page).checked(); + config.EnableIntrosFromUpcomingTrailers = $('#chkUpcomingTheaterTrailers', page).checked(); + config.EnableIntrosFromUpcomingDvdMovies = $('#chkUpcomingDvdTrailers', page).checked(); + config.EnableIntrosFromUpcomingStreamingMovies = $('#chkUpcomingStreamingTrailers', page).checked(); ApiClient.updateNamedConfiguration("cinemamode", config).done(Dashboard.processServerConfigurationUpdateResult); }); diff --git a/dashboard-ui/scripts/homelatest.js b/dashboard-ui/scripts/homelatest.js index 59d6c83a72..0c740192d9 100644 --- a/dashboard-ui/scripts/homelatest.js +++ b/dashboard-ui/scripts/homelatest.js @@ -17,7 +17,9 @@ elem.html(html); } - Sections.loadRecentlyAdded($('.section0', page), userId); + var context = 'home-latest'; + + Sections.loadRecentlyAdded($('.section0', page), userId, context); Sections.loadLatestLiveTvRecordings($(".section1", page), userId); Sections.loadLatestChannelItems($(".section2", page), userId); } diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js index a9c71395ba..da9b61f320 100644 --- a/dashboard-ui/scripts/indexpage.js +++ b/dashboard-ui/scripts/indexpage.js @@ -122,7 +122,7 @@ }); } - function loadRecentlyAdded(elem, userId) { + function loadRecentlyAdded(elem, userId, context) { var screenWidth = $(window).width(); @@ -144,10 +144,10 @@ items: items, preferThumb: true, shape: 'homePageBackdrop', - context: 'home', + context: context || 'home', showUnplayedIndicator: false, showChildCountIndicator: true, - lazy: true + lazy: true, }); html += '
  • '; } @@ -354,7 +354,7 @@ var options = { - Limit: screenWidth >= 1600 ? 5 : (screenWidth >= 1440 ? 5 : (screenWidth >= 800 ? 6 : 6)), + Limit: screenWidth >= 1600 ? 6 : (screenWidth >= 1440 ? 5 : (screenWidth >= 800 ? 6 : 6)), Fields: "PrimaryImageAspectRatio", Filters: "IsUnplayed", UserId: Dashboard.getCurrentUserId(), diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index 639400d136..755a9bdcac 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -39,7 +39,7 @@ renderHeader(page, item, context); LibraryBrowser.renderName(item, $('.itemName', page), false, context); - LibraryBrowser.renderParentName(item, $('.parentName', page)); + LibraryBrowser.renderParentName(item, $('.parentName', page), context); Dashboard.getCurrentUser().done(function (user) { @@ -243,6 +243,11 @@ $('a', elem).removeClass('ui-btn-active'); $('.lnkHomeUpcoming', page).addClass('ui-btn-active'); } + else if (context == 'home-latest') { + elem = $('.homeTabs', page).show(); + $('a', elem).removeClass('ui-btn-active'); + $('.lnkHomeLatest', page).addClass('ui-btn-active'); + } else if (context == 'movies' || item.Type == 'Movie') { elem = $('#movieTabs', page).show(); $('a', elem).removeClass('ui-btn-active'); diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index d8520cc4c1..25c355d416 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -590,6 +590,7 @@ }, getUserDataCssClass: function (key) { + return 'libraryItemUserData' + key.replace(new RegExp(' ', 'g'), ''); }, @@ -1569,34 +1570,36 @@ } }, - renderParentName: function (item, parentNameElem) { + renderParentName: function (item, parentNameElem, context) { var html = []; + var contextParam = context ? ('&context=' + context) : ''; + if (item.AlbumArtist && item.Type == "Audio") { - html.push('' + item.AlbumArtist + ''); + html.push('' + item.AlbumArtist + ''); } else if (item.AlbumArtist && item.Type == "MusicAlbum") { - html.push('' + item.AlbumArtist + ''); + html.push('' + item.AlbumArtist + ''); } else if (item.Artists && item.Artists.length && item.Type == "MusicVideo") { - html.push('' + item.Artists[0] + ''); + html.push('' + item.Artists[0] + ''); } else if (item.SeriesName && item.Type == "Episode") { - html.push('' + item.SeriesName + ''); + html.push('' + item.SeriesName + ''); } if (item.SeriesName && item.Type == "Season") { - html.push('' + item.SeriesName + ''); + html.push('' + item.SeriesName + ''); } else if (item.ParentIndexNumber != null && item.Type == "Episode") { - html.push('' + item.SeasonName + ''); + html.push('' + item.SeasonName + ''); } else if (item.Album && item.Type == "Audio" && (item.AlbumId || item.ParentId)) { - html.push('' + item.Album + ''); + html.push('' + item.Album + ''); } else if (item.Album && item.Type == "MusicVideo" && item.AlbumId) { - html.push('' + item.Album + ''); + html.push('' + item.Album + ''); } else if (item.AlbumArtist && item.Type == "MusicAlbum") { diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js index 27d24ad937..69a1baa894 100644 --- a/dashboard-ui/scripts/moviecollections.js +++ b/dashboard-ui/scripts/moviecollections.js @@ -232,7 +232,7 @@ $('.movieTabs', page).hide(); } - query.ParentId = LibraryMenu.getTopParentId(); + //query.ParentId = LibraryMenu.getTopParentId(); var limit = LibraryBrowser.getDefaultPageSize(); diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js index 91fa4103dd..3881b759c4 100644 --- a/dashboard-ui/scripts/moviesrecommended.js +++ b/dashboard-ui/scripts/moviesrecommended.js @@ -83,7 +83,7 @@ userId: Dashboard.getCurrentUserId(), categoryLimit: screenWidth >= 1200 ? 4 : 3, - ItemLimit: screenWidth >= 1920 ? 9 : (screenWidth >= 1600 ? 7 : (screenWidth >= 1200 ? 6 : 5)), + ItemLimit: screenWidth >= 1920 ? 10 : (screenWidth >= 1600 ? 7 : (screenWidth >= 1200 ? 6 : 5)), Fields: "PrimaryImageAspectRatio" }); diff --git a/dashboard-ui/scripts/mypreferencesdisplay.js b/dashboard-ui/scripts/mypreferencesdisplay.js index d8966bc376..96006caef2 100644 --- a/dashboard-ui/scripts/mypreferencesdisplay.js +++ b/dashboard-ui/scripts/mypreferencesdisplay.js @@ -100,6 +100,8 @@ $('#chkDisplayMissingEpisodes', page).checked(user.Configuration.DisplayMissingEpisodes || false).checkboxradio("refresh"); $('#chkDisplayUnairedEpisodes', page).checked(user.Configuration.DisplayUnairedEpisodes || false).checkboxradio("refresh"); + $('#chkDisplayTrailersWithinMovieSuggestions', page).checked(user.Configuration.IncludeTrailersInSuggestions || false).checkboxradio("refresh"); + $('#chkGroupMoviesIntoCollections', page).checked(user.Configuration.GroupMoviesIntoBoxSets || false).checkboxradio("refresh"); $('#chkDisplayCollectionView', page).checked(user.Configuration.DisplayCollectionsView || false).checkboxradio("refresh"); $('#chkDisplayFolderView', page).checked(user.Configuration.DisplayFoldersView || false).checkboxradio("refresh"); @@ -133,6 +135,8 @@ user.Configuration.DisplayCollectionsView = $('#chkDisplayCollectionView', page).checked(); user.Configuration.DisplayFoldersView = $('#chkDisplayFolderView', page).checked(); + user.Configuration.IncludeTrailersInSuggestions = $('#chkDisplayTrailersWithinMovieSuggestions', page).checked(); + user.Configuration.ExcludeFoldersFromGrouping = $(".chkGroupFolder:not(:checked)", page).get().map(function (i) { return i.getAttribute('data-folderid'); diff --git a/dashboard-ui/scripts/supporterpage.js b/dashboard-ui/scripts/supporterpage.js index f5a4c78778..32ba39d685 100644 --- a/dashboard-ui/scripts/supporterpage.js +++ b/dashboard-ui/scripts/supporterpage.js @@ -45,7 +45,7 @@ var lifeTimeAmount = 30; var dailyAmount = 1; - var monthlyAmount = 3; + var monthlyAmount = 4; var yearlyAmount = 20; function getDonationAmount(page) { diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js index 47fee82d4e..b1cafd7eec 100644 --- a/dashboard-ui/scripts/tvrecommended.js +++ b/dashboard-ui/scripts/tvrecommended.js @@ -67,7 +67,7 @@ $('.noNextUpItems', page).show(); } - $('#nextUpItems', page).html(LibraryBrowser.getPosterViewHtml({ + var html = LibraryBrowser.getPosterViewHtml({ items: result.Items, shape: "homePageBackdrop", showTitle: true, @@ -76,7 +76,9 @@ context: context, lazy: true - })).trigger('create').createCardMenus(); + }); + + $('#nextUpItems', page).html(html).trigger('create').createCardMenus(); }); } diff --git a/dashboard-ui/wizardfinish.html b/dashboard-ui/wizardfinish.html index ae0d071262..223b55c21c 100644 --- a/dashboard-ui/wizardfinish.html +++ b/dashboard-ui/wizardfinish.html @@ -21,8 +21,9 @@ - - + + +