diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html index 73f58392..d2c21d2e 100644 --- a/data/interfaces/default/base.html +++ b/data/interfaces/default/base.html @@ -13,7 +13,7 @@ Headphones - ${title} - + @@ -84,7 +84,7 @@
Version: ${headphones.CURRENT_VERSION} diff --git a/data/interfaces/default/css/style.css b/data/interfaces/default/css/style.css index 86caec5b..15296d1f 100644 --- a/data/interfaces/default/css/style.css +++ b/data/interfaces/default/css/style.css @@ -487,7 +487,7 @@ header #logo { } footer { display: table; - margin: 60px auto 20px auto; + margin: 60px auto 50px auto; width: 960px; padding-top: 10px; border-top: 1px solid #EEE; diff --git a/data/interfaces/default/css/style.less b/data/interfaces/default/css/style.less index 4649e0c3..86a91c0b 100644 --- a/data/interfaces/default/css/style.less +++ b/data/interfaces/default/css/style.less @@ -339,7 +339,7 @@ header { } footer { display: table; - margin: 60px auto 20px auto; + margin: 60px auto 50px auto; width: 960px; padding-top: 10px; border-top: 1px solid #EEE; diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js index d1bb1e8e..466a611d 100644 --- a/data/interfaces/default/js/script.js +++ b/data/interfaces/default/js/script.js @@ -255,6 +255,13 @@ function refreshTab() { function showMsg(msg,loader,timeout,ms) { var feedback = $("#ajaxMsg"); + update = $("#updatebar"); + if ( update.is(":visible") ) { + var height = update.height() + 35; + feedback.css("bottom",height + "px"); + } else { + feedback.removeAttr("style"); + } feedback.fadeIn(); var message = $("
" + msg + "
"); if (loader) { @@ -275,6 +282,14 @@ function showMsg(msg,loader,timeout,ms) { function doAjaxCall(url,elem,reload,form) { // Set Message feedback = $("#ajaxMsg"); + update = $("#updatebar"); + if ( update.is(":visible") ) { + var height = update.height() + 35; + feedback.css("bottom",height + "px"); + } else { + feedback.removeAttr("style"); + } + feedback.fadeIn(); // Get Form data var formID = "#"+url; @@ -301,7 +316,7 @@ function doAjaxCall(url,elem,reload,form) { // Check if checkbox is selected if ( form ) { - if ( $('td#select input[type=checkbox]').length > 0 && !$('td#select input[type=checkbox]').is(':checked') || $('#importLastFM #username').length > 0 && $("#importLastFM #username" ).val().length === 0 ) { + if ( $('td#select input[type=checkbox]').length > 0 && !$('td#select input[type=checkbox]').is(':checked') || $('#importLastFM #username:visible').length > 0 && $("#importLastFM #username" ).val().length === 0 ) { feedback.addClass('error') $(feedback).prepend(errorMsg); setTimeout(function(){