more media player fixes

4 files changed, 26 insertions, 36 deletions

diff --git a/apps/media/css/music.css b/apps/media/css/music.css
index b8c695f74d5..dd9b8ea70d9 100644
--- a/apps/media/css/music.css
+++ b/apps/media/css/music.css
@@ -16,4 +16,4 @@ li button.right.prettybutton{font-size:1em;}
 img.remove{float:right;}
 #searchresults input.play, #searchresults input.add{float:right; height:16px; width:16px;}
 #collection tr.collapsed td.album, #collection tr.collapsed td.title{color:#ddd}
-a.expander{float:right;display:block}
\ No newline at end of file
+a.expander{float:right;display:block}
diff --git a/apps/media/css/player.css b/apps/media/css/player.css
index 8f96a3c17a5..6cf424a8ea1 100644
--- a/apps/media/css/player.css
+++ b/apps/media/css/player.css
@@ -1,27 +1,25 @@
 #controls ul.jp-controls{list-style-type:none;padding:0;}
 #controls ul.jp-controls li{display:inline;}
 #controls ul.jp-controls a{position:absolute;overflow:hidden;text-indent:-9999px;}
-a.jp-play,a.jp-pause{width:40px;height:40px;z-index:1;top:20px;left:48px;}
+a.jp-play,a.jp-pause{width:40px;height:40px;z-index:1;top:0;left:48px;}
 a.jp-play{background:url("../img/jplayer.blue.monday.png") 0 0 no-repeat;}
 a.jp-play:hover{background:url("../img/jplayer.blue.monday.png") -41px 0 no-repeat;}
 a.jp-pause{background:url("../img/jplayer.blue.monday.png") 0 -42px no-repeat;display:none;}
 a.jp-pause:hover{background:url("../img/jplayer.blue.monday.png") -41px -42px no-repeat;}
-a.jp-stop{top:26px;left:126px;background:url("../img/jplayer.blue.monday.png") 0 -83px no-repeat;width:28px;height:28px;z-index:1;}
-a.jp-stop:hover{background:url("../img/jplayer.blue.monday.png") -29px -83px no-repeat;}
-a.jp-previous{left:20px;top:26px;background:url("../img/jplayer.blue.monday.png") 0 -112px no-repeat;width:28px;height:28px;}
+a.jp-previous{left:20px;top:.5em;background:url("../img/jplayer.blue.monday.png") 0 -112px no-repeat;width:28px;height:28px;}
 a.jp-previous:hover{background:url("../img/jplayer.blue.monday.png") -29px -112px no-repeat;}
-a.jp-next{left:88px;top:26px;background:url("../img/jplayer.blue.monday.png") 0 -141px no-repeat;width:28px;height:28px;}
+a.jp-next{left:88px;top:.5em;background:url("../img/jplayer.blue.monday.png") 0 -141px no-repeat;width:28px;height:28px;}
 a.jp-next:hover{background:url("../img/jplayer.blue.monday.png") -29px -141px no-repeat;}
