From 1879df6806a66448024607656de87d5ff48a4050 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 15 Apr 2013 19:00:17 -0400 Subject: [PATCH 1/5] show seasons on series page --- dashboard-ui/scripts/tvseries.js | 37 +++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dashboard-ui/scripts/tvseries.js b/dashboard-ui/scripts/tvseries.js index 36e0448bb4..86f3663369 100644 --- a/dashboard-ui/scripts/tvseries.js +++ b/dashboard-ui/scripts/tvseries.js @@ -58,9 +58,44 @@ function renderUserDataIcons(page, item) { $('#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); + }); + } $(document).on('pageshow', "#tvSeriesPage", function () { - reload(this); + + var page = this; + + reload(page); + + $('#seasonsCollapsible', page).on('expand.lazyload', function () { + + renderSeasons(page); + + $(this).off('expand.lazyload'); + }); + + }).on('pagehide', "#tvSeriesPage", function () { + + var page = this; + + $('#seasonsCollapsible', page).off('expand.lazyload'); }); From 157bb32f94b92c2b12658004aa1f9c01824ca193 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 15 Apr 2013 19:04:50 -0400 Subject: [PATCH 2/5] added collapsible placeholders --- dashboard-ui/boxset.html | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dashboard-ui/boxset.html b/dashboard-ui/boxset.html index 280932e7c1..ae8d9352c0 100644 --- a/dashboard-ui/boxset.html +++ b/dashboard-ui/boxset.html @@ -40,6 +40,23 @@ +
+

Movies

+
+
+
+

Trailers

+
+
+
+

Cast & Crew

+
+
+
+

Gallery

+
+
+ From e19fd498c067665d0a3d88d3c538f0a5a1dce57d Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 15 Apr 2013 19:08:03 -0400 Subject: [PATCH 3/5] display movies on boxset page --- dashboard-ui/boxset.html | 6 +----- dashboard-ui/scripts/boxset.js | 37 +++++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/dashboard-ui/boxset.html b/dashboard-ui/boxset.html index ae8d9352c0..ad4f138ff5 100644 --- a/dashboard-ui/boxset.html +++ b/dashboard-ui/boxset.html @@ -41,17 +41,13 @@
-

Movies

+

Titles

Trailers

-
-

Cast & Crew

-
-

Gallery

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'); }); From b9a45615c556bd2d4de2ced74fcc133bf2a967b6 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 15 Apr 2013 19:15:46 -0400 Subject: [PATCH 4/5] show movies on boxset page --- dashboard-ui/boxset.html | 8 ++++---- dashboard-ui/css/librarybrowser.css | 10 ++++++---- dashboard-ui/scripts/librarybrowser.js | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dashboard-ui/boxset.html b/dashboard-ui/boxset.html index ad4f138ff5..57f463527e 100644 --- a/dashboard-ui/boxset.html +++ b/dashboard-ui/boxset.html @@ -37,13 +37,13 @@

+
+

Titles

+
+
-
-

Titles

-
-

Trailers

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/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 25bb11030a..22cfbc31af 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) { From d4c62e484b92746c21407f0c388d14dd5c14d102 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 15 Apr 2013 19:19:49 -0400 Subject: [PATCH 5/5] moved movies back underneath --- dashboard-ui/boxset.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dashboard-ui/boxset.html b/dashboard-ui/boxset.html index 57f463527e..ad4f138ff5 100644 --- a/dashboard-ui/boxset.html +++ b/dashboard-ui/boxset.html @@ -37,13 +37,13 @@

-
-

Titles

-
-
+
+

Titles

+
+

Trailers