diff --git a/apps/media/css/player.css b/apps/media/css/player.css index 94dd4d6360..8f96a3c17a 100644 --- 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 index 3dabd86a49..0000000000 --- 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 "); - } - }) - if(!found){ - $('#folderlist').children().last().before("
  • "+path+""+songCount+" songs
    • "); - } - } - }); -} diff --git a/apps/media/templates/collection.php b/apps/media/templates/collection.php deleted file mode 100644 index 8fd437f769..0000000000 --- a/apps/media/templates/collection.php +++ /dev/null @@ -1,20 +0,0 @@ -
    - -
    - - -
    - - - - - - - - - - - - - -
    ArtistAlbumTitle
    diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php index dd393535bb..5fe11bdae3 100644 --- a/apps/media/templates/music.php +++ b/apps/media/templates/music.php @@ -1,3 +1,71 @@ - - - +
    + +
    + +
    +
    + +
    +
    +
    +
    +
    + +
    + + + + + + + + + + + + + + + + + + +
    NameArtist
    + The playlist is empty +
    + + +
    +
    + +
    +
    + +
    + + +
    + + + + + + + + + + + + + +
    ArtistAlbumTitle
    +
    diff --git a/apps/media/templates/player.php b/apps/media/templates/player.php deleted file mode 100644 index 9d6ead458f..0000000000 --- a/apps/media/templates/player.php +++ /dev/null @@ -1,21 +0,0 @@ -
    - -
    - -
    -
    - -
    -
    -
    -
    -
    diff --git a/apps/media/templates/playlist.php b/apps/media/templates/playlist.php deleted file mode 100644 index f99e8a0608..0000000000 --- a/apps/media/templates/playlist.php +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - -
    NameArtist
    - The playlist is empty -
    - - -
    \ 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 45c6076150..0000000000 --- a/apps/media/templates/settings.php +++ /dev/null @@ -1,23 +0,0 @@ -
    -
    - Music Directories - - - id='autoupdate' title='Automaticaly scan new files in above directories'> -
    -
    \ No newline at end of file diff --git a/core/css/styles.css b/core/css/styles.css index 97352abb6c..40f1602626 100644 --- 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 c5cf26bf12..08a8cf1609 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -20,14 +20,14 @@ t( 'Create an admin account' ); ?>

    - + t( 'Advanced' ); ?> ▾
    t( 'Set data folder' ); ?>

    -
    +
    t( 'Configure the database' ); ?> diff --git a/files/templates/index.php b/files/templates/index.php index 46d47ee4e8..bb58f5e754 100644 --- a/files/templates/index.php +++ b/files/templates/index.php @@ -1,4 +1,4 @@ -
    +