-div.jp-progress{position:absolute;overflow:hidden;background-color:#293b51;top:32px;left:164px;width:122px;height:15px;}
+div.jp-progress{position:absolute;overflow:hidden;background-color:#293b51;top:1em;left:164px;width:122px;height:15px;}
 div.jp-seek-bar{background:url("../img/jplayer.blue.monday.png") 0 -202px repeat-x;width:0;height:100%;cursor:pointer;}
 div.jp-play-bar{background:url("../img/jplayer.blue.monday.png") 0 -218px repeat-x;width:0;height:100%;}
 div.jp-seeking-bg{background:url("../img/pbar-ani.gif");}
-a.jp-mute,a.jp-unmute{height:15px;width:18px;top:32px;left:296px;}
+a.jp-mute,a.jp-unmute{height:15px;width:18px;top:1em;left:296px;}
 a.jp-mute{background:url("../img/jplayer.blue.monday.png") 0 -186px no-repeat;}
 a.jp-mute:hover{background:url("../img/jplayer.blue.monday.png") -19px -170px no-repeat;}
 a.jp-unmute{background:url("../img/jplayer.blue.monday.png") 0 -170px no-repeat;display:none;}
 a.jp-unmute:hover{background:url("../img/jplayer.blue.monday.png") -19px -186px no-repeat;}
-div.jp-volume-bar{position:absolute;overflow:hidden;background:url("../img/jplayer.blue.monday.png") 0 -250px repeat-x;width:46px;height:5px;cursor:pointer;top:37px;left:324px;}
+div.jp-volume-bar{position:absolute;overflow:hidden;background:url("../img/jplayer.blue.monday.png") 0 -250px repeat-x;width:46px;height:5px;cursor:pointer;top:1.3em;left:324px;}
 div.jp-volume-bar-value{background:url("../img/jplayer.blue.monday.png") 0 -256px repeat-x;width:0;height:5px;}
-div.jp-current-time,div.jp-duration{position:absolute;font-size:.64em;font-style:oblique;top:45px;left:164px;width:122px;}
+div.jp-current-time,div.jp-duration{position:absolute;font-size:.64em;font-style:oblique;top:1em;left:164px;width:122px;}
 div.jp-duration{text-align:right;}
diff --git a/apps/media/index.php b/apps/media/index.php
index a7128aaad42..fe724b45ddf 100644
--- a/apps/media/index.php
+++ b/apps/media/index.php
@@ -42,17 +42,9 @@ OC_Util::addScript('media','jquery.jplayer.min');
 OC_Util::addStyle('media','player');
 OC_Util::addStyle('media','music');
 
-OC_App::setActiveNavigationEntry( 'media_playlist' );
+OC_App::setActiveNavigationEntry( 'media_index' );
 
 $tmpl = new OC_Template( 'media', 'music', 'user' );
-
-$player = new OC_Template( 'media', 'player');
-$playlist = new OC_Template( 'media', 'playlist');
-$collection= new OC_Template( 'media', 'collection');
-
-$tmpl->assign('player',$player->fetchPage());
-$tmpl->assign('playlist',$playlist->fetchPage());
-$tmpl->assign('collection',$collection->fetchPage());
 $tmpl->printPage();
 ?>
  
diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php
index 5fe11bdae30..5d0b0b6f0c4 100644
--- a/apps/media/templates/music.php
+++ b/apps/media/templates/music.php
@@ -17,15 +17,15 @@
 	</div>
 	<div class="jp-current-time"></div>
 	<div class="jp-duration"></div>
-	<div class='player' id='jp-player'></div>
+	<div class="player" id="jp-player"></div>
 </div>
 
 <div id="leftcontent">
-<table id='playlist'>
+<table id="playlist">
 	<thead>
 		<tr>
-			<th class='name'><input id='selectAll' type='checkbox'>Name</th>
-			<th class='artist'>Artist</th>
+			<th class="name"><input id="selectAll" type="checkbox">Name</th>
+			<th class="artist">Artist</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -36,35 +36,35 @@
 		</tr>
 	</tbody>
 	<tfoot>
-		<tr class='template'>
-			<td class='name'>
-				<input type='checkbox'>
+		<tr class="template">
+			<td class="name">
+				<input type="checkbox">
 				<span></span>
 			</td>
-			<td class='artist'></td>
+			<td class="artist"></td>
 		</tr>
 	</tfoot>
 </table>
 </div>
 
 <div id="rightcontent">
-<div id='scan'>
-	<p id='scancount' style='display:none'><span class='songCount'>0</span> Songs scanned</p>
+<div id="scan">
+	<p id="scancount" style="display:none"><span class="songCount">0</span> Songs scanned</p>
 	<div id="scanprogressbar"></div>
-	<input type='button' class='start' value='Recan Collection'></input>
-	<input type='button' class='stop' style='display:none' value='Pause'></input>
+	<input type="button" class="start" value="Rescan Collection"></input>
+	<input type="button" class="stop" style="display:none" value="Pause"></input>
 </div>
-<table id='collection'>
+<table id="collection">
 	<thead>
 		<th>Artist</th>
 		<th>Album</th>
 		<th>Title</th>
 	</thead>
 	<tbody>
-		<tr class='template'>
-			<td class='artist'><a/></td>
-			<td class='album'><a/></td>
-			<td class='title'><a/></td>
+		<tr class="template">
+			<td class="artist"><a/></td>
+			<td class="album"><a/></td>
+			<td class="title"><a/></td>
 		</tr>
 	</tbody>
 </table>