diff --git a/ApiClient.js b/ApiClient.js index a5621ff4d0..d6f82184c1 100644 --- a/ApiClient.js +++ b/ApiClient.js @@ -378,6 +378,39 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi }); }; + self.getLiveTvServices = function (options) { + + var url = self.getUrl("/LiveTv/Services", options || {}); + + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; + + self.getLiveTvChannels = function (options) { + + var url = self.getUrl("/LiveTv/Channels", options || {}); + + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; + + self.getLiveTvRecordings = function (options) { + + var url = self.getUrl("/LiveTv/Recordings", options || {}); + + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; + /** * Gets the current server status */ diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index a5379fa458..360566cfaa 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -129,7 +129,7 @@ .libraryViewNav a { display: inline-block; - padding: .5em .25em; + padding: .25em .25em; color: #eee!important; text-decoration: none; } @@ -486,6 +486,13 @@ a.itemTag:hover { } } +@media all and (min-width: 750px) { + + .libraryViewNav a { + padding: .5em 1em; + } +} + @media all and (max-width: 750px) { .itemBackdrop { @@ -525,10 +532,6 @@ a.itemTag:hover { .noBackdrop .lnkSibling { bottom: 260px; } - - .libraryViewNav a { - padding: .5em 1em; - } } @media all and (min-width: 1000px) { diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 6f010bcae7..badb867e46 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -1257,7 +1257,7 @@ } if (providerIds.NesBox) { - + if (item.GameSystem == "Nintendo") { links.push('NESbox'); } @@ -2287,6 +2287,7 @@ (function (window, document, $) { var itemCountsPromise; + var liveTvServicesPromise; function renderHeader(page, user) { @@ -2329,11 +2330,11 @@ Search.onSearchRendered($('.viewMenuBar', page)); } - - function insertViews(page, user, counts) { + + function insertViews(page, user, counts, liveTvServices) { var html = ''; - + var selectedCssClass = ' selectedViewLink'; var selectedHtml = ""; @@ -2352,7 +2353,7 @@ viewCount++; } - if (false) { + if (liveTvServices.length) { html += '' + (view == 'livetv' ? selectedHtml : '') + 'Live TV'; viewCount++; } @@ -2383,10 +2384,16 @@ renderHeader(page, user); itemCountsPromise = itemCountsPromise || ApiClient.getItemCounts(Dashboard.getCurrentUserId()); + liveTvServicesPromise = liveTvServicesPromise || ApiClient.getLiveTvServices(); + + $.when(itemCountsPromise, liveTvServicesPromise).done(function (response1, response2) { + + var counts = response1[0]; + var liveTvServices = response2[0]; + + insertViews(page, user, counts, liveTvServices); - itemCountsPromise.done(function (counts) { - insertViews(page, user, counts); }); }); } diff --git a/packages.config b/packages.config index 846153190f..d431a43a56 100644 --- a/packages.config +++ b/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file