diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 98c2414ee5..6cedf184e5 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -686,14 +686,9 @@ h1 .imageLink { height: 50px; } -.footerNotifications { - height: 50px; - margin: 0 2px 2px 2px; -} - .footerNotification { text-shadow: none; - padding: 0 1em .75em; + padding: .75em 1em; margin: 0; font-weight: normal; border-top: 1px solid #555; diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js index 54a3de071a..a9003520ed 100644 --- a/dashboard-ui/scripts/mediaplayer-video.js +++ b/dashboard-ui/scripts/mediaplayer-video.js @@ -56,7 +56,7 @@ $("#videoBackdrop", footer).hide(); - if ($("#footerNotifications", footer).html() == "") { // only hide footer if no notifications + if (!$("#footerNotifications", footer).html()) { // only hide footer if no notifications footer.hide(); @@ -1036,7 +1036,7 @@ var errorMsg = 'There was an error playing the video.'; - if (item.Type == "Channel") { + if (item.Type == "TvChannel") { errorMsg += " Please ensure there is an open tuner availalble."; } diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index af8f538449..3906985161 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -704,7 +704,7 @@ }); } - else if (item.Type == "Channel" || item.Type == "Recording") { + else if (item.Type == "TvChannel" || item.Type == "Recording") { url = "css/images/items/detail/tv.png"; } else if (item.MediaType == "Audio") { diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 1a4b8a49ac..4a2dc2a1e4 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -318,19 +318,13 @@ var Dashboard = { if (videoBackdrop.is(":visible")) { - footer.css("height", "50px"); - videoBackdrop.css("bottom", "48px"); isPlaying = true; } else { - if (!footer.is(":visible")) { - - footer.show(); - - } + footer.show(); }