diff --git a/ApiClient.js b/ApiClient.js index 592cf2bad4..73f0207b8d 100644 --- a/ApiClient.js +++ b/ApiClient.js @@ -395,10 +395,10 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi throw new Error("null id"); } - var options = { - + var options = { + }; - + if (userId) { options.userId = userId; } @@ -456,6 +456,21 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi }); }; + self.getLiveTvRecordingGroup = function (id) { + + if (!id) { + throw new Error("null id"); + } + + var url = self.getUrl("LiveTv/Recordings/Groups/" + id); + + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; + self.getLiveTvRecording = function (id, userId) { if (!id) { @@ -559,7 +574,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi self.getNewLiveTvTimerDefaults = function (options) { options = options || {}; - + var url = self.getUrl("LiveTv/Timers/Defaults", options); return self.ajax({ diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 2d283dcbe4..3edb84c6be 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -408,7 +408,7 @@ h1 .imageLink { @media all and (min-width: 900px) { - .page:not(.wizardPage) .header { + .page:not(.standalonePage) .header { padding-top: 0; } } diff --git a/dashboard-ui/css/tileitem.css b/dashboard-ui/css/tileitem.css index 646b992ca2..a9984707f0 100644 --- a/dashboard-ui/css/tileitem.css +++ b/dashboard-ui/css/tileitem.css @@ -106,7 +106,7 @@ } .tileName { - font-weight: bold; + font-size: 14px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; diff --git a/dashboard-ui/livetvchannel.html b/dashboard-ui/livetvchannel.html index 8c603a49fe..14dd849359 100644 --- a/dashboard-ui/livetvchannel.html +++ b/dashboard-ui/livetvchannel.html @@ -19,7 +19,6 @@
-
diff --git a/dashboard-ui/livetvrecordinglist.html b/dashboard-ui/livetvrecordinglist.html index 640cec8f3d..fff562fd34 100644 --- a/dashboard-ui/livetvrecordinglist.html +++ b/dashboard-ui/livetvrecordinglist.html @@ -13,6 +13,7 @@ Series
' + channel.Number + '
'; + html += '' + LibraryBrowser.getUserDataIconsHtml(channel) + '
'; diff --git a/dashboard-ui/scripts/livetvrecordinglist.js b/dashboard-ui/scripts/livetvrecordinglist.js index bbbfb677ba..07342ca5ec 100644 --- a/dashboard-ui/scripts/livetvrecordinglist.js +++ b/dashboard-ui/scripts/livetvrecordinglist.js @@ -23,7 +23,7 @@ updateFilterControls(); html += LibraryBrowser.getPosterViewHtml({ - + items: result.Items, shape: "square", showTitle: true, @@ -77,6 +77,8 @@ }).on('pagebeforeshow', "#liveTvRecordingListPage", function () { + var page = this; + var limit = LibraryBrowser.getDefaultPageSize(); // If the default page size has changed, the start index will have to be reset @@ -92,7 +94,17 @@ query.GroupId = groupId; } - reloadItems(this); + reloadItems(page); + + if (query.GroupId) { + + ApiClient.getLiveTvRecordingGroup(query.GroupId).done(function (group) { + $('.listName', page).show().html(group.Name); + }); + + } else { + $('.listName', page).hide(); + } }).on('pageshow', "#liveTvRecordingListPage", function () { diff --git a/dashboard-ui/scripts/loginpage.js b/dashboard-ui/scripts/loginpage.js index 2d53f16e45..104a3387c4 100644 --- a/dashboard-ui/scripts/loginpage.js +++ b/dashboard-ui/scripts/loginpage.js @@ -135,9 +135,9 @@ html += ''; } - html += '