diff --git a/ApiClient.js b/ApiClient.js index fe0e5e541f..b35341ebb0 100644 --- a/ApiClient.js +++ b/ApiClient.js @@ -438,7 +438,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi options = options || {}; - if (options.channelIds) { + if (options.channelIds && options.channelIds.length > 1800) { return self.ajax({ type: "POST", @@ -458,6 +458,17 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi } }; + self.getLiveTvRecommendedPrograms = function (options) { + + options = options || {}; + + return self.ajax({ + type: "GET", + url: self.getUrl("LiveTv/Programs/Recommended", options), + dataType: "json" + }); + }; + self.getLiveTvRecordings = function (options) { var url = self.getUrl("LiveTv/Recordings", options || {}); diff --git a/dashboard-ui/css/mediaplayer.css b/dashboard-ui/css/mediaplayer.css index 1cc1c984d7..5951ff5ec1 100644 --- a/dashboard-ui/css/mediaplayer.css +++ b/dashboard-ui/css/mediaplayer.css @@ -76,7 +76,6 @@ height: auto; width: 270px; bottom: 45px; - left: -290px; border: 1px solid #444; background: #000; } @@ -173,10 +172,6 @@ input[type="range"]::-ms-fill-upper { .positionSliderContainer { width: 50px; } - - .itemVideo:not(.fullscreenVideo) { - left: -250px; - } } @media all and (max-width: 750px) { @@ -291,28 +286,16 @@ input[type="range"]::-ms-fill-upper { .positionSliderContainer { width: 300px; } - - .itemVideo { - left: -420px; - } } @media (min-width: 1700px) { .itemVideo:not(.fullscreenVideo) { width: 500px; } - - .itemVideo { - left: -420px; - } } @media (min-width: 2400px) { .itemVideo:not(.fullscreenVideo) { width: 550px; } - - .itemVideo { - left: -400px; - } } diff --git a/dashboard-ui/livetvsuggested.html b/dashboard-ui/livetvsuggested.html index cf4904df8c..8494eb5432 100644 --- a/dashboard-ui/livetvsuggested.html +++ b/dashboard-ui/livetvsuggested.html @@ -14,6 +14,22 @@ Series
+ + + + +
+
+

What's On

+
+
+
+
+

Upcoming TV

+
+
+
+
diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js index a37be9919c..5240385f61 100644 --- a/dashboard-ui/scripts/livetvrecordings.js +++ b/dashboard-ui/scripts/livetvrecordings.js @@ -105,11 +105,6 @@ reload(page); - }).on('pagehide', "#liveTvRecordingsPage", function () { - - var page = this; - - $('.recordingGroupCollapsible', page).off('collapsibleexpand.lazyload'); }); })(jQuery, document, ApiClient); \ No newline at end of file diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js index 5f282702bb..93e26bbe12 100644 --- a/dashboard-ui/scripts/livetvsuggested.js +++ b/dashboard-ui/scripts/livetvsuggested.js @@ -1 +1,61 @@ - \ No newline at end of file +(function ($, document, apiClient) { + + function reload(page) { + + Dashboard.showLoadingMsg(); + + apiClient.getLiveTvRecommendedPrograms({ + + userId: Dashboard.getCurrentUserId(), + IsAiring: true, + limit: 10 + + }).done(function (result) { + + var html = LibraryBrowser.getPosterViewHtml({ + + items: result.Items, + shape: "square", + showTitle: true, + showParentTitle: true, + overlayText: true, + coverImage: true + + }); + + $('.activeProgramItems', page).html(html); + }); + + apiClient.getLiveTvRecommendedPrograms({ + + userId: Dashboard.getCurrentUserId(), + IsAiring: false, + HasAired: false, + limit: 10 + + }).done(function (result) { + + var html = LibraryBrowser.getPosterViewHtml({ + + items: result.Items, + shape: "square", + showTitle: true, + showParentTitle: true, + overlayText: true, + coverImage: true + + }); + + $('.upcomingProgramItems', page).html(html); + }); + } + + $(document).on('pagebeforeshow', "#liveTvSuggestedPage", function () { + + var page = this; + + reload(page); + + }); + +})(jQuery, document, ApiClient); \ No newline at end of file diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index b619938864..5cecd93e77 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1319,6 +1319,9 @@ $(function () { footerHtml += ''; footerHtml += ''; footerHtml += ''; + + footerHtml += '
'; + footerHtml += ''; footerHtml += ''; @@ -1327,7 +1330,6 @@ $(function () { footerHtml += ''; footerHtml += '
'; - footerHtml += '
'; footerHtml += '
'; footerHtml += ''; diff --git a/packages.config b/packages.config index 6c512e8bb6..b28f5655a4 100644 --- a/packages.config +++ b/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file