moved scanning to controls bar

diff --git a/apps/media/css/music.css b/apps/media/css/music.css
index 54b4bd624c09b77835de75ffd3f092411440a2b0..ddfe342983008737c5fe55878166173716c527fc 100644 (file)
--- 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 9b40faa96191f0939b7bebfe875db1f74b51ec20..6c8d740cc13f146d2ca8fd0e451b4fa4387ece82 100644 (file)
--- 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>