diff --git a/dashboard-ui/boxset.html b/dashboard-ui/boxset.html index 280932e7c1..ad4f138ff5 100644 --- a/dashboard-ui/boxset.html +++ b/dashboard-ui/boxset.html @@ -40,6 +40,19 @@ +
+

Titles

+
+
+
+

Trailers

+
+
+
+

Gallery

+
+
+ diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 945beca856..43b761c149 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -110,10 +110,6 @@ margin: 0 0 5px; } -.detailPagePrimaryInfo { - padding: 0 10px; -} - .itemMiscInfo { color: #ddd; font-size: 14px; @@ -240,6 +236,12 @@ display: none; } +@media all and (min-width: 650px) { + .detailPagePrimaryInfo { + padding: 0 10px; + } +} + @media all and (min-width: 850px) { .posterDetailViewItem { width: 46%; diff --git a/dashboard-ui/scripts/boxset.js b/dashboard-ui/scripts/boxset.js index 0f9df757fc..8a35a84a79 100644 --- a/dashboard-ui/scripts/boxset.js +++ b/dashboard-ui/scripts/boxset.js @@ -59,8 +59,43 @@ $('#itemRatings', page).html(LibraryBrowser.getUserDataIconsHtml(item)); } + function renderMovies(page) { + + ApiClient.getItems(Dashboard.getCurrentUserId(), { + + ParentId: getParameterByName('id'), + SortBy: "SortName" + + }).done(function (result) { + + var html = LibraryBrowser.getPosterDetailViewHtml({ + items: result.Items, + useAverageAspectRatio: true + }); + + + $('#moviesContent', page).html(html); + }); + } + $(document).on('pageshow', "#boxsetPage", function () { - reload(this); + + var page = this; + + reload(page); + + $('#moviesCollapsible', page).on('expand.lazyload', function () { + + renderMovies(page); + + $(this).off('expand.lazyload'); + }); + + }).on('pagehide', "#boxsetPage", function () { + + var page = this; + + $('#moviesCollapsible', page).off('expand.lazyload'); }); diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index b09b7a18bb..49466724ef 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -7,7 +7,7 @@ if (window.location.toString().toLowerCase().indexOf('localhost') != -1) { return 100; } - return 25; + return 20; }, getPosterDetailViewHtml: function (options) { diff --git a/dashboard-ui/scripts/tvseries.js b/dashboard-ui/scripts/tvseries.js index 91b19cf608..1c1a86b25a 100644 --- a/dashboard-ui/scripts/tvseries.js +++ b/dashboard-ui/scripts/tvseries.js @@ -73,6 +73,24 @@ $('#itemRatings', page).html(LibraryBrowser.getUserDataIconsHtml(item)); } + function renderSeasons(page) { + + ApiClient.getItems(Dashboard.getCurrentUserId(), { + + ParentId: getParameterByName('id'), + SortBy: "SortName" + + }).done(function(result) { + + var html = LibraryBrowser.getPosterDetailViewHtml({ + items: result.Items, + useAverageAspectRatio: true + }); + + $('#seasonsContent', page).html(html); + }); + } + function renderGallery(page, item) { var imageTags = item.ImageTags || {}; @@ -149,6 +167,13 @@ reload(page); + $('#seasonsCollapsible', page).on('expand.lazyload', function () { + + renderSeasons(page); + + $(this).off('expand.lazyload'); + }); + $('#castCollapsible', page).on('expand.lazyload', function () { renderCast(page, currentItem); @@ -167,6 +192,7 @@ currentItem = null; var page = this; + $('#seasonsCollapsible', page).off('expand.lazyload'); $('#castCollapsible', page).off('expand.lazyload'); $('#galleryCollapsible', page).off('expand.lazyload'); }); @@ -179,4 +205,4 @@ window.TvSeriesPage = new tvSeriesPage(); -})(jQuery, document, LibraryBrowser, window); \ No newline at end of file +})(jQuery, document, LibraryBrowser, window);