From 8a3dcc53f7e9242bc0e7171ca0769af47dd9ed28 Mon Sep 17 00:00:00 2001
From: Elmar Kouwenhoven <elmarkou@gmail.com>
Date: Wed, 9 May 2012 16:51:33 +0200
Subject: [PATCH] fixed the meta refresh, made some nice ajax loaders while
 getting artist information,

Also fixed clicking on 'refresh artist' after the ajaxcall was success
the table with albums will be refreshed.
---
 data/interfaces/default/artist.html  | 18 +++++++++++++++---
 data/interfaces/default/js/script.js | 21 ++++++++++++++++++++-
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/data/interfaces/default/artist.html b/data/interfaces/default/artist.html
index 4b418732..2232df6e 100644
--- a/data/interfaces/default/artist.html
+++ b/data/interfaces/default/artist.html
@@ -7,7 +7,7 @@
 <%def name="headerIncludes()">
 	<div id="subhead_container">
 		<div id="subhead_menu">		
-			<a id="menu_link_refresh" onclick="doAjaxCall('refreshArtist?ArtistID=${artist['ArtistID']}', $(this))" href="#" data-success="'${artist['ArtistName']}' will be refreshed">Refresh Artist</a>
+			<a id="menu_link_refresh" onclick="doAjaxCall('refreshArtist?ArtistID=${artist['ArtistID']}', $(this)),'table'" href="#" data-success="'${artist['ArtistName']}' will be refreshed">Refresh Artist</a>
 			<a id="menu_link_delete" href="deleteArtist?ArtistID=${artist['ArtistID']}">Delete Artist</a>
 			%if artist['Status'] == 'Paused':
 				<a id="menu_link_resume" href="#" onclick="doAjaxCall('resumeArtist?ArtistID=${artist['ArtistID']}',$(this),true)" data-success="${artist['ArtistName']} resumed">Resume Artist</a>
@@ -29,7 +29,12 @@
 		<div id="artistImg">
 			<img class="albumArt" src="http://ec1.images-amazon.com/images/P/None.01.MZZZZZZZ.jpg" width="200" height="200" alt="${artist['ArtistName']}"/>
 		</div>
-		<h1><a href="http://musicbrainz.org/artist/${artist['ArtistID']}">${artist['ArtistName']}</a></h1>
+		<h1>	
+			%if artist['Status'] == 'Loading':	
+				<img src="interfaces/default/images/loader_black.gif" alt="loading" style="float:left; margin-right: 5px;"/> 
+			%endif
+			<a href="http://musicbrainz.org/artist/${artist['ArtistID']}">${artist['ArtistName']}</a>
+		</h1>
 		<div id="artistBio"></div>
 		%if artist['Status'] == 'Loading':
 		<h3><i>(Album information for this artist is currently being loaded)</i></h3>
@@ -134,7 +139,6 @@
 
 <%def name="headIncludes()">
 	<link rel="stylesheet" href="interfaces/default/css/data_table.css">
-	<script type="javascript" href="interfaces/default/css/data_table.css">
 	%if artist['Status'] == 'Loading':
 	<meta http-equiv="refresh" content="5">
 	%endif
@@ -145,6 +149,10 @@
 	
 	<script>
 	function initThisPage() {
+		%if artist['Status'] == 'Loading':
+			showMsg("Getting artist information",true);
+		%endif
+		
 		$('#album_table').dataTable({
 			"bDestroy": true,
 			"aoColumns": [
@@ -173,6 +181,10 @@
 
 		});			
 		resetFilters("albums");
+		replaceEmptyAlbum("table#album_table td#albumart img","${artist['ArtistName']}");
+		setTimeout(function(){
+			initFancybox();
+		},1000);
 	}
 	
 	$(document).ready(function() {		
diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js
index b4de2851..d1bb1e8e 100644
--- a/data/interfaces/default/js/script.js
+++ b/data/interfaces/default/js/script.js
@@ -253,6 +253,25 @@ function refreshTab() {
 	});
 }
 
+function showMsg(msg,loader,timeout,ms) {
+	var feedback = $("#ajaxMsg");
+	feedback.fadeIn();
+	var message = $("<div class='msg'>" + msg + "</div>");
+	if (loader) {
+		var message = $("<div class='msg'><img src='interfaces/default/images/loader_black.gif' alt='loading' class='loader' style='position: relative;top:10px;margin-top:-15px; margin-left:-10px;'/>" + msg + "</div>");
+		feedback.css("padding","14px 10px")
+	}
+	$(feedback).prepend(message);
+	if (timeout) {
+		setTimeout(function(){
+			message.fadeOut(function(){
+				$(this).remove();
+				feedback.fadeOut();					
+			});
+		},ms);
+	} 
+}
+
 function doAjaxCall(url,elem,reload,form) {
 	// Set Message
 	feedback = $("#ajaxMsg");
@@ -328,7 +347,7 @@ function doAjaxCall(url,elem,reload,form) {
 	  				feedback.removeClass('success');
 	  			});
 	  			if ( reload == true ) 	refreshSubmenu(url);
-	  			if ( reload == "table") refreshTable();
+	  			if ( reload == "table") console.log('refresh'); refreshTable();
 	  			if ( reload == "tabs") 	refreshTab();
 	  			if ( form ) {
 	  				// Change the option to 'choose...'