diff --git a/dashboard-ui/css/livetv.css b/dashboard-ui/css/livetv.css index 45924cb53a..6a5d581748 100644 --- a/dashboard-ui/css/livetv.css +++ b/dashboard-ui/css/livetv.css @@ -168,7 +168,7 @@ border-bottom: 1px solid #444; border-left: 1px solid #444; border-right: 1px solid #444; - width: 139px; + width: 189px; } .channelTimeslotHeader, .timeslotHeader { @@ -188,6 +188,7 @@ text-decoration: none; font-weight: normal!important; color: #fff!important; + position: relative; } .channelHeaderCellInner:hover { @@ -235,7 +236,7 @@ } .timeslotHeaders, .programGrid { - left: 141px; + left: 191px; } .channelTimeslotHeader, .timeslotHeaders { @@ -261,6 +262,21 @@ background-color: #252525; } +.guideChannelInfo { + display: inline-block; + max-width: 110px; + overflow: hidden; + white-space: nowrap; +} + +.guideChannelImage { + max-width: 60px; + max-height: 35px; + position: absolute; + right: 5px; + top: 5px; +} + @media (max-width: 600px) { .channelHeaderCell, .channelTimeslotHeader { @@ -270,6 +286,10 @@ .timeslotHeaders, .programGrid { left: 91px; } + + .guideChannelImage { + display: none; + } } /* Account for hidden navigation */ @media (max-width: 750px) { diff --git a/dashboard-ui/edititemimages.html b/dashboard-ui/edititemimages.html index a30cc503b0..7f7d14198a 100644 --- a/dashboard-ui/edititemimages.html +++ b/dashboard-ui/edititemimages.html @@ -87,7 +87,7 @@

- + Cancel diff --git a/dashboard-ui/livetvguide.html b/dashboard-ui/livetvguide.html index bb9a328286..7b3c6bb6f0 100644 --- a/dashboard-ui/livetvguide.html +++ b/dashboard-ui/livetvguide.html @@ -29,10 +29,6 @@
- diff --git a/dashboard-ui/livetvrecordings.html b/dashboard-ui/livetvrecordings.html index 40ad897cd1..6d43bf7e0d 100644 --- a/dashboard-ui/livetvrecordings.html +++ b/dashboard-ui/livetvrecordings.html @@ -28,7 +28,7 @@
diff --git a/dashboard-ui/scripts/livetvguide.js b/dashboard-ui/scripts/livetvguide.js index 68433bd22d..c25db02540 100644 --- a/dashboard-ui/scripts/livetvguide.js +++ b/dashboard-ui/scripts/livetvguide.js @@ -300,7 +300,21 @@ html += '
'; html += ''; - html += channel.Name + '
' + channel.Number; + + html += '
' + channel.Name + '
' + channel.Number + '
'; + + if (channel.ImageTags.Primary) { + + var url = ApiClient.getUrl("LiveTV/Channels/" + channel.Id + "/Images/Primary", { + maxheight: 200, + maxwidth: 200, + tag: channel.ImageTags.Primary, + type: "Primary" + }); + + html += ''; + } + html += '
'; html += '
'; diff --git a/dashboard-ui/scripts/livetvrecordinglist.js b/dashboard-ui/scripts/livetvrecordinglist.js index f63508a9b9..822279b721 100644 --- a/dashboard-ui/scripts/livetvrecordinglist.js +++ b/dashboard-ui/scripts/livetvrecordinglist.js @@ -99,11 +99,11 @@ if (query.GroupId) { ApiClient.getLiveTvRecordingGroup(query.GroupId).done(function (group) { - $('.listName', page).show().html(group.Name); + $('.listName', page).html(group.Name); }); } else { - $('.listName', page).hide(); + $('.listName', page).html('All Recordings'); } }).on('pageshow', "#liveTvRecordingListPage", function () {