From a3a8ae104a8e27d237f23130f1712e95618872e1 Mon Sep 17 00:00:00 2001 From: martin Date: Mon, 21 Mar 2011 15:01:43 -0400 Subject: [PATCH] CC-2030: Icon needed for Cue In/Out -Implemented --- .../views/scripts/playlist/update.phtml | 1 + public/css/images/cue_playlist.png | Bin 0 -> 1907 bytes public/css/playlist_builder.css | 49 ++++++++++++++++-- public/js/airtime/library/spl.js | 11 ++-- 4 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 public/css/images/cue_playlist.png diff --git a/application/views/scripts/playlist/update.phtml b/application/views/scripts/playlist/update.phtml index 7c9c2a898..590f071cf 100644 --- a/application/views/scripts/playlist/update.phtml +++ b/application/views/scripts/playlist/update.phtml @@ -10,6 +10,7 @@
+
diff --git a/public/css/images/cue_playlist.png b/public/css/images/cue_playlist.png new file mode 100644 index 0000000000000000000000000000000000000000..b928ccfae576d241c26c0e3717440cdbea75ae16 GIT binary patch literal 1907 zcmeAS@N?(olHy`uVBq!ia0vp^ia@N(!3HE1)R;tolw^r(L`iUdT1k0gQ7VIDN`6wR zf@f}GdTLN=VoGJ<$y6H#24;oKkcg59UmvUF{9L_6kQ%*;+ybC(1_m4Zih{)C?9>v4 zq}24xJX@vryZ0+8WTx0Eg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7*i={n4aiL` zNmQuF&B-gas<2f8n`;GRgM{^!6u?SKvTcwn`Gtf;oFf&jvGt@IQ zHZeCh*HJJsFf`CNFw!?P(ls=ztz{SPf#L~&h(9qSu!o|$g(aF%s(#+7% z$j!wJrq?AuximL5uLPzy1)~a z3ELYaZ747;&&EX4<0!L%^R5rm**wk~8}K-@KQZixXFhYG^@GxlBccnv4+aD~rd@Ja z(z|8%q_9tt()}kD``_tgZvCFAT6_Q1*|TTYd#!Z78k4!*rs3z$pT`95+_@uDCBVh7 ziSh04JHflv3#>&RT%5)E(<5`)V&<%@|FN&uurmH(xoBr))%7@@kFUreAiw;<8?NPo zGPOcn0);0Ju+4hDW81R-zpH<*Q*JC~&U0;e{~)11*Xp=zYHNINzWMbaWxwL3pZK%a z&VI0}@TwL2+&<={jaBXsj$P!-xD)=tbj!_ik7Sx_J1$P*PxycQxU8Z2PhSNlf$V|@ zPoAiJWf%A(?@}MvYjn)geCOWv_u^l8e_qJe;=B68(=T7Ph_T$f+W6oF!%gYy&sTpJ z_S#^2D1YkufTN7@W##4V4Gjwwme_t+wRgTyixdMRV-i@b_!i#BNP# z__OBy^XHr;8!bYuPk*(1+i>&d_dm9~_AF4`)Y4_b(Bsa&?4hMprJ4o5&x)Hq##4oS zGek8!m_MFB{MXj?Q1oN|{cegaOecf6*tw>(gyF5J0==Klod#}GGbv2}gJrPpOisFzEId$#r z*P8SxMbRFXr*`n>))lM1^fTd~;Ij7iTeV%{WuclE4+PzN9jnEB(z8Q?u|VqKXSOqn zK4&EV-1b;o_;`hTpQXOO{$&2d`P>m}GP8f#|7vDBR(6c3xoyUh2~*TBr0}o0|Ngnw zt0KO`-;{(DqfafZDJ|VPAx$7s5a`|sGpDYeKW9D<3s2dM zD=QGqI&%;6Ezb-4_CES^@ie cPxVYZ4DONT-ScM6R0CCmp00i_>zopr06+5fdjJ3c literal 0 HcmV?d00001 diff --git a/public/css/playlist_builder.css b/public/css/playlist_builder.css index dd1ad24b1..4e2dc5ada 100644 --- a/public/css/playlist_builder.css +++ b/public/css/playlist_builder.css @@ -15,7 +15,11 @@ #spl_sortable > li, #side_playlist > div, #spl_editor, -.spl_artist { +.spl_artist, +.spl_cue_in, +.spl_fade_in, +.spl_cue_out, +.spl_fade_out { clear: left; } @@ -35,8 +39,8 @@ #spl_sortable { list-style: none; padding:0; - height: 400px; - overflow-y: scroll; + height: 300px; + overflow: auto; width:100%; margin-top:0; } @@ -52,6 +56,10 @@ border: none; } +#spl_name { + +} + .ui-icon-closethick { margin-top: 7px; } @@ -72,6 +80,15 @@ font-size:12px; } +/*#spl_editor { + height: 50px; +}*/ + +#spl_editor > div > span { +/* display: inline-block; + width: 150px;*/ +} + .ui-icon-closethick, .ui-icon-play, .spl_fade_control, @@ -239,13 +256,12 @@ margin: 0; } -dd.edit-error { +.edit-error { color:#b80000; margin:0; padding-bottom:0; font-size:12px; display:none; - clear: left; } /*.edit-error:last-child { @@ -276,3 +292,26 @@ dd.edit-error { top: 3px; z-index: 3; } + +#spl_sortable li .spl_cue { + background-color: transparent; + float:right; + font-size: 9px; + height: 15px; + right: 35px; + width: 33px; + margin-top:2px; + cursor:pointer; +} +#spl_sortable li .spl_cue.ui-state-default { + background: transparent url(images/cue_playlist.png) no-repeat 0 0; + border:none; +} +#spl_sortable li .spl_cue.ui-state-default:hover { + background: transparent url(images/cue_playlist.png) no-repeat 0 -15px; + border:none; +} +#spl_sortable li .spl_cue.ui-state-active, #spl_sortable li .spl_cue.ui-state-active:hover { + background: transparent url(images/cue_playlist.png) no-repeat 0 -30px; + border:none; +} \ No newline at end of file diff --git a/public/js/airtime/library/spl.js b/public/js/airtime/library/spl.js index e32e83f62..89203600d 100644 --- a/public/js/airtime/library/spl.js +++ b/public/js/airtime/library/spl.js @@ -205,13 +205,15 @@ function openFadeEditor(event) { function openCueEditor(event) { event.stopPropagation(); - var pos, url, li; + var pos, url, li, icon; li = $(this).parent().parent().parent(); + icon = $(this); pos = li.attr("id").split("_").pop(); if(li.hasClass("ui-state-active")) { li.removeClass("ui-state-active"); + icon.attr("class", "spl_cue ui-state-default"); $("#cues_"+pos) .empty() @@ -220,6 +222,7 @@ function openCueEditor(event) { return; } + icon.attr("class", "spl_cue ui-state-default ui-state-active"); url = '/Playlist/set-cue'; highlightActive(li); @@ -253,7 +256,8 @@ function setSPLContent(json) { $("#spl_sortable .ui-icon-closethick").click(deleteSPLItem); $(".spl_fade_control").click(openFadeEditor); - $(".spl_playlength").click(openCueEditor); + //$(".spl_playlength").click(openCueEditor); + $(".spl_cue").click(openCueEditor); return false; } @@ -487,7 +491,8 @@ function setUpSPL() { $("#spl_sortable .ui-icon-closethick").click(deleteSPLItem); $(".spl_fade_control").click(openFadeEditor); - $(".spl_playlength").click(openCueEditor); + //$(".spl_playlength").click(openCueEditor); + $(".spl_cue").click(openCueEditor); $("#spl_sortable").droppable(); $("#spl_sortable" ).bind( "drop", addSPLItem);