diff --git a/ApiClient.js b/ApiClient.js index cbe815c03a..fe0e5e541f 100644 --- a/ApiClient.js +++ b/ApiClient.js @@ -1594,9 +1594,6 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi if (itemType == "Artist") { url = self.getUrl("Artists/" + self.encodeName(itemName) + "/Images"); } - else if (itemType == "Channel") { - url = self.getUrl("LiveTv/Channels/" + itemId + "/Images"); - } else if (itemType == "Genre") { url = self.getUrl("Genres/" + self.encodeName(itemName) + "/Images"); } else if (itemType == "GameGenre") { @@ -1667,9 +1664,6 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi if (itemType == "Artist") { url = self.getUrl("Artists/" + self.encodeName(itemName) + "/Images/" + imageType + "/" + imageIndex + "/Index", options); } - else if (itemType == "Channel") { - url = self.getUrl("LiveTv/Channels/" + itemId + "/Images/" + imageType + "/" + imageIndex + "/Index", options); - } else if (itemType == "Genre") { url = self.getUrl("Genres/" + self.encodeName(itemName) + "/Images/" + imageType + "/" + imageIndex + "/Index", options); } else if (itemType == "GameGenre") { @@ -1701,9 +1695,6 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi if (itemType == "Artist") { url = self.getUrl("Artists/" + self.encodeName(itemName) + "/Images"); } - else if (itemType == "Channel") { - url = self.getUrl("LiveTv/Channels/" + itemId + "/Images"); - } else if (itemType == "Genre") { url = self.getUrl("Genres/" + self.encodeName(itemName) + "/Images"); } else if (itemType == "GameGenre") { @@ -1838,9 +1829,6 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi if (itemType == "Artist") { url = self.getUrl("Artists/" + self.encodeName(itemName) + "/Images"); } - else if (itemType == "Channel") { - url = self.getUrl("LiveTv/Channels/" + itemId + "/Images"); - } else if (itemType == "Genre") { url = self.getUrl("Genres/" + self.encodeName(itemName) + "/Images"); } else if (itemType == "GameGenre") { diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index dbbcddde7a..6c79a9bacf 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -156,9 +156,9 @@ } .detailButtonsContainer { - padding: .75em 0 .75em; + padding: .5em 0 .5em; text-align: center; - border-top: 1px solid #444; + border-top: 1px solid #333; border-bottom: 1px solid #333; } diff --git a/dashboard-ui/css/livetv.css b/dashboard-ui/css/livetv.css index f9d1739f21..d5de19d6d2 100644 --- a/dashboard-ui/css/livetv.css +++ b/dashboard-ui/css/livetv.css @@ -133,12 +133,12 @@ .channelTimeslotHeader { position: absolute; - left: 15px; + left: 10px; } .timeslotHeaders { position: absolute; - right: 28px; + right: 13px; overflow-y: hidden; overflow-x: hidden; white-space: nowrap; @@ -146,7 +146,7 @@ .channelPrograms { white-space: nowrap; - height: 47px; + height: 53px; } .timeslotHeader { @@ -197,7 +197,7 @@ position: relative; } - .channelHeaderCellInner:hover { + .channelHeaderCell:hover { background-color: #38c; } @@ -205,14 +205,14 @@ overflow-y: hidden; overflow-x: hidden; position: absolute; - left: 15px; + left: 10px; bottom: 46px; } .programGrid { position: absolute; bottom: 30px; - right: 15px; + right: 0; overflow-y: scroll; overflow-x: scroll; } @@ -242,7 +242,7 @@ } .timeslotHeaders, .programGrid { - left: 206px; + left: 201px; } .channelTimeslotHeader, .timeslotHeaders { @@ -254,11 +254,12 @@ } .channelHeaderCell, .timeslotCell { - height: 46px; + height: 52px; } .guideProgramName { padding: .35em .5em; + font-size: 14px; } .guideProgramTime { @@ -300,15 +301,4 @@ .timerPageImageContainer { display: none !important; } -} -/* Account for hidden navigation */ -@media (max-width: 750px) { - - .channelTimeslotHeader, .timeslotHeaders { - top: 115px; - } - - .channelList, .programGrid { - top: 145px; - } -} +} \ No newline at end of file diff --git a/dashboard-ui/livetvseriestimers.html b/dashboard-ui/livetvseriestimers.html index 2171c3b2ab..b443ba94ab 100644 --- a/dashboard-ui/livetvseriestimers.html +++ b/dashboard-ui/livetvseriestimers.html @@ -14,7 +14,7 @@ Series
' + startDate.toLocaleDateString() + '
'; + html += ''; html += LiveTvHelpers.getDisplayTime(timer.StartDate); - - if (timer.ChannelName) { - html += ' on ' + timer.ChannelName; - } + html += ' - ' + LiveTvHelpers.getDisplayTime(timer.EndDate); html += '
'; - + + + if (timer.SeriesTimerId) { + html += ''; - html += ' | Name | '; - html += 'Channel | '; - html += 'Date | '; - html += 'Time | '; - html += 'Length | '; - html += 'Status | '; - html += 'Series | '; - - html += '
---|---|---|---|---|---|---|---|
'; - html += ''; - html += ' | '; - - html += ''; - html += '' + timer.Name + ''; - html += ' | '; - - html += ''; - if (timer.ChannelId) { - html += '' + timer.ChannelName + ''; - } - html += ' | '; - - var startDate = timer.StartDate; - - try { - - startDate = parseISO8601Date(startDate, { toLocal: true }); - - } catch (err) { + var startDateText = LibraryBrowser.getFutureDateText(parseISO8601Date(timer.StartDate, { toLocal: true })); + if (startDateText != index) { + html += '' + startDate.toLocaleDateString() + ' | '; + html += '' + LiveTvHelpers.getDisplayTime(timer.StartDate) + ' | '; - - var minutes = timer.RunTimeTicks / 600000000; - - minutes = minutes || 1; - - html += '' + Math.round(minutes) + 'min | '; - - html += ''; - - if (timer.Status == 'ConflictedNotOk' || timer.Status == 'Error') { - - html += ''; - html += timer.Status; - html += ''; + var program = timer.ProgramInfo; + var imgUrl; + + if (program.ImageTags && program.ImageTags.Primary) { + imgUrl = ApiClient.getImageUrl(program.Id, { + height: 160, + tag: program.ImageTags.Primary, + type: "Primary" + }); } else { - html += timer.Status; + imgUrl = "css/images/items/searchhintsv2/tv.png"; } - html += ' | '; + html += ' '; + html += ''; + + html += '';
if (timer.SeriesTimerId) {
- html += '';
+ html += ' ';
html += '';
html += '';
html += '';
- html += '';
+ html += ' ';
}
- html += ' | ';
+ html += '';
- html += '
'; + //html += ' | Name | '; + //html += 'Channel | '; + //html += 'Date | '; + //html += 'Time | '; + //html += 'Length | '; + //html += 'Status | '; + //html += 'Series | '; + + //html += '
---|---|---|---|---|---|---|---|
'; + // html += ''; + // html += ' | '; + + // html += ''; + // html += '' + timer.Name + ''; + // html += ' | '; + + // html += ''; + // if (timer.ChannelId) { + // html += '' + timer.ChannelName + ''; + // } + // html += ' | '; + + // var startDate = timer.StartDate; + + // try { + + // startDate = parseISO8601Date(startDate, { toLocal: true }); + + // } catch (err) { + + // } + + // html += '' + startDate.toLocaleDateString() + ' | '; + + // html += '' + LiveTvHelpers.getDisplayTime(timer.StartDate) + ' | '; + + // var minutes = timer.RunTimeTicks / 600000000; + + // minutes = minutes || 1; + + // html += '' + Math.round(minutes) + 'min | '; + + // html += ''; + + // if (timer.Status == 'ConflictedNotOk' || timer.Status == 'Error') { + + // html += ''; + // html += timer.Status; + // html += ''; + + // } else { + // html += timer.Status; + // } + + // html += ' | '; + + // html += ''; + + // if (timer.SeriesTimerId) { + // html += ''; + // html += ''; + // html += ''; + // html += ''; + // html += ''; + // } + + // html += ' | '; + + // html += '