first mediaplayer styling

diff --git a/apps/media/css/player.css b/apps/media/css/player.css
index 94dd4d63605aca9eace7d7a1212ea8a566f6836d..8f96a3c17a52285ed5d0a76db90b3cda2a8c33a6 100644 (file)
--- a/apps/media/css/player.css
+++ b/apps/media/css/player.css
@@ -1,8 +1,6 @@
-#jp-interface{position:fixed;z-index:100;width:25em;left:201px;top:-20px;height:60px;border-bottom:none;}
-#jp-interface div.player{height:0px}
-#jp-interface ul.jp-controls{list-style-type:none;padding:0;}
-#jp-interface ul.jp-controls li{display:inline;}
-#jp-interface ul.jp-controls a{position:absolute;overflow:hidden;text-indent:-9999px;}
+#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{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;}

diff --git a/apps/media/js/settings.js b/apps/media/js/settings.js
deleted file mode 100644 (file)
index 3dabd86..0000000
--- a/apps/media/js/settings.js
+++ /dev/null
@@ -1,65 +0,0 @@
-$(document).ready(function() {
-       $("button.scan").click(function(event){
-               event.preventDefault();
-               var parent=$(this).parent().parent();
-               var path=parent.children('input').val();
-               scan(path);
-       });
-       $("button.rescan").live('click', function(event) {
-               event.preventDefault();
-               var parent=$(this).parent().parent();
-               var path=parent.contents().filter(function(){ return(this.nodeType == 3); }).text();
-               path=path.trim();
-               scan(path);
-       });
-       $("button.delete").live('click', function(event) {
-               event.preventDefault();
-               var parent=$(this).parent().parent();
-               var path=parent.contents().filter(function(){ return(this.nodeType == 3); }).text();
-               path=path.trim();
-               var data="action=delete&path="+path;
-               $.ajax({
-                       type: 'POST',
-                       url: 'ajax/api.php',
-                       cache: false,
-                       data: data,
-                       success: function(){
-                               parent.remove();
-                       }
-               });
-       });
-       $( "#scanpath" ).autocomplete({
-               source: "../../files/ajax/autocomplete.php?dironly=true",
-               minLength: 1
-       });
-       $('#autoupdate').change(function(){
-               $.ajax({
-                       url: 'ajax/autoupdate.php',
-                       data: "autoupdate="+$(this).attr('checked')
-               });
-       })
-});
-
-function scan(path){
-       var data="action=scan&path="+path;
-       $.ajax({
-               type: 'POST',
-               url: 'ajax/api.php',
-               cache: false,
-               data: data,
-               success: function(songCount){
-                       var found=false;
-                       $('#folderlist').children('li').each(function(){
-                               var otherPath=$(this).contents().filter(function(){ return(this.nodeType == 3); }).text();
-                               otherPath=otherPath.trim();
-                               if(otherPath==path){
-                                       found=true;
-                                       $(this).children("span").html(songCount+" songs <button class='rescan prettybutton'>Rescan</button></span>");
-                               }
-                       })
-                       if(!found){
-                               $('#folderlist').children().last().before("<li>"+path+"<span class='right'>"+songCount+" songs <button class='rescan prettybutton'>Rescan</button></span></li>");
-                       }
-               }
-       });
-}

diff --git a/apps/media/templates/collection.php b/apps/media/templates/collection.php
deleted file mode 100644 (file)
index 8fd437f..0000000
--- 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 dd393535bb92da514188743d7a102681fbc742aa..5fe11bdae303141a1a9badcd59ffe07707d2d940 100644 (file)
--- 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 (file)
index 9d6ead4..0000000
--- 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 (file)
index f99e8a0..0000000
--- 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 (file)
index 45c6076..0000000
--- 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

diff --git a/core/css/styles.css b/core/css/styles.css
index 97352abb6c82cd2700e50f28eaaf26ef6ab130bb..40f1602626b243d23c7fd422675670cdfc2c18bc 100644 (file)
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -1,5 +1,5 @@
 * { margin:0; padding:0; border:0; outline:0; cursor:default; }
-body { background:#fefefe; font:normal 80%/1.6em "Lucida Grande", Arial, Verdana, sans-serif; color:#000; }
+body { background:#fefefe; font:normal 80%/1.6em "Lucida Grande", Arial, Verdana, sans-serif; color:#000; margin-bottom:2em; }
 
 
 /* HEADERS */
@@ -54,7 +54,7 @@ border:1px solid #ddd; font-weight:bold; cursor:pointer; background:#f2f2f2; col
 legend { padding:.2em; font-size:1.2em; }
 .template{display:none;}
 
-div.controls { width:100%; height:3em; margin:0; background-color:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:2; }
+#controls { width:100%; height:3em; margin:0; background-color:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:2; }
 
 /* LOG IN & INSTALLATION ------------------------------------------------------------ */
 #body-login { background-color:#ddd; }

diff --git a/core/templates/installation.php b/core/templates/installation.php
index c5cf26bf1297db8477dd2ad588ba9603da2a6105..08a8cf1609f831dc678d8bba8401be604bc11be6 100644 (file)
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -20,14 +20,14 @@
                <legend><?php echo $l->t( 'Create an <strong>admin account</strong>' ); ?></legend>
                <input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_Helper::init_var('adminlogin'); ?>" placeholder="<?php echo $l->t( 'Username' ); ?>" autofocus /></p>
                <input type="password" name="adminpass" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" placeholder="<?php echo $l->t( 'Password' ); ?>" /></p>
-</fieldset>
+       </fieldset>
 
 <a id='showAdvanced'><strong><?php echo $l->t( 'Advanced' ); ?> ▾</strong></a>
 
 <fieldset id='datadirField'>
                <legend><?php echo $l->t( 'Set data folder' ); ?></legend>
                <input type="text" name="directory" id="directory" value="<?php print OC_Helper::init_var('directory', $_['directory']); ?>" placeholder="<?php echo $l->t( 'Data folder' ); ?>" /></p>
-       </fieldset>
+</fieldset>
        
        <fieldset id='databaseField'>
                <legend><?php echo $l->t( 'Configure the database' ); ?></legend>

diff --git a/files/templates/index.php b/files/templates/index.php
index 46d47ee4e8527fa71b51b7d0a0c87c7249e26bbc..bb58f5e754ac3df70638bfa58042fa708ebc497f 100644 (file)
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -1,4 +1,4 @@
-<div class="controls">
+<div id="controls">
        <span class="nav">
                <?php echo($_['breadcrumb']); ?>
        </span>