From 12370286d883423caccaf0fb062b232494df2a36 Mon Sep 17 00:00:00 2001 From: Dan Barber Date: Sun, 24 Jan 2010 11:32:38 +0000 Subject: [PATCH] ~ Further design improvements, mostly there now. --- lib/js/neompc.js | 11 +++++- templates/default/browselist_item.html | 45 +++++++++++----------- templates/default/images/add.png | Bin 968 -> 373 bytes templates/default/images/add_disabled.png | Bin 0 -> 487 bytes templates/default/images/del.png | Bin 1136 -> 457 bytes templates/default/images/delall.png | Bin 0 -> 261 bytes templates/default/images/play.png | Bin 843 -> 350 bytes templates/default/playlist.html | 2 +- templates/default/styles.css | 19 +++++---- 9 files changed, 45 insertions(+), 32 deletions(-) create mode 100644 templates/default/images/add_disabled.png create mode 100644 templates/default/images/delall.png diff --git a/lib/js/neompc.js b/lib/js/neompc.js index 1d8f9cf..3f4435c 100644 --- a/lib/js/neompc.js +++ b/lib/js/neompc.js @@ -3,6 +3,7 @@ template = '{:$template:}'; volume_min = {:$volume_min:}; volume_max = {:$volume_max:}; vol_orientation = '{:$volume_orientation:}' +page = '{:$page:}'; vol_offset = 0; String.prototype.pad = function(l, s){ @@ -128,8 +129,14 @@ $(document).ready(function(){ hide_vol = setTimeout('hide_volume(); $(\'#volume_slider\').attr(\'rel\', \'\');', 2000); } }); + + $('#removeall').click(function() { + return confirm('Are you sure you want to clear the whole playlist?'); + }); - ajax_control(); - ajax_int = setInterval('ajax_control()', 1000); + if (page = 'control') { + ajax_control(); + ajax_int = setInterval('ajax_control()', 1000); + } }); diff --git a/templates/default/browselist_item.html b/templates/default/browselist_item.html index ab79d41..47cefd9 100644 --- a/templates/default/browselist_item.html +++ b/templates/default/browselist_item.html @@ -1,30 +1,31 @@ - - {:if $browselist_item.directory:} - + + {:if $browselist_item.directory:} +
  • {:$browselist_item.directory_name|escape:'html':} -
    • - - {:elseif $browselist_item.metaArtist:} - + + + {:elseif $browselist_item.metaArtist:} +
  • {:$browselist_item.metaArtist|escape:'html':} -
    • - - {:elseif $browselist_item.metaAlbum:} - + + + {:elseif $browselist_item.metaAlbum:} +
  • {:$browselist_item.metaAlbum|escape:'html':} -
    • - - {:elseif $browselist_item.Title:} - + + + {:elseif $browselist_item.Title:} + {:if $browselist_item.in_playlist:}
  • + Add {:else:}
  • - {:/if:} Add + {:/if:} Play {:if $browselist_item.Title|escape:'html':} @@ -32,14 +33,14 @@ {: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:} + 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 9ae6d05ac3160f9cee9c01f768b9121ce528db3c..d6cfe8b300dddbb90de8e7b5c89bd4319b715585 100644 GIT binary patch delta 263 zcmV+i0r>vN2lWDwHwoYX-~iy*e@=LjKp+Sh3ji^SH!SjzXeWOF&`Cr=R5;7+lsgW> zFc1ajMMyaXRj4>v(!)LIa|}2O(4``maP?>$DFjSVu&7wch2{0wJO02wz75SK)OGD~ zzirzM&`S!h@{0wVH~?$g$_1=|GBsG_)}%RSb1`*VWH{Idr#XNRPK(@E@5!O}rDHwj( z7Lm_Y)fbVFrwz~ZE>^46NcTmxT8%ua^jy?m#x1m5+WXx4yskzyx^nm80R* z>#pOv?m(wHqpitCTfVDOsQ_?yqh_x+TjqMRW!>GV*#Lj>URPU-jAT%jh$I7WJkOhS zT{l;$RB#7}MgV#pn-|kP0%)&e@BaPZ&`7CNx?Cs}D3{C2A~LV4J0hZ%sv;tW=Xn>V zrlvm4X0tLeF_C;ca#ATH*d-xODg_XYkBttGkBtrkjEsy#K(~l|rmCUDfX*+=%U4ef z47~fvkGFqYch=TzJMb~WNETQB)I;eE0BempgGXMF$TZZqY+gO|oPX)eDd*Rfl`l@_ za_3dGW$j80YqMV82Ke&!in&(bl;?Z8@PmLpCnXNM>gY?E+G%5@7wE&yElwZn#}5O2sqX;C4<8HxE1k)91CLd8Plv&^>$3|- zU+#bB!?SNWZSsjexcZfG>;5W$oIcji$LA*^Ad#3;tJU=S+}uKZEcav+iO3b8>AG%i zX=#56cW~&9@v+fiKMXWw?K1Mi0KoX>+wXoZFW$V7&*v$Z%gZw}GjlP<9%WV4Rt$Ot z=q{B?m&eCOhZ{RBR{v=Tz>x!41t>4xyiqI`J)oHgJH{ZHG9nVSQEe6q1qC>M_@IC9 z(S{kXL%_-B^CV#HwF%ZUo5S?<^s|{mOkqC`=zjm)xwDOWtr^=__qEyCg}7(NK2}d< putsdIiNQXO<?NMQuI#rMCAj679xf}g1`0`*xJHyX=jZ08 z=9Mrw7o{eaq^2m8XO?6rxO@5rgg5eu1FdrMba4!^IQ@3YM!&-b0&V~ATbetEup1s= zPC0wXC4N!<0lrt&Ut9wuf6LV}FYDoXdx0^Z_eX?`ri)@;>yehFJeK$8{;hv*{h
    q7QETVTDQ-19#&Do&Zyj5K%FVu?-dYQb*R6Q{%kF%!xG&=Yw@`kSua8=eNlbpe zbN1P^@QWqP2mZaN7nGl*>EmOlefm;p=++I_&Ut<+vD$0yyZQ6I-vUj1GrhVbPx`oY zRakd;1cqL93bj8z!X?zGQvs_~4aZ|0<|Shbx&?$OCRdE3jCf+UiS z7$WqhuV?6EuuD22cYy7{jwdhnyi76i{d_~;>rQ=VC&PkX*NcHCRiZ;}Oa9-hzOT*j z=Y a{S18S#U=0Ar#%M-IfJLGpUXO@geCx}OTcsh literal 0 HcmV?d00001 diff --git a/templates/default/images/del.png b/templates/default/images/del.png index a8e26ffbb59195eeefeeabecacaafcde1fb90f29..a817971ba9cbfd5316ee4fe8c9ffdfb016c3b860 100644 GIT binary patch delta 348 zcmV-i0i*u#2+0GGHwoYX-~iy*e@=LjKp+Sh3OW$tHHhMoXeWOGBuPX;R5;7+lPyvM zK@f$%#w3SGRC0;P;J8Ryl{acE`&4iRxVQ0x)7%^9i~N;(|_3wOUiBX$Gq z&Fon36=#?Y`yPXbbao=v8;ZMs^z6+54dSo^jjlN^(`D7^up|}{pAqragVd-f*ao{1 zz#dpf#8tuQ^^3eYX)b9a=}FR7(lR_T`bH|(w%N1EGgb^G=P}J& utAzGg;B?aHd9Q=%0^3@D&yRZkq`m;G&b5Z3F=d_r0000&H+7!IX$3MPyh+oY;p%BoRfCilRt~h#7x#W8D^!l<)gS zKaL6D`@SI}pWnWH`$8_4`z{Q_j@BB_^Q2O#+*L~b1W+gx&dkovUfkZ^)*^!AIEl5j zwO@^E?Ig05O3s(7t!?-onX~ zC%?{3PdiG4zm}G;To*$rQpWyN=ysdkR*R2~2B&|{pC?-=P_Ng+N~LlaXaijtn88B| zzJD78)l4R1y;)h|&pUUpjvl374go&Cd&jBEmpO6vEE^jeACHfZ{}911TI(GVi4+Hz z)|#l*Lic)zVSosTAf}1#_4c*+C!d;%qDVv}k3Z+Njl*^ZERl_(q8m5feB(H#c`-bad2txwOO|(wgVZWk|`1;B9}6Nm;GXqC(5QWQl8!a<-QP&fzJ9K}34K@9$_9 zi^T?NMQuI#rMCAhf_GY@~Y1PV!(xJHyX=jZ08 z=9Mrw7o{eaq^2m8XO?6rxO@5rgg5eu0~IBBx;TbdoPImWkdHxugL&=$|Hgh&NgJ*$ zm@V5lPc!0Fc-Rc?w6w*X3Pu}eo{IbI7B;!jIDws8dG)cYUIjws?28@PVh=8nUAF)1 w-9PfTCn^C|%NooLF z_f7_Qj4eP@Cgud-?#8gmJo>29MVO0000y{D6rKp+Sg5fLL}g-BYFXeWOHrb$FWR5;7slubyK zQ51&X^L>t`DcFRSff;5PRt9E{PEKls;HE{X2vJnfs{F}~xoekDt9D_5xzH&n9HK=; zC6YF3njrZzU^pt8&W!&$I9uDU`_W=KT)DU+HfG7Y)0O0@v z!Ly?X08@Y8z{h{dQBT+8gsZE(qU;`k_~6^N6X$R^+DKBTpCm~?10&ASL34K24FE^C z3p_y|J)V_u7BwEzYdaqV=2zWZPj^pOZ*fWC9aT|N0e~b(0s!jj>OulfYIC}Cd})Zq z)@0s#lfjagDf+A4C!ARNxdCo&`E0MLsi_8#5CjVV)YpI4BWx3p1V|A3A`c=VCKtaiRIZUb%lc zWzIpo2_R`F%OSJBZ{U+_e7bw;m#e$9th6%tBb2`dgj#7)03w5vTLiFz|0cfyCeU9% TMh?~R00000NkvXXu0mjfEJ0bT diff --git a/templates/default/playlist.html b/templates/default/playlist.html index 73b8137..b307801 100644 --- a/templates/default/playlist.html +++ b/templates/default/playlist.html @@ -1,5 +1,5 @@
    -
    +
    {:if $playlist:} diff --git a/templates/default/styles.css b/templates/default/styles.css index 0ca9331..f0a4cff 100644 --- a/templates/default/styles.css +++ b/templates/default/styles.css @@ -88,11 +88,11 @@ p { clear: left; } #list { - background-color: #ddd; color: #333; margin: 0; } #list ul { + background-color: #ddd; list-style-type: none; max-width: 320px; text-align: left; @@ -129,14 +129,19 @@ p { text-shadow: 1px 1px 2px rgba(255, 255, 255, 1); font-weight: bold; } -li .play { +li .remove,.add,.play { display: block; -} -li .remove .add .play { float: right; - padding: 5px 0px 3px 5px; + padding: 2px 0px 0px 0px; display: block; -} +} +li .add { + padding-right: 3px; +} +li .remove { + padding-right: 3px; + padding-top: 8px; +} li.playing a { } li .title { @@ -178,7 +183,7 @@ li .title { } #buttons { float: right; - margin: 5px 10px 0px 0px; + margin: 5px 5px 0px 0px; text-align: right; }