From 877e21c9cbe29bee56ac7828dc7213721bd71963 Mon Sep 17 00:00:00 2001 From: Dan Barber Date: Sat, 23 Jan 2010 17:46:55 +0000 Subject: [PATCH] ~ Further template development. --- config/config.inc.php | 2 +- lib/js/neompc.js | 2 +- templates/default/browse.html | 4 +-- templates/default/browselist_item.html | 43 +++++++++++++++++++------ templates/default/images/add.png | Bin 178 -> 968 bytes templates/default/images/addall.png | Bin 0 -> 217 bytes templates/default/images/play.png | Bin 4142 -> 843 bytes templates/default/images/playall.png | Bin 0 -> 232 bytes templates/default/playlist.html | 14 ++++---- templates/default/playlist_item.html | 2 +- templates/default/styles.css | 42 +++++++++++++++--------- 11 files changed, 72 insertions(+), 37 deletions(-) create mode 100644 templates/default/images/addall.png create mode 100644 templates/default/images/playall.png diff --git a/config/config.inc.php b/config/config.inc.php index 96d0b62..db53c1c 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -12,7 +12,7 @@ /* Config relating to the display of CD covers */ /* music_directory must match you MPD music_directory config */ $_CONFIG['music_directory'] = '/var/lib/mpd/music'; - $_CONFIG['album_cover_name'] = 'folder.jpg'; + $_CONFIG['album_cover_name'] = '{:artist:} - {:album:}.jpg'; /* Template to use for displaying the pages */ $_CONFIG['template'] = 'default'; diff --git a/lib/js/neompc.js b/lib/js/neompc.js index e19b757..1d8f9cf 100644 --- a/lib/js/neompc.js +++ b/lib/js/neompc.js @@ -113,7 +113,7 @@ $(document).ready(function(){ containment: $('#slider_container'), start: function() { this.rel = '1'; - vol_int = setInterval('ajax_control(\'volume\', new_volume);', 250); + vol_int = setInterval('ajax_control(\'volume\', new_volume);', 100); if (typeof(hide_vol) != 'undefined') { clearTimeout(hide_vol); } diff --git a/templates/default/browse.html b/templates/default/browse.html index 57dc6fc..3259eb2 100644 --- a/templates/default/browse.html +++ b/templates/default/browse.html @@ -8,12 +8,12 @@ --> -
+
+
{:if $browse_parent_link:} {:/if:}

{:$browse_header|escape:'html':}

-
    diff --git a/templates/default/browselist_item.html b/templates/default/browselist_item.html index 6b2ba62..ab79d41 100644 --- a/templates/default/browselist_item.html +++ b/templates/default/browselist_item.html @@ -1,22 +1,45 @@ - {:if $browselist_item.directory:} + {:if $browselist_item.directory:} -
  • {:$browselist_item.directory_name|escape:'html':}
    • +
  • + {:$browselist_item.directory_name|escape:'html':} +
    • - {:elseif $browselist_item.metaArtist:} + {:elseif $browselist_item.metaArtist:} -
  • {:$browselist_item.metaArtist|escape:'html':}
    • +
  • + {:$browselist_item.metaArtist|escape:'html':} +
    • - {:elseif $browselist_item.metaAlbum:} + {:elseif $browselist_item.metaAlbum:} -
  • {:$browselist_item.metaAlbum|escape:'html':}
    • +
  • + {:$browselist_item.metaAlbum|escape:'html':} +
    • - {:elseif $browselist_item.Title:} + {:elseif $browselist_item.Title:} - {:if $browselist_item.in_playlist:}
  • {:else:}
  • {:/if:}AddPlay {:if $browselist_item.Title|escape:'html':}{:$browselist_item.Title|escape:'html':}{:if $browselist_item.Artist && $show_extra_track_info:}
    {:$browselist_item.Artist|escape:'html':} {:if $browselist_item.Album:}({:$browselist_item.Album|escape:'html':}){:/if:}{:/if:}{:else:}{:$browselist_item.file_name|escape:'html':}{:/if:}
    • + {:if $browselist_item.in_playlist:} +
  • + {:else:} +
  • + {:/if:} + Add + Play + + {:if $browselist_item.Title|escape:'html':} + {:$browselist_item.Title|escape:'html':} + {:if $browselist_item.Artist && $show_extra_track_info:}
    {:$browselist_item.Artist|escape:'html':} {:if $browselist_item.Album:}({:$browselist_item.Album|escape:'html':}){:/if:}{:/if:}{:else:}{:$browselist_item.file_name|escape:'html':}{:/if:} +     +
    • - {:elseif $browselist_item.file:} + {:elseif $browselist_item.file:} - {:if $browselist_item.in_playlist:}
  • {:else:}
  • {:/if:}AddPlay {:if $browselist_item.Title|escape:'html':}{:$browselist_item.Title|escape:'html':}{:if $browselist_item.Artist && $show_extra_track_info:}
    {:$browselist_item.Artist|escape:'html':} {:if $browselist_item.Album:}({:$browselist_item.Album|escape:'html':}){:/if:}{:/if:}{:else:}{:$browselist_item.file_name|escape:'html':}{:/if:}
    • + {:if $browselist_item.in_playlist:} +
  • + {:else:} +
  • + {:/if:} + AddPlay {:if $browselist_item.Title|escape:'html':}{:$browselist_item.Title|escape:'html':}{:if $browselist_item.Artist && $show_extra_track_info:}
    {:$browselist_item.Artist|escape:'html':} {:if $browselist_item.Album:}({:$browselist_item.Album|escape:'html':}){:/if:}{:/if:}{:else:}{:$browselist_item.file_name|escape:'html':}{:/if:}
    • {:/if:} diff --git a/templates/default/images/add.png b/templates/default/images/add.png index 89f8c11b302107264d48e74624831e5ddeeda2fe..9ae6d05ac3160f9cee9c01f768b9121ce528db3c 100644 GIT binary patch literal 968 zcmV;(12_DMP)Px#24YJ`L;zj@r2sU5XQAr=000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igG_ z5d;TlGfJNT000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0009cNkl?@p6zUw-qo`g zFL(gjCjO{;@r2Px7q+clFablbQ46j6qwRKwnRz^PrrA_BfyC!B?>ujw@67jkzVG*i zCxoi*J(KnR_x5~y2pvLIMMMO!fK;3gfIw9v5qTn_)d9>D5xZC{UU+YE^6f^wwhfTZ zWP4`k=f4(_&sEhIk&vei&+{%;tJO&NMYURuJkPt>sm|)O;kxcXHk*}?ekixTzxTid zc=MH`;neG{gY?E+;MVVC}UD)-#*K^z`(znL|ur4(NXW+_|%jdaW7TSNFBq*@d`g#y(b0 qWw1tUu8F}uj^)wOVEMnVfPVpunYEdg-qR!i0000R|DNig)WpGT%PfAtr%uP&B4N6T+sVqF1Y6Dcn8Q>G*3Z(zvD*XTdfBF3*@<0xA zNswRg|NjivPw@f`WKi&QaSW-rm6VXw!lcF~aFRi>&_Hql!&FZX=|fx%49pAyhZua% Tr(G!rs%7wW^>bP0l+XkKv(_|R diff --git a/templates/default/images/addall.png b/templates/default/images/addall.png new file mode 100644 index 0000000000000000000000000000000000000000..1ae1d39b2060bacca289ad49780ee4fdafd61adf GIT binary patch literal 217 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 Rwm{<;JYD@<);T3K0RSn+KrsLS literal 0 HcmV?d00001 diff --git a/templates/default/playlist.html b/templates/default/playlist.html index 977bc20..73b8137 100644 --- a/templates/default/playlist.html +++ b/templates/default/playlist.html @@ -1,14 +1,16 @@ -
    +
    +
    +
    + {:if $playlist:}
    - {:if $playlist:}
      {:foreach from=$playlist item=playlist_item:} {:include file="default/playlist_item.html":} {:/foreach:}
    - {:else:} -

    (Empty playlist)

    - {:/if:} -
    +
{:else:} +

(Empty playlist)

+ {:/if:} + diff --git a/templates/default/playlist_item.html b/templates/default/playlist_item.html index f28444a..76a70c3 100644 --- a/templates/default/playlist_item.html +++ b/templates/default/playlist_item.html @@ -4,7 +4,7 @@
  • {:/if:} Remove from Playlist - + {:$playlist_item.Pos+1|string_format:"%02d":} {:if $playlist_item.Title:} {:$playlist_item.Title:} diff --git a/templates/default/styles.css b/templates/default/styles.css index 977ec50..0ca9331 100644 --- a/templates/default/styles.css +++ b/templates/default/styles.css @@ -65,22 +65,22 @@ p { width: 106px; text-shadow: 0 0 12px rgba(150, 210, 255, 0.9); } -#browse_parent { +#list_header { height: 30px; padding: 0; width: 320px; margin: 0 auto; } -#browse_parent p { +#list_header p { padding: 8px 10px; text-align: left; } -#browse_parent a#browse_back { +#list_header a#browse_back { display: block; float: left; - width: 45px; + width: 30px; height: 30px; - margin-right: 10px; + margin-right: 5px; background: url(templates/{:$template:}/images/back.png) center center no-repeat; } #page { @@ -102,10 +102,23 @@ p { #list ul.list { margin-top: 0; } -#list ul li { - padding: 3px 10px 3px 10px; +#list ul .browse { + display: block; + padding: 5px 10px 5px 35px; border-top: 1px solid white; border-bottom: 1px solid #aaa; +} +#list ul .playlist_item { + display: block; + padding: 5px 10px 5px 10px; + border-top: 1px solid white; + border-bottom: 1px solid #aaa; +} +#list ul li.dir { + background: url(templates/{:$template:}/images/folder.png) 10px center no-repeat; +} +#list ul li.track { + background: url(templates/{:$template:}/images/music.png) 10px center no-repeat; } #list li .pos { float: left; @@ -119,14 +132,12 @@ p { li .play { display: block; } -li .remove { +li .remove .add .play { float: right; - padding: 5px 0px 3px; + padding: 5px 0px 3px 5px; display: block; } -li.playing { - background: #ccc; - border-bottom: 1px solid #999; +li.playing a { } li .title { font-weight: bold; @@ -165,10 +176,9 @@ li .title { #page #album { color: #888; } -#buttons { - width: 280px; - margin: 0px auto; - padding-top: 10px; +#buttons { + float: right; + margin: 5px 10px 0px 0px; text-align: right; }