From c144976676efc829b6a2e884ea2bb4d2bfebb733 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>
Date: Sat, 13 Aug 2011 07:02:51 +0200
Subject: [PATCH] start scanning music automatically when in Music

---
 apps/media/js/collection.js    | 4 ++--
 apps/media/templates/music.php | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
index 8ef10951b6b..15c83b86229 100644
--- a/apps/media/js/collection.js
+++ b/apps/media/js/collection.js
@@ -244,12 +244,12 @@ $(document).ready(function(){
 	Collection.parent=$('#collection');
 	Collection.load();
 	Collection.parent.hide();
-	$('#scan input.start').click(function(){
+	//$('#scan input.start').click(function(){
 		$('#scan input.start').hide();
 		$('#scan input.stop').show();
 		$('#scan input.stop').click(function(){
 			Scanner.toggle();
 		});
 		Scanner.scanCollection();
-	});
+	//});
 });
diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php
index d3917ac8137..9c31ddd288a 100644
--- a/apps/media/templates/music.php
+++ b/apps/media/templates/music.php
@@ -24,10 +24,11 @@
 
 <div id="rightcontent">
 <div id="scan">
-	<p id="scancount" style="display:none"><span class="songCount">0</span> <?php echo $l->t('Songs scanned')?></p>
-	<div id="scanprogressbar"></div>
+	<p id="scancount" style="display:none"><span class="songCount">0</span> <?php echo $l->t('Songs scanned')?>
 	<input type="button" class="start" value="<?php echo $l->t('Rescan Collection')?>"></input>
-	<input type="button" class="stop" style="display:none" value="<?php echo $l->t('Pause')?>"></input>
+	<input type="button" class="stop" style="display:none" value="<?php echo $l->t('Pause')?>"></input></p>
+	<div id="scanprogressbar"></div>
+	
 </div>
 <table id="collection">
 	<thead>