Merge branch 'public/9.0' into public/9.1

Changelog9.html

@@ -56,7 +56,9 @@ <h2><a name="v9.0.1" id="v9.0.1"></a>Version 9.0.1</h2>
 		<li>Fix helper search path initialisation on older macOS using Perl 5.18.</li>
 		<li><a href="https://github.com/LMS-Community/slimserver-platforms/issues/74">#74</a> - Speed up Perl installation during an initial installation on Windows.</li>
 		<li><a href="https://github.com/LMS-Community/slimserver-platforms/issues/75">#75</a> - Make sure newly installed LMS on Windows is running before sending the user to the web page.</li>
+		<li><a href="https://github.com/LMS-Community/slimserver-platforms/issues/77">#77</a> - Add instructions to the macOS DMG file.</li>
 		<li><a href="https://github.com/LMS-Community/slimserver-platforms/issues/78">#78</a> - Fix crypto library linking issues in the Docker image.</li>
+		<li><a href="https://github.com/LMS-Community/slimserver-platforms/issues/80">#80</a> - Reset update status when updating fromt he macOS menu bar item.</li>
 	</ul>
 	<br />
 
@@ -69,6 +71,7 @@ <h2><a name="v9.0.1" id="v9.0.1"></a>Version 9.0.1</h2>
 		<li><a href="https://github.com/LMS-Community/slimserver/pull/1238">#1238</a> - Merge multiple works per track into one single work (thanks @darrel-k!)</li>
 		<li><a href="https://github.com/LMS-Community/slimserver/pull/1240">#1240</a> - Add option to limit works scanning to classical genre(s) (thanks @darrel-k!)</li>
 		<li><a href="https://github.com/LMS-Community/slimserver/issues/1242">#1242</a> - Fix plugin download - must wait for the download to finish before restarting the server</li>
+		<li><a href="https://github.com/LMS-Community/slimserver/issues/1247">#1247</a> - Fix display of final "Scan done" message and "Abort scan" link in Material/Classic skins.</li>
 	</ul>
 	<br />
 

HTML/EN/html/progress.js

@@ -1,20 +1,20 @@
 function ajaxProgressCallback(theData) {
-	
+
 	var parsedData = fillDataHash(theData);
-	
+
 	var elems = ['Name', 'Done', 'Total', 'Active', 'Time', 'Bar', 'Info'];
-	
+
 	for (var i=0; i <= 50; i++) {
-	
+
 		// only show the count if it is more than one item
 		if (parsedData['Total'+i] > 1) {
 			showElements(['Count'+i],'inline');
 		} else {
 			hideElements(['Count'+i]);
 		}
-		
+
 		for (var j=0; j < elems.length; j++) {
-		
+
 			if (parsedData['Name'+i]) {
 				showElements(['progress'+i],'inline');
 				refreshElement(elems[j]+i, parsedData[elems[j]+i]);
@@ -27,21 +27,24 @@ function ajaxProgressCallback(theData) {
 			}
 		}
 	}
-	
+
 	if (parsedData['message']) {
 		if (parsedData['total_time']) {
 			refreshElement('message',parsedData['message']+ timestring + parsedData['total_time']);
 		} else {
 			refreshElement('message',parsedData['message']);
 		}
+
+		hideElements(['abortscanlink']);
 	} else {
+		showElements(['abortscanlink']);
 		setTimeout( "ajaxProgressRefresh()", 5000);
 	}
 }
 
 function ajaxProgressRefresh() {
 
-	// add a random number to the params as IE loves to cache the heck out of 
+	// add a random number to the params as IE loves to cache the heck out of
 	var args = 'type=' + progresstype + '&barlen=' + progressbarlen + '&ajaxRequest=1&player=' + player + '&d=' + Math.random();
 	ajaxProgressUpdate(args, ajaxProgressCallback);
 }