From ae4c83af916056b566e143b6fcebc80239a5b3e5 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>
Date: Sun, 25 Sep 2011 00:17:54 +0200
Subject: [PATCH] moved scanning to controls bar

---
 apps/media/css/music.css       |  5 +++++
 apps/media/templates/music.php | 13 ++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/apps/media/css/music.css b/apps/media/css/music.css
index 54b4bd624c..ddfe342983 100644
--- a/apps/media/css/music.css
+++ b/apps/media/css/music.css
@@ -34,3 +34,8 @@ tr td { border-top:1px solid #eee; height:2.2em; }
 tr .artist img { vertical-align:middle; }
 tr.album td.artist { padding-left:1em; }
 tr.song td.artist { padding-left:2em; }
+
+#scan { position:absolute; right:13em; top:0em; }
+#scan .start { position:relative; display:inline; float:right; }
+#scan .stop { position:relative; display:inline; float:right; }
+#scan #scanprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; }
diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php
index 9b40faa961..6c8d740cc1 100644
--- a/apps/media/templates/music.php
+++ b/apps/media/templates/music.php
@@ -19,18 +19,17 @@
 	</div>
 
 	<div class="player" id="jp-player"></div>
+
+	<div id="scan">
+		<input type="button" class="start" value="<?php echo $l->t('Rescan Collection')?>" />
+		<input type="button" class="stop" style="display:none" value="<?php echo $l->t('Pause')?>" />
+		<div id="scanprogressbar"></div>
+	</div>
 </div>
 
 <ul id="leftcontent"></ul>
 
 <div id="rightcontent">
-<div id="scan">
-	<p id="scancount" style="display:none"><span class="songCount">0</span> <?php echo $l->t('Songs scanned')?></p>
-	<input type="button" class="start" value="<?php echo $l->t('Rescan Collection')?>" />
-	<input type="button" class="stop" style="display:none" value="<?php echo $l->t('Pause')?>" />
-	<div id="scanprogressbar"></div>
-	
-</div>
 <table id="collection">
 	<thead>
 		<tr>