diff options
| author | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-09-25 00:17:54 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-09-25 00:17:54 +0200 |
| commit | ae4c83af916056b566e143b6fcebc80239a5b3e5 (patch) | |
| tree | 93f67f14bd6412976cf0ee1cc2439c2cb83ef39d /apps/media | |
| parent | 368412a730c607a5fe77b76a905e3dba748d4824 (diff) | |
| download | nextcloud-server-ae4c83af916056b566e143b6fcebc80239a5b3e5.tar.gz nextcloud-server-ae4c83af916056b566e143b6fcebc80239a5b3e5.zip | |
moved scanning to controls bar
Diffstat (limited to 'apps/media')
| -rw-r--r-- | apps/media/css/music.css | 5 | ||||
| -rw-r--r-- | 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 54b4bd624c0..ddfe3429830 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 9b40faa9619..6c8d740cc13 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> |