diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 072446f240..98c2414ee5 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -686,6 +686,11 @@ h1 .imageLink { height: 50px; } +.footerNotifications { + height: 50px; + margin: 0 2px 2px 2px; +} + .footerNotification { text-shadow: none; padding: 0 1em .75em; diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js index 494a7b8fdb..54a3de071a 100644 --- a/dashboard-ui/scripts/mediaplayer-video.js +++ b/dashboard-ui/scripts/mediaplayer-video.js @@ -234,6 +234,8 @@ $("#videoBackdrop", footer).show(); + footer.css("height", "0"); + var videoPlayer = $("#videoPlayer", footer) //.hide() .append(nowPlayingBar); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index a1a079ccfa..14923a11b0 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -292,7 +292,7 @@ var Dashboard = { options.id = options.id || "notification" + new Date().getTime() + parseInt(Math.random()); - var footer = $("#footer").show(); + var footer = $("#footer").css("height", "50px"); var parentElem = $('#footerNotifications', footer); @@ -309,7 +309,16 @@ var Dashboard = { } if (options.forceShow) { - elem.show(); + elem.slideDown(400); + } + + var videoBackdrop = $("#videoBackdrop"); + + var isPlaying = false; + + if (videoBackdrop.is(":visible")) { + videoBackdrop.css("bottom", "48px"); + isPlaying = true; } elem.html(options.html).trigger("create"); @@ -329,9 +338,13 @@ var Dashboard = { footer.on("notification.remove notification.hide", function (e) { setTimeout(function () { // give the DOM time to catch up - console.log("html", parentElem.html() == "", this); if (parentElem.html() == "") { - footer.slideUp(); + if (!isPlaying) { + footer.slideUp(); + } else { + footer.css({ height: "0" }); + videoBackdrop.animate({ bottom: "0" }, 400); + } } }, 50); });