From e10893543062a86bf310a54869bebec969c373c3 Mon Sep 17 00:00:00 2001 From: rembo10 Date: Tue, 6 May 2014 17:01:30 -0700 Subject: [PATCH] Fix for spinner not showing up anymore when marking albums as wanted --- data/interfaces/default/artist.html | 8 ++++---- data/interfaces/default/base.html | 2 +- data/interfaces/default/css/style.css | 12 ++++++------ data/interfaces/default/js/script.js | 15 +++++++++++++++ 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/data/interfaces/default/artist.html b/data/interfaces/default/artist.html index 863a4717..c5f21ccf 100644 --- a/data/interfaces/default/artist.html +++ b/data/interfaces/default/artist.html @@ -240,7 +240,8 @@ refreshTable(); $('#artistnamelink').text(data["ArtistName"]); if (loadingMessage == false){ - showMsg("Getting artist information",true); + $("#ajaxMsg").after( "
" ); + showArtistMsg("Getting artist information"); loadingMessage = true; } if (spinner_active == false){ @@ -255,8 +256,7 @@ else{ $('#artistnamespinner').remove() $('#loadingtext').remove() - $('#ajaxMsg').empty() - $('#ajaxMsg').removeAttr('style') + $('#ajaxMsg2').remove() spinner_active = false loadingtext_active = false loadingMessage = false @@ -303,7 +303,7 @@ resetFilters("albums"); setTimeout(function(){ initFancybox(); - },1500) + },1500); } $(document).ready(function() { diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html index 326a02cf..e606a02b 100644 --- a/data/interfaces/default/base.html +++ b/data/interfaces/default/base.html @@ -29,7 +29,7 @@
-
+
% if not headphones.CURRENT_VERSION:
You're running an unknown version of Headphones. Update or diff --git a/data/interfaces/default/css/style.css b/data/interfaces/default/css/style.css index 0bcf383f..6789726f 100644 --- a/data/interfaces/default/css/style.css +++ b/data/interfaces/default/css/style.css @@ -545,7 +545,7 @@ footer { position: relative; top: 4px; } -#ajaxMsg { +.ajaxMsg { border: 1px solid #cccccc; background-image: -moz-linear-gradient(#ffffff, #eeeeee) !important; background-image: linear-gradient(#ffffff, #eeeeee) !important; @@ -576,16 +576,16 @@ footer { -o-opacity: 0.8 !important; opacity: 0.8 !important; } -#ajaxMsg .msg { +.ajaxMsg .msg { font-family: "Trebuchet MS", Helvetica, Arial, sans-serif; line-height: normal; padding-left: 20px; } -#ajaxMsg .loader { +.ajaxMsg .loader { position: relative; top: 2px; } -#ajaxMsg.success { +.ajaxMsg .success { background-image: -moz-linear-gradient(#d3ffd7, #c2edc6) !important; background-image: linear-gradient(#d3ffd7, #c2edc6) !important; background-image: -webkit-linear-gradient(#d3ffd7, #c2edc6) !important; @@ -595,7 +595,7 @@ footer { padding: 15px 10px; text-align: left; } -#ajaxMsg.error { +.ajaxMsg .error { background-image: -moz-linear-gradient(#ffd3d3, #edc4c4) !important; background-image: linear-gradient(#ffd3d3, #edc4c4) !important; background-image: -webkit-linear-gradient(#ffd3d3, #edc4c4) !important; @@ -605,7 +605,7 @@ footer { padding: 15px 10px; text-align: left; } -#ajaxMsg .ui-icon { +.ajaxMsg .ui-icon { display: inline-block; margin-left: -20px; top: 2px; diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js index b2e56b52..33eec003 100644 --- a/data/interfaces/default/js/script.js +++ b/data/interfaces/default/js/script.js @@ -228,6 +228,21 @@ function showMsg(msg,loader,timeout,ms) { } } +function showArtistMsg(msg) { + var feedback = $("#ajaxMsg2"); + 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 + "
"); + feedback.css("padding","14px 10px") + $(feedback).prepend(message); +} + function doAjaxCall(url,elem,reload,form) { // Set Message feedback = $("#ajaxMsg");