first mediaplayer styling

5 files changed, 71 insertions, 91 deletions

diff --git a/apps/media/templates/collection.php b/apps/media/templates/collection.php
deleted file mode 100644
index 8fd437f769b..00000000000
--- a/apps/media/templates/collection.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<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>
-</div>
-<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>
-	</tbody>
-</table>
diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php
index dd393535bb9..5fe11bdae30 100644
--- a/apps/media/templates/music.php
+++ b/apps/media/templates/music.php
@@ -1,3 +1,71 @@
-<?php echo $_['player'];?>
-<?php echo $_['playlist'];?>
-<?php echo $_['collection'];?>
+<div id="controls">
+	<ul class="jp-controls">
+		<li><a href="#" class="jp-play" tabindex="1">play</a></li>
+		<li><a href="#" class="jp-pause" tabindex="1">pause</a></li>
+		<li><a href="#" class="jp-mute" tabindex="1">mute</a></li>
+		<li><a href="#" class="jp-unmute" tabindex="1">unmute</a></li>
+		<li><a href="#" class="jp-previous" tabindex="1">previous</a></li>
+		<li><a href="#" class="jp-next" tabindex="1">next</a></li>
+	</ul>
+	<div class="jp-progress">
+		<div class="jp-seek-bar">
+			<div class="jp-play-bar"></div>
+		</div>
+	</div>
+	<div class="jp-volume-bar">
+		<div class="jp-volume-bar-value"></div>
+	</div>
+	<div class="jp-current-time"></div>
+	<div class="jp-duration"></div>
+	<div class='player' id='jp-player'></div>
+</div>
+
+<div id="leftcontent">
+<table id='playlist'>
+	<thead>
+		<tr>
+			<th class='name'><input id='selectAll' type='checkbox'>Name</th>
+			<th class='artist'>Artist</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>
+				The playlist is empty
+			</td>
+		</tr>
+	</tbody>
+	<tfoot>
+		<tr class='template'>
+			<td class='name'>
+				<input type='checkbox'>
+				<span></span>
+			</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="scanprogressbar"></div>
+	<input type='button' class='start' value='Recan Collection'></input>
+	<input type='button' class='stop' style='display:none' value='Pause'></input>
+</div>
+<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>
+	</tbody>
+</table>
+</div>
diff --git a/apps/media/templates/player.php b/apps/media/templates/player.php
deleted file mode 100644
index 9d6ead458f9..00000000000
--- a/apps/media/templates/player.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="jp-interface">
-	<ul class="jp-controls">
-		<li><a href="#" class="jp-play" tabindex="1">play</a></li>
-		<li><a href="#" class="jp-pause" tabindex="1">pause</a></li>
-		<li><a href="#" class="jp-mute" tabindex="1">mute</a></li>
-		<li><a href="#" class="jp-unmute" tabindex="1">unmute</a></li>
-		<li><a href="#" class="jp-previous" tabindex="1">previous</a></li>
-		<li><a href="#" class="jp-next" tabindex="1">next</a></li>
-	</ul>
-	<div class="jp-progress">
-		<div class="jp-seek-bar">
-			<div class="jp-play-bar"></div>
-		</div>
-	</div>
-	<div class="jp-volume-bar">
-		<div class="jp-volume-bar-value"></div>
-	</div>
-	<div class="jp-current-time"></div>
-	<div class="jp-duration"></div>
-	<div class='player' id='jp-player'></div>
-</div>
diff --git a/apps/media/templates/playlist.php b/apps/media/templates/playlist.php
deleted file mode 100644
index f99e8a0608d..00000000000
--- a/apps/media/templates/playlist.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<table id='playlist'>
-	<thead>
-		<tr>
-			<th class='name'><input id='selectAll' type='checkbox'>Name</th>
-			<th class='artist'>Artist</th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr>
-			<td>
-				The playlist is empty
-			</td>
-		</tr>
-	</tbody>
-	<tfoot>
-		<tr class='template'>
-			<td class='name'>
-				<input type='checkbox'>
-				<span></span>
-			</td>
-			<td class='artist'></td>
-		</tr>
-	</tfoot>
-</table>
\ No newline at end of file
diff --git a/apps/media/templates/settings.php b/apps/media/templates/settings.php
deleted file mode 100644
index 45c60761507..00000000000
--- a/apps/media/templates/settings.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<form id="quota">
-	<fieldset>
-		<legend>Music Directories</legend>
-		<ul id='folderlist'>
-			<?php foreach($_['folders'] as $folder):?>
-				<li>
-					<?php echo $folder['name'];?>
-					<span class='right'>
-						<?php echo $folder['songs'];?> songs
-						<button class='rescan prettybutton'>Rescan</button>
-						<button class='delete prettybutton'>Delete</button>
-					</span>
-				</li>
-			<?php endforeach; ?>
-			<li>
-				<input placeholder='path' id='scanpath'/>
-				<span class='right'><button class='scan prettybutton'>Scan</button></span>
-			</li>
-		</ul>
-		<label for="autoupdate" title='Automaticaly scan new files in above directories'>Auto Update</label>
-		<input type='checkbox' <?php if($_['autoupdate']){echo 'checked="checked"';};?> id='autoupdate' title='Automaticaly scan new files in above directories'>
-	</fieldset>
-</form>
\ No newline at end of file