From e1b2c5113037a407174ed0a1a95c325754ec3de4 Mon Sep 17 00:00:00 2001 From: Robert Elder Date: Tue, 21 Oct 2014 20:15:05 +0000 Subject: [PATCH 01/21] Upgrade jPlayer library from 2.5.0 (7th November 2013) to 2.7.0 (1st September 2014) to resolve playback issues. --- airtime_mvc/public/js/jplayer/Jplayer.swf | Bin 14148 -> 14170 bytes .../public/js/jplayer/jplayer.playlist.min.js | 48 +- .../js/jplayer/jquery.jplayer.inspector.js | 338 ++++++++++ .../public/js/jplayer/jquery.jplayer.min.js | 182 +++--- .../js/jplayer/popcorn/popcorn.jplayer.js | 583 ++++++++++++++++++ 5 files changed, 1039 insertions(+), 112 deletions(-) create mode 100644 airtime_mvc/public/js/jplayer/jquery.jplayer.inspector.js create mode 100644 airtime_mvc/public/js/jplayer/popcorn/popcorn.jplayer.js diff --git a/airtime_mvc/public/js/jplayer/Jplayer.swf b/airtime_mvc/public/js/jplayer/Jplayer.swf index 2121715c8fa1314942889291905cd6da37c7c2ca..103a729071893d9d6e94d583103d2f0cccc0ebb4 100644 GIT binary patch literal 14170 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 z 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 T>B;x}&)h$EU(kA}RDS;-56>)h literal 14148 zcmaL4V{9gl6D?e~TW-CzZDVVXU8H>$a0@&uRBSdbLI*w4z-XQLKT)Ha?rz%gW=W2`frcbgL5X1 zM-UIfVfvi~f7g&N?iG1wu`eXEwN-(W>ll;L>szQX<5U{~EW&g0rlmA#sqUMR2aF0@ zwLG{Hu2Aug;9FaB(fWSH8Esx3#3*pOwY0N1>G;u5C~*luAhNl1JqZ@V6tAx&Yb`Na zN|p!QQXu*P=WmxZ`EA12q{`l$M42U^^m2`hKbx*LXytbsKdIqJGM5y?@wg%Z$U7U+7 zpU=tz;Dxcmfh0?){i<1C-jvF*C!eC6;_;mmw|6yQsB9fH-CDAX_{Zw+cW>r`-FQu_ z#UmY!XE=Q{6>NH<9nUNlx9lAy3mUZAgVp+1PVM8YlF-~^ot|#t$xTlEmB;(TIn|3r z_%hCgS;Gp&0iMp4`#mQx$m0xN2LUfD&y6hU>U;S?xUZ0t4kIE2Oy_w$dwN;k%Xskc z5dNU@9zOjr*Q-D=2cFaug}qBgFSm+B(EIuQ+D)AKP!sn;GRU~cRJW1_OEX&=_xyYg zIul=W4jXQ8!U`qt&r_a0lB#;#kli_iQ*iuS z?~sMgDyD327K@b#q>V7+U$H+pbveFba+KYM(qPuy(B=D}Tpm8+p5n}TPfmV=`jrhV z%SCc0*V+nOOL2*jP8T#Uq<`~&Wo*y48QQ;CWjP+3=L@pWU~ThI)HsUj)Hi6^y5d|d z8s13A11}^%0L2ZW;`@`)&GNMT28_Afai_n~AsQyD&ed%I^m=HPu4l#y9Sxw8D&myu zKufr$=f)FpqdtMg{B|3@C0t1>_QM-VZtTbanz~97tVq_%Q$%yTRiGdv3aqZY=tCCP zKZ;GfIkQsU-&vTy1|OW4RW9gkHk*x0D~QB8rjkz%(@fT9{@FE>Axo(~HaZV#a(9?| zI$YQj{y}gksPE%8l+_oZ7dpw*h0z22zQ@tSwYY%!_beYTfoT>s3}&5(s)UyaO&IGg zCJZ1&GYi~od>qc_%|hvEpuoa5AMM<%@d1#A?vwP1#>44A97D(Z8-hFAQ)1=5_Y0_L zv7*hygreZ>AYe7|bg8aE>a-9uz*xKc&#_=oHf9w3wmq!z7jWl8vUs*yP93t?r)em``Z4cw!iSuQrPiWyFwmNrythj zf!K}>jU%0KDK?`TqU;T9Evw8>Tj#VtTb}sLqEgEkO`OzT6uU!GZ+s$t2QQ{6Q1q9^ z1RzKVQ^4R1otR5W1LIU89UZ!vP)<+)v79@fsD#It`Y8C+2gl1U7UZ=#OR@LIV@6`W`&he{(kIld~QB&xvgBfRD@RynD( zyyhd&1Ho%2sVN44zK?4qT>MET3!pmavV7z~HxYIg2zkwOYC{^rUGcJ+)uO9;+5<(BH5q{v9v z1!9Bk<;QF;WFDGh<7Nm)N?qHP26YS5=`rrSoRJ<9XmtYF!=>t&S$-xYBt|*|$}4f9 zyo}ztIx9)+iiy_Lr4As6+gFr}q4CqvK}4mLOBeT1^BV1D?Pm18n7>jLNE3zh=gmR< zU1S|1h=PJJLUm!AjsR4;C;+EX*R1M^czGTPHHy@v3Bv*_Cqde}x9z>D-!hjZSPqR? z^H=evcB}BSKK%%W>WTYl{l!0fW{CE0G zg|<-1P?MTOa)cJ9To>|n>psfq*|^BFd7kTCgJZ3$kf&{Ya9IE=ry+9J#Twu+K1E;! zfi9V22OWVvUhaN{AKkGN+Eud#*?h>D_D=-4CfHqT6)`?irJc*jzNCh$;tdbwMxj*# znI}N4mL6?c6RhbW6SI+3nW6fTgZ)rvmRLi)fkHcr&MEL;f2VBcqx~jM`~LJaMyxQI z#q{Q9oQ6}I5GCJ#ho{?G{tl{*6nj@y!4zOixIPDDLWY~XSVx5y>gnhZx~el4_lus} z@&_11;?dwiz!0*x3~n}U){fvBY+Fg!ZEEYoU!M?}`zOh$*$C1u1D#^StET9qSBP7v zcgvjAL<*)Ox#PpB)P7pQu)x(aH8j-pu4T}Fxm1Q+{v~-yG2*p*ndX`1C94(F5tboXj%x$tHbOf%htz8Y^lY2z@ zNmjOoPP$N9_jo(EuTHU?ZWS_cM+4otX{iZLEVXL_?2g{fxNxm!RFA2rJ1@VwuW_qz zj{5H!Ew%YBf-X=zfAR>gZ9JcGk2%1QQe;LZFUP#Joi2${ zKcs*1hlhqMMaiqbtIt!X-;zq$=*={=dwQv^J~29BLZEZhL94dT7;Skojze&VlBZ&v zp}5<{#vGhe8YP81G64AYo$WNZj(zEV?Lj`$tAxH+c>x|$7kBhQ7$fUK(VD)1ug-AM zr0Jlw!}vewbJ5TA;(@-B6ZzxiP+ETF2~mG!a_N?_(?NIKfTCZQX(Kb~Pg7}Cym$)# zq~pj)<*P#>q$;Bxp0s0xVueA&4T99;$|Z{u__uN9kw<)|NKqX~@Q&`U3cf);*W|T% zi!aT#=Z>i}Eci^RU#rOuc!@fyS9tu{w`y5(#4{E(5Lss;oJ2O1IV%wd_HOJ>AlP`2 z)e%bOrYkzi?M1?nxv~~_8C4&nJ@@DtUY+tI@!aVIX=e7v*N2nOL&k@GUy3F@VC%05 zT)2+^YP!xA8O%C3Z#c3F2H+PqYFSMbJ`v+MT@2yJt^HdTxD9x2y?zieC=+yyyUMh7 zap~u|`WNtmEkp0|7X`0sF81qj+))!dg>(JD|5`$vanA~&$ zJ}|0UGfSpi8|Up3H0?P+&r!Mc6q{EUa(In)#N7olpM)kVfM=KS63aA~V-^`f-<*R9 zcVC*-B6hfxggmCjqq~cKQMawr)A+%Cfu=YIC-r+vV?oX;ZO+N+mxLTC-pDCvSXse- zp6u#Iasw_G?Y;app0_+eO^#KQlZRO0nvSoP3YrC{d{qCK9r<|FfGKj%QVD>lOWqvU zH(^f1uud8UcozMk&Uo@(`mF6ejmLg++x?a3#N%0pSkXlbghhAf> z*`@}lK1H-A+>xA_!D?53j6g1@+GR~aV1LRf z`33>Vg*ag8hmRNc=((9f1~#rbMdZ=UZp_K<1*#iuCyfQoV!#bItLc2r$sZ?45)wyYOb3FiAR#*YCphnelmf8~fw_ zIRzz99!?do%*_EK{}g-P(^*&?3QASI&bH5*LvW6Fy;%=yI~d;o-d#}pa2}9+7;v(m zd|=S6FRjm;hkuDjPWmlor6RgyJ}f-`;0R891ev@m*49Ci_c7pRVT~8IE?_O#kFrKp z`ogh1ZOgRc=!B!2R^be3V;~H_9HoWfyfTH4;M_z(;*v=aY=N3pr_L-i<7RZ#39Al@ z@J?>kj+}uoD~pQ}NcD28XwCV9a6((Qh@q0Bab}Ukn&8e$94ieK5GQ>ppoJ?TwkTjJ zbkQqZ3Ta=AO2^j=U%)wF2PS43GCj-1Q~;Y&{kpqMnRwqfmBjd?dN?VldmX8%e!qt< zx~AHW#!`6l*IeDmDCO=);IZMAli*mVn!q*ix^>yGh=N0ilyN9N}3G}rY=|5@uKILTunvh zNlhSGQ5?QW38%2m;PG&~1?wc$3NWakt5TzvEP^`n9)12(t zVNcK9Y?tl{Ry){Y(R?fuLDXz!prZ2t%U#=7u(3oI#lsElAZ}DT8JnvKLs}jA zWWtBn7c9R_mt^@Glgp+<(8+PJjquA}*l!F%E?m3vJ3Qy}kk5rqCMYQxQ^ua4I`BX>?V_0R+BMnsVilxa$_Lz`<`twTmf9! z`v=2Op6M~3Au*oGF&hITydx2MCqq3aLmeuFoFjAa2WG3SpuibSY8)1qOz+R2u!QJG zX0{%`GBTy%qm*$EA7rJ8;z%6l$jY|xHD%{!B;SSBQSibwe~`hn1%uRsE`??gK_;#8vhD{JQ{zK z31tzBl*vy7afZTg}CFBM8hZ;N{CMkI@#FZ6FAD3xN+i-;o;9Iyl zk$)^frKtJ3|DcGlgFk5FT%+xBXzr&`uW$Z!lJD7IxYPA_DX)U{Z&7aw?%AMT$J&KL zT4K@?tB2a%h?_<=Cm0&XMnMt;aaasz$|atW~s){1^5a%b(g0qP2J4YrA}3fT&6$FR%S zYt#GX2MvM*h7ZOA?*?&8xy#gh;70)>2bK-SgWv{rORJBx%hmhfhY7*}<^$pO>y~*J zy|=<|C6)5?7w3c0p)JTZMB%JYr+!HU@of#vCyfP$XjMKXW%#;?LJDPgSiX&dQyyh_ zM1ByZRCqqV!Xiz0av1S#Aq)={m|S>o0`X;w8^iGj*1fl%V6RWFmR}3#4ahcRC-fh% zPuyF$-VZ-LFg}n^*jvlqP`@4h>K)=Am|Lb@)J1;CPsCf##UGGYl3kX?ABb1DUB_Nb zzaH>zuur&H@?ZU;T@ba{c3k>&`n9Y&v*=pFW4=qYqaS!Ca2>!j2#EK2EW+Dgr6En zjRVsg#i(!iC&J;EA1M9smFPE1FJCXAKL0LV?}nc%$PL&wI6SBi;w$8?cP|4d0f-Oe zE8DJcuPsOqO<(HJF;Unso{$7j!qso zfzjj}#IEFjqLhGGg4!A=-Pnz;JoR3H|4-B_w+!mW|4&kpjV(VNKTnVsuxq8Exfc>& zkXx8tg0`7AW{Crjpu-V|Bvt*zZn%P zjUg8mD>dh2`;v^-;A{p^UuZ8#P7sNT{eJ+~QrccI6;Aqg+(M_2+|)aVS>y;cp!Zs{AToMSJsCN5Vq_7mA&xXt5E$TyeXC_foLoYX0I8hy-L z8}TlrqYMxRaQ6HwwqCYK{!z38B%@4}Bou_OsEl9ugPWuq1~P{XKBu9)C}Y)}e;Q7X z|Jck(lTJdii5H&_${*JsAT4bs9-5$J3r?sp`=%Olyqnn%!$z7rpk~z3;2qqub&0a2 z)6wbmkc3(AL#T)0-rb-cFu{>b1r%d)28tf&)2l(L9YCesUsCQ#(|pE^HlIuzz8TRL zAKr=^tl4Dr<84CqD?`l-;J((}8YtB&kmr38VtoBLgqogx{H(s*(pBhJ^RaM{w$5$_ z#LY@dc#zUXqGJW(73j!z^hYz0v*QZ(L@1Bst6-H-9whw=XI4lnq!g#t6-}$e4W`nm zE-=v~UZ7&8OEOQ(Z%s5pGbv}5S&m66lT#?BVG&r7E-r0I&Bq%-+qly|wkrO|C2j8& zNHuNCJmd_fw7Fv_wH+os#$YPd*OJD(Pg?9I3mhM9lcwScrYev%ky3zE63ZD*+;^Ae zGUQVlR%SM_LRT85(;t5gmQItON(^I@PIKZ`iq;-PyD==5t~ME0K-G~=VLnpt$){DA zmQUm^(pA7t6cgoA;sPj4t4`-3=B>z* z2Qm`VomgWU-V)Q>eTDFsB5#>mkIaAEud7OPply6k{&Up5A;%jEW^LeO^MB(YdXrS` z$Y81){b}+#X8%BGt@kCvtj>crXCgIggJ_9_T?@^-BgNB)9^>X|bKdE;QGIy7hj);f zUYCU5`$-cdo(VI1s~5+NJ}RW~kuQvxya!3=6uu>v7{514=fs^gFmI78oEX1%O6$cI z=q8%pk<6m|{*v4uk%(s?Idg}Uys3~#{#CM2;HBmnHAmD%-$efLE2GlurbMEfU&k?8 znZCZq|Cu8#eqOFgZ)XW4q{i42OLAZ)w%SmJ526#zK$z}~UE#*+h(M?Ro_q^S=6MwShzIIG z+xDbgt#_oX3v_|f*4XmE?4PR5VR9d^0DhD4o5#zSStl2nFK`p~rd1 zxsxVijPu>kWw6416PqhX?5tRD~e||kyQsS z(?7%d^BXGPWJWlxItM@cj5k;8-*Ut34joxWXEbd(cC;N~8+f5eGHn_zF+o}`AXO}^-z z={>{Mk%zxr9Z4G$w;f!Y2p=LoNT&RxUrscOpL14?!->@F3QFpcGRtV)nOv-*U!bVi z3-kt7?ZvA$2A2{tb^N`jqv-yg#X!2;mHA_*tGXf}9_pf^Of+^V3RZ>%w%)vI z{$k`woP8O&S`;8Gv8X($sKs%|=DH`4r2wK|5pc7=*U{#Sq17J2&=nebbL9WQndJI# z`^9q$A{Pu0=c}NEGJF-h_RN04N(yz$xe?vQq>>FDVPA_H4s}n;g1j~{W6{Ll>rQ#C z?)7#+Fnv{+Z0r5`lQPjd5L2KjqXG}JGvQH-gm!Hd%pQ+a&MsrMWI>2f8T3bxvK9!)Y@kY9{a^o9LBO~Xyli^iH z(i!ry#51)vUh+oRROCigj=S^)4tVIF(ND)Fwysg&%A)?-GkxpT{lTBk$T|3mJDKIH za$T2*{fj<%PWMUHy2RQ9EJxuYN9QXZ#Bj^Lc!NtcTG+#M53>~C6$d_%X?!uMltlDS zB&I;=&NZk#U9ycclS1p37*Pdf(f#%9=Y>?xRHZZqU}-9jl7atg77A>p3r-3GX+8<{ z4X3hjZkAK0?r$N|t5l=VsL%y8nR`q*k?jM5C;Dw~QB2Z*Wcrz?$*Rr2(N-SYdkDOW z11T5IDDgC;BVx45L!f85m2$i@eHlVg132bxxKY`%qGtq;-hF54bryq-@=J;;h_|$7WnTpT^zFOSYf2p$gNU{)17Ipw797PLe{cVY_ zrYy$dA1CrIi9a~-A8J>dXC7D|6v>~FG=P`8Tf!OM_P^*Bk6D?pz6(7BDbPnsN_(hN z4x-fBHpwT&{S>K3N{V~7X-5nH<&2}ZvfD9W8#8*gWpah$p3>xffby$yLnkA8HRHrm z*{!)47drj(l7P^1{9sg7xv|e{_i7B($nsKF`jHN=gqC}Tr>k|EDvX>(xo(w5C=FjT zK*~6*zQ`Pu0xmt|JL3p1Tf=L#Fd1(R z$Ns;X(tUM2CssEqJJt;|xr9n_mN5_3{~HJ|RgG4VwzQ~I;nXX#8y8uPO0C5v)f3T} z2&;~VR3;*5{BKaqGAjv>n+V?-G5V;9b=t%{YiW|ZGA>Y)dtvaFViH*pN%Y%aHX{K9d(Gv z>Nv*>@v88jzRpF~o&4OQe8~xwcsd zR=yXBV9RK8XU8u8VF@02z7S)U-ij+g*P%~l86zF*J>@9%{@T;C*SyfDF^+5$I;@ae zbqmuoT2u3dzw3;ROf?TiB<@?e3B`%dt~=;0%Br>X!cj3Fe0Qn)zO^~-K&jvxZGOEL zeF8o9gkMvde1WJpO}&vco?+fO7|jOmzR`7;$Zr;4=7`;K9eYBpJxsb{F1Q|bZ0K7U z@gWi(Z4@E~`9|qjtA0TB6Xe^Wqx%H*FDbv$!LG>fk+kiBW-f8=OCZ=EYChdY=4LD( zCSFTNCA?wQ))-8r2=Unr}Jz8&HD9J>vXE6cOX;?g8=f=gz- zlVNQPQ}wJE{kuE}8SIg#vYC&{U5aGebVUjJ?IV{K9gb1A(ChPSz-pLLCV%X!SQ8K2 zQ>#fe!#8j0T*`zaunS$|MYXZRF8Z{;MYeX*4c*`f6F0!Fl;?#UgLhspm$l3CaD{c?)My zreb{}akQ@NwvM!*%;)D*7^X_=g~&$ngD8#l!MMHFW^$9jCrc1&&I#?T!Ey}sZVUeH zrz=qgDebpWb{a4JozkZH-uWok|8uu^&9mFh>|gZ3zMbG(g9F!{k@e21uTBxaUIMogrbO9eqJ z)5xtGuif9iS^?o==^@fWxyEOtbokLCK|yA;{EjtoUBz_!%R#)~Za%}?buWo9?t|uS zb4tF-Lw*VE@zqme_Rl3)ZXzh;2X}~UIocK1A^V4(;qVf%Wo?_7-8yk?$^4MEnMr@3MF`|D zU&dFBgkgUSLht3xmhB7m~?|<#W$Cyx98&Lby$%q7&^L ze^#|6%i?sx`!qhQ3mD>Qpo=>6+vqr!_;VZlMJB)=Ic7G3KY=LzEQpAaZdueh1YtA7 zpy*)_KI#F z%d;gtV=yYPz;+W0!V5P`A6%R1DEj{;?`c_~qjA-@rN81)pn})BwQTVEi zPFlJ}tyJ?Jtq*jaFiIjZhfNji5}CmzUZqj{kFLall#EIzUy=wlU|+{t_=`;bI+003 z#yN%E*5?o#jPH0{9&ZGouD#854kdb1gbPbj& z9R5og^xCqj#_@}}PKO_0a7YF>OU)fZE1z%vBoXv=8 z8Rt)$h9!VL6hI_X1b4PX(w$vt?pEGve;mX30QElA&i!nn^EO3qNhlR3aR%E_Y1;;1fgIRb0!KWktBNIBKU^)U{<(sPt@ zUsJk|tj`3Kk-kg`Mv7Aq?6u7St~ ziaj9Benx7%5mC>abM7dCd7j>@&JL(o>s17rY?0A?-%2G-y1Ey9?nS6{oh1j89d2if zu|&=-%~S89!{AvbmA}jwO>Rmqi}-QUF1jN`zOfD{>-&{Q>IrV-hJ2I)RU^r0%mwff zUj2z(qnoMgmv7fub@K6-wT(jB*pYGcV%b(O=1JPcu{mforleMzF|mf%G?SSs(w7_3 zpH4ML9IP7)E2)%;F$2&1dW-b8M2q~FsOj%T-&?{FCTm-o8MlVp z`mI{m%~s9WwQX4?!puA(8Ss$1;Zbdpr&h(;RtkNubllsxPj%YFwsr`7!sxoRy-R0> zhihr|WV5oF#JmyS@0pJ#%%#V3NUL;&HNC;Qs_(clkICbJm z6#8Az@lCc3x76MC^b3xup`zRn3d}LgLxNs!3`5z;FtozfVudH65>hpRJSpE7hn3%f zrg%UBT7&ktB|T2vo;M_>duXL^YvUg4MNF>#%lPi-AE*L=-UEDlkq+rUSC+Py4_H&c zf<6sPRrs7ng%GBjFVaJ-1WuFgaau9M9oSZDK&6jRd*~UqRL(3b>$#a}f+Kv?Bvhyd z_LIgSGtEAuQh~qj%FZskTeQAi*0#Z+zs_{OrOHmsBC+{kHJG4UeJ}UY0eeM;@sn;? z=2f@7`d7HY6T#>^Hu=^>{U|n2b25|>%7&@3KEe#_$3x{L4_}KqiMX&QBHO4k;xIYI zMqbi67Isa+Ie5I-DsKmtI(uep>M>ArreuDPCvxrPjfyLwW)^R)G^9ou+PkKrShx+b z`B6@Jq2QCxf?s8d!A+;MD=%H|HaY*f*utl;LYU5E(dz!Mevd-K#El=gn9S&npJ!CM zun+WSnt~&cM?K|HU*}eTMzTZ)4zUmuPojo1R@alz`^*1P2YMbFu~6si(f;hQW#P=R z&~&5pEV=ED{%V1&g8$TJjfcBS zi%wBk+!qUhYxNzp?8I*2bJ;xJ<&j(UyeBcTU=$HZ+3R>F+X!k)=m19&S+1f@MdxsS zYVr**D~tG4t0-otNxJTV67SRKAk zhH~fL%w`|@R~v3C40})Eu})rD&);WN>zO@Hv7Ump#{4>dTg{ERV%YoYZdok1R9;Sj zx9E0V%&qECsc2UOTEE+VNviG6&IRuhu5Tgbg$-S| zm|?Hw^Covp&fC;@_vTltXdX3SvES0fOM~*%TXGh_x}34j3wsvkg|x;u1MV<{DegcY z_h${mdk6zxp^pRpbgaD4pyFIyu~qa!23L2HNfkprvRSKW>8NP+B`}V&QTA{duB(IaHeQ zw5S00&V1Lzt8y2i$Nqr&(0Z6WSl^-cs{EJwS%-}#qZw6PxmXODRn^?9*|fybcj2t%<_{%hFk>hhv~))bn3L=G8+rKC85=dYTZQ<6rf&>i#%m#MvemFCh=t z=Ca2=A5DX9kpu*Qt+K22T$ZkeUY8t3b43L-3scdTnDnn>bgF+_mFMik#3=;*Yi#6a zJ0|O`4(0wj#R()T!nOusJ_(%#xLj)EzAUAWhcm;6@M&0 zkQkrz`=$8<-ZTSJD%|2U>)Tz;oBt5DSo@7JsC+;RSQ35NS%8ET+w*+96!*W>_R3J- z>(JUYq~D9>VrJ0CwYMIl+?pgQGXZ$__+lHkYU$MKy5^;(c)rEYI;a)y636>fdlA`G z^2Mry1miK+26+;kBGa(ogBgK9CPkTwI%R?ijVKj{B#75<_(gy-?-zy|?|gH+#=3P? zp=-})3$Hh0_sh@h!q3ynni*FBbsCf)FIfsX39ESJ-Hq~8O2Fmf03?K=u@nxwNnh%w zTd(SY$*BqtoBSb^?W3Ai(w);h2TfZnG8^Hima?dC0}?9cD0i)3e3k3s4=1T#M=i}s zWp91|*l^R5D79QkQzX7~+yn*pBokL%5bzv!r(B9=zXyl+4_N_p2b^O+bPu2O>n_F5 z@m!1=qVw?~m)p6ctd-z2@=daAHIMepWabfK`p4`D?a|pS5v+R~q176RO~Icb9u_eo zozovydE|XDh%I>KN)r!RYNi9~|8SOAS}+1NDtE{irN*qpEP#%!B4{~UeyGecoOf|n z&}B9*O+ApvECj*?9PuQBAF>y=eTCcz-ec$=lXfq{ivp4qE-@_f)MUQV;ZaD8pD>N{ zyzK&TVP#eDp~O_^=WMM|CGgR*f&Ze1{UX$K?;}H#H0E5a47x)CiLW|i(U|Inxv>|n z-NRD>xVND^FnEo$BWrtDIv3KjD2=cH1wK;;3hfQ`bWE0sH!cC8CnZy)Bk$N{j%ZqV7C~RBs*C;n`K*;}l5X51-8Iw#@mffa_< zR+*S#z8EFbk{#=6eM&z-;-Ed}loAr}R1U=%ZGw2I&^K3F@Xd-TBE~dAZd4EKc^2dy zPq-{tN_xriS>hew=#i}9ahR&uWyIw13JQLcS_A}hhO6mcDpm~1F?2gY}UVSvB)oM!; zW3@N6V!uO<-xkebd(>UwW=vz-o&8b07x&*v_Uny)k`1>9gw2*Dahu(#jW%1H7^{;h z4u>5V{I)obok4GoyHT0WH{kWfL0pErBf-nnVI1FfXW)m;Q5;^UJH^Y^G|6B02f9sH zikQv*jQ=)txF4!+d*Qrn4Un|N>3gd+Y+M$cS+aiN=4u9CJz@v$y>r{&c|J1q4F^OR zoP0&Y}Ot`#kV5JI25p?{Nu?%^+;+*hf2>y>shsO<17?@Ua-z*e-2qxZgp zA`0V}_z1Y{->hL9>*xm)?5DDBC3Z**%+207r*9jx*)o&ehrr{8?C1l;gKvV+!c%UCK7^JzJc*8GVABE*&mE}?+N(U@BUNY z4J)@9Gq(||S3(Zb2ygA-%DC|sN8%*g426LStRa~b;C?Y5i;d5~{S$-^k$>2Q#mULVLW4Af=s@iYn7IxAT$Euo4^nP`J|X@XvNvL@fEQ zrnw>pPe>BSd=`rQ^crYo-?tsa(r;#p-1azxm{K3F)PLtmR&Ekc2LnOM98CT%9||_S z*-z>4Bz)n3W3$n)|7n85Lg7iFf~W+5;>d>JFD1uqep=y6+Ebdte=^tKZ!hGPw3_% zh5pg#kQ)iR`hjoDS&WT`Q@aYj|2B!ht(22i9S`5wLjgZcjEV?}We9)G-&-@p-oov3b;F zglO}$?}voreK+P-4tF@B`^z$BVV}ixIu0LthKj3%@$bv3Qwr9}QJVg=j@zkG{QWKe z>&VT?`^ZYePj+Bu6v9jF3l9E$?imr%xY(9(xBr(~_l0fB%Fp3|_p0jzY@yIk{mooi zY|gVu!QTG%Xo%-3N1br%Y9MsSDo4Yl_}9&`&mw>4z!rsgB-__nKp@^V9*U6{)PX$W zi!5+t?2G1ty~mQRjQs%A2dw5sg;8xlF26RW;5IS+L3ntN{uxyR^J8p}{xLxn^P_C< zOYV!HeKmV-xk@MNp?9la`sCwm;O~yhz#AV5xQ&TMOwjj)QhJnbNwHko4fd34)$vCD zTlIpMR#UoM8r}V`1l~#4uH%j3H=A5ly8FM$0d3!y=H4GaWO^kV_SorFRBRO@XKSXP zr(QXx^zd-yZp9KG2Mm)fI)GsQyq&#@ZXAVAJRE_#xQ`b*_S!a6JHPb)ip4qG;)Sma z&r^eMk!6CU;(okI;DXggt5bfD;qAx|44Cr>>Afk`%5}}*y7zQ?cCeT4*yoH81?!cd zJK3KX3NiU6aTOB1ac=__sY4cA0CTDPbuy{XuqNA?JVds_6ZR=f_RrGhPv&?-RlBAA zTJ3WF?E{)hOS6+3N1pBKS6;#OR4qJzl_1ubEoutOg(|n z;v>n;v0h?K*5S&A;;RhN0i`_#_0;AE%!WTc8c$p0PeuK{Cf;pRHM{AZ;ys{0nNM$e zDruqc{u*CvdUx!;eaYj_0Cj@p%+uZYg&d|GYiybMPz}-r1$N5Lcip$Yz2<>t>z%&( zw!3i0@_0P1u{?RK8TZ*Zp#yzykdu7Ad7qRHm^=tmDQq;#!r!eGfx znYAXEl?5{xc*$DVMILa$YYV~&=&qd~RFyM^g@e6e7-4Lv&X7Wc%%4bZXMM-`Yd@dH zc6Tp=h0Jv8z+$CS9gWtX)ZAkoyhhMV5TdH*94YU@(}x9qM*r3zJ;eqG;U9a<5+6$` zlAp!4r;u_t{8*n+wKe@E{<;k>EMCUiZHQ%$_qtJ&MD58_DGF#ZxN%2y{my6bwW0rB zU7c21IA$F7=eM-YlY}!TB_f0hYU5R17qGXPXU8Jcj%Fz)@A7V87PnZ%sGKjXCcB<> zfYz95U)3d1lf^L=o><7sJ449zmdNy+hfy*p+v)9ASra$>%PB1(dV1j88Q?f(Gh4iTsT diff --git a/airtime_mvc/public/js/jplayer/jplayer.playlist.min.js b/airtime_mvc/public/js/jplayer/jplayer.playlist.min.js index 138ccfa5e..f24018c62 100644 --- a/airtime_mvc/public/js/jplayer/jplayer.playlist.min.js +++ b/airtime_mvc/public/js/jplayer/jplayer.playlist.min.js @@ -2,33 +2,33 @@ * Playlist Object for the jPlayer Plugin * http://www.jplayer.org * - * Copyright (c) 2009 - 2013 Happyworm Ltd - * Dual licensed under the MIT and GPL licenses. - * - http://www.opensource.org/licenses/mit-license.php - * - http://www.gnu.org/copyleft/gpl.html + * Copyright (c) 2009 - 2014 Happyworm Ltd + * Licensed under the MIT license. + * http://www.opensource.org/licenses/MIT * * Author: Mark J Panaghiston - * Version: 2.3.0 - * Date: 20th April 2013 + * Version: 2.4.0 + * Date: 1st September 2014 * * Requires: * - jQuery 1.7.0+ - * - jPlayer 2.3.0+ + * - jPlayer 2.7.0+ */ -(function(b,f){jPlayerPlaylist=function(a,c,d){var e=this;this.current=0;this.removing=this.shuffled=this.loop=!1;this.cssSelector=b.extend({},this._cssSelector,a);this.options=b.extend(!0,{keyBindings:{next:{key:39,fn:function(){e.next()}},previous:{key:37,fn:function(){e.previous()}}}},this._options,d);this.playlist=[];this.original=[];this._initPlaylist(c);this.cssSelector.title=this.cssSelector.cssSelectorAncestor+" .jp-title";this.cssSelector.playlist=this.cssSelector.cssSelectorAncestor+" .jp-playlist"; -this.cssSelector.next=this.cssSelector.cssSelectorAncestor+" .jp-next";this.cssSelector.previous=this.cssSelector.cssSelectorAncestor+" .jp-previous";this.cssSelector.shuffle=this.cssSelector.cssSelectorAncestor+" .jp-shuffle";this.cssSelector.shuffleOff=this.cssSelector.cssSelectorAncestor+" .jp-shuffle-off";this.options.cssSelectorAncestor=this.cssSelector.cssSelectorAncestor;this.options.repeat=function(a){e.loop=a.jPlayer.options.loop};b(this.cssSelector.jPlayer).bind(b.jPlayer.event.ready,function(){e._init()}); -b(this.cssSelector.jPlayer).bind(b.jPlayer.event.ended,function(){e.next()});b(this.cssSelector.jPlayer).bind(b.jPlayer.event.play,function(){b(this).jPlayer("pauseOthers")});b(this.cssSelector.jPlayer).bind(b.jPlayer.event.resize,function(a){a.jPlayer.options.fullScreen?b(e.cssSelector.title).show():b(e.cssSelector.title).hide()});b(this.cssSelector.previous).click(function(){e.previous();b(this).blur();return!1});b(this.cssSelector.next).click(function(){e.next();b(this).blur();return!1});b(this.cssSelector.shuffle).click(function(){e.shuffle(!0); -return!1});b(this.cssSelector.shuffleOff).click(function(){e.shuffle(!1);return!1}).hide();this.options.fullScreen||b(this.cssSelector.title).hide();b(this.cssSelector.playlist+" ul").empty();this._createItemHandlers();b(this.cssSelector.jPlayer).jPlayer(this.options)};jPlayerPlaylist.prototype={_cssSelector:{jPlayer:"#jquery_jplayer_1",cssSelectorAncestor:"#jp_container_1"},_options:{playlistOptions:{autoPlay:!1,loopOnPrevious:!1,shuffleOnLoop:!0,enableRemoveControls:!1,displayTime:"slow",addTime:"fast", -removeTime:"fast",shuffleTime:"slow",itemClass:"jp-playlist-item",freeGroupClass:"jp-free-media",freeItemClass:"jp-playlist-item-free",removeItemClass:"jp-playlist-item-remove"}},option:function(a,b){if(b===f)return this.options.playlistOptions[a];this.options.playlistOptions[a]=b;switch(a){case "enableRemoveControls":this._updateControls();break;case "itemClass":case "freeGroupClass":case "freeItemClass":case "removeItemClass":this._refresh(!0),this._createItemHandlers()}return this},_init:function(){var a= -this;this._refresh(function(){a.options.playlistOptions.autoPlay?a.play(a.current):a.select(a.current)})},_initPlaylist:function(a){this.current=0;this.removing=this.shuffled=!1;this.original=b.extend(!0,[],a);this._originalPlaylist()},_originalPlaylist:function(){var a=this;this.playlist=[];b.each(this.original,function(b){a.playlist[b]=a.original[b]})},_refresh:function(a){var c=this;if(a&&!b.isFunction(a))b(this.cssSelector.playlist+" ul").empty(),b.each(this.playlist,function(a){b(c.cssSelector.playlist+ -" ul").append(c._createListItem(c.playlist[a]))}),this._updateControls();else{var d=b(this.cssSelector.playlist+" ul").children().length?this.options.playlistOptions.displayTime:0;b(this.cssSelector.playlist+" ul").slideUp(d,function(){var d=b(this);b(this).empty();b.each(c.playlist,function(a){d.append(c._createListItem(c.playlist[a]))});c._updateControls();b.isFunction(a)&&a();c.playlist.length?b(this).slideDown(c.options.playlistOptions.displayTime):b(this).show()})}},_createListItem:function(a){var c= -this,d="
  • ",d=d+("×");if(a.free){var e=!0,d=d+("(");b.each(a,function(a,f){b.jPlayer.prototype.format[a]&&(e?e=!1:d+=" | ",d+=""+a+"")});d+=")"}d+=""+a.title+(a.artist? -" ":"")+"";return d+="
    • "},_createItemHandlers:function(){var a=this;b(this.cssSelector.playlist).off("click","a."+this.options.playlistOptions.itemClass).on("click","a."+this.options.playlistOptions.itemClass,function(){var c=b(this).parent().parent().index();a.current!==c?a.play(c):b(a.cssSelector.jPlayer).jPlayer("play");b(this).blur();return!1});b(this.cssSelector.playlist).off("click","a."+this.options.playlistOptions.freeItemClass).on("click", -"a."+this.options.playlistOptions.freeItemClass,function(){b(this).parent().parent().find("."+a.options.playlistOptions.itemClass).click();b(this).blur();return!1});b(this.cssSelector.playlist).off("click","a."+this.options.playlistOptions.removeItemClass).on("click","a."+this.options.playlistOptions.removeItemClass,function(){var c=b(this).parent().parent().index();a.remove(c);b(this).blur();return!1})},_updateControls:function(){this.options.playlistOptions.enableRemoveControls?b(this.cssSelector.playlist+ -" ."+this.options.playlistOptions.removeItemClass).show():b(this.cssSelector.playlist+" ."+this.options.playlistOptions.removeItemClass).hide();this.shuffled?(b(this.cssSelector.shuffleOff).show(),b(this.cssSelector.shuffle).hide()):(b(this.cssSelector.shuffleOff).hide(),b(this.cssSelector.shuffle).show())},_highlight:function(a){this.playlist.length&&a!==f&&(b(this.cssSelector.playlist+" .jp-playlist-current").removeClass("jp-playlist-current"),b(this.cssSelector.playlist+" li:nth-child("+(a+1)+ -")").addClass("jp-playlist-current").find(".jp-playlist-item").addClass("jp-playlist-current"),b(this.cssSelector.title+" li").html(this.playlist[a].title+(this.playlist[a].artist?" ":"")))},setPlaylist:function(a){this._initPlaylist(a);this._init()},add:function(a,c){b(this.cssSelector.playlist+" ul").append(this._createListItem(a)).find("li:last-child").hide().slideDown(this.options.playlistOptions.addTime);this._updateControls();this.original.push(a); -this.playlist.push(a);c?this.play(this.playlist.length-1):1===this.original.length&&this.select(0)},remove:function(a){var c=this;if(a===f)return this._initPlaylist([]),this._refresh(function(){b(c.cssSelector.jPlayer).jPlayer("clearMedia")}),!0;if(this.removing)return!1;a=0>a?c.original.length+a:a;0<=a&&aa?this.original.length+a:a;0<=a&&aa?this.original.length+a:a;0<=a&&a
    ",d=d+("×");if(a.free){var e=!0,d=d+("(");b.each(a,function(a,f){b.jPlayer.prototype.format[a]&&(e?e=!1:d+=" | ",d+=""+a+"")});d+=")"}d+=""+a.title+(a.artist?" ":"")+"";return d+="
    "},_createItemHandlers:function(){var a=this;b(this.cssSelector.playlist).off("click","a."+this.options.playlistOptions.itemClass).on("click","a."+this.options.playlistOptions.itemClass,function(c){c.preventDefault();c=b(this).parent().parent().index(); +a.current!==c?a.play(c):b(a.cssSelector.jPlayer).jPlayer("play");a.blur(this)});b(this.cssSelector.playlist).off("click","a."+this.options.playlistOptions.freeItemClass).on("click","a."+this.options.playlistOptions.freeItemClass,function(c){c.preventDefault();b(this).parent().parent().find("."+a.options.playlistOptions.itemClass).click();a.blur(this)});b(this.cssSelector.playlist).off("click","a."+this.options.playlistOptions.removeItemClass).on("click","a."+this.options.playlistOptions.removeItemClass, +function(c){c.preventDefault();c=b(this).parent().parent().index();a.remove(c);a.blur(this)})},_updateControls:function(){this.options.playlistOptions.enableRemoveControls?b(this.cssSelector.playlist+" ."+this.options.playlistOptions.removeItemClass).show():b(this.cssSelector.playlist+" ."+this.options.playlistOptions.removeItemClass).hide();this.shuffled?b(this.cssSelector.jPlayer).jPlayer("addStateClass","shuffled"):b(this.cssSelector.jPlayer).jPlayer("removeStateClass","shuffled");b(this.cssSelector.shuffle).length&& +b(this.cssSelector.shuffleOff).length&&(this.shuffled?(b(this.cssSelector.shuffleOff).show(),b(this.cssSelector.shuffle).hide()):(b(this.cssSelector.shuffleOff).hide(),b(this.cssSelector.shuffle).show()))},_highlight:function(a){this.playlist.length&&a!==f&&(b(this.cssSelector.playlist+" .jp-playlist-current").removeClass("jp-playlist-current"),b(this.cssSelector.playlist+" li:nth-child("+(a+1)+")").addClass("jp-playlist-current").find(".jp-playlist-item").addClass("jp-playlist-current"))},setPlaylist:function(a){this._initPlaylist(a); +this._init()},add:function(a,c){b(this.cssSelector.playlist+" ul").append(this._createListItem(a)).find("li:last-child").hide().slideDown(this.options.playlistOptions.addTime);this._updateControls();this.original.push(a);this.playlist.push(a);c?this.play(this.playlist.length-1):1===this.original.length&&this.select(0)},remove:function(a){var c=this;if(a===f)return this._initPlaylist([]),this._refresh(function(){b(c.cssSelector.jPlayer).jPlayer("clearMedia")}),!0;if(this.removing)return!1;a=0>a?c.original.length+ +a:a;0<=a&&aa?this.original.length+a:a;0<=a&&aa?this.original.length+a:a;0<=a&&a' + (config.visible ? "Hide" : "Show") + ' jPlayer Inspector

    ' + + '
    ' + + '
    ' + + '
    ' + + '

    jPlayer events that have occurred over the past 1 second:' + + '
    (Backgrounds: Never occurred Occurred before Occurred Multiple occurrences reset)

    '; + + // MJP: Would use the next 3 lines for ease, but the events are just slapped on the page. + // $.each($.jPlayer.event, function(eventName,eventType) { + // structure += '
    ' + eventName + '
    '; + // }); + + var eventStyle = "float:left;margin:0 5px 5px 0;padding:0 5px;border:1px dotted #000;"; + // MJP: Doing it longhand so order and layout easier to control. + structure += + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + '
    ' + + + '
    '; + + // MJP: Would like a check here in case we missed an event. + + // MJP: Check fails, since it is not on the page yet. +/* $.each($.jPlayer.event, function(eventName,eventType) { + if($("#" + config.eventId[eventType])[0] === undefined) { + structure += '
    ' + eventName + '
    '; + } + }); +*/ + structure += + '
    ' + + '

    Update jPlayer Inspector

    ' + + '
    ' + + '
    '; + $(this).html(structure); + + config.windowJq = $("#" + config.windowId); + config.statusJq = $("#" + config.statusId); + config.configJq = $("#" + config.configId); + config.toggleJq = $("#" + config.toggleId); + config.eventResetJq = $("#" + config.eventResetId); + config.updateJq = $("#" + config.updateId); + + $.each($.jPlayer.event, function(eventName,eventType) { + config.eventJq[eventType] = $("#" + config.eventId[eventType]); + config.eventJq[eventType].text(eventName + " (" + config.eventOccurrence[eventType] + ")"); // Sets the text to the event name and (0); + + config.jPlayer.bind(eventType + ".jPlayerInspector", function(e) { + config.eventOccurrence[e.type]++; + if(config.eventOccurrence[e.type] > 1) { + config.eventJq[e.type].css("background-color","#ff9"); + } else { + config.eventJq[e.type].css("background-color","#9f9"); + } + config.eventJq[e.type].text(eventName + " (" + config.eventOccurrence[e.type] + ")"); + // The timer to handle the color + clearTimeout(config.eventTimeout[e.type]); + config.eventTimeout[e.type] = setTimeout(function() { + config.eventJq[e.type].css("background-color","#fff"); + }, 1000); + // The timer to handle the occurences. + setTimeout(function() { + config.eventOccurrence[e.type]--; + config.eventJq[e.type].text(eventName + " (" + config.eventOccurrence[e.type] + ")"); + }, 1000); + if(config.visible) { // Update the status, if inspector open. + $this.jPlayerInspector("updateStatus"); + } + }); + }); + + config.jPlayer.bind($.jPlayer.event.ready + ".jPlayerInspector", function(e) { + $this.jPlayerInspector("updateConfig"); + }); + + config.toggleJq.click(function() { + if(config.visible) { + $(this).text("Show"); + config.windowJq.hide(); + config.statusJq.empty(); + config.configJq.empty(); + } else { + $(this).text("Hide"); + config.windowJq.show(); + config.updateJq.click(); + } + config.visible = !config.visible; + $(this).blur(); + return false; + }); + + config.eventResetJq.click(function() { + $.each($.jPlayer.event, function(eventName,eventType) { + config.eventJq[eventType].css("background-color","#eee"); + }); + $(this).blur(); + return false; + }); + + config.updateJq.click(function() { + $this.jPlayerInspector("updateStatus"); + $this.jPlayerInspector("updateConfig"); + return false; + }); + + if(!config.visible) { + config.windowJq.hide(); + } else { + // config.updateJq.click(); + } + + $.jPlayerInspector.i++; + + return this; + }, + destroy: function() { + $(this).data("jPlayerInspector") && $(this).data("jPlayerInspector").jPlayer.unbind(".jPlayerInspector"); + $(this).empty(); + }, + updateConfig: function() { // This displays information about jPlayer's configuration in inspector + + var jPlayerInfo = "

    This jPlayer instance is running in your browser where:
    " + + for(i = 0; i < $(this).data("jPlayerInspector").jPlayer.data("jPlayer").solutions.length; i++) { + var solution = $(this).data("jPlayerInspector").jPlayer.data("jPlayer").solutions[i]; + jPlayerInfo += " jPlayer's " + solution + " solution is"; + if($(this).data("jPlayerInspector").jPlayer.data("jPlayer")[solution].used) { + jPlayerInfo += " being used and will support:"; + for(format in $(this).data("jPlayerInspector").jPlayer.data("jPlayer")[solution].support) { + if($(this).data("jPlayerInspector").jPlayer.data("jPlayer")[solution].support[format]) { + jPlayerInfo += " " + format; + } + } + jPlayerInfo += "
    "; + } else { + jPlayerInfo += " not required
    "; + } + } + jPlayerInfo += "

    "; + + if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").html.active) { + if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").flash.active) { + jPlayerInfo += "Problem with jPlayer since both HTML5 and Flash are active."; + } else { + jPlayerInfo += "The HTML5 is active."; + } + } else { + if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").flash.active) { + jPlayerInfo += "The Flash is active."; + } else { + jPlayerInfo += "No solution is currently active. jPlayer needs a setMedia()."; + } + } + jPlayerInfo += "

    "; + + var formatType = $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.formatType; + jPlayerInfo += "

    status.formatType = '" + formatType + "'
    "; + if(formatType) { + jPlayerInfo += "Browser canPlay('" + $.jPlayer.prototype.format[formatType].codec + "')"; + } else { + jPlayerInfo += "

    "; + } + + jPlayerInfo += "

    status.src = '" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.src + "'

    "; + + jPlayerInfo += "

    status.media = {
    "; + for(prop in $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.media) { + jPlayerInfo += " " + prop + ": " + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.media[prop] + "
    "; // Some are strings + } + jPlayerInfo += "};

    " + + jPlayerInfo += "

    "; + jPlayerInfo += "status.videoWidth = '" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.videoWidth + "'"; + jPlayerInfo += " | status.videoHeight = '" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.videoHeight + "'"; + jPlayerInfo += "
    status.width = '" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.width + "'"; + jPlayerInfo += " | status.height = '" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.height + "'"; + jPlayerInfo += "

    "; + + + "

    Raw browser test for HTML5 support. Should equal a function if HTML5 is available.
    "; + if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").html.audio.available) { + jPlayerInfo += "htmlElement.audio.canPlayType = " + (typeof $(this).data("jPlayerInspector").jPlayer.data("jPlayer").htmlElement.audio.canPlayType) +"
    " + } + if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").html.video.available) { + jPlayerInfo += "htmlElement.video.canPlayType = " + (typeof $(this).data("jPlayerInspector").jPlayer.data("jPlayer").htmlElement.video.canPlayType) +""; + } + jPlayerInfo += "

    "; + + jPlayerInfo += "

    This instance is using the constructor options:
    " + + "$('#" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").internal.self.id + "').jPlayer({
    " + + + " swfPath: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "swfPath") + "',
    " + + + " solution: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "solution") + "',
    " + + + " supplied: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "supplied") + "',
    " + + + " preload: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "preload") + "',
    " + + + " volume: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "volume") + ",
    " + + + " muted: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "muted") + ",
    " + + + " backgroundColor: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "backgroundColor") + "',
    " + + + " cssSelectorAncestor: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "cssSelectorAncestor") + "',
    " + + + " cssSelector: {"; + + var cssSelector = $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "cssSelector"); + for(prop in cssSelector) { + + // jPlayerInfo += "
      " + prop + ": '" + cssSelector[prop] + "'," // This works too of course, but want to use option method for deep keys. + jPlayerInfo += "
      " + prop + ": '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "cssSelector." + prop) + "'," + } + + jPlayerInfo = jPlayerInfo.slice(0, -1); // Because the sloppy comma was bugging me. + + jPlayerInfo += "
     },
    " + + + " errorAlerts: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "errorAlerts") + ",
    " + + + " warningAlerts: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "warningAlerts") + "
    " + + + "});

    "; + $(this).data("jPlayerInspector").configJq.html(jPlayerInfo); + return this; + }, + updateStatus: function() { // This displays information about jPlayer's status in the inspector + $(this).data("jPlayerInspector").statusJq.html( + "

    jPlayer is " + + ($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.paused ? "paused" : "playing") + + " at time: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.currentTime*10)/10 + "s." + + " (d: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.duration*10)/10 + "s" + + ", sp: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.seekPercent) + "%" + + ", cpr: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.currentPercentRelative) + "%" + + ", cpa: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.currentPercentAbsolute) + "%)

    " + ); + return this; + } + }; + $.fn.jPlayerInspector = function( method ) { + // Method calling logic + if ( methods[method] ) { + return methods[ method ].apply( this, Array.prototype.slice.call( arguments, 1 )); + } else if ( typeof method === 'object' || ! method ) { + return methods.init.apply( this, arguments ); + } else { + $.error( 'Method ' + method + ' does not exist on jQuery.jPlayerInspector' ); + } + }; +})(jQuery); diff --git a/airtime_mvc/public/js/jplayer/jquery.jplayer.min.js b/airtime_mvc/public/js/jplayer/jquery.jplayer.min.js index 796e970e2..f7acb7704 100644 --- a/airtime_mvc/public/js/jplayer/jquery.jplayer.min.js +++ b/airtime_mvc/public/js/jplayer/jquery.jplayer.min.js @@ -2,113 +2,119 @@ * jPlayer Plugin for jQuery JavaScript Library * http://www.jplayer.org * - * Copyright (c) 2009 - 2013 Happyworm Ltd + * Copyright (c) 2009 - 2014 Happyworm Ltd * Licensed under the MIT license. * http://opensource.org/licenses/MIT * * Author: Mark J Panaghiston - * Version: 2.5.0 - * Date: 7th November 2013 + * Version: 2.7.0 + * Date: 1st September 2014 */ (function(b,f){"function"===typeof define&&define.amd?define(["jquery"],f):b.jQuery?f(b.jQuery):f(b.Zepto)})(this,function(b,f){b.fn.jPlayer=function(a){var c="string"===typeof a,d=Array.prototype.slice.call(arguments,1),e=this;a=!c&&d.length?b.extend.apply(null,[!0,a].concat(d)):a;if(c&&"_"===a.charAt(0))return e;c?this.each(function(){var c=b(this).data("jPlayer"),h=c&&b.isFunction(c[a])?c[a].apply(c,d):c;if(h!==c&&h!==f)return e=h,!1}):this.each(function(){var c=b(this).data("jPlayer");c?c.option(a|| {}):b(this).data("jPlayer",new b.jPlayer(a,this))});return e};b.jPlayer=function(a,c){if(arguments.length){this.element=b(c);this.options=b.extend(!0,{},this.options,a);var d=this;this.element.bind("remove.jPlayer",function(){d.destroy()});this._init()}};"function"!==typeof b.fn.stop&&(b.fn.stop=function(){});b.jPlayer.emulateMethods="load play pause";b.jPlayer.emulateStatus="src readyState networkState currentTime duration paused ended playbackRate";b.jPlayer.emulateOptions="muted volume";b.jPlayer.reservedEvent= -"ready flashreset resize repeat error warning";b.jPlayer.event={};b.each("ready flashreset resize repeat click error warning loadstart progress suspend abort emptied stalled play pause loadedmetadata loadeddata waiting playing canplay canplaythrough seeking seeked timeupdate ended ratechange durationchange volumechange".split(" "),function(){b.jPlayer.event[this]="jPlayer_"+this});b.jPlayer.htmlEvent="loadstart abort emptied stalled loadedmetadata loadeddata canplay canplaythrough".split(" ");b.jPlayer.pause= -function(){b.each(b.jPlayer.prototype.instances,function(a,c){c.data("jPlayer").status.srcSet&&c.jPlayer("pause")})};b.jPlayer.timeFormat={showHour:!1,showMin:!0,showSec:!0,padHour:!1,padMin:!0,padSec:!0,sepHour:":",sepMin:":",sepSec:""};var m=function(){this.init()};m.prototype={init:function(){this.options={timeFormat:b.jPlayer.timeFormat}},time:function(a){var c=new Date(1E3*(a&&"number"===typeof a?a:0)),b=c.getUTCHours();a=this.options.timeFormat.showHour?c.getUTCMinutes():c.getUTCMinutes()+60* -b;c=this.options.timeFormat.showMin?c.getUTCSeconds():c.getUTCSeconds()+60*a;b=this.options.timeFormat.padHour&&10>b?"0"+b:b;a=this.options.timeFormat.padMin&&10>a?"0"+a:a;c=this.options.timeFormat.padSec&&10>c?"0"+c:c;b=""+(this.options.timeFormat.showHour?b+this.options.timeFormat.sepHour:"");b+=this.options.timeFormat.showMin?a+this.options.timeFormat.sepMin:"";return b+=this.options.timeFormat.showSec?c+this.options.timeFormat.sepSec:""}};var n=new m;b.jPlayer.convertTime=function(a){return n.time(a)}; +"ready flashreset resize repeat error warning";b.jPlayer.event={};b.each("ready setmedia flashreset resize repeat click error warning loadstart progress suspend abort emptied stalled play pause loadedmetadata loadeddata waiting playing canplay canplaythrough seeking seeked timeupdate ended ratechange durationchange volumechange".split(" "),function(){b.jPlayer.event[this]="jPlayer_"+this});b.jPlayer.htmlEvent="loadstart abort emptied stalled loadedmetadata loadeddata canplay canplaythrough".split(" "); +b.jPlayer.pause=function(){b.each(b.jPlayer.prototype.instances,function(a,c){c.data("jPlayer").status.srcSet&&c.jPlayer("pause")})};b.jPlayer.timeFormat={showHour:!1,showMin:!0,showSec:!0,padHour:!1,padMin:!0,padSec:!0,sepHour:":",sepMin:":",sepSec:""};var l=function(){this.init()};l.prototype={init:function(){this.options={timeFormat:b.jPlayer.timeFormat}},time:function(a){var c=new Date(1E3*(a&&"number"===typeof a?a:0)),b=c.getUTCHours();a=this.options.timeFormat.showHour?c.getUTCMinutes():c.getUTCMinutes()+ +60*b;c=this.options.timeFormat.showMin?c.getUTCSeconds():c.getUTCSeconds()+60*a;b=this.options.timeFormat.padHour&&10>b?"0"+b:b;a=this.options.timeFormat.padMin&&10>a?"0"+a:a;c=this.options.timeFormat.padSec&&10>c?"0"+c:c;b=""+(this.options.timeFormat.showHour?b+this.options.timeFormat.sepHour:"");b+=this.options.timeFormat.showMin?a+this.options.timeFormat.sepMin:"";return b+=this.options.timeFormat.showSec?c+this.options.timeFormat.sepSec:""}};var n=new l;b.jPlayer.convertTime=function(a){return n.time(a)}; b.jPlayer.uaBrowser=function(a){a=a.toLowerCase();var c=/(opera)(?:.*version)?[ \/]([\w.]+)/,b=/(msie) ([\w.]+)/,e=/(mozilla)(?:.*? rv:([\w.]+))?/;a=/(webkit)[ \/]([\w.]+)/.exec(a)||c.exec(a)||b.exec(a)||0>a.indexOf("compatible")&&e.exec(a)||[];return{browser:a[1]||"",version:a[2]||"0"}};b.jPlayer.uaPlatform=function(a){var c=a.toLowerCase(),b=/(android)/,e=/(mobile)/;a=/(ipad|iphone|ipod|android|blackberry|playbook|windows ce|webos)/.exec(c)||[];c=/(ipad|playbook)/.exec(c)||!e.exec(c)&&b.exec(c)|| [];a[1]&&(a[1]=a[1].replace(/\s/g,"_"));return{platform:a[1]||"",tablet:c[1]||""}};b.jPlayer.browser={};b.jPlayer.platform={};var k=b.jPlayer.uaBrowser(navigator.userAgent);k.browser&&(b.jPlayer.browser[k.browser]=!0,b.jPlayer.browser.version=k.version);k=b.jPlayer.uaPlatform(navigator.userAgent);k.platform&&(b.jPlayer.platform[k.platform]=!0,b.jPlayer.platform.mobile=!k.tablet,b.jPlayer.platform.tablet=!!k.tablet);b.jPlayer.getDocMode=function(){var a;b.jPlayer.browser.msie&&(document.documentMode? a=document.documentMode:(a=5,document.compatMode&&"CSS1Compat"===document.compatMode&&(a=7)));return a};b.jPlayer.browser.documentMode=b.jPlayer.getDocMode();b.jPlayer.nativeFeatures={init:function(){var a=document,c=a.createElement("video"),b={w3c:"fullscreenEnabled fullscreenElement requestFullscreen exitFullscreen fullscreenchange fullscreenerror".split(" "),moz:"mozFullScreenEnabled mozFullScreenElement mozRequestFullScreen mozCancelFullScreen mozfullscreenchange mozfullscreenerror".split(" "), webkit:" webkitCurrentFullScreenElement webkitRequestFullScreen webkitCancelFullScreen webkitfullscreenchange ".split(" "),webkitVideo:"webkitSupportsFullscreen webkitDisplayingFullscreen webkitEnterFullscreen webkitExitFullscreen ".split(" ")},e=["w3c","moz","webkit","webkitVideo"],g,h;this.fullscreen=c={support:{w3c:!!a[b.w3c[0]],moz:!!a[b.moz[0]],webkit:"function"===typeof a[b.webkit[3]],webkitVideo:"function"===typeof c[b.webkitVideo[2]]},used:{}};g=0;for(h=e.length;g','','','',''];c=document.createElement(''); -for(var e=0;e','','','',''];c=document.createElement('');for(var e=0;e").join(">").split('"').join(""")},_qualifyURL:function(a){var c=document.createElement("div");c.innerHTML='x';return c.firstChild.href},_absoluteMediaUrls:function(a){var c=this;b.each(a,function(b,e){c.format[b]&& -(a[b]=c._qualifyURL(e))});return a},setMedia:function(a){var c=this,d=!1,e=this.status.media.poster!==a.poster;this._resetMedia();this._resetGate();this._resetActive();a=this._absoluteMediaUrls(a);b.each(this.formats,function(e,f){var k="video"===c.format[f].media;b.each(c.solutions,function(b,e){if(c[e].support[f]&&c._validString(a[f])){var g="html"===e;k?(g?(c.html.video.gate=!0,c._html_setVideo(a),c.html.active=!0):(c.flash.gate=!0,c._flash_setVideo(a),c.flash.active=!0),c.css.jq.videoPlay.length&& -c.css.jq.videoPlay.show(),c.status.video=!0):(g?(c.html.audio.gate=!0,c._html_setAudio(a),c.html.active=!0):(c.flash.gate=!0,c._flash_setAudio(a),c.flash.active=!0),c.css.jq.videoPlay.length&&c.css.jq.videoPlay.hide(),c.status.video=!1);d=!0;return!1}});if(d)return!1});d?(this.status.nativeVideoControls&&this.html.video.gate||!this._validString(a.poster)||(e?this.htmlElement.poster.src=a.poster:this.internal.poster.jq.show()),this.status.srcSet=!0,this.status.media=b.extend({},a),this._updateButtons(!1), -this._updateInterface()):this._error({type:b.jPlayer.error.NO_SUPPORT,context:"{supplied:'"+this.options.supplied+"'}",message:b.jPlayer.errorMsg.NO_SUPPORT,hint:b.jPlayer.errorHint.NO_SUPPORT})},_resetMedia:function(){this._resetStatus();this._updateButtons(!1);this._updateInterface();this._seeked();this.internal.poster.jq.hide();clearTimeout(this.internal.htmlDlyCmdId);this.html.active?this._html_resetMedia():this.flash.active&&this._flash_resetMedia()},clearMedia:function(){this._resetMedia(); -this.html.active?this._html_clearMedia():this.flash.active&&this._flash_clearMedia();this._resetGate();this._resetActive()},load:function(){this.status.srcSet?this.html.active?this._html_load():this.flash.active&&this._flash_load():this._urlNotSetError("load")},focus:function(){this.options.keyEnabled&&(b.jPlayer.focus=this)},play:function(a){a="number"===typeof a?a:NaN;this.status.srcSet?(this.focus(),this.html.active?this._html_play(a):this.flash.active&&this._flash_play(a)):this._urlNotSetError("play")}, -videoPlay:function(){this.play()},pause:function(a){a="number"===typeof a?a:NaN;this.status.srcSet?this.html.active?this._html_pause(a):this.flash.active&&this._flash_pause(a):this._urlNotSetError("pause")},tellOthers:function(a,c){var d=this,e="function"===typeof c,g=Array.prototype.slice.call(arguments);"string"===typeof a&&(e&&g.splice(1,1),b.each(this.instances,function(){d.element!==this&&(e&&!c.call(this.data("jPlayer"),d)||this.jPlayer.apply(this,g))}))},pauseOthers:function(a){this.tellOthers("pause", -function(){return this.status.srcSet},a)},stop:function(){this.status.srcSet?this.html.active?this._html_pause(0):this.flash.active&&this._flash_pause(0):this._urlNotSetError("stop")},playHead:function(a){a=this._limitValue(a,0,100);this.status.srcSet?this.html.active?this._html_playHead(a):this.flash.active&&this._flash_playHead(a):this._urlNotSetError("playHead")},_muted:function(a){this.mutedWorker(a);this.options.globalVolume&&this.tellOthers("mutedWorker",function(){return this.options.globalVolume}, -a)},mutedWorker:function(a){this.options.muted=a;this.html.used&&this._html_setProperty("muted",a);this.flash.used&&this._flash_mute(a);this.html.video.gate||this.html.audio.gate||(this._updateMute(a),this._updateVolume(this.options.volume),this._trigger(b.jPlayer.event.volumechange))},mute:function(a){a=a===f?!0:!!a;this._muted(a)},unmute:function(a){a=a===f?!0:!!a;this._muted(!a)},_updateMute:function(a){a===f&&(a=this.options.muted);this.css.jq.mute.length&&this.css.jq.unmute.length&&(this.status.noVolume? -(this.css.jq.mute.hide(),this.css.jq.unmute.hide()):a?(this.css.jq.mute.hide(),this.css.jq.unmute.show()):(this.css.jq.mute.show(),this.css.jq.unmute.hide()))},volume:function(a){this.volumeWorker(a);this.options.globalVolume&&this.tellOthers("volumeWorker",function(){return this.options.globalVolume},a)},volumeWorker:function(a){a=this._limitValue(a,0,1);this.options.volume=a;this.html.used&&this._html_setProperty("volume",a);this.flash.used&&this._flash_volume(a);this.html.video.gate||this.html.audio.gate|| -(this._updateVolume(a),this._trigger(b.jPlayer.event.volumechange))},volumeBar:function(a){if(this.css.jq.volumeBar.length){var c=b(a.currentTarget),d=c.offset(),e=a.pageX-d.left,g=c.width();a=c.height()-a.pageY+d.top;c=c.height();this.options.verticalVolume?this.volume(a/c):this.volume(e/g)}this.options.muted&&this._muted(!1)},volumeBarValue:function(){},_updateVolume:function(a){a===f&&(a=this.options.volume);a=this.options.muted?0:a;this.status.noVolume?(this.css.jq.volumeBar.length&&this.css.jq.volumeBar.hide(), +this._trigger(a);break;case b.jPlayer.event.seeked:this._seeked();this._trigger(a);break;case b.jPlayer.event.ready:break;default:this._trigger(a)}return!1},_getFlashStatus:function(a){this.status.seekPercent=a.seekPercent;this.status.currentPercentRelative=a.currentPercentRelative;this.status.currentPercentAbsolute=a.currentPercentAbsolute;this.status.currentTime=a.currentTime;this.status.duration=a.duration;this.status.remaining=a.duration-a.currentTime;this.status.videoWidth=a.videoWidth;this.status.videoHeight= +a.videoHeight;this.status.readyState=4;this.status.networkState=0;this.status.playbackRate=1;this.status.ended=!1},_updateButtons:function(a){a===f?a=!this.status.paused:this.status.paused=!a;a?this.addStateClass("playing"):this.removeStateClass("playing");!this.status.noFullWindow&&this.options.fullWindow?this.addStateClass("fullScreen"):this.removeStateClass("fullScreen");this.options.loop?this.addStateClass("looped"):this.removeStateClass("looped");this.css.jq.play.length&&this.css.jq.pause.length&& +(a?(this.css.jq.play.hide(),this.css.jq.pause.show()):(this.css.jq.play.show(),this.css.jq.pause.hide()));this.css.jq.restoreScreen.length&&this.css.jq.fullScreen.length&&(this.status.noFullWindow?(this.css.jq.fullScreen.hide(),this.css.jq.restoreScreen.hide()):this.options.fullWindow?(this.css.jq.fullScreen.hide(),this.css.jq.restoreScreen.show()):(this.css.jq.fullScreen.show(),this.css.jq.restoreScreen.hide()));this.css.jq.repeat.length&&this.css.jq.repeatOff.length&&(this.options.loop?(this.css.jq.repeat.hide(), +this.css.jq.repeatOff.show()):(this.css.jq.repeat.show(),this.css.jq.repeatOff.hide()))},_updateInterface:function(){this.css.jq.seekBar.length&&this.css.jq.seekBar.width(this.status.seekPercent+"%");this.css.jq.playBar.length&&(this.options.smoothPlayBar?this.css.jq.playBar.stop().animate({width:this.status.currentPercentAbsolute+"%"},250,"linear"):this.css.jq.playBar.width(this.status.currentPercentRelative+"%"));var a="";this.css.jq.currentTime.length&&(a=this._convertTime(this.status.currentTime), +a!==this.css.jq.currentTime.text()&&this.css.jq.currentTime.text(this._convertTime(this.status.currentTime)));var a="",a=this.status.duration,c=this.status.remaining;this.css.jq.duration.length&&("string"===typeof this.status.media.duration?a=this.status.media.duration:("number"===typeof this.status.media.duration&&(a=this.status.media.duration,c=a-this.status.currentTime),a=this.options.remainingDuration?(0").join(">").split('"').join(""")}, +_qualifyURL:function(a){var c=document.createElement("div");c.innerHTML='x';return c.firstChild.href},_absoluteMediaUrls:function(a){var c=this;b.each(a,function(b,e){e&&c.format[b]&&(a[b]=c._qualifyURL(e))});return a},addStateClass:function(a){this.ancestorJq.length&&this.ancestorJq.addClass(this.options.stateClass[a])},removeStateClass:function(a){this.ancestorJq.length&&this.ancestorJq.removeClass(this.options.stateClass[a])},setMedia:function(a){var c=this, +d=!1,e=this.status.media.poster!==a.poster;this._resetMedia();this._resetGate();this._resetActive();this.androidFix.setMedia=!1;this.androidFix.play=!1;this.androidFix.pause=!1;a=this._absoluteMediaUrls(a);b.each(this.formats,function(e,f){var k="video"===c.format[f].media;b.each(c.solutions,function(e,g){if(c[g].support[f]&&c._validString(a[f])){var l="html"===g;k?(l?(c.html.video.gate=!0,c._html_setVideo(a),c.html.active=!0):(c.flash.gate=!0,c._flash_setVideo(a),c.flash.active=!0),c.css.jq.videoPlay.length&& +c.css.jq.videoPlay.show(),c.status.video=!0):(l?(c.html.audio.gate=!0,c._html_setAudio(a),c.html.active=!0,b.jPlayer.platform.android&&(c.androidFix.setMedia=!0)):(c.flash.gate=!0,c._flash_setAudio(a),c.flash.active=!0),c.css.jq.videoPlay.length&&c.css.jq.videoPlay.hide(),c.status.video=!1);d=!0;return!1}});if(d)return!1});d?(this.status.nativeVideoControls&&this.html.video.gate||!this._validString(a.poster)||(e?this.htmlElement.poster.src=a.poster:this.internal.poster.jq.show()),this.css.jq.title.length&& +"string"===typeof a.title&&(this.css.jq.title.html(a.title),this.htmlElement.audio&&this.htmlElement.audio.setAttribute("title",a.title),this.htmlElement.video&&this.htmlElement.video.setAttribute("title",a.title)),this.status.srcSet=!0,this.status.media=b.extend({},a),this._updateButtons(!1),this._updateInterface(),this._trigger(b.jPlayer.event.setmedia)):this._error({type:b.jPlayer.error.NO_SUPPORT,context:"{supplied:'"+this.options.supplied+"'}",message:b.jPlayer.errorMsg.NO_SUPPORT,hint:b.jPlayer.errorHint.NO_SUPPORT})}, +_resetMedia:function(){this._resetStatus();this._updateButtons(!1);this._updateInterface();this._seeked();this.internal.poster.jq.hide();clearTimeout(this.internal.htmlDlyCmdId);this.html.active?this._html_resetMedia():this.flash.active&&this._flash_resetMedia()},clearMedia:function(){this._resetMedia();this.html.active?this._html_clearMedia():this.flash.active&&this._flash_clearMedia();this._resetGate();this._resetActive()},load:function(){this.status.srcSet?this.html.active?this._html_load():this.flash.active&& +this._flash_load():this._urlNotSetError("load")},focus:function(){this.options.keyEnabled&&(b.jPlayer.focus=this)},play:function(a){"object"===typeof a&&this.options.useStateClassSkin&&!this.status.paused?this.pause(a):(a="number"===typeof a?a:NaN,this.status.srcSet?(this.focus(),this.html.active?this._html_play(a):this.flash.active&&this._flash_play(a)):this._urlNotSetError("play"))},videoPlay:function(){this.play()},pause:function(a){a="number"===typeof a?a:NaN;this.status.srcSet?this.html.active? +this._html_pause(a):this.flash.active&&this._flash_pause(a):this._urlNotSetError("pause")},tellOthers:function(a,c){var d=this,e="function"===typeof c,g=Array.prototype.slice.call(arguments);"string"===typeof a&&(e&&g.splice(1,1),b.each(this.instances,function(){d.element!==this&&(e&&!c.call(this.data("jPlayer"),d)||this.jPlayer.apply(this,g))}))},pauseOthers:function(a){this.tellOthers("pause",function(){return this.status.srcSet},a)},stop:function(){this.status.srcSet?this.html.active?this._html_pause(0): +this.flash.active&&this._flash_pause(0):this._urlNotSetError("stop")},playHead:function(a){a=this._limitValue(a,0,100);this.status.srcSet?this.html.active?this._html_playHead(a):this.flash.active&&this._flash_playHead(a):this._urlNotSetError("playHead")},_muted:function(a){this.mutedWorker(a);this.options.globalVolume&&this.tellOthers("mutedWorker",function(){return this.options.globalVolume},a)},mutedWorker:function(a){this.options.muted=a;this.html.used&&this._html_setProperty("muted",a);this.flash.used&& +this._flash_mute(a);this.html.video.gate||this.html.audio.gate||(this._updateMute(a),this._updateVolume(this.options.volume),this._trigger(b.jPlayer.event.volumechange))},mute:function(a){"object"===typeof a&&this.options.useStateClassSkin&&this.options.muted?this._muted(!1):(a=a===f?!0:!!a,this._muted(a))},unmute:function(a){a=a===f?!0:!!a;this._muted(!a)},_updateMute:function(a){a===f&&(a=this.options.muted);a?this.addStateClass("muted"):this.removeStateClass("muted");this.css.jq.mute.length&&this.css.jq.unmute.length&& +(this.status.noVolume?(this.css.jq.mute.hide(),this.css.jq.unmute.hide()):a?(this.css.jq.mute.hide(),this.css.jq.unmute.show()):(this.css.jq.mute.show(),this.css.jq.unmute.hide()))},volume:function(a){this.volumeWorker(a);this.options.globalVolume&&this.tellOthers("volumeWorker",function(){return this.options.globalVolume},a)},volumeWorker:function(a){a=this._limitValue(a,0,1);this.options.volume=a;this.html.used&&this._html_setProperty("volume",a);this.flash.used&&this._flash_volume(a);this.html.video.gate|| +this.html.audio.gate||(this._updateVolume(a),this._trigger(b.jPlayer.event.volumechange))},volumeBar:function(a){if(this.css.jq.volumeBar.length){var c=b(a.currentTarget),d=c.offset(),e=a.pageX-d.left,g=c.width();a=c.height()-a.pageY+d.top;c=c.height();this.options.verticalVolume?this.volume(a/c):this.volume(e/g)}this.options.muted&&this._muted(!1)},_updateVolume:function(a){a===f&&(a=this.options.volume);a=this.options.muted?0:a;this.status.noVolume?(this.css.jq.volumeBar.length&&this.css.jq.volumeBar.hide(), this.css.jq.volumeBarValue.length&&this.css.jq.volumeBarValue.hide(),this.css.jq.volumeMax.length&&this.css.jq.volumeMax.hide()):(this.css.jq.volumeBar.length&&this.css.jq.volumeBar.show(),this.css.jq.volumeBarValue.length&&(this.css.jq.volumeBarValue.show(),this.css.jq.volumeBarValue[this.options.verticalVolume?"height":"width"](100*a+"%")),this.css.jq.volumeMax.length&&this.css.jq.volumeMax.show())},volumeMax:function(){this.volume(1);this.options.muted&&this._muted(!1)},_cssSelectorAncestor:function(a){var c= this;this.options.cssSelectorAncestor=a;this._removeUiClass();this.ancestorJq=a?b(a):[];a&&1!==this.ancestorJq.length&&this._warning({type:b.jPlayer.warning.CSS_SELECTOR_COUNT,context:a,message:b.jPlayer.warningMsg.CSS_SELECTOR_COUNT+this.ancestorJq.length+" found for cssSelectorAncestor.",hint:b.jPlayer.warningHint.CSS_SELECTOR_COUNT});this._addUiClass();b.each(this.options.cssSelector,function(a,b){c._cssSelector(a,b)});this._updateInterface();this._updateButtons();this._updateAutohide();this._updateVolume(); -this._updateMute()},_cssSelector:function(a,c){var d=this;"string"===typeof c?b.jPlayer.prototype.options.cssSelector[a]?(this.css.jq[a]&&this.css.jq[a].length&&this.css.jq[a].unbind(".jPlayer"),this.options.cssSelector[a]=c,this.css.cs[a]=this.options.cssSelectorAncestor+" "+c,this.css.jq[a]=c?b(this.css.cs[a]):[],this.css.jq[a].length&&this.css.jq[a].bind("click.jPlayer",function(c){c.preventDefault();d[a](c);b(this).blur()}),c&&1!==this.css.jq[a].length&&this._warning({type:b.jPlayer.warning.CSS_SELECTOR_COUNT, +this._updateMute()},_cssSelector:function(a,c){var d=this;"string"===typeof c?b.jPlayer.prototype.options.cssSelector[a]?(this.css.jq[a]&&this.css.jq[a].length&&this.css.jq[a].unbind(".jPlayer"),this.options.cssSelector[a]=c,this.css.cs[a]=this.options.cssSelectorAncestor+" "+c,this.css.jq[a]=c?b(this.css.cs[a]):[],this.css.jq[a].length&&this[a]&&this.css.jq[a].bind("click.jPlayer",function(c){c.preventDefault();d[a](c);d.options.autoBlur&&b(this).blur()}),c&&1!==this.css.jq[a].length&&this._warning({type:b.jPlayer.warning.CSS_SELECTOR_COUNT, context:this.css.cs[a],message:b.jPlayer.warningMsg.CSS_SELECTOR_COUNT+this.css.jq[a].length+" found for "+a+" method.",hint:b.jPlayer.warningHint.CSS_SELECTOR_COUNT})):this._warning({type:b.jPlayer.warning.CSS_SELECTOR_METHOD,context:a,message:b.jPlayer.warningMsg.CSS_SELECTOR_METHOD,hint:b.jPlayer.warningHint.CSS_SELECTOR_METHOD}):this._warning({type:b.jPlayer.warning.CSS_SELECTOR_STRING,context:c,message:b.jPlayer.warningMsg.CSS_SELECTOR_STRING,hint:b.jPlayer.warningHint.CSS_SELECTOR_STRING})}, -seekBar:function(a){if(this.css.jq.seekBar.length){var c=b(a.currentTarget),d=c.offset();a=a.pageX-d.left;c=c.width();this.playHead(100*a/c)}},playBar:function(){},playbackRate:function(a){this._setOption("playbackRate",a)},playbackRateBar:function(a){if(this.css.jq.playbackRateBar.length){var c=b(a.currentTarget),d=c.offset(),e=a.pageX-d.left,g=c.width();a=c.height()-a.pageY+d.top;c=c.height();this.playbackRate((this.options.verticalPlaybackRate?a/c:e/g)*(this.options.maxPlaybackRate-this.options.minPlaybackRate)+ -this.options.minPlaybackRate)}},playbackRateBarValue:function(){},_updatePlaybackRate:function(){var a=(this.options.playbackRate-this.options.minPlaybackRate)/(this.options.maxPlaybackRate-this.options.minPlaybackRate);this.status.playbackRateEnabled?(this.css.jq.playbackRateBar.length&&this.css.jq.playbackRateBar.show(),this.css.jq.playbackRateBarValue.length&&(this.css.jq.playbackRateBarValue.show(),this.css.jq.playbackRateBarValue[this.options.verticalPlaybackRate?"height":"width"](100*a+"%"))): -(this.css.jq.playbackRateBar.length&&this.css.jq.playbackRateBar.hide(),this.css.jq.playbackRateBarValue.length&&this.css.jq.playbackRateBarValue.hide())},repeat:function(){this._loop(!0)},repeatOff:function(){this._loop(!1)},_loop:function(a){this.options.loop!==a&&(this.options.loop=a,this._updateButtons(),this._trigger(b.jPlayer.event.repeat))},currentTime:function(){},duration:function(){},gui:function(){},noSolution:function(){},option:function(a,c){var d=a;if(0===arguments.length)return b.extend(!0, -{},this.options);if("string"===typeof a){var e=a.split(".");if(c===f){for(var d=b.extend(!0,{},this.options),g=0;g= a&&(b=!0);return b},_validString:function(a){return a&&"string"===typeof a},_limitValue:function(a,b,d){return ad?d:a},_urlNotSetError:function(a){this._error({type:b.jPlayer.error.URL_NOT_SET,context:a,message:b.jPlayer.errorMsg.URL_NOT_SET,hint:b.jPlayer.errorHint.URL_NOT_SET})},_flashError:function(a){var c;c=this.internal.ready?"FLASH_DISABLED":"FLASH";this._error({type:b.jPlayer.error[c],context:this.internal.flash.swf,message:b.jPlayer.errorMsg[c]+a.message,hint:b.jPlayer.errorHint[c]}); this.internal.flash.jq.css({width:"1px",height:"1px"})},_error:function(a){this._trigger(b.jPlayer.event.error,a);this.options.errorAlerts&&this._alert("Error!"+(a.message?"\n"+a.message:"")+(a.hint?"\n"+a.hint:"")+"\nContext: "+a.context)},_warning:function(a){this._trigger(b.jPlayer.event.warning,f,a);this.options.warningAlerts&&this._alert("Warning!"+(a.message?"\n"+a.message:"")+(a.hint?"\n"+a.hint:"")+"\nContext: "+a.context)},_alert:function(a){a="jPlayer "+this.version.script+" : id='"+this.internal.self.id+ -"' : "+a;this.options.consoleAlerts?console&&console.log&&console.log(a):alert(a)},_emulateHtmlBridge:function(){var a=this;b.each(b.jPlayer.emulateMethods.split(/\s+/g),function(b,d){a.internal.domNode[d]=function(b){a[d](b)}});b.each(b.jPlayer.event,function(c,d){var e=!0;b.each(b.jPlayer.reservedEvent.split(/\s+/g),function(a,b){if(b===c)return e=!1});e&&a.element.bind(d+".jPlayer.jPlayerHtml",function(){a._emulateHtmlUpdate();var b=document.createEvent("Event");b.initEvent(c,!1,!0);a.internal.domNode.dispatchEvent(b)})})}, -_emulateHtmlUpdate:function(){var a=this;b.each(b.jPlayer.emulateStatus.split(/\s+/g),function(b,d){a.internal.domNode[d]=a.status[d]});b.each(b.jPlayer.emulateOptions.split(/\s+/g),function(b,d){a.internal.domNode[d]=a.options[d]})},_destroyHtmlBridge:function(){var a=this;this.element.unbind(".jPlayerHtml");b.each((b.jPlayer.emulateMethods+" "+b.jPlayer.emulateStatus+" "+b.jPlayer.emulateOptions).split(/\s+/g),function(b,d){delete a.internal.domNode[d]})}};b.jPlayer.error={FLASH:"e_flash",FLASH_DISABLED:"e_flash_disabled", -NO_SOLUTION:"e_no_solution",NO_SUPPORT:"e_no_support",URL:"e_url",URL_NOT_SET:"e_url_not_set",VERSION:"e_version"};b.jPlayer.errorMsg={FLASH:"jPlayer's Flash fallback is not configured correctly, or a command was issued before the jPlayer Ready event. Details: ",FLASH_DISABLED:"jPlayer's Flash fallback has been disabled by the browser due to the CSS rules you have used. Details: ",NO_SOLUTION:"No solution can be found by jPlayer in this browser. Neither HTML nor Flash can be used.",NO_SUPPORT:"It is not possible to play any media format provided in setMedia() on this browser using your current options.", -URL:"Media URL could not be loaded.",URL_NOT_SET:"Attempt to issue media playback commands, while no media url is set.",VERSION:"jPlayer "+b.jPlayer.prototype.version.script+" needs Jplayer.swf version "+b.jPlayer.prototype.version.needFlash+" but found "};b.jPlayer.errorHint={FLASH:"Check your swfPath option and that Jplayer.swf is there.",FLASH_DISABLED:"Check that you have not display:none; the jPlayer entity or any ancestor.",NO_SOLUTION:"Review the jPlayer options: support and supplied.",NO_SUPPORT:"Video or audio formats defined in the supplied option are missing.", -URL:"Check media URL is valid.",URL_NOT_SET:"Use setMedia() to set the media URL.",VERSION:"Update jPlayer files."};b.jPlayer.warning={CSS_SELECTOR_COUNT:"e_css_selector_count",CSS_SELECTOR_METHOD:"e_css_selector_method",CSS_SELECTOR_STRING:"e_css_selector_string",OPTION_KEY:"e_option_key"};b.jPlayer.warningMsg={CSS_SELECTOR_COUNT:"The number of css selectors found did not equal one: ",CSS_SELECTOR_METHOD:"The methodName given in jPlayer('cssSelector') is not a valid jPlayer method.",CSS_SELECTOR_STRING:"The methodCssSelector given in jPlayer('cssSelector') is not a String or is empty.", -OPTION_KEY:"The option requested in jPlayer('option') is undefined."};b.jPlayer.warningHint={CSS_SELECTOR_COUNT:"Check your css selector and the ancestor.",CSS_SELECTOR_METHOD:"Check your method name.",CSS_SELECTOR_STRING:"Check your css selector is a string.",OPTION_KEY:"Check your option name."}}); \ No newline at end of file +"' : "+a;this.options.consoleAlerts?window.console&&window.console.log&&window.console.log(a):alert(a)},_emulateHtmlBridge:function(){var a=this;b.each(b.jPlayer.emulateMethods.split(/\s+/g),function(b,d){a.internal.domNode[d]=function(b){a[d](b)}});b.each(b.jPlayer.event,function(c,d){var e=!0;b.each(b.jPlayer.reservedEvent.split(/\s+/g),function(a,b){if(b===c)return e=!1});e&&a.element.bind(d+".jPlayer.jPlayerHtml",function(){a._emulateHtmlUpdate();var b=document.createEvent("Event");b.initEvent(c, +!1,!0);a.internal.domNode.dispatchEvent(b)})})},_emulateHtmlUpdate:function(){var a=this;b.each(b.jPlayer.emulateStatus.split(/\s+/g),function(b,d){a.internal.domNode[d]=a.status[d]});b.each(b.jPlayer.emulateOptions.split(/\s+/g),function(b,d){a.internal.domNode[d]=a.options[d]})},_destroyHtmlBridge:function(){var a=this;this.element.unbind(".jPlayerHtml");b.each((b.jPlayer.emulateMethods+" "+b.jPlayer.emulateStatus+" "+b.jPlayer.emulateOptions).split(/\s+/g),function(b,d){delete a.internal.domNode[d]})}}; +b.jPlayer.error={FLASH:"e_flash",FLASH_DISABLED:"e_flash_disabled",NO_SOLUTION:"e_no_solution",NO_SUPPORT:"e_no_support",URL:"e_url",URL_NOT_SET:"e_url_not_set",VERSION:"e_version"};b.jPlayer.errorMsg={FLASH:"jPlayer's Flash fallback is not configured correctly, or a command was issued before the jPlayer Ready event. Details: ",FLASH_DISABLED:"jPlayer's Flash fallback has been disabled by the browser due to the CSS rules you have used. Details: ",NO_SOLUTION:"No solution can be found by jPlayer in this browser. Neither HTML nor Flash can be used.", +NO_SUPPORT:"It is not possible to play any media format provided in setMedia() on this browser using your current options.",URL:"Media URL could not be loaded.",URL_NOT_SET:"Attempt to issue media playback commands, while no media url is set.",VERSION:"jPlayer "+b.jPlayer.prototype.version.script+" needs Jplayer.swf version "+b.jPlayer.prototype.version.needFlash+" but found "};b.jPlayer.errorHint={FLASH:"Check your swfPath option and that Jplayer.swf is there.",FLASH_DISABLED:"Check that you have not display:none; the jPlayer entity or any ancestor.", +NO_SOLUTION:"Review the jPlayer options: support and supplied.",NO_SUPPORT:"Video or audio formats defined in the supplied option are missing.",URL:"Check media URL is valid.",URL_NOT_SET:"Use setMedia() to set the media URL.",VERSION:"Update jPlayer files."};b.jPlayer.warning={CSS_SELECTOR_COUNT:"e_css_selector_count",CSS_SELECTOR_METHOD:"e_css_selector_method",CSS_SELECTOR_STRING:"e_css_selector_string",OPTION_KEY:"e_option_key"};b.jPlayer.warningMsg={CSS_SELECTOR_COUNT:"The number of css selectors found did not equal one: ", +CSS_SELECTOR_METHOD:"The methodName given in jPlayer('cssSelector') is not a valid jPlayer method.",CSS_SELECTOR_STRING:"The methodCssSelector given in jPlayer('cssSelector') is not a String or is empty.",OPTION_KEY:"The option requested in jPlayer('option') is undefined."};b.jPlayer.warningHint={CSS_SELECTOR_COUNT:"Check your css selector and the ancestor.",CSS_SELECTOR_METHOD:"Check your method name.",CSS_SELECTOR_STRING:"Check your css selector is a string.",OPTION_KEY:"Check your option name."}}); \ No newline at end of file diff --git a/airtime_mvc/public/js/jplayer/popcorn/popcorn.jplayer.js b/airtime_mvc/public/js/jplayer/popcorn/popcorn.jplayer.js new file mode 100644 index 000000000..31fead479 --- /dev/null +++ b/airtime_mvc/public/js/jplayer/popcorn/popcorn.jplayer.js @@ -0,0 +1,583 @@ +/* + * jPlayer Player Plugin for Popcorn JavaScript Library + * http://www.jplayer.org + * + * Copyright (c) 2012 - 2014 Happyworm Ltd + * Licensed under the MIT license. + * http://opensource.org/licenses/MIT + * + * Author: Mark J Panaghiston + * Version: 1.1.4 + * Date: 1st September 2014 + * + * For Popcorn Version: 1.3 + * For jPlayer Version: 2.7.0 + * Requires: jQuery 1.7+ + * Note: jQuery dependancy cannot be removed since jPlayer 2 is a jQuery plugin. Use of jQuery will be kept to a minimum. + */ + +/* Code verified using http://www.jshint.com/ */ +/*jshint asi:false, bitwise:false, boss:false, browser:true, curly:false, debug:false, eqeqeq:true, eqnull:false, evil:false, forin:false, immed:false, jquery:true, laxbreak:false, newcap:true, noarg:true, noempty:true, nonew:true, onevar:false, passfail:false, plusplus:false, regexp:false, undef:true, sub:false, strict:false, white:false, smarttabs:true */ +/*global Popcorn:false, console:false */ + +(function(Popcorn) { + + var JQUERY_SCRIPT = '//code.jquery.com/jquery-1.11.1.min.js', // Used if jQuery not already present. + JPLAYER_SCRIPT = '//www.jplayer.org/2.7.0/js/jquery.jplayer.min.js', // Used if jPlayer not already present. + JPLAYER_SWFPATH = '//www.jplayer.org/2.7.0/js/Jplayer.swf', // Used if not specified in jPlayer options via SRC Object. + SOLUTION = 'html,flash', // The default solution option. + DEBUG = false, // Decided to leave the debugging option and console output in for the time being. Overhead is trivial. + jQueryDownloading = false, // Flag to stop multiple instances from each pulling in jQuery, thus corrupting it. + jPlayerDownloading = false, // Flag to stop multiple instances from each pulling in jPlayer, thus corrupting it. + format = { // Duplicate of jPlayer 2.5.0 object, to avoid always requiring jQuery and jPlayer to be loaded before performing the _canPlayType() test. + mp3: { + codec: 'audio/mpeg;', + flashCanPlay: true, + media: 'audio' + }, + m4a: { // AAC / MP4 + codec: 'audio/mp4; codecs="mp4a.40.2"', + flashCanPlay: true, + media: 'audio' + }, + m3u8a: { // AAC / MP4 / Apple HLS + codec: 'application/vnd.apple.mpegurl; codecs="mp4a.40.2"', + flashCanPlay: false, + media: 'audio' + }, + m3ua: { // M3U + codec: 'audio/mpegurl', + flashCanPlay: false, + media: 'audio' + }, + oga: { // OGG + codec: 'audio/ogg; codecs="vorbis, opus"', + flashCanPlay: false, + media: 'audio' + }, + flac: { // FLAC + codec: 'audio/x-flac', + flashCanPlay: false, + media: 'audio' + }, + wav: { // PCM + codec: 'audio/wav; codecs="1"', + flashCanPlay: false, + media: 'audio' + }, + webma: { // WEBM + codec: 'audio/webm; codecs="vorbis"', + flashCanPlay: false, + media: 'audio' + }, + fla: { // FLV / F4A + codec: 'audio/x-flv', + flashCanPlay: true, + media: 'audio' + }, + rtmpa: { // RTMP AUDIO + codec: 'audio/rtmp; codecs="rtmp"', + flashCanPlay: true, + media: 'audio' + }, + m4v: { // H.264 / MP4 + codec: 'video/mp4; codecs="avc1.42E01E, mp4a.40.2"', + flashCanPlay: true, + media: 'video' + }, + m3u8v: { // H.264 / AAC / MP4 / Apple HLS + codec: 'application/vnd.apple.mpegurl; codecs="avc1.42E01E, mp4a.40.2"', + flashCanPlay: false, + media: 'video' + }, + m3uv: { // M3U + codec: 'audio/mpegurl', + flashCanPlay: false, + media: 'video' + }, + ogv: { // OGG + codec: 'video/ogg; codecs="theora, vorbis"', + flashCanPlay: false, + media: 'video' + }, + webmv: { // WEBM + codec: 'video/webm; codecs="vorbis, vp8"', + flashCanPlay: false, + media: 'video' + }, + flv: { // FLV / F4V + codec: 'video/x-flv', + flashCanPlay: true, + media: 'video' + }, + rtmpv: { // RTMP VIDEO + codec: 'video/rtmp; codecs="rtmp"', + flashCanPlay: true, + media: 'video' + } + }, + isObject = function(val) { // Basic check for Object + if(val && typeof val === 'object' && val.hasOwnProperty) { + return true; + } else { + return false; + } + }, + getMediaType = function(url) { // Function to gleam the media type from the URL + var mediaType = false; + if(/\.mp3$/i.test(url)) { + mediaType = 'mp3'; + } else if(/\.mp4$/i.test(url) || /\.m4v$/i.test(url)) { + mediaType = 'm4v'; + } else if(/\.m4a$/i.test(url)) { + mediaType = 'm4a'; + } else if(/\.ogg$/i.test(url) || /\.oga$/i.test(url)) { + mediaType = 'oga'; + } else if(/\.ogv$/i.test(url)) { + mediaType = 'ogv'; + } else if(/\.webm$/i.test(url)) { + mediaType = 'webmv'; + } + return mediaType; + }, + getSupplied = function(url) { // Function to generate a supplied option from an src object. ie., When supplied not specified. + var supplied = '', + separator = ''; + if(isObject(url)) { + // Generate supplied option from object's properties. Non-format properties would be ignored by jPlayer. Order is unpredictable. + for(var prop in url) { + if(url.hasOwnProperty(prop)) { + supplied += separator + prop; + separator = ','; + } + } + } + if(DEBUG) console.log('getSupplied(): Generated: supplied = "' + supplied + '"'); + return supplied; + }; + + Popcorn.player( 'jplayer', { + _canPlayType: function( containerType, url ) { + // url : Either a String or an Object structured similar a jPlayer media object. ie., As used by setMedia in jPlayer. + // The url object may also contain a solution and supplied property. + + // Define the src object structure here! + + var cType = containerType.toLowerCase(), + srcObj = { + media:{}, + options:{} + }, + rVal = false, // Only a boolean false means it is not supported. + mediaType; + + if(cType !== 'video' && cType !== 'audio') { + + if(typeof url === 'string') { + // Check it starts with http, so the URL is absolute... Well, it is not a perfect check. + if(/^http.*/i.test(url)) { + mediaType = getMediaType(url); + if(mediaType) { + srcObj.media[mediaType] = url; + srcObj.options.solution = SOLUTION; + srcObj.options.supplied = mediaType; + } + } + } else { + srcObj = url; // Assume the url is an src object. + } + + // Check for Object and appropriate minimum data structure. + if(isObject(srcObj) && isObject(srcObj.media)) { + + if(!isObject(srcObj.options)) { + srcObj.options = {}; + } + + if(!srcObj.options.solution) { + srcObj.options.solution = SOLUTION; + } + + if(!srcObj.options.supplied) { + srcObj.options.supplied = getSupplied(srcObj.media); + } + + // Figure out how jPlayer will play it. + // This may not work properly when both audio and video is supplied. ie., A media player. But it should return truethy and jPlayer can figure it out. + + var solution = srcObj.options.solution.toLowerCase().split(","), // Create the solution array, with prority based on the order of the solution string. + supplied = srcObj.options.supplied.toLowerCase().split(","); // Create the supplied formats array, with prority based on the order of the supplied formats string. + + for(var sol = 0; sol < solution.length; sol++) { + + var solutionType = solution[sol].replace(/^\s+|\s+$/g, ""), //trim + checkingHtml = solutionType === 'html', + checkingFlash = solutionType === 'flash', + mediaElem; + + for(var fmt = 0; fmt < supplied.length; fmt++) { + mediaType = supplied[fmt].replace(/^\s+|\s+$/g, ""); //trim + if(format[mediaType]) { // Check format is valid. + + // Create an HTML5 media element for the type of media. + if(!mediaElem && checkingHtml) { + mediaElem = document.createElement(format[mediaType].media); + } + // See if the HTML5 media element can play the MIME / Codec type. + // Flash also returns the object if the format is playable, so it is truethy, but that html property is false. + // This assumes Flash is available, but that should be dealt with by jPlayer if that happens. + var htmlCanPlay = !!(mediaElem && mediaElem.canPlayType && mediaElem.canPlayType(format[mediaType].codec)), + htmlWillPlay = htmlCanPlay && checkingHtml, + flashWillPlay = format[mediaType].flashCanPlay && checkingFlash; + // The first one found will match what jPlayer uses. + if(htmlWillPlay || flashWillPlay) { + rVal = { + html: htmlWillPlay, + type: mediaType + }; + sol = solution.length; // Exit solution loop + fmt = supplied.length; // Exit supplied loop + } + } + } + } + } + } + return rVal; + }, + // _setup: function( options ) { // Warning: options is deprecated. + _setup: function() { + var media = this, + myPlayer, // The jQuery selector of the jPlayer element. Usually a
    + jPlayerObj, // The jPlayer data instance. For performance and DRY code. + mediaType = 'unknown', + jpMedia = {}, + jpOptions = {}, + ready = false, // Used during init to override the annoying duration dependance in the track event padding during Popcorn's isReady(). ie., We is ready after loadeddata and duration can then be set real value at leisure. + duration = 0, // For the durationchange event with both HTML5 and Flash solutions. Used with 'ready' to keep control during the Popcorn isReady() via loadeddata event. (Duration=0 is bad.) + durationchangeId = null, // A timeout ID used with delayed durationchange event. (Because of the duration=NaN fudge to avoid Popcorn track event corruption.) + canplaythrough = false, + error = null, // The MediaError object. + + dispatchDurationChange = function() { + if(ready) { + if(DEBUG) console.log('Dispatched event : durationchange : ' + duration); + media.dispatchEvent('durationchange'); + } else { + if(DEBUG) console.log('DELAYED EVENT (!ready) : durationchange : ' + duration); + clearTimeout(durationchangeId); // Stop multiple triggers causing multiple timeouts running in parallel. + durationchangeId = setTimeout(dispatchDurationChange, 250); + } + }, + + jPlayerFlashEventsPatch = function() { + + /* Events already supported by jPlayer Flash: + * loadstart + * loadedmetadata (M4A, M4V) + * progress + * play + * pause + * seeking + * seeked + * timeupdate + * ended + * volumechange + * error <- See the custom handler in jPlayerInit() + */ + + /* Events patched: + * loadeddata + * durationchange + * canplaythrough + * playing + */ + + /* Events NOT patched: + * suspend + * abort + * emptied + * stalled + * loadedmetadata (MP3) + * waiting + * canplay + * ratechange + */ + + // Triggering patched events through the jPlayer Object so the events are homogeneous. ie., The contain the event.jPlayer data structure. + + var checkDuration = function(event) { + if(event.jPlayer.status.duration !== duration) { + duration = event.jPlayer.status.duration; + dispatchDurationChange(); + } + }, + + checkCanPlayThrough = function(event) { + if(!canplaythrough && event.jPlayer.status.seekPercent === 100) { + canplaythrough = true; + setTimeout(function() { + if(DEBUG) console.log('Trigger : canplaythrough'); + jPlayerObj._trigger($.jPlayer.event.canplaythrough); + }, 0); + } + }; + + myPlayer.bind($.jPlayer.event.loadstart, function() { + setTimeout(function() { + if(DEBUG) console.log('Trigger : loadeddata'); + jPlayerObj._trigger($.jPlayer.event.loadeddata); + }, 0); + }) + .bind($.jPlayer.event.progress, function(event) { + checkDuration(event); + checkCanPlayThrough(event); + }) + .bind($.jPlayer.event.timeupdate, function(event) { + checkDuration(event); + checkCanPlayThrough(event); + }) + .bind($.jPlayer.event.play, function() { + setTimeout(function() { + if(DEBUG) console.log('Trigger : playing'); + jPlayerObj._trigger($.jPlayer.event.playing); + }, 0); + }); + + if(DEBUG) console.log('Created CUSTOM event handlers for FLASH'); + }, + + jPlayerInit = function() { + (function($) { + + myPlayer = $('#' + media.id); + + if(typeof media.src === 'string') { + mediaType = getMediaType(media.src); + jpMedia[mediaType] = media.src; + jpOptions.supplied = mediaType; + jpOptions.solution = SOLUTION; + } else if(isObject(media.src)) { + jpMedia = isObject(media.src.media) ? media.src.media : {}; + jpOptions = isObject(media.src.options) ? media.src.options : {}; + jpOptions.solution = jpOptions.solution || SOLUTION; + jpOptions.supplied = jpOptions.supplied || getSupplied(media.src.media); + } + + // Allow the swfPath to be set to local server. ie., If the jPlayer Plugin is local and already on the page, then you can also use the local SWF. + jpOptions.swfPath = jpOptions.swfPath || JPLAYER_SWFPATH; + + myPlayer.bind($.jPlayer.event.ready, function(event) { + if(event.jPlayer.flash.used) { + jPlayerFlashEventsPatch(); + } + // Set the media andd load it, so that the Flash solution behaves similar to HTML5 solution. + // This also allows the loadstart event to be used to know jPlayer is ready. + $(this).jPlayer('setMedia', jpMedia).jPlayer('load'); + }); + + // Do not auto-bubble the reserved events, nor the loadeddata and durationchange event, since the duration must be carefully handled when loadeddata event occurs. + // See the duration property code for more details. (Ranting.) + + var reservedEvents = $.jPlayer.reservedEvent + ' loadeddata durationchange', + reservedEvent = reservedEvents.split(/\s+/g); + + // Generate event handlers for all the standard HTML5 media events. (Except durationchange) + + var bindEvent = function(name) { + myPlayer.bind($.jPlayer.event[name], function(event) { + if(DEBUG) console.log('Dispatched event: ' + name + (event && event.jPlayer ? ' (' + event.jPlayer.status.currentTime + 's)' : '')); // Must be after dispatch for some reason on Firefox/Opera + media.dispatchEvent(name); + }); + if(DEBUG) console.log('Created event handler for: ' + name); + }; + + for(var eventName in $.jPlayer.event) { + if($.jPlayer.event.hasOwnProperty(eventName)) { + var nativeEvent = true; + for(var iRes in reservedEvent) { + if(reservedEvent.hasOwnProperty(iRes)) { + if(reservedEvent[iRes] === eventName) { + nativeEvent = false; + break; + } + } + } + if(nativeEvent) { + bindEvent(eventName); + } else { + if(DEBUG) console.log('Skipped auto event handler creation for: ' + eventName); + } + } + } + + myPlayer.bind($.jPlayer.event.loadeddata, function(event) { + if(DEBUG) console.log('Dispatched event: loadeddata' + (event && event.jPlayer ? ' (' + event.jPlayer.status.currentTime + 's)' : '')); + media.dispatchEvent('loadeddata'); + ready = true; + }); + if(DEBUG) console.log('Created CUSTOM event handler for: loadeddata'); + + myPlayer.bind($.jPlayer.event.durationchange, function(event) { + duration = event.jPlayer.status.duration; + dispatchDurationChange(); + }); + if(DEBUG) console.log('Created CUSTOM event handler for: durationchange'); + + // The error event is a special case. Plus jPlayer error event assumes it is a broken URL. (It could also be a decoder error... Or aborted or a Network error.) + myPlayer.bind($.jPlayer.event.error, function(event) { + // Not sure how to handle the error situation. Popcorn does not appear to have the error or error.code property documented here: http://popcornjs.org/popcorn-docs/media-methods/ + // If any error event happens, then something has gone pear shaped. + + error = event.jPlayer.error; // Saving object pointer, not a copy of the object. Possible garbage collection issue... But the player is dead anyway, so don't care. + + if(error.type === $.jPlayer.error.URL) { + error.code = 4; // MEDIA_ERR_SRC_NOT_SUPPORTED since jPlayer makes this assumption. It is the most common error, then the decode error. Never seen either of the other 2 error types occur. + } else { + error.code = 0; // It was a jPlayer error, not an HTML5 media error. + } + + if(DEBUG) console.log('Dispatched event: error'); + if(DEBUG) console.dir(error); + media.dispatchEvent('error'); + }); + if(DEBUG) console.log('Created CUSTOM event handler for: error'); + + Popcorn.player.defineProperty( media, 'error', { + set: function() { + // Read-only property + return error; + }, + get: function() { + return error; + } + }); + + Popcorn.player.defineProperty( media, 'currentTime', { + set: function( val ) { + if(jPlayerObj.status.paused) { + myPlayer.jPlayer('pause', val); + } else { + myPlayer.jPlayer('play', val); + } + return val; + }, + get: function() { + return jPlayerObj.status.currentTime; + } + }); + + /* The joy of duration and the loadeddata event isReady() handler + * The duration is assumed to be a NaN or a valid duration. + * jPlayer uses zero instead of a NaN and this screws up the Popcorn track event start/end arrays padding. + * This line here: + * videoDurationPlus = duration != duration ? Number.MAX_VALUE : duration + 1; + * Not sure why it is not simply: + * videoDurationPlus = Number.MAX_VALUE; // Who cares if the padding is close to the real duration? + * So if you trigger loadeddata before the duration is correct, the track event padding is screwed up. (It pads the start, not the end... Well, duration+1 = 0+1 = 1s) + * That line makes the MP3 Flash fallback difficult to setup. The whole MP3 will need to load before the duration is known. + * Planning on using a NaN for duration until a >0 value is found... Except with MP3, where seekPercent must be 100% before setting the duration. + * Why not just use a NaN during init... And then correct the duration later? + */ + + Popcorn.player.defineProperty( media, 'duration', { + set: function() { + // Read-only property + if(ready) { + return duration; + } else { + return NaN; + } + }, + get: function() { + if(ready) { + return duration; // Popcorn has initialized, we can now use duration zero or whatever without fear. + } else { + return NaN; // Keep the duration a NaN until after loadeddata event has occurred. Otherwise Popcorn track event padding is corrupted. + } + } + }); + + Popcorn.player.defineProperty( media, 'muted', { + set: function( val ) { + myPlayer.jPlayer('mute', val); + return jPlayerObj.options.muted; + }, + get: function() { + return jPlayerObj.options.muted; + } + }); + + Popcorn.player.defineProperty( media, 'volume', { + set: function( val ) { + myPlayer.jPlayer('volume', val); + return jPlayerObj.options.volume; + }, + get: function() { + return jPlayerObj.options.volume; + } + }); + + Popcorn.player.defineProperty( media, 'paused', { + set: function() { + // Read-only property + return jPlayerObj.status.paused; + }, + get: function() { + return jPlayerObj.status.paused; + } + }); + + media.play = function() { + myPlayer.jPlayer('play'); + }; + media.pause = function() { + myPlayer.jPlayer('pause'); + }; + + myPlayer.jPlayer(jpOptions); // Instance jPlayer. Note that the options should not have a ready event defined... Kill it by default? + jPlayerObj = myPlayer.data('jPlayer'); + + }(jQuery)); + }, + + jPlayerCheck = function() { + if (!jQuery.jPlayer) { + if (!jPlayerDownloading) { + jPlayerDownloading = true; + Popcorn.getScript(JPLAYER_SCRIPT, function() { + jPlayerDownloading = false; + jPlayerInit(); + }); + } else { + setTimeout(jPlayerCheck, 250); + } + } else { + jPlayerInit(); + } + }, + + jQueryCheck = function() { + if (!window.jQuery) { + if (!jQueryDownloading) { + jQueryDownloading = true; + Popcorn.getScript(JQUERY_SCRIPT, function() { + jQueryDownloading = false; + jPlayerCheck(); + }); + } else { + setTimeout(jQueryCheck, 250); + } + } else { + jPlayerCheck(); + } + }; + + jQueryCheck(); + }, + _teardown: function() { + jQuery('#' + this.id).jPlayer('destroy'); + } + }); + +}(Popcorn)); \ No newline at end of file From a67397d0cf75b1deee9d3295f6fa8815e08273de Mon Sep 17 00:00:00 2001 From: localizer Date: Tue, 4 Nov 2014 16:44:18 +0000 Subject: [PATCH 02/21] updated translation resources --- airtime_mvc/locale/az/LC_MESSAGES/airtime.mo | Bin 474 -> 474 bytes airtime_mvc/locale/az/LC_MESSAGES/airtime.po | 2 +- .../locale/es_ES/LC_MESSAGES/airtime.mo | Bin 63208 -> 63208 bytes .../locale/es_ES/LC_MESSAGES/airtime.po | 2 +- .../locale/hy_AM/LC_MESSAGES/airtime.mo | Bin 487 -> 487 bytes .../locale/hy_AM/LC_MESSAGES/airtime.po | 2 +- airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo | Bin 73271 -> 73270 bytes airtime_mvc/locale/ja/LC_MESSAGES/airtime.po | 4 ++-- airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo | Bin 464 -> 464 bytes airtime_mvc/locale/ka/LC_MESSAGES/airtime.po | 2 +- .../locale/pt_BR/LC_MESSAGES/airtime.mo | Bin 61996 -> 62015 bytes .../locale/pt_BR/LC_MESSAGES/airtime.po | 5 +++-- 12 files changed, 9 insertions(+), 8 deletions(-) diff --git a/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo index b417eafa0aed11b56fbb19cc2e43595a05024d8f..fdd8f82320032179195c37451347930853563931 100644 GIT binary patch delta 22 dcmcb`e2aO)8g4@aT|+YkLt`srqmA2@839yx2BrW2 delta 22 dcmcb`e2aO)8g2s%T_ZyULlY}Q!;RaO839zJ2B!c3 diff --git a/airtime_mvc/locale/az/LC_MESSAGES/airtime.po b/airtime_mvc/locale/az/LC_MESSAGES/airtime.po index aa92945ae..871620a8a 100644 --- a/airtime_mvc/locale/az/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/az/LC_MESSAGES/airtime.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-12-13 12:58-0500\n" -"PO-Revision-Date: 2014-08-21 14:11+0000\n" +"PO-Revision-Date: 2014-10-16 13:32+0000\n" "Last-Translator: Daniel James \n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/airtime/language/az/)\n" "MIME-Version: 1.0\n" diff --git a/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.mo index ce72e893f99cd0741529b1e82d4ac2e3ed8652d9..12b82f4592d939aef8f9214241ed5de1d5320dea 100644 GIT binary patch delta 17 ZcmaFymifh7<_#AnFc}+czBEBB4FFfM2)6(L delta 17 ZcmaFymifh7<_#AnFd3O`zBEBB4FFfp2)qCQ diff --git a/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po b/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po index 318e50e00..95befdecc 100644 --- a/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-12-13 12:58-0500\n" -"PO-Revision-Date: 2014-10-09 04:26+0000\n" +"PO-Revision-Date: 2014-10-09 04:30+0000\n" "Last-Translator: Víctor Carranza \n" "Language-Team: Spanish (Spain) (http://www.transifex.com/projects/p/airtime/language/es_ES/)\n" "MIME-Version: 1.0\n" diff --git a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo index 474ec47fcf64eb1aed1f10ce363c8ed682b1ebd5..fde96a965057e018a5e51e4b5787818bcc58c9dd 100644 GIT binary patch delta 21 ccmaFP{G55h8ZJWvT|+YkLlZ00joS\n" "Language-Team: Armenian (Armenia) (http://www.transifex.com/projects/p/airtime/language/hy_AM/)\n" "MIME-Version: 1.0\n" diff --git a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo index d964292cdb7b8bae067d5f801d2a824b01b17bc8..a0dcead7618bd106f78a875bba59fe89b36cd6d4 100644 GIT binary patch delta 6851 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 aBtIXhi_iRjUE5)!(nn;hf9!)xQ~w8mr-M=e delta 6852 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\n" +"PO-Revision-Date: 2014-11-04 16:43+0000\n" +"Last-Translator: Duncan Sommerville \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/airtime/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo index 8084be60e1e6b7ccf5eff5b08a5b96d4bea57907..c79ce247597de37d6679a8db214316bc7e49c5b2 100644 GIT binary patch delta 21 ccmcb>e1Unw8ZJWvT|+YkLsKh*joYLc0ZiZqQ~&?~ delta 21 ccmcb>e1Unw8ZHA1T_ZyULlY~*joYLc0ZkDGR{#J2 diff --git a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po index 02a6e665e..274959bd8 100644 --- a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-12-13 12:58-0500\n" -"PO-Revision-Date: 2014-08-21 14:11+0000\n" +"PO-Revision-Date: 2014-10-16 15:01+0000\n" "Last-Translator: Daniel James \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/airtime/language/ka/)\n" "MIME-Version: 1.0\n" diff --git a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo index 8ac337070b792fcb8799e26ebe17220e13e3b980..f1d49b7dc28365a945a23bf439da00f4767d2f7f 100644 GIT binary patch delta 6345 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 IKT}8iAIVB!7XSbN diff --git a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po index f8208013d..c51fc6de5 100644 --- a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the Airtime package. # # Translators: +# Pedro Garbellini da Silva , 2014 # Sourcefabric , 2012 msgid "" msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-12-13 12:58-0500\n" -"PO-Revision-Date: 2014-10-07 13:41+0000\n" -"Last-Translator: Daniel James \n" +"PO-Revision-Date: 2014-10-16 16:20+0000\n" +"Last-Translator: Pedro Garbellini da Silva \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/airtime/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" From 0f3c1914e1b332c8b7856933cddee7087de6e60c Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Tue, 4 Nov 2014 18:38:31 -0500 Subject: [PATCH 03/21] CC-5948 - Fixed bug where user couldn't edit repeating instances of a show while another instance was playing --- airtime_mvc/application/services/ShowFormService.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/services/ShowFormService.php b/airtime_mvc/application/services/ShowFormService.php index 882d22c44..74124421f 100644 --- a/airtime_mvc/application/services/ShowFormService.php +++ b/airtime_mvc/application/services/ShowFormService.php @@ -412,11 +412,9 @@ class Application_Service_ShowFormService $ccShowInstance = CcShowInstancesQuery::create() ->filterByDbShowId($this->ccShow->getDbId()) ->filterByDbModifiedInstance(false) - ->filterByDbEnds(gmdate("Y-m-d H:i:s"), Criteria::GREATER_THAN) - ->orderByDbStarts() - ->limit(1) + ->filterByDbStarts(gmdate("Y-m-d H:i:s"), Criteria::GREATER_THAN) ->findOne(); - + $starts = new DateTime($ccShowInstance->getDbStarts(), new DateTimeZone("UTC")); $ends = new DateTime($ccShowInstance->getDbEnds(), new DateTimeZone("UTC")); $showTimezone = $this->ccShow->getFirstCcShowDay()->getDbTimezone(); @@ -427,6 +425,7 @@ class Application_Service_ShowFormService return array($starts, $ends); } + /** * * Validates show forms From 6c27606aa7d6ad49b523e99a58c141737802f2c9 Mon Sep 17 00:00:00 2001 From: localizer Date: Wed, 5 Nov 2014 10:56:11 +0000 Subject: [PATCH 04/21] updated translation resources --- airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo | Bin 73270 -> 74160 bytes airtime_mvc/locale/ja/LC_MESSAGES/airtime.po | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo index a0dcead7618bd106f78a875bba59fe89b36cd6d4..26002088e75c55d2003473cd93e16bb58066028d 100644 GIT binary patch delta 18899 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 G$o~V^+690B delta 18116 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 diff --git a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po index 2008a9abd..48df8c9db 100644 --- a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-12-13 12:58-0500\n" -"PO-Revision-Date: 2014-11-04 16:43+0000\n" -"Last-Translator: Duncan Sommerville \n" +"PO-Revision-Date: 2014-11-05 10:53+0000\n" +"Last-Translator: Andrey Podshivalov\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/airtime/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2063,14 +2063,14 @@ msgid "" "A static smart block will save the criteria and generate the block content " "immediately. This allows you to edit and view it in the Library before " "adding it to a show." -msgstr "" +msgstr "スマート・ブロックは基準を満たし、即時にブロック・コンテンツを生成します。これにより、コンテンツをショーに追加する前にライブラリーにおいてコンテンツを編集および閲覧できます。" #: airtime_mvc/application/controllers/LocaleController.php:134 msgid "" "A dynamic smart block will only save the criteria. The block content will " "get generated upon adding it to a show. You will not be able to view and " "edit the content in the Library." -msgstr "" +msgstr "自動生成スマートブロックは基準の設定のみ操作できます。ブロックコンテンツは番組に追加するとすぐに生成されます。生成したコンテンツをライブラリ内で編集することはできません。" #: airtime_mvc/application/controllers/LocaleController.php:136 msgid "" From 00e85de3c8818c2cb9e486430b8c82326fc140ae Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Tue, 28 Oct 2014 17:18:11 -0400 Subject: [PATCH 05/21] Updated preEditShowValidationCheck to behave properly when dealing with shows with cc_show_days rows in the past, updated serialized form data in add-show to accommodate the change --- .../application/services/ShowFormService.php | 19 +- .../public/js/airtime/schedule/add-show.js | 304 +++++++++--------- 2 files changed, 164 insertions(+), 159 deletions(-) diff --git a/airtime_mvc/application/services/ShowFormService.php b/airtime_mvc/application/services/ShowFormService.php index 74124421f..94cc0068a 100644 --- a/airtime_mvc/application/services/ShowFormService.php +++ b/airtime_mvc/application/services/ShowFormService.php @@ -362,33 +362,22 @@ class Application_Service_ShowFormService } /** - * * Before we send the form data in for validation, there * are a few fields we may need to adjust first + * * @param $formData */ public function preEditShowValidationCheck($formData) { - $validateStartDate = true; - $validateStartTime = true; + // If the start date or time were disabled, don't validate them + $validateStartDate = $formData['start_date_disabled'] === "false"; + $validateStartTime = $formData['start_time_disabled'] === "false"; //CcShowDays object of the show currently being edited $currentShowDay = $this->ccShow->getFirstCcShowDay(); //DateTime object $dt = $currentShowDay->getLocalStartDateAndTime(); - - if (!array_key_exists('add_show_start_date', $formData)) { - //Changing the start date was disabled, since the - //array key does not exist. We need to repopulate this entry from the db. - $formData['add_show_start_date'] = $dt->format("Y-m-d"); - - if (!array_key_exists('add_show_start_time', $formData)) { - $formData['add_show_start_time'] = $dt->format("H:i"); - $validateStartTime = false; - } - $validateStartDate = false; - } $formData['add_show_record'] = $currentShowDay->getDbRecord(); //if the show is repeating, set the start date to the next diff --git a/airtime_mvc/public/js/airtime/schedule/add-show.js b/airtime_mvc/public/js/airtime/schedule/add-show.js index 0d22188c4..c452c2520 100644 --- a/airtime_mvc/public/js/airtime/schedule/add-show.js +++ b/airtime_mvc/public/js/airtime/schedule/add-show.js @@ -1,6 +1,6 @@ /** * -* Schedule Dialog creation methods. +* Schedule Dialog creation methods. * */ @@ -53,14 +53,14 @@ function removeAddShowButton(){ //$el is DOM element #add-show-form //form is the new form contents to append to $el function redrawAddShowForm($el, form) { - - //need to clean up the color picker. + + //need to clean up the color picker. $el.find("#schedule-show-style input").each(function(i, el){ - var $input = $(this), - colId = $input.data("colorpickerId"); - - $("#"+colId).remove(); - $input.removeData(); + var $input = $(this), + colId = $input.data("colorpickerId"); + + $("#"+colId).remove(); + $input.removeData(); }); $el.empty().append(form); @@ -74,12 +74,12 @@ function closeAddShowForm(event) { var $el = $("#add-show-form"); - $el.hide(); + $el.hide(); windowResize(); $.get(baseUrl+"Schedule/get-form", {format:"json"}, function(json) { - - redrawAddShowForm($el, json.form); + + redrawAddShowForm($el, json.form); }); makeAddShowButton(); @@ -87,29 +87,29 @@ function closeAddShowForm(event) { //dateText mm-dd-yy function startDpSelect(dateText, inst) { - var time, date; + var time, date; - time = dateText.split("-"); - date = new Date(time[0], time[1] - 1, time[2]); + time = dateText.split("-"); + date = new Date(time[0], time[1] - 1, time[2]); if (inst.input) inst.input.trigger('input'); } function endDpSelect(dateText, inst) { - var time, date; + var time, date; - time = dateText.split("-"); - date = new Date(time[0], time[1] - 1, time[2]); + time = dateText.split("-"); + date = new Date(time[0], time[1] - 1, time[2]); - if (inst.input) + if (inst.input) inst.input.trigger('input'); } function createDateInput(el, onSelect) { - var date; + var date; - el.datepicker({ + el.datepicker({ minDate: adjustDateToServerDate(new Date(), timezoneOffset), onSelect: onSelect, dateFormat: 'yy-mm-dd', @@ -119,42 +119,42 @@ function createDateInput(el, onSelect) { closeText: $.i18n._('Close'), //showButtonPanel: true, firstDay: calendarPref.weekStart - }); + }); } function autoSelect(event, ui) { $("#add_show_hosts-"+ui.item.index).attr("checked", "checked"); - event.preventDefault(); + event.preventDefault(); } function findHosts(request, callback) { - var search, url; + var search, url; - url = baseUrl+"User/get-hosts"; - search = request.term; + url = baseUrl+"User/get-hosts"; + search = request.term; - var noResult = new Array(); + var noResult = new Array(); noResult[0] = new Array(); noResult[0]['value'] = $("#add_show_hosts_autocomplete").val(); noResult[0]['label'] = $.i18n._("No result found"); noResult[0]['index'] = null; - $.post(url, - {format: "json", term: search}, + $.post(url, + {format: "json", term: search}, - function(json) { - if(json.hosts.length<1){ - callback(noResult); - }else{ - callback(json.hosts); - } - }); + function(json) { + if(json.hosts.length<1){ + callback(noResult); + }else{ + callback(json.hosts); + } + }); } function beginEditShow(data){ - + if (data.show_error == true){ alertShowErrorAndReload(); return false; @@ -201,11 +201,11 @@ function stringToColor(s) } function getContrastYIQ(hexcolor){ - var r = parseInt(hexcolor.substr(0,2),16); - var g = parseInt(hexcolor.substr(2,2),16); - var b = parseInt(hexcolor.substr(4,2),16); - var yiq = ((r*299)+(g*587)+(b*114))/1000; - return (yiq >= 128) ? '000000' : 'ffffff'; + var r = parseInt(hexcolor.substr(0,2),16); + var g = parseInt(hexcolor.substr(2,2),16); + var b = parseInt(hexcolor.substr(4,2),16); + var yiq = ((r*299)+(g*587)+(b*114))/1000; + return (yiq >= 128) ? '000000' : 'ffffff'; } @@ -213,7 +213,7 @@ function setAddShowEvents(form) { //var form = $("#add-show-form"); - form.find("h3").click(function(){ + form.find("h3").click(function(){ $(this).next().toggle(); }); @@ -308,16 +308,16 @@ function setAddShowEvents(form) { form.find("#add_show_rebroadcast").click(function(){ $(this).blur(); if(form.find("#add_show_record").attr('checked')){ - if($(this).attr('checked') && !form.find("#add_show_repeats").attr('checked')) { - form.find("#add_show_rebroadcast_absolute").show(); - } - else if($(this).attr('checked') && form.find("#add_show_repeats").attr('checked')) { - form.find("#add_show_rebroadcast_relative").show(); - } - else { - form.find("#schedule-record-rebroadcast > fieldset:not(:first-child)").hide(); - } - } + if($(this).attr('checked') && !form.find("#add_show_repeats").attr('checked')) { + form.find("#add_show_rebroadcast_absolute").show(); + } + else if($(this).attr('checked') && form.find("#add_show_repeats").attr('checked')) { + form.find("#add_show_rebroadcast_relative").show(); + } + else { + form.find("#schedule-record-rebroadcast > fieldset:not(:first-child)").hide(); + } + } }); // in case user is creating a new show, there will be @@ -492,9 +492,9 @@ function setAddShowEvents(form) { endDateVisibility(); form.find("#add_show_no_end").click(endDateVisibility); - createDateInput(form.find("#add_show_start_date"), startDpSelect); - createDateInput(form.find("#add_show_end_date_no_repeat"), endDpSelect); - createDateInput(form.find("#add_show_end_date"), endDpSelect); + createDateInput(form.find("#add_show_start_date"), startDpSelect); + createDateInput(form.find("#add_show_end_date_no_repeat"), endDpSelect); + createDateInput(form.find("#add_show_end_date"), endDpSelect); $("#add_show_start_time").timepicker({ amPmText: ['', ''], @@ -519,7 +519,7 @@ function setAddShowEvents(form) { closeText: 'Close', showButtonPanel: true, firstDay: calendarPref.weekStart - }); + }); form.find('input[name^="add_show_rebroadcast_time"]').timepicker({ amPmText: ['', ''], defaultTime: '', @@ -569,36 +569,36 @@ function setAddShowEvents(form) { list.next().show(); }); - form.find("#add_show_hosts_autocomplete").autocomplete({ - source: findHosts, - select: autoSelect, + form.find("#add_show_hosts_autocomplete").autocomplete({ + source: findHosts, + select: autoSelect, delay: 200 - }); - - form.find("#add_show_hosts_autocomplete").keypress(function(e){ + }); + + form.find("#add_show_hosts_autocomplete").keypress(function(e){ if( e.which == 13 ){ return false; } }) - form.find("#schedule-show-style input").ColorPicker({ + form.find("#schedule-show-style input").ColorPicker({ onChange: function (hsb, hex, rgb, el) { - $(el).val(hex); - }, - onSubmit: function(hsb, hex, rgb, el) { - $(el).val(hex); - $(el).ColorPickerHide(); - }, - onBeforeShow: function () { - $(this).ColorPickerSetColor(this.value); - } - }); + $(el).val(hex); + }, + onSubmit: function(hsb, hex, rgb, el) { + $(el).val(hex); + $(el).ColorPickerHide(); + }, + onBeforeShow: function () { + $(this).ColorPickerSetColor(this.value); + } + }); form.find("#add-show-close").click(closeAddShowForm); - form.find(".add-show-submit").click(function(event) { - event.preventDefault(); - + form.find(".add-show-submit").click(function(event) { + event.preventDefault(); + var addShowButton = $(this); $('#schedule-add-show').block({ @@ -612,9 +612,25 @@ function setAddShowEvents(form) { if (form.find("#add_show_record").attr("disabled", true)) { form.find("#add_show_record").attr("disabled", false); } + + var startDateDisabled = false, + startTimeDisabled = false; + + // Similarly, we need to re-enable start date and time if they're disabled + if (form.find("#add_show_start_date").prop("disabled") === true) { + form.find("#add_show_start_date").attr("disabled", false); + startDateDisabled = true; + } + if (form.find("#add_show_start_time").prop("disabled") === true) { + form.find("#add_show_start_time").attr("disabled", false); + startTimeDisabled = true; + } - var data = $("form").serializeArray(); - + var data = $("form").serializeArray(); + // We need to notify the application if date and time were disabled + data.push({name: 'start_date_disabled', value: startDateDisabled}); + data.push({name: 'start_time_disabled', value: startTimeDisabled}); + var hosts = $('#add_show_hosts-element input').map(function() { if($(this).attr("checked")) { return $(this).val(); @@ -638,21 +654,21 @@ function setAddShowEvents(form) { var $addShowForm = $("#add-show-form"); if (json.form) { - - redrawAddShowForm($addShowForm, json.form); + + redrawAddShowForm($addShowForm, json.form); $("#add_show_end_date").val(end_date); $("#add_show_start_date").val(start_date); showErrorSections(); } else if (json.edit) { - + $("#schedule_calendar").removeAttr("style") - .fullCalendar('render'); + .fullCalendar('render'); $addShowForm.hide(); $.get(baseUrl+"Schedule/get-form", {format:"json"}, function(json){ - redrawAddShowForm($addShowForm, json.form); + redrawAddShowForm($addShowForm, json.form); }); makeAddShowButton(); } @@ -662,60 +678,60 @@ function setAddShowEvents(form) { scheduleRefetchEvents(json); } }); - }); + }); var regDate = new RegExp(/^[0-9]{4}-[0-1][0-9]-[0-3][0-9]$/); var regTime = new RegExp(/^[0-2][0-9]:[0-5][0-9]$/); - // when start date/time changes, set end date/time to start date/time+1 hr - $('#add_show_start_date, #add_show_start_time').bind('input', 'change', function(){ - var startDateString = $('#add_show_start_date').val(); - var startTimeString = $('#add_show_start_time').val(); - - if(regDate.test(startDateString) && regTime.test(startTimeString)){ - var startDate = startDateString.split('-'); - var startTime = startTimeString.split(':'); + // when start date/time changes, set end date/time to start date/time+1 hr + $('#add_show_start_date, #add_show_start_time').bind('input', 'change', function(){ + var startDateString = $('#add_show_start_date').val(); + var startTimeString = $('#add_show_start_time').val(); + + if(regDate.test(startDateString) && regTime.test(startTimeString)){ + var startDate = startDateString.split('-'); + var startTime = startTimeString.split(':'); var startDateTime = new Date(startDate[0], parseInt(startDate[1], 10)-1, startDate[2], startTime[0], startTime[1], 0, 0); var endDateString = $('#add_show_end_date_no_repeat').val(); var endTimeString = $('#add_show_end_time').val() - var endDate = endDateString.split('-'); - var endTime = endTimeString.split(':'); + var endDate = endDateString.split('-'); + var endTime = endTimeString.split(':'); var endDateTime = new Date(endDate[0], parseInt(endDate[1], 10)-1, endDate[2], endTime[0], endTime[1], 0, 0); - if(startDateTime.getTime() >= endDateTime.getTime()){ - var duration = $('#add_show_duration').val(); - // parse duration - var time = 0; - var info = duration.split(' '); - var h = parseInt(info[0], 10); - time += h * 60 * 60* 1000; - if(info.length >1 && $.trim(info[1]) !== ''){ - var m = parseInt(info[1], 10); - time += m * 60 * 1000; - } - endDateTime = new Date(startDateTime.getTime() + time); - } + if(startDateTime.getTime() >= endDateTime.getTime()){ + var duration = $('#add_show_duration').val(); + // parse duration + var time = 0; + var info = duration.split(' '); + var h = parseInt(info[0], 10); + time += h * 60 * 60* 1000; + if(info.length >1 && $.trim(info[1]) !== ''){ + var m = parseInt(info[1], 10); + time += m * 60 * 1000; + } + endDateTime = new Date(startDateTime.getTime() + time); + } - var endDateFormat = endDateTime.getFullYear() + '-' + pad(endDateTime.getMonth()+1,2) + '-' + pad(endDateTime.getDate(),2); - var endTimeFormat = pad(endDateTime.getHours(),2) + ':' + pad(endDateTime.getMinutes(),2); + var endDateFormat = endDateTime.getFullYear() + '-' + pad(endDateTime.getMonth()+1,2) + '-' + pad(endDateTime.getDate(),2); + var endTimeFormat = pad(endDateTime.getHours(),2) + ':' + pad(endDateTime.getMinutes(),2); - $('#add_show_end_date_no_repeat').val(endDateFormat); - $('#add_show_end_time').val(endTimeFormat); + $('#add_show_end_date_no_repeat').val(endDateFormat); + $('#add_show_end_time').val(endTimeFormat); - // calculate duration - var startDateTimeString = startDateString + " " + startTimeString; - var endDateTimeString = $('#add_show_end_date_no_repeat').val() + " " + $('#add_show_end_time').val(); - var timezone = $("#add_show_timezone").val(); - calculateDuration(startDateTimeString, endDateTimeString, timezone); - } - }); + // calculate duration + var startDateTimeString = startDateString + " " + startTimeString; + var endDateTimeString = $('#add_show_end_date_no_repeat').val() + " " + $('#add_show_end_time').val(); + var timezone = $("#add_show_timezone").val(); + calculateDuration(startDateTimeString, endDateTimeString, timezone); + } + }); - // when end date/time changes, check if the changed date is in past of start date/time - $('#add_show_end_date_no_repeat, #add_show_end_time').bind('input', 'change', function(){ - var endDateString = $('#add_show_end_date_no_repeat').val(); + // when end date/time changes, check if the changed date is in past of start date/time + $('#add_show_end_date_no_repeat, #add_show_end_time').bind('input', 'change', function(){ + var endDateString = $('#add_show_end_date_no_repeat').val(); var endTimeString = $('#add_show_end_time').val() - + if(regDate.test(endDateString) && regTime.test(endTimeString)){ var startDateString = $('#add_show_start_date').val(); var startTimeString = $('#add_show_start_time').val(); @@ -727,21 +743,21 @@ function setAddShowEvents(form) { var endTime = endTimeString.split(':'); var endDateTime = new Date(endDate[0], parseInt(endDate[1], 10)-1, endDate[2], endTime[0], endTime[1], 0, 0); - if(startDateTime.getTime() > endDateTime.getTime()){ - $('#add_show_end_date_no_repeat').css('background-color', '#F49C9C'); - $('#add_show_end_time').css('background-color', '#F49C9C'); - }else{ - $('#add_show_end_date_no_repeat').css('background-color', ''); - $('#add_show_end_time').css('background-color', ''); - } + if(startDateTime.getTime() > endDateTime.getTime()){ + $('#add_show_end_date_no_repeat').css('background-color', '#F49C9C'); + $('#add_show_end_time').css('background-color', '#F49C9C'); + }else{ + $('#add_show_end_date_no_repeat').css('background-color', ''); + $('#add_show_end_time').css('background-color', ''); + } - // calculate duration - var startDateTimeString = startDateString + " " + startTimeString; + // calculate duration + var startDateTimeString = startDateString + " " + startTimeString; var endDateTimeString = endDateString + " " + endTimeString; var timezone = $("#add_show_timezone").val(); calculateDuration(startDateTimeString, endDateTimeString, timezone); } - }); + }); if($('#cb_custom_auth').attr('checked')){ $('#custom_auth_div').show() @@ -757,18 +773,18 @@ function setAddShowEvents(form) { } }) - function calculateDuration(startDateTime, endDateTime, timezone){ - var loadingIcon = $('#icon-loader-small'); - - loadingIcon.show(); - $.post( - baseUrl+"Schedule/calculate-duration", - {startTime: startDateTime, endTime: endDateTime, timezone: timezone}, - function(data) { - $('#add_show_duration').val(JSON.parse(data)); - loadingIcon.hide(); - }); - } + function calculateDuration(startDateTime, endDateTime, timezone){ + var loadingIcon = $('#icon-loader-small'); + + loadingIcon.show(); + $.post( + baseUrl+"Schedule/calculate-duration", + {startTime: startDateTime, endTime: endDateTime, timezone: timezone}, + function(data) { + $('#add_show_duration').val(JSON.parse(data)); + loadingIcon.hide(); + }); + } var bgColorEle = $("#add_show_background_color"); var textColorEle = $("#add_show_color"); From 79548c9e834c36b1a2e28cdb2779d840ea565e65 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Wed, 5 Nov 2014 14:35:19 -0500 Subject: [PATCH 06/21] Changed tabs to spaces and moved apache2 version call to after installation --- install_full/ubuntu/airtime-full-install | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install index 5b0522f73..5bd4a6485 100755 --- a/install_full/ubuntu/airtime-full-install +++ b/install_full/ubuntu/airtime-full-install @@ -29,10 +29,6 @@ echo "----------------------------------------------------" dist=`lsb_release -is` code=`lsb_release -cs` -set +e -apache2 -v | grep "2\.4" > /dev/null -apacheversion=$? -set -e #enable squeeze backports to get lame packages if [ "$dist" = "Debian" -a "$code" = "squeeze" ]; then @@ -130,21 +126,27 @@ if [ "$server" = "nginx" ]; then fi else apt-get -y --force-yes install apache2 libapache2-mod-php5 + set +e + apache2 -v | grep "2\.4" > /dev/null + apacheversion=$? + set -e + + # Apache Config File echo "----------------------------------------------------" echo "2.1 Apache Config File" echo "----------------------------------------------------" if [ "$apacheversion" != "1" ]; then - airtimeconfigfile="airtime.conf" + airtimeconfigfile="airtime.conf" else - airtimeconfigfile="airtime" + airtimeconfigfile="airtime" fi if [ ! -f /etc/apache2/sites-available/$airtimeconfigfile ]; then echo "Creating Apache config for Airtime..." - cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/$airtimeconfigfile + cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/$airtimeconfigfile a2dissite 000-default a2ensite airtime else From 273afaa126aabb80e6907cc442579b4dad98a0e7 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Wed, 5 Nov 2014 16:47:09 -0500 Subject: [PATCH 07/21] Added Japanese language text files to js i18n datatables --- airtime_mvc/public/js/datatables/i18n/ja.txt | 17 +++++++++++++++++ airtime_mvc/public/js/datatables/i18n/ja_JP.txt | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 airtime_mvc/public/js/datatables/i18n/ja.txt create mode 100644 airtime_mvc/public/js/datatables/i18n/ja_JP.txt diff --git a/airtime_mvc/public/js/datatables/i18n/ja.txt b/airtime_mvc/public/js/datatables/i18n/ja.txt new file mode 100644 index 000000000..54a83283a --- /dev/null +++ b/airtime_mvc/public/js/datatables/i18n/ja.txt @@ -0,0 +1,17 @@ +{ + "sProcessing": "処理中...", + "sLengthMenu": "_MENU_ 件表示", + "sZeroRecords": "データはありません。", + "sInfo": " _TOTAL_ 件中 _START_ から _END_ まで表示", + "sInfoEmpty": " 0 件中 0 から 0 まで表示", + "sInfoFiltered": "（全 _MAX_ 件より抽出）", + "sInfoPostFix": "", + "sSearch": "検索:", + "sUrl": "", + "oPaginate": { + "sFirst": "先頭", + "sPrevious": "前", + "sNext": "次", + "sLast": "最終" + } +} diff --git a/airtime_mvc/public/js/datatables/i18n/ja_JP.txt b/airtime_mvc/public/js/datatables/i18n/ja_JP.txt new file mode 100644 index 000000000..54a83283a --- /dev/null +++ b/airtime_mvc/public/js/datatables/i18n/ja_JP.txt @@ -0,0 +1,17 @@ +{ + "sProcessing": "処理中...", + "sLengthMenu": "_MENU_ 件表示", + "sZeroRecords": "データはありません。", + "sInfo": " _TOTAL_ 件中 _START_ から _END_ まで表示", + "sInfoEmpty": " 0 件中 0 から 0 まで表示", + "sInfoFiltered": "（全 _MAX_ 件より抽出）", + "sInfoPostFix": "", + "sSearch": "検索:", + "sUrl": "", + "oPaginate": { + "sFirst": "先頭", + "sPrevious": "前", + "sNext": "次", + "sLast": "最終" + } +} From 90626a2fcbcb91672560bdc6bedd95f9eab701e0 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Wed, 5 Nov 2014 17:04:18 -0500 Subject: [PATCH 08/21] Formatting; Changed tabs to spaces --- .../controllers/LocaleController.php | 2 +- airtime_mvc/application/models/Preference.php | 177 ++++++++---------- 2 files changed, 81 insertions(+), 98 deletions(-) diff --git a/airtime_mvc/application/controllers/LocaleController.php b/airtime_mvc/application/controllers/LocaleController.php index 3eb346d0b..372967bbb 100644 --- a/airtime_mvc/application/controllers/LocaleController.php +++ b/airtime_mvc/application/controllers/LocaleController.php @@ -5,7 +5,7 @@ class LocaleController extends Zend_Controller_Action public function init() { } - + public function datatablesTranslationTableAction() { $this->view->layout()->disableLayout(); diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index e73069f43..848792318 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -4,45 +4,44 @@ require_once 'Cache.php'; class Application_Model_Preference { - - private static function getUserId() - { - //pass in true so the check is made with the autoloader - //we need this check because saas calls this function from outside Zend - if (!class_exists("Zend_Auth", true) || !Zend_Auth::getInstance()->hasIdentity()) { - $userId = null; - } - else { - $auth = Zend_Auth::getInstance(); - $userId = $auth->getIdentity()->id; - } - - return $userId; - } - + + private static function getUserId() + { + //pass in true so the check is made with the autoloader + //we need this check because saas calls this function from outside Zend + if (!class_exists("Zend_Auth", true) || !Zend_Auth::getInstance()->hasIdentity()) { + $userId = null; + } else { + $auth = Zend_Auth::getInstance(); + $userId = $auth->getIdentity()->id; + } + + return $userId; + } + /** * * @param boolean $isUserValue is true when we are setting a value for the current user */ private static function setValue($key, $value, $isUserValue = false) { - $cache = new Cache(); - + $cache = new Cache(); + try { + $con = Propel::getConnection(CcPrefPeer::DATABASE_NAME); $con->beginTransaction(); $userId = self::getUserId(); - if ($isUserValue && is_null($userId)) { - throw new Exception("User id can't be null for a user preference {$key}."); - } + if ($isUserValue && is_null($userId)) + throw new Exception("User id can't be null for a user preference {$key}."); Application_Common_Database::prepareAndExecute("LOCK TABLE cc_pref"); //Check if key already exists $sql = "SELECT COUNT(*) FROM cc_pref" - ." WHERE keystr = :key"; + ." WHERE keystr = :key"; $paramMap = array(); $paramMap[':key'] = $key; @@ -64,37 +63,33 @@ class Application_Model_Preference //this case should not happen. throw new Exception("Invalid number of results returned. Should be ". "0 or 1, but is '$result' instead"); - } - elseif ($result == 1) { - + } else if ($result == 1) { + // result found if (!$isUserValue) { // system pref $sql = "UPDATE cc_pref" - ." SET subjid = NULL, valstr = :value" - ." WHERE keystr = :key"; - } - else { + ." SET subjid = NULL, valstr = :value" + ." WHERE keystr = :key"; + } else { // user pref $sql = "UPDATE cc_pref" - . " SET valstr = :value" - . " WHERE keystr = :key AND subjid = :id"; + . " SET valstr = :value" + . " WHERE keystr = :key AND subjid = :id"; $paramMap[':id'] = $userId; } - } - else { - + } else { + // result not found if (!$isUserValue) { // system pref $sql = "INSERT INTO cc_pref (keystr, valstr)" - ." VALUES (:key, :value)"; - } - else { + ." VALUES (:key, :value)"; + } else { // user pref $sql = "INSERT INTO cc_pref (subjid, keystr, valstr)" - ." VALUES (:id, :key, :value)"; + ." VALUES (:id, :key, :value)"; $paramMap[':id'] = $userId; } @@ -109,8 +104,7 @@ class Application_Model_Preference $con); $con->commit(); - } - catch (Exception $e) { + } catch (Exception $e) { $con->rollback(); header('HTTP/1.0 503 Service Unavailable'); Logging::info("Database error: ".$e->getMessage()); @@ -118,26 +112,22 @@ class Application_Model_Preference } $cache->store($key, $value, $isUserValue, $userId); - //Logging::info("SAVING {$key} {$userId} into cache. = {$value}"); } private static function getValue($key, $isUserValue = false) { - $cache = new Cache(); - + $cache = new Cache(); + try { - - $userId = self::getUserId(); - - if ($isUserValue && is_null($userId)) { - throw new Exception("User id can't be null for a user preference."); - } + + $userId = self::getUserId(); + + if ($isUserValue && is_null($userId)) + throw new Exception("User id can't be null for a user preference."); - $res = $cache->fetch($key, $isUserValue, $userId); - if ($res !== false) { - //Logging::info("returning {$key} {$userId} from cache. = {$res}"); - return $res; - } + // If the value is already cached, return it + $res = $cache->fetch($key, $isUserValue, $userId); + if ($res !== false) return $res; //Check if key already exists $sql = "SELECT COUNT(*) FROM cc_pref" @@ -147,7 +137,7 @@ class Application_Model_Preference $paramMap[':key'] = $key; //For user specific preference, check if id matches as well - if ($isUserValue) { + if ($isUserValue) { $sql .= " AND subjid = :id"; $paramMap[':id'] = $userId; } @@ -157,8 +147,7 @@ class Application_Model_Preference //return an empty string if the result doesn't exist. if ($result == 0) { $res = ""; - } - else { + } else { $sql = "SELECT valstr FROM cc_pref" ." WHERE keystr = :key"; @@ -248,53 +237,53 @@ class Application_Model_Preference public static function SetDefaultCrossfadeDuration($duration) { - self::setValue("default_crossfade_duration", $duration); + self::setValue("default_crossfade_duration", $duration); } public static function GetDefaultCrossfadeDuration() { - $duration = self::getValue("default_crossfade_duration"); + $duration = self::getValue("default_crossfade_duration"); - if ($duration === "") { - // the default value of the fade is 00.5 - return "0"; - } + if ($duration === "") { + // the default value of the fade is 00.5 + return "0"; + } - return $duration; + return $duration; } public static function SetDefaultFadeIn($fade) { - self::setValue("default_fade_in", $fade); + self::setValue("default_fade_in", $fade); } public static function GetDefaultFadeIn() { - $fade = self::getValue("default_fade_in"); + $fade = self::getValue("default_fade_in"); - if ($fade === "") { - // the default value of the fade is 00.5 - return "00.5"; - } + if ($fade === "") { + // the default value of the fade is 00.5 + return "00.5"; + } - return $fade; + return $fade; } public static function SetDefaultFadeOut($fade) { - self::setValue("default_fade_out", $fade); + self::setValue("default_fade_out", $fade); } public static function GetDefaultFadeOut() { - $fade = self::getValue("default_fade_out"); + $fade = self::getValue("default_fade_out"); - if ($fade === "") { - // the default value of the fade is 00.5 - return "00.5"; - } + if ($fade === "") { + // the default value of the fade is 00.5 + return "00.5"; + } - return $fade; + return $fade; } public static function SetDefaultFade($fade) @@ -556,9 +545,8 @@ class Application_Model_Preference { // When a new user is created they will get the default timezone // setting which the admin sets on preferences page - if (is_null($timezone)) { + if (is_null($timezone)) $timezone = self::GetDefaultTimezone(); - } self::setValue("user_timezone", $timezone, true); } @@ -567,8 +555,7 @@ class Application_Model_Preference $timezone = self::getValue("user_timezone", true); if (!$timezone) { return self::GetDefaultTimezone(); - } - else { + } else { return $timezone; } } @@ -580,8 +567,7 @@ class Application_Model_Preference if (!is_null($userId)) { return self::GetUserTimezone(); - } - else { + } else { return self::GetDefaultTimezone(); } } @@ -612,9 +598,8 @@ class Application_Model_Preference { // When a new user is created they will get the default locale // setting which the admin sets on preferences page - if (is_null($locale)) { + if (is_null($locale)) $locale = self::GetDefaultLocale(); - } self::setValue("user_locale", $locale, true); } @@ -624,8 +609,7 @@ class Application_Model_Preference if (!is_null($userId)) { return self::GetUserLocale(); - } - else { + } else { return self::GetDefaultLocale(); } } @@ -648,7 +632,7 @@ class Application_Model_Preference public static function SetUniqueId($id) { - self::setValue("uniqueId", $id); + self::setValue("uniqueId", $id); } public static function GetUniqueId() @@ -908,7 +892,7 @@ class Application_Model_Preference public static function SetAirtimeVersion($version) { - self::setValue("system_version", $version); + self::setValue("system_version", $version); } public static function GetAirtimeVersion() @@ -1404,12 +1388,11 @@ class Application_Model_Preference return self::getValue("enable_replay_gain", false); } - public static function getReplayGainModifier(){ + public static function getReplayGainModifier() { $rg_modifier = self::getValue("replay_gain_modifier"); - if ($rg_modifier === "") { + if ($rg_modifier === "") return "0"; - } return $rg_modifier; } @@ -1420,18 +1403,18 @@ class Application_Model_Preference } public static function SetHistoryItemTemplate($value) { - self::setValue("history_item_template", $value); + self::setValue("history_item_template", $value); } public static function GetHistoryItemTemplate() { - return self::getValue("history_item_template"); + return self::getValue("history_item_template"); } public static function SetHistoryFileTemplate($value) { - self::setValue("history_file_template", $value); + self::setValue("history_file_template", $value); } public static function GetHistoryFileTemplate() { - return self::getValue("history_file_template"); + return self::getValue("history_file_template"); } } From 564e8d931107047883d21819a3d1b93380e10169 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Wed, 5 Nov 2014 17:21:19 -0500 Subject: [PATCH 09/21] Replaced hardcoded locale defaults with the station default locale --- .../controllers/LoginController.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/application/controllers/LoginController.php b/airtime_mvc/application/controllers/LoginController.php index 5e9b70e31..c808c2aee 100644 --- a/airtime_mvc/application/controllers/LoginController.php +++ b/airtime_mvc/application/controllers/LoginController.php @@ -12,12 +12,12 @@ class LoginController extends Zend_Controller_Action $CC_CONFIG = Config::getConfig(); $request = $this->getRequest(); + $stationLocale = Application_Model_Preference::GetDefaultLocale(); - Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', 'en_CA')); + Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', $stationLocale)); $auth = Zend_Auth::getInstance(); - if ($auth->hasIdentity()) - { + if ($auth->hasIdentity()) { $this->_redirect('Showbuilder'); } @@ -110,7 +110,9 @@ class LoginController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl.'js/airtime/login/password-restore.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $request = $this->getRequest(); - Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', 'en_CA')); + $stationLocale = Application_Model_Preference::GetDefaultLocale(); + + Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', $stationLocale)); if (!Application_Model_Preference::GetEnableSystemEmail()) { $this->_redirect('login'); @@ -154,7 +156,9 @@ class LoginController extends Zend_Controller_Action public function passwordRestoreAfterAction() { $request = $this->getRequest(); - Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', 'en_CA')); + $stationLocale = Application_Model_Preference::GetDefaultLocale(); + + Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', $stationLocale)); //uses separate layout without a navigation. $this->_helper->layout->setLayout('login'); @@ -172,8 +176,10 @@ class LoginController extends Zend_Controller_Action $form = new Application_Form_PasswordChange(); $auth = new Application_Model_Auth(); $user = CcSubjsQuery::create()->findPK($user_id); + + $stationLocale = Application_Model_Preference::GetDefaultLocale(); - Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', 'en_CA')); + Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', $stationLocale)); //check validity of token if (!$auth->checkToken($user_id, $token, 'password.restore')) { From b94d34f719ce16682b31b81790b11659cd60ac35 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Wed, 5 Nov 2014 17:22:13 -0500 Subject: [PATCH 10/21] Removed calls to set user locale and timezone on user creation; these calls were updating the current user instead of the created user, and so served no purpose --- airtime_mvc/application/controllers/UserController.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php index fad0277db..c75e2b49e 100644 --- a/airtime_mvc/application/controllers/UserController.php +++ b/airtime_mvc/application/controllers/UserController.php @@ -69,12 +69,6 @@ class UserController extends Zend_Controller_Action $user->setJabber($formData['jabber']); $user->save(); - // Language and timezone settings are saved on a per-user basis - // By default, the default language, and timezone setting on - // preferences page is what gets assigned. - Application_Model_Preference::SetUserLocale(); - Application_Model_Preference::SetUserTimezone(); - $form->reset(); $this->view->form = $form; @@ -83,7 +77,7 @@ class UserController extends Zend_Controller_Action } else { $this->view->successMessage = "
    "._("User updated successfully!")."
    "; } - + $this->_helper->json->sendJson(array("valid"=>"true", "html"=>$this->view->render('user/add-user.phtml'))); } else { $this->view->form = $form; From eecd3fa188cacc16b787a7b336213d4809682e3e Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Wed, 5 Nov 2014 17:24:08 -0500 Subject: [PATCH 11/21] Added setDefaults call to initialize the locale field to user's locale, or the station default; removed unnecessary field --- airtime_mvc/application/forms/Login.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/airtime_mvc/application/forms/Login.php b/airtime_mvc/application/forms/Login.php index 40f4da83f..b8d3989c2 100644 --- a/airtime_mvc/application/forms/Login.php +++ b/airtime_mvc/application/forms/Login.php @@ -53,13 +53,11 @@ class Application_Form_Login extends Zend_Form $locale->setMultiOptions(Application_Model_Locale::getLocales()); $locale->setDecorators(array('ViewHelper')); $this->addElement($locale); + $this->setDefaults(array( + "locale" => Application_Model_Locale::getUserLocale() + )); - $recaptchaNeeded = false; if (Application_Model_LoginAttempts::getAttempts($_SERVER['REMOTE_ADDR']) >= 3) { - $recaptchaNeeded = true; - } - if ($recaptchaNeeded) { - // recaptcha $this->addRecaptcha(); } From e5e7942b4233a675be549a47ac6c56796524da32 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Wed, 5 Nov 2014 17:24:54 -0500 Subject: [PATCH 12/21] Added getUserLocale function to pull locale data into the Login form --- airtime_mvc/application/models/Locale.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/airtime_mvc/application/models/Locale.php b/airtime_mvc/application/models/Locale.php index 726302a82..e5ada5995 100644 --- a/airtime_mvc/application/models/Locale.php +++ b/airtime_mvc/application/models/Locale.php @@ -47,5 +47,22 @@ class Application_Model_Locale textdomain($domain); bind_textdomain_codeset($domain, $codeset); } + + /** + * We need this function for the case where a user has logged out, but + * has an airtime_locale cookie containing their locale setting. + * + * If the user does not have an airtime_locale cookie set, we default + * to the station locale. + * + * When the user logs in, the value set in the login form will be passed + * into the airtime_locale cookie. This cookie is also updated when + * a user updates their user settings. + */ + public static function getUserLocale() { + $request = Zend_Controller_Front::getInstance()->getRequest(); + $locale = $request->getCookie('airtime_locale', Application_Model_Preference::GetLocale()); + return $locale; + } } From 534b56351ecea05741eb37fc659e65ab9f3d14b8 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Wed, 5 Nov 2014 17:26:05 -0500 Subject: [PATCH 13/21] Added styles to completely hide csrf elements on the page; changed tabs to spaces --- airtime_mvc/public/css/styles.css | 2289 +++++++++++++++-------------- 1 file changed, 1148 insertions(+), 1141 deletions(-) diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index a63f4975e..098f4d55d 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -2,8 +2,8 @@ /* CSS Document */ body { - font-size: 62.5%; - font-family:Arial, Helvetica, sans-serif; + font-size: 62.5%; + font-family:Arial, Helvetica, sans-serif; background: #7f7f7f; margin: 0; padding: 0; @@ -16,8 +16,8 @@ html, body { background: #1f1f1f url(images/login_page_bg.png) no-repeat center 0;` margin: 0; padding: 0; - height:100%; - text-align:center; + height:100%; + text-align:center; } h2 { @@ -28,59 +28,59 @@ h2 { padding: 0 0 10px; } h3 { - font-size:1.7em; - font-weight:normal; - color:#000; - padding:0 0 10px 0; - margin:0; + font-size:1.7em; + font-weight:normal; + color:#000; + padding:0 0 10px 0; + margin:0; } a, a:focus { - outline:none; + outline:none; } label { - font-size:12px; + font-size:12px; } select { - font-size:12px; - font-family:Arial, Helvetica, sans-serif; - border:1px solid #9d9d9d; + font-size:12px; + font-family:Arial, Helvetica, sans-serif; + border:1px solid #9d9d9d; } .logo { - position:absolute; - right:20px; - top:104px; - background:transparent url(images/airtime_logo.png) no-repeat 0 0; - height:35px; - width:66px; - z-index:1000; - display:block; + position:absolute; + right:20px; + top:104px; + background:transparent url(images/airtime_logo.png) no-repeat 0 0; + height:35px; + width:66px; + z-index:1000; + display:block; } /* Version Notification Starts*/ #version-icon { - position:absolute; - right:96px; - top:104px; - height:35px; - width:35px; - z-index:1000; - display:block; + position:absolute; + right:96px; + top:104px; + height:35px; + width:35px; + z-index:1000; + display:block; cursor:pointer; background-repeat:no-repeat; background-position:center; } #version-icon.outdated { - background-image:url(images/icon_outdated.png); + background-image:url(images/icon_outdated.png); } #version-icon.update2 { - background-image:url(images/icon_update2.png); + background-image:url(images/icon_update2.png); } #version-icon.update { - background-image:url(images/icon_update.png); + background-image:url(images/icon_update.png); } #version-icon.uptodate { - background-image:url(images/icon_uptodate.png); + background-image:url(images/icon_uptodate.png); } #ui-tooltip-version a { @@ -137,34 +137,34 @@ select { } /* Clearfix */ -.clearfix:after, #side_playlist li:after { content: "."; display: block; height: 0; clear: both; visibility: hidden;} -.clearfix, #side_playlist li { display: inline-block; } +.clearfix:after, #side_playlist li:after { content: "."; display: block; height: 0; clear: both; visibility: hidden;} +.clearfix, #side_playlist li { display: inline-block; } * html .clearfix, * html li { height: 1%;} -.clearfix, #side_playlist li { display: block; } +.clearfix, #side_playlist li { display: block; } /* Master Panel */ #sticky { - position:fixed; - height:130px; - top:0; - left:0; + position:fixed; + height:130px; + top:0; + left:0; } #master-panel { - background:#3d3d3d url(images/masterpanel_bg.png) repeat-x 0 0; - height:100px; - border:1px solid #000; - border-width: 1px 0; - overflow:hidden; - position:relative; + background:#3d3d3d url(images/masterpanel_bg.png) repeat-x 0 0; + height:100px; + border:1px solid #000; + border-width: 1px 0; + overflow:hidden; + position:relative; } .now-playing-block, .show-block, .on-air-block, .time-info-block, .personal-block, .listen-control-block, .trial-info-block { - height:100px; - float:left; - margin-right:10px; + height:100px; + float:left; + margin-right:10px; } .source-info-block { @@ -174,207 +174,207 @@ select { } .personal-block { - float:right; - margin-right:20px; - text-align:right; - min-width:110px; + float:right; + margin-right:20px; + text-align:right; + min-width:110px; } .personal-block ul { - margin:0; - padding:8px 0 0; + margin:0; + padding:8px 0 0; } .personal-block li { - font-size:11px; - color:#bdbdbd; - list-style-type:none; - margin:0 0 2px 0; + font-size:11px; + color:#bdbdbd; + list-style-type:none; + margin:0 0 2px 0; } .personal-block li.name { - color:#fff; - font-weight:normal; + color:#fff; + font-weight:normal; } .personal-block li a { - color:#fff; - text-decoration:underline; + color:#fff; + text-decoration:underline; } .personal-block li a:hover { - color:#ff5d1a; + color:#ff5d1a; } .now-playing-block { - width:35%; - padding-left:10px; + width:35%; + padding-left:10px; } .show-block { - width:30%; + width:30%; } .text-row { - height:30px; - padding:0px 0 0; - font-size:12px; - text-wrap:none; - text-indent:2px; - overflow:hidden; - line-height:30px; + height:30px; + padding:0px 0 0; + font-size:12px; + text-wrap:none; + text-indent:2px; + overflow:hidden; + line-height:30px; } #master-panel .text-row { - color:#dfdfdf; + color:#dfdfdf; } .text-row.next-song { - color:#d9d9d9; + color:#d9d9d9; } .text-row strong { - font-weight:bold; - color:#969696; - padding-right:12px; + font-weight:bold; + color:#969696; + padding-right:12px; } .text-row.rebroadcast, #master-panel .text-row.rebroadcast { - color:#969696; + color:#969696; } .now-playing-info { - height:25px; - background:#3a3a3a url(images/playinfo_bg.png) repeat-x 0 0; - border: 1px solid #242424; - border-bottom-color:#727272; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - color:#fff; - font-size:15px; - line-height:22px; - text-indent:5px; - overflow:hidden; - margin-bottom:3px; + height:25px; + background:#3a3a3a url(images/playinfo_bg.png) repeat-x 0 0; + border: 1px solid #242424; + border-bottom-color:#727272; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + color:#fff; + font-size:15px; + line-height:22px; + text-indent:5px; + overflow:hidden; + margin-bottom:3px; } .time-elapsed { - color:#c4c4c4; - padding-right:6px; + color:#c4c4c4; + padding-right:6px; } .time-remaining { - color:#ff6f01; + color:#ff6f01; } .progressbar { - height:6px; - border:1px solid #242424; - border-width:1px 1px 0 1px; - background:#141414 url(images/progressbar_bg.png) repeat-x 0 0; + height:6px; + border:1px solid #242424; + border-width:1px 1px 0 1px; + background:#141414 url(images/progressbar_bg.png) repeat-x 0 0; } .progressbar .progress-song, .progressbar .progress-show, .progressbar .progress-show-error { - height:4px; - width:0%; - background:#f97202 url(images/progressbar_song.png) repeat-x 0 0; + height:4px; + width:0%; + background:#f97202 url(images/progressbar_song.png) repeat-x 0 0; } .progressbar .progress-show { - background:#02cef9 url(images/progressbar_show.png) repeat-x 0 0; + background:#02cef9 url(images/progressbar_show.png) repeat-x 0 0; } .progressbar .progress-show-error { - background:#d40000 url(images/progressbar_show_error.png) repeat-x 0 0; + background:#d40000 url(images/progressbar_show_error.png) repeat-x 0 0; } .now-playing-info .show-length { - color:#c4c4c4; - padding-left:6px; + color:#c4c4c4; + padding-left:6px; } .now-playing-info .song-length { - color:#9b9b9b; - padding-right:6px; + color:#9b9b9b; + padding-right:6px; } .on-air-block { - padding:0 12px 0 0; - background:url(images/masterpanel_spacer.png) no-repeat right 0; + padding:0 12px 0 0; + background:url(images/masterpanel_spacer.png) no-repeat right 0; } .time-info-block { - padding:0 14px 0 2px; - min-width:105px; + padding:0 14px 0 2px; + min-width:105px; } .time-info-block ul { - margin:0; - padding:6px 0 0; + margin:0; + padding:6px 0 0; } .time-info-block li { - list-style-type:none; - font-size:14px; - color:#bdbdbd; - margin:0 0 6px; + list-style-type:none; + font-size:14px; + color:#bdbdbd; + margin:0 0 6px; } .time-info-block li.time { - font-size:26px; - color:#fff; - width:auto; - text-align:left; + font-size:26px; + color:#fff; + width:auto; + text-align:left; } .time-info-block li.time-zone { - font-size:17px; - margin-bottom:0; + font-size:17px; + margin-bottom:0; } .listen-control-block a, .listen-control-button { - font-size:11px; - text-transform:uppercase; - padding:0; - border:1px solid #242424; - color:#fff; - text-decoration:none; - font-weight:bold; - margin-top:34px; - display:block; - text-align:center; - + font-size:11px; + text-transform:uppercase; + padding:0; + border:1px solid #242424; + color:#fff; + text-decoration:none; + font-weight:bold; + margin-top:34px; + display:block; + text-align:center; + } .listen-control-button { - margin-top:6px; + margin-top:6px; } .listen-control-block a span, .listen-control-button span { - background-color: #6e6e6e; + background-color: #6e6e6e; background: -moz-linear-gradient(top, #868686 0, #6e6e6e 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #868686), color-stop(100%, #6e6e6e)); - padding:5px 10px; - border:1px solid #a1a1a1; - border-width:1px 0; - border-bottom-color:#646464; - color:#dcdcdc; - text-shadow: #555555 0px -1px; - display:block; + padding:5px 10px; + border:1px solid #a1a1a1; + border-width:1px 0; + border-bottom-color:#646464; + color:#dcdcdc; + text-shadow: #555555 0px -1px; + display:block; } .listen-control-button span { - padding:2px 10px; + padding:2px 10px; } .listen-control-block a:hover, .listen-control-button:hover { - border:1px solid #000; + border:1px solid #000; } .listen-control-block a:hover span, .listen-control-button:hover span { - background-color: #292929; + background-color: #292929; background: -moz-linear-gradient(top, #3b3b3b 0, #292929 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #3b3b3b), color-stop(100%, #292929)); - border:1px solid #555555; - border-width:1px 0; - border-bottom-color:#1e1e1e; - color:#fff; - color:#0C0; - text-shadow: #000 0px -1px; - display:block; + border:1px solid #555555; + border-width:1px 0; + border-bottom-color:#1e1e1e; + color:#fff; + color:#0C0; + text-shadow: #000 0px -1px; + display:block; } .listen-control-block a:active span { - color:#fff; + color:#fff; } /* END Master Panel */ .wrapper { - margin: 0 5px 0 5px; - padding:10px 0 0 0; + margin: 0 5px 0 5px; + padding:10px 0 0 0; } .alpha-block { - padding:0; - float:left; - margin:0 16px 10px 0; + padding:0; + float:left; + margin:0 16px 10px 0; } .omega-block { - padding:0; - float:left; - margin:0 0 10px 0; + padding:0; + float:left; + margin:0 0 10px 0; } .block-shadow { -moz-box-shadow: 0 2px 2px rgba(0,0,0,.10); @@ -390,32 +390,32 @@ select { width: 0; } fieldset.plain { - border:none; - padding:0; - margin:0; + border:none; + padding:0; + margin:0; } .frame { - padding:0; - border:1px solid #5b5b5b; - margin: 0 0 8px 0; + padding:0; + border:1px solid #5b5b5b; + margin: 0 0 8px 0; } .padded { - padding:8px; + padding:8px; } .padded-strong { - padding:10px; + padding:10px; } .input_text, input[type="text"], input[type="password"] { - font-family:Arial, Helvetica, sans-serif; - border: 1px solid #5b5b5b; + font-family:Arial, Helvetica, sans-serif; + border: 1px solid #5b5b5b; font-size: 12px; /*height: 23px;*/ margin: 0; padding: 4px 3px; /*text-indent: 3px;*/ - width:auto; + width:auto; background-color: #dddddd; - border: 1px solid #5b5b5b; + border: 1px solid #5b5b5b; box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset; } @@ -424,25 +424,25 @@ input[readonly]{ } input[type="text"]:focus, input[type="password"]:focus, textarea:focus, .input_text_area:focus { - border: 1px solid #0088f1; - outline: none; + border: 1px solid #0088f1; + outline: none; } .auto-search { - background:#dddddd url(images/search_auto_bg.png) no-repeat 0 0; - text-indent:25px; + background:#dddddd url(images/search_auto_bg.png) no-repeat 0 0; + text-indent:25px; } .input_text_area, textarea { background-color: #dddddd; - border: 1px solid #5b5b5b; + border: 1px solid #5b5b5b; box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset; font-size: 13px; text-indent: 3px; - margin:0; + margin:0; } .input_select, select { background-color: #DDDDDD; - box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset; - border: 1px solid #5b5b5b; + box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset; + border: 1px solid #5b5b5b; font-family: Arial,Helvetica,sans-serif; font-size: 12px; height: 25px; @@ -539,7 +539,7 @@ table.library-get-file-md.table-small{ .webstream { color: #4eba70; } - + /***** LIBRARY QTIP METADATA SPECIFIC STYLES END *****/ @@ -583,10 +583,10 @@ input.input_text.sp_extra_input_text{ } .sp-ui-button-icon-only { - position: relative; - top: 5px; - margin-top: -10px; - margin-left: 5px; + position: relative; + top: 5px; + margin-top: -10px; + margin-left: 5px; } .sp-ui-button-icon-only .ui-icon-closethick:hover, .sp-ui-button-icon-only .ui-icon-plusthick:hover { @@ -621,14 +621,14 @@ input.input_text.sp_extra_input_text{ } .sp-closed{ - border-width: 0 0 0 !important; + border-width: 0 0 0 !important; } /***** SMART BLOCK SPECIFIC STYLES END *****/ label { - font-size:13px; - color:#5b5b5b; - padding:0 16px 0 0; + font-size:13px; + color:#5b5b5b; + padding:0 16px 0 0; } .static_text { font-size:13px; @@ -637,61 +637,61 @@ label { word-wrap: break-word; } #library_quick_search { - margin-bottom:16px; + margin-bottom:16px; } #library_quick_search label { } #library_quick_search input { - width:60%; + width:60%; } dl.inline-list { - float: left; - margin: 0; - padding: 0; + float: left; + margin: 0; + padding: 0; } dl.inline-list dt { - clear: left; - float: left; - margin: 0; - padding: 0px 0; - font-weight: bold; - color:#333333; - font-size:12px; - font-weight:bold; - text-align:left; - min-width:70px; + clear: left; + float: left; + margin: 0; + padding: 0px 0; + font-weight: bold; + color:#333333; + font-size:12px; + font-weight:bold; + text-align:left; + min-width:70px; } dl.inline-list dd { - float: left; - margin: 0; - padding: 0px 0 4px 15px; - font-size:12px; + float: left; + margin: 0; + padding: 0px 0 4px 15px; + font-size:12px; } .left-floated { - float:left; - margin-left:0; - margin-right:10px; + float:left; + margin-left:0; + margin-right:10px; } .right-floated { - float:right; - margin-left:10px; - margin-right:0; - text-align:right; + float:right; + margin-left:10px; + margin-right:0; + text-align:right; } /*----Data Table----*/ .datatable tr th.ui-state-default { border: 1px solid #CCC; - border-width: 0 0 0 1px !important; + border-width: 0 0 0 1px !important; } .datatable { border-color: #5b5b5b; border-style: solid; border-width: 1px 1px 1px 1px; - width:100%; + width:100%; } .datatable th { @@ -711,7 +711,7 @@ dl.inline-list dd { .even { background-color:#c7c7c7; } - + .datatable tr.even.selected td { background-color: #abcfe2; } @@ -723,7 +723,7 @@ dl.inline-list dd { } .datatable tr td:first-child, .datatable tr th:first-child, .datatable tr th.ui-state-default:first-child { - border-left-width:0 !important; + border-left-width:0 !important; } .ui-widget-header + .datatable { border-width: 0px 1px 1px 1px; @@ -749,7 +749,7 @@ dl.inline-list dd { .DataTables_sort_wrapper .ui-icon { display: block; float: left; - margin: 0 3px 0 -2px; + margin: 0 3px 0 -2px; } .dataTables_type { float:right; @@ -758,72 +758,72 @@ dl.inline-list dd { } .dataTables_length { - float:right; - margin:0; - + float:right; + margin:0; + } .dataTables_length label { - padding:0; - font-size:12px; - color:#404040; - line-height:24px; + padding:0; + font-size:12px; + color:#404040; + line-height:24px; } .dataTables_filter { - margin:0 0 8px 8px; + margin:0 0 8px 8px; } .dataTables_filter .auto-search { - width:55%; + width:55%; } .dt-process-rel { - position: relative; + position: relative; } .dataTables_processing { - opacity: 1 !important; - position: absolute; - top: 100px; - left: 10%; - width: 80%; - height: 50px; - text-align: center; - font-size:14px; - font-weight:bold; - padding-top: 40px; - background: -moz-linear-gradient(top, #b2b2b2 0, #a2a2a2 100%); + opacity: 1 !important; + position: absolute; + top: 100px; + left: 10%; + width: 80%; + height: 50px; + text-align: center; + font-size:14px; + font-weight:bold; + padding-top: 40px; + background: -moz-linear-gradient(top, #b2b2b2 0, #a2a2a2 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #b2b2b2), color-stop(100%, #a2a2a2)); background: linear-gradient(top, #b2b2b2 0, #a2a2a2 100%); border: 1px solid #8F8F8F; color: #ffffff; } #library_display_wrapper .ui-widget-header:first-child { - background:none; + background:none; border-width:0 0 1px 0; color: #444444; font-weight: bold; } #library_display_wrapper .ui-widget-header:first-child .dataTables_length { - margin:0; + margin:0; } #library_display_wrapper .ui-widget-header:first-child .dataTables_filter { - margin:0; + margin:0; } .dataTables_info { - float: left; - padding: 8px 0 0 8px; - font-size:12px; - color:#555555; - font-weight:normal; + float: left; + padding: 8px 0 0 8px; + font-size:12px; + color:#555555; + font-weight:normal; } .dataTables_paginate { - float: right; - padding: 8px 0 8px 8px; + float: right; + padding: 8px 0 8px 8px; } .dataTables_paginate .ui-button { - font-size:12px; - font-weight:normal; + font-size:12px; + font-weight:normal; padding: 0.2em 1em; - margin-right:3px; + margin-right:3px; } .dataTables_filter input { background: url("images/search_auto_bg.png") no-repeat scroll 0 0 #DDDDDD; @@ -888,30 +888,37 @@ fieldset.plain { padding: 0; } input[type="checkbox"] { - margin:0; - outline:none; - padding:0; - width:13px; - height:13px; + margin:0; + outline:none; + padding:0; + width:13px; + height:13px; } /*---//////////////////// LOGIN & PASSWORD RESET ////////////////////---*/ +#csrf-label, #csrf-element { + /* Remove any visible csrf form token footprint */ + height: 0; + padding: 0; + margin: 0; +} + .login_box { margin: 0 auto 0 auto; text-align:center; width:420px; border:1px solid #181818; - border-width: 0 0 1px 0; - padding:0; - padding-top:60px; + border-width: 0 0 1px 0; + padding:0; + padding-top:60px; } .login_box h2 { - background:#1f1f1f; + background:#1f1f1f; background: -moz-linear-gradient(center top , #2c2c2c 0pt, #1f1f1f 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #2c2c2c), color-stop(100%, #1f1f1f)); border:1px solid #181818; - border-top-color:#4f4f4f; + border-top-color:#4f4f4f; margin:0; padding:8px 0 8px 20px; font-size:15px; @@ -932,7 +939,7 @@ input[type="checkbox"] { .logobox { height:120px; text-align:center; - background:url(images/airtime_logo_big.png) no-repeat 50% 0; + background:url(images/airtime_logo_big.png) no-repeat 50% 0; } .login { @@ -948,7 +955,7 @@ input[type="checkbox"] { .login td { border:none; background-color:transparent; - color:#696969; + color:#696969; } .login h2 { @@ -959,20 +966,20 @@ input[type="checkbox"] { color:#1683b0; } .alert { - color:#C00; + color:#C00; } .login-content { - background:url(images/login_content_bg.png) no-repeat 0 bottom; - padding:10px 20px 14px; - text-align:left; + background:url(images/login_content_bg.png) no-repeat 0 bottom; + padding:10px 20px 14px; + text-align:left; } .login-content dl, .login-content dl.zend_form { - margin: 12px 0 0 0; - margin-bottom:8px; - margin:0; - padding:0; - width:100%; + margin: 12px 0 0 0; + margin-bottom:8px; + margin:0; + padding:0; + width:100%; } .login-content dd { @@ -980,7 +987,7 @@ input[type="checkbox"] { font-size: 1.2em; margin: 0; padding: 0 0 9px 0; - display:block; + display:block; } .login-content dt { color: #666666; @@ -990,34 +997,34 @@ input[type="checkbox"] { margin: 0; padding: 0 0 6px 0; text-align: left; - min-width:90px; - clear:left; - display:block; + min-width:90px; + clear:left; + display:block; } dt.block-display, dd.block-display { - display:block; - float:none; - margin-left:0; - padding-left:0; + display:block; + float:none; + margin-left:0; + padding-left:0; } .login-content dt label { padding-right:0; - color:#a8a8a8; + color:#a8a8a8; } .login-content dd .input_text, .login-content dd input[type="text"], .login-content dd input[type="password"] { - width:99%; - font-size:14px; - padding: 6px 0 6px 3px; + width:99%; + font-size:14px; + padding: 6px 0 6px 3px; } .login-content dd select { width: 100%; } .login-content dd input.ui-button, .login-content dd input.btn { - width:100%; - font-size:14px; - padding: 6px 10px 6px; + width:100%; + font-size:14px; + padding: 6px 10px 6px; } .login-content dd button.ui-button, .login-content dd button.btn { @@ -1026,18 +1033,18 @@ dt.block-display, dd.block-display { padding: 6px 10px 6px; } .login-content .hidden, .hidden { - display:none; + display:none; } .login-content .text-right, .text-right { - text-align:right; + text-align:right; } .login-content .link { - color:#FF5D1A; - text-decoration:none; - } - .login-content .link:hover { - text-decoration:underline; - } + color:#FF5D1A; + text-decoration:none; + } + .login-content .link:hover { + text-decoration:underline; + } /*---//////////////////// END LOGIN ////////////////////---*/ @@ -1047,7 +1054,7 @@ dt.block-display, dd.block-display { display:block; height:40px; clear:both; - color:#4b4b4b; + color:#4b4b4b; margin-top:12px; font-size:11px; line-height:140%; @@ -1060,7 +1067,7 @@ dt.block-display, dd.block-display { text-decoration:none; } #login-page .footer { - color:#6d6d6d; + color:#6d6d6d; } .footer a:hover { color:#ff5d1a; @@ -1069,27 +1076,27 @@ dt.block-display, dd.block-display { /*---//////////////////// END FOOTER ////////////////////---*/ .button-bar { - height: 28px; - margin-top:12px; + height: 28px; + margin-top:12px; } /*.sticky { - padding:0; - width:100%; - z-index:2000; - position:fixed; - top:0; - left:0; - margin-bottom:140px; + padding:0; + width:100%; + z-index:2000; + position:fixed; + top:0; + left:0; + margin-bottom:140px; }*/ .sticky { - padding:0; - width:100%; + padding:0; + width:100%; } .floated-panel { - margin-top:0; - width:99.99%; - z-index:999; + margin-top:0; + width:99.99%; + z-index:999; } @@ -1097,15 +1104,15 @@ dt.block-display, dd.block-display { #schedule_playlist_dialog .wrapp-two { - float: left; - width: 50%; - padding: 0; + float: left; + width: 50%; + padding: 0; } #schedule_playlist_dialog .wrapp-one { - margin-right:2%; - width: 48%; - float: left; + margin-right:2%; + width: 48%; + float: left; } #schedule_playlist_dialog div:first-child .ui-widget-header:first-child { @@ -1127,7 +1134,7 @@ dt.block-display, dd.block-display { } .ui-dialog #schedule_playlist_dialog.ui-dialog-content { - padding:0; + padding:0; } @@ -1135,15 +1142,15 @@ dt.block-display, dd.block-display { background: none repeat scroll 0 0 transparent; border: 1px solid #8f8f8f; padding: 8px; - margin:8px 8px 0 8px; + margin:8px 8px 0 8px; } #schedule_playlist_dialog > div h4 { padding: 13px 0 12px 0; margin: 0; - font-size:16px; - font-weight:normal; + font-size:16px; + font-weight:normal; } #schedule_calendar { @@ -1151,13 +1158,13 @@ dt.block-display, dd.block-display { } #schedule_block_table { - width: 100%; + width: 100%; } thead tr.fc-first { - height: 32px; - line-height: 32px; + height: 32px; + line-height: 32px; } /** Extremely nasty workaround for a fullcalendar bug, where clicking "Add Show" @@ -1169,7 +1176,7 @@ thead tr.fc-first div.fc-agenda > div:nth-child(2) { - top: 34px !important; + top: 34px !important; } #schedule_calendar_cell @@ -1182,91 +1189,91 @@ div.fc-agenda > div:nth-child(2) .schedule_change_slots /** The time span combobox */ { - margin-top: 4px; /** Center it vertically */ + margin-top: 4px; /** Center it vertically */ } #schedule_block_table td { - padding: 0px; - vertical-align: top; + padding: 0px; + vertical-align: top; } div.ui-datepicker { - /*font-size: 75%;*/ + /*font-size: 75%;*/ } #schedule_playlist_dialog ul { - list-style-type: none; - overflow: auto; - margin: 0 0 8px 0; - padding: 0; - height: 280px; - background:#9a9a9a; - width:100%; + list-style-type: none; + overflow: auto; + margin: 0 0 8px 0; + padding: 0; + height: 280px; + background:#9a9a9a; + width:100%; } #schedule_playlist_chosen li { - float: left; - clear: left; - margin: 0; - width: 100%; - display:block; - margin-bottom:-1px; + float: left; + clear: left; + margin: 0; + width: 100%; + display:block; + margin-bottom:-1px; } #schedule_playlist_chosen li > h3 { - font-size:15px; - padding: 7px 0 0 0; - margin: 0; - min-height:25px; + font-size:15px; + padding: 7px 0 0 0; + margin: 0; + min-height:25px; } #schedule_playlist_chosen li > h3 > div { - float: left; - margin: 0 5px 2px 0; + float: left; + margin: 0 5px 2px 0; } #schedule_playlist_chosen li > h3 > div > span.ui-icon { - margin-top: 0px; + margin-top: 0px; } #schedule_playlist_chosen li > h3 > span.ui-icon.ui-icon-triangle-1-e, #schedule_playlist_chosen li > h3 > span.ui-icon.ui-icon-triangle-1-s { - float:left; - margin-right: 8px; + float:left; + margin-right: 8px; } #schedule_playlist_chosen li > h3 > span.ui-icon.ui-icon-close { - float:right; - margin-right: 8px; + float:right; + margin-right: 8px; } #schedule_playlist_chosen div.group_list { - border-width:0 1px 1px 1px; + border-width:0 1px 1px 1px; } /*#schedule_playlist_chosen li div{ - float: left; + float: left; } #schedule_playlist_chosen li > div{ - width: 475px; + width: 475px; } */ #schedule_playlist_chosen li > div > div{ - clear: left; - padding-top: 5px; - padding-left: 5px; + clear: left; + padding-top: 5px; + padding-left: 5px; } #schedule_playlist_chosen li > div:first-child { - border-bottom:1px solid #b1b1b1; + border-bottom:1px solid #b1b1b1; } .sched_description { - clear: left; - font-size: 85%; - margin-left: 2em; + clear: left; + font-size: 85%; + margin-left: 2em; } .sh_pl_name { - min-width: 150px; + min-width: 150px; } .sh_pl_creator { @@ -1274,78 +1281,78 @@ div.ui-datepicker { } #schedule_playlist_chosen li > h3 > div.sh_pl_time { - float:right; - margin-right:22px; + float:right; + margin-right:22px; } #schedule_playlist_chosen li > div > div > span { - float: right; - margin-right:46px; + float: right; + margin-right:46px; } #schedule_playlist_chosen li > div > div > span.sh_file_name { - display: inline-block; - float: left; - margin-right:0; + display: inline-block; + float: left; + margin-right:0; } .sh_file_artist, #schedule_playlist_chosen li > div > div.sh_file_artist { - font-size: 11px; - padding-top: 2px; - padding-bottom: 8px; - color:#5b5b5b; + font-size: 11px; + padding-top: 2px; + padding-bottom: 8px; + color:#5b5b5b; } #schedule_playlist_chosen li > div > div.sched_description { - font-size: 12px; - padding-top: 5px; - padding-bottom: 7px; - border-bottom:1px solid #b1b1b1; - color:#5b5b5b; - margin:0; - background:#dddddd; + font-size: 12px; + padding-top: 5px; + padding-bottom: 7px; + border-bottom:1px solid #b1b1b1; + color:#5b5b5b; + margin:0; + background:#dddddd; } #show_time_info { - font-size:12px; - height:30px; + font-size:12px; + height:30px; } #show_time_info > div, #show_time_info > span{ - float: left; + float: left; } #show_progressbar { - width: 46%; - height: 5px; - margin: 9px 9px 0 0; + width: 46%; + height: 5px; + margin: 9px 9px 0 0; } #show_progressbar.ui-widget-content { - background: #646464 url(images/schedule-show_progressbar_bg.png) repeat-x 0 0; - border-color:#343434; - border-bottom-color:#cfcfcf; + background: #646464 url(images/schedule-show_progressbar_bg.png) repeat-x 0 0; + border-color:#343434; + border-bottom-color:#cfcfcf; } #show_progressbar .ui-progressbar-value { - background: #ff5d1a; - border-color:#343434; - border-width: 1px 0 0 1px; + background: #ff5d1a; + border-color:#343434; + border-width: 1px 0 0 1px; } h2#scheduled_playlist_name { - font-size:21px; - font-weight:normal; - margin:0; - padding:8px 0 0px 12px; - color:#1c1c1c; + font-size:21px; + font-weight:normal; + margin:0; + padding:8px 0 0px 12px; + color:#1c1c1c; } h2#scheduled_playlist_name span { - color:#656565; + color:#656565; } .time { - width: 80px; - margin: 5px; - text-align: left; + width: 80px; + margin: 5px; + text-align: left; } /* --- Add show Dialog --- */ @@ -1355,57 +1362,57 @@ h2#scheduled_playlist_name span { } #add_show_description { - width: 400px; - height: 200px; + width: 400px; + height: 200px; } #fullcalendar_show_display { - width: 400px; + width: 400px; } .fc-agenda-body { - max-height:560px; + max-height:560px; } #schedule_calendar .ui-progressbar { - width: 46%; - height: 5px; - margin: 9px 9px 0 0; + width: 46%; + height: 5px; + margin: 9px 9px 0 0; } #schedule_calendar .ui-progressbar.ui-widget-content { - background: #646464 url(images/schedule-show_progressbar_bg.png) repeat-x 0 0; - border-color:#343434; - border-bottom-color:#cfcfcf; + background: #646464 url(images/schedule-show_progressbar_bg.png) repeat-x 0 0; + border-color:#343434; + border-bottom-color:#cfcfcf; } #schedule_calendar .ui-progressbar .ui-progressbar-value { - background: #ff5d1a; - border-color:#343434; - border-width: 1px 0 0 1px; + background: #ff5d1a; + border-color:#343434; + border-width: 1px 0 0 1px; } /*---//////////////////// Advenced Search ////////////////////---*/ .search_control { - padding:8px; - border:1pxp solid #8f8f8f; - background:#d8d8d8; - margin-bottom:8px; + padding:8px; + border:1pxp solid #8f8f8f; + background:#d8d8d8; + margin-bottom:8px; } .search_group { - padding:8px; - border:1pxp solid #8f8f8f; - margin-bottom:8px; + padding:8px; + border:1pxp solid #8f8f8f; + margin-bottom:8px; } .search_group > fieldset { - padding:0; - border:none; - margin-top:8px; + padding:0; + border:none; + margin-top:8px; } .search_group > fieldset .input_text { - width:45%; + width:45%; } .search_group > fieldset .input_text, .search_group > fieldset .input_select { - margin-right:6px; + margin-right:6px; } .search_group fieldset .ui-button-icon-only .ui-button-text, .search_group fieldset .ui-button-icons-only .ui-button-text { padding: 3px 2px; @@ -1449,15 +1456,15 @@ h2#scheduled_playlist_name span { font-size: 1.2em; margin: 0; padding: 4px 0 4px 15px; - width:60%; + width:60%; } .simple-formblock .liquidsoap_status{ width: 100%; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - padding: 4px 0 8px; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + padding: 4px 0 8px; } .user-form-label { @@ -1473,11 +1480,11 @@ h2#scheduled_playlist_name span { } .stream-setting-content dd.block-display { - /*width: 60%;*/ + /*width: 60%;*/ } .simple-formblock.padded-strong { - padding:12px; + padding:12px; } .simple-formblock dd .input_text { @@ -1485,11 +1492,11 @@ h2#scheduled_playlist_name span { } .simple-formblock h2 { - font-size:1.7em; - padding-bottom:16px; + font-size:1.7em; + padding-bottom:16px; } .simple-formblock label { - padding:0; + padding:0; } .ui-button-icon-only.crossfade-main-button, .ui-button-icons-only.crossfade-main-button { @@ -1504,28 +1511,28 @@ h2#scheduled_playlist_name span { padding: 0.1em 1em; } -.ui-state-default .ui-icon.crossfade-main-icon { - background:url(images/crossfade_main.png) no-repeat 0 2px; - width:25px; +.ui-state-default .ui-icon.crossfade-main-icon { + background:url(images/crossfade_main.png) no-repeat 0 2px; + width:25px; } .btn.crossfade-main-button span { - text-indent: 100%; - white-space: nowrap; - overflow: hidden; - display:inline-block; - width: 0; - height:0; + text-indent: 100%; + white-space: nowrap; + overflow: hidden; + display:inline-block; + width: 0; + height:0; } .btn i.crossfade-main-icon { - display: inline-block; - background:url(images/crossfade_main.png) no-repeat 0 2px; - width:22px; - height: 14px; - line-height: 14px; - vertical-align: text-top; - margin-top: 1px; - margin-right: -5px; + display: inline-block; + background:url(images/crossfade_main.png) no-repeat 0 2px; + width:22px; + height: 14px; + line-height: 14px; + vertical-align: text-top; + margin-top: 1px; + margin-right: -5px; } .ui-button-icon-only.crossfade-main-button .ui-icon { @@ -1534,27 +1541,27 @@ h2#scheduled_playlist_name span { } button, input { - margin-top:0; - margin-bottom:0; + margin-top:0; + margin-bottom:0; } .user-management { - width:910px; - /*width:380px;*/ + width:910px; + /*width:380px;*/ } .user-management-expanded { - width:910px; + width:910px; } .user-data { - float:left; - width:420px; - margin-left:10px; - /*display:none;*/ + float:left; + width:420px; + margin-left:10px; + /*display:none;*/ } .user-list-wrapper { - float:left; - width:480px; - /*margin-right:10px;*/ + float:left; + width:480px; + /*margin-right:10px;*/ } .user-management div.user-list-wrapper .ui-widget-header:first-child { @@ -1564,7 +1571,7 @@ button, input { font-weight: bold; } .user-list-wrapper .ui-widget-header:first-child .dataTables_filter { - margin:0; + margin:0; } .user-management h2 { font-size: 1.7em; @@ -1572,127 +1579,127 @@ button, input { } .user-management .dataTables_filter input { width: 93.8%; - margin-bottom:8px; + margin-bottom:8px; } .user-data.simple-formblock dd { width: 73%; } .user-data fieldset { - margin-bottom:8px; + margin-bottom:8px; } .user-data fieldset:last-child { - margin-bottom:0; + margin-bottom:0; } .user-list-wrapper .button-holder { - padding:0; - text-align:right; - height:37px; + padding:0; + text-align:right; + height:37px; } .user-list-wrapper .button-holder .ui-button { - margin:0; + margin:0; } .ui-widget-content .user-list-wrapper .ui-icon.ui-icon-closethick { - background-image:url(redmond/images/ui-icons_666666_256x240.png); - cursor:pointer; - float:right; - margin-right:5px; + background-image:url(redmond/images/ui-icons_666666_256x240.png); + cursor:pointer; + float:right; + margin-right:5px; } .ui-widget-content .user-list-wrapper .ui-icon.ui-icon-closethick:hover { - background-image:url(redmond/images/ui-icons_ff5d1a_256x240.png); + background-image:url(redmond/images/ui-icons_ff5d1a_256x240.png); } .button-bar-top { - text-align:right; - height:38px; + text-align:right; + height:38px; } .toggle-button, .toggle-button-active { - border: 1px solid #505050; - background-color: #5e5e5e; + border: 1px solid #505050; + background-color: #5e5e5e; background: -moz-linear-gradient(top, #757575 0, #5e5e5e 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #757575), color-stop(100%, #5e5e5e)); - color: #ffffff; - margin:0; - font-size:12px; - padding:5px 12px; - text-decoration:none; - text-shadow: #343434 0px -1px; - border-width:1px 0 1px 1px; - cursor:pointer; + color: #ffffff; + margin:0; + font-size:12px; + padding:5px 12px; + text-decoration:none; + text-shadow: #343434 0px -1px; + border-width:1px 0 1px 1px; + cursor:pointer; } .toggle-button:hover { - background-color: #292929; + background-color: #292929; background: -moz-linear-gradient(top, #3b3b3b 0, #292929 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #3b3b3b), color-stop(100%, #292929)); - text-shadow: #000000 0px -1px; + text-shadow: #000000 0px -1px; } .toggle-button-active { - background-color: #c6c6c6; + background-color: #c6c6c6; background: -moz-linear-gradient(top, #767676 0, #c6c6c6 20%, #c6c6c6 35%, #a0a0a0 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #767676), color-stop(20%, #c6c6c6), color-stop(35%, #c6c6c6), color-stop(100%, #a0a0a0)); - color: #2e2e2e; - cursor:default; - text-shadow: #d8d8d8 0px 1px; + color: #2e2e2e; + cursor:default; + text-shadow: #d8d8d8 0px 1px; } .end-button { - border-width:1px; + border-width:1px; } .button-bar-top .toggle-button, .button-bar-top .toggle-button-active { - float:right; + float:right; } .button-bar-top .input_text { - height:25px; - margin-right:6px; - padding: 0 3px; + height:25px; + margin-right:6px; + padding: 0 3px; } .button-bar-top .input_text.hasDatepicker, .input_text.hasDatepicker { - background-image:url(images/input_with_calendar_bg.png); - background-repeat:no-repeat; - background-position:right 0; + background-image:url(images/input_with_calendar_bg.png); + background-repeat:no-repeat; + background-position:right 0; } .input_text.hasTimepicker { - background-image:url(images/input_with_time_bg.png); - background-repeat:no-repeat; - background-position:right 0; + background-image:url(images/input_with_time_bg.png); + background-repeat:no-repeat; + background-position:right 0; } ul.errors { - display:block; - clear:left; - padding:3px 0 0 0; - margin:0; + display:block; + clear:left; + padding:3px 0 0 0; + margin:0; } .formrow-repeat ul.errors { - width:278px; + width:278px; } ul.errors li { - color:#902d2d; - font-size:11px; - padding:2px 4px; - background:#c6b4b4; - margin-bottom:2px; - border:1px solid #c83f3f; - list-style: none; + color:#902d2d; + font-size:11px; + padding:2px 4px; + background:#c6b4b4; + margin-bottom:2px; + border:1px solid #c83f3f; + list-style: none; } div.success{ - color:#3B5323; - font-size:11px; - padding:2px 4px; - background:#93DB70; - margin-bottom:2px; - border:1px solid #488214; + color:#3B5323; + font-size:11px; + padding:2px 4px; + background:#93DB70; + margin-bottom:2px; + border:1px solid #488214; } div.errors, span.errors{ - color:#902d2d; - font-size:11px; + color:#902d2d; + font-size:11px; padding:2px 4px; background:#c6b4b4; margin-bottom:2px; @@ -1701,38 +1708,38 @@ div.errors, span.errors{ span.errors.sp-errors{ width: 429px; - display: block; + display: block; } .collapsible-header, .collapsible-header-disabled { - border: 1px solid #8f8f8f; - background-color: #cccccc; + border: 1px solid #8f8f8f; + background-color: #cccccc; background: -moz-linear-gradient(top, #cccccc 0, #b9b9b9 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #cccccc), color-stop(100%, #b9b9b9)); - font-size:13px; - color:#353535; - font-weight:bold; - padding:6px 0 6px 20px; - margin:8px 0 0 0; - cursor:pointer; - position:relative; + font-size:13px; + color:#353535; + font-weight:bold; + padding:6px 0 6px 20px; + margin:8px 0 0 0; + cursor:pointer; + position:relative; } .collapsible-content { - margin-top:-1px; - display:none; + margin-top:-1px; + display:none; } .collapsible-header .arrow-icon, .collapsible-header-disabled .arrow-icon { - display:block; - background:url(images/arrows_collapse.png) no-repeat 0 0; - height:11px; - width:11px; - position:absolute; - left:5px; - top:8px; + display:block; + background:url(images/arrows_collapse.png) no-repeat 0 0; + height:11px; + width:11px; + position:absolute; + left:5px; + top:8px; } .collapsible-header.closed .arrow-icon, collapsible-header-disabled.close .arrow-icon { - background-position: 0 -11px !important; + background-position: 0 -11px !important; } #schedule-add-show .button-bar { @@ -1743,44 +1750,44 @@ span.errors.sp-errors{ margin: 16px 0 0; } .schedule { - text-align:left; - height:38px; + text-align:left; + height:38px; } .add-button, .ui-widget-content a.add-button { - border: 1px solid #242424; - background-color: #353535; + border: 1px solid #242424; + background-color: #353535; background: -moz-linear-gradient(top, #494949 0, #353535 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #494949), color-stop(100%, #353535)); - color: #ffffff; - margin:0; - font-size:12px; - font-weight:bold; - padding:4px 12px 4px 22px; - text-decoration:none; - text-shadow: #000 0px -1px; - display:block; - float:left; - position:relative; + color: #ffffff; + margin:0; + font-size:12px; + font-weight:bold; + padding:4px 12px 4px 22px; + text-decoration:none; + text-shadow: #000 0px -1px; + display:block; + float:left; + position:relative; } .add-button:hover, .ui-widget-content a.add-button:hover { - border: 1px solid #000000; - background-color: #353535; + border: 1px solid #000000; + background-color: #353535; background: -moz-linear-gradient(top, #353535 0, #000000 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #353535), color-stop(100%, #000000)); - color: #ffffff; + color: #ffffff; } .add-button span { - position:absolute; - top:3px; - left:3px; - height:16px; - width:16px; - display:block; - background:url(redmond/images/ui-icons_ffffff_256x240.png) no-repeat; + position:absolute; + top:3px; + left:3px; + height:16px; + width:16px; + display:block; + background:url(redmond/images/ui-icons_ffffff_256x240.png) no-repeat; } .add-button:hover span { - background:url(redmond/images/ui-icons_ff5d1a_256x240.png) no-repeat; + background:url(redmond/images/ui-icons_ff5d1a_256x240.png) no-repeat; } .add-button span.add-icon { background-position: -32px -128px; @@ -1788,20 +1795,20 @@ span.errors.sp-errors{ /*---//////////////////// NOW PLAYING COLORS ////////////////////---*/ .playing-song, .datatable tr.playing-song:hover td { - background-color:#ff753c !important; + background-color:#ff753c !important; } .playing-list { - background-color:#b0dcf2; + background-color:#b0dcf2; } .odd.playing-list { - background-color:#bfe5f8; + background-color:#bfe5f8; } .gap, .datatable tr.gap:hover td { - background-color:#da5454 !important; + background-color:#da5454 !important; } .group, tr td.group { - background-color:#0aa2be; - color:#FFF; + background-color:#0aa2be; + color:#FFF; } @@ -1810,10 +1817,10 @@ span.errors.sp-errors{ color: #646464; position: relative; text-decoration: none; - padding: 0 0 0 20px; + padding: 0 0 0 20px; } .icon-link .ui-icon { - background-image:url(redmond/images/ui-icons_666666_256x240.png); + background-image:url(redmond/images/ui-icons_666666_256x240.png); background-repeat: no-repeat; display: block; height: 16px; @@ -1826,107 +1833,107 @@ span.errors.sp-errors{ } .icon-link:hover, .ui-widget-content a.icon-link:hover { color: #444444; - text-decoration:underline; + text-decoration:underline; } .icon-link:hover .ui-icon { - background-image:url(redmond/images/ui-icons_454545_256x240.png); + background-image:url(redmond/images/ui-icons_454545_256x240.png); } .button-bar .icon-link { - float:left; - margin:7px 0 0 1px; + float:left; + margin:7px 0 0 1px; } #show_content_dialog .datatable tr:first-child td { - border-top:none; + border-top:none; } #show_content_dialog .datatable { - margin-top:8px; + margin-top:8px; } .simple-formblock.metadata, #side_playlist .simple-formblock.metadata { - border:none; - width:auto; - display:block; - padding: 2px; + border:none; + width:auto; + display:block; + padding: 2px; } #side_playlist .simple-formblock.metadata .input_text, #side_playlist .simple-formblock.metadata .input_text_area { - width:95%; + width:95%; } #side_playlist .simple-formblock.metadata.simple-formblock dd { - width:70%; + width:70%; } #side_playlist h3.plain { - float:none; - font-size:18px; - margin:2px 0 20px 0; + float:none; + font-size:18px; + margin:2px 0 20px 0; } .qtip { - font-size:11px; - line-height:160%; + font-size:11px; + line-height:160%; } #schedule-show-who.scrolled { margin-bottom: 0; - max-height:300px; - overflow:auto; + max-height:300px; + overflow:auto; } .text-content { - padding:20px 10px 40px 58px; - background: url(images/sf_arror.png) no-repeat 60% 0; - min-height: 300px; + padding:20px 10px 40px 58px; + background: url(images/sf_arror.png) no-repeat 60% 0; + min-height: 300px; } .text-content h2 { - font-size:2.4em; - color:#1f1f1f; + font-size:2.4em; + color:#1f1f1f; } .text-content p { - font-size:1.6em; - line-height:140%; - color:#1f1f1f; - margin:0 0 1.4em 0; + font-size:1.6em; + line-height:140%; + color:#1f1f1f; + margin:0 0 1.4em 0; } .text-content a { - color:#f2f2f2; - text-decoration:none; + color:#f2f2f2; + text-decoration:none; } .text-content a:hover { - text-decoration:underline; + text-decoration:underline; } .text-content ol { - margin:0 0 22px 25px; - padding:0; - list-style-position:outside; + margin:0 0 22px 25px; + padding:0; + list-style-position:outside; } .text-content ol li { - margin:0 0 6px 0; - font-size:1.7em; - display:list-item; - color:#1f1f1f; + margin:0 0 6px 0; + font-size:1.7em; + display:list-item; + color:#1f1f1f; } .gray-logo { - margin:5px 0 0 20px; + margin:5px 0 0 20px; } .formrow-repeat { - list-style-type:none; - margin:0; - padding:0; + list-style-type:none; + margin:0; + padding:0; } .formrow-repeat li { - list-style-type:none; - margin:0 0 8px 0; - padding:0; - display:block; + list-style-type:none; + margin:0 0 8px 0; + padding:0; + display:block; } /* .formrow-repeat li .ui-button-icon-only { - width:1.8em; + width:1.8em; } .formrow-repeat li .ui-button-icon-only .ui-button-text, .formrow-repeat li .ui-button-icons-only .ui-button-text { - padding: 3px 3px 4px; + padding: 3px 3px 4px; } .formrow-repeat li .ui-button-icon-only .ui-icon { @@ -1951,7 +1958,7 @@ span.errors.sp-errors{ #add_show_rebroadcast_absolute .ui-button-icons-only .ui-button-text, #add_show_rebroadcast_relative .ui-button-text-icon-primary .ui-button-text, #add_show_rebroadcast_absolute .ui-button-text-icon-primary .ui-button-text { - font-size:12px; + font-size:12px; } #add_show_rebroadcast_relative .ui-button-icon-only .ui-icon, @@ -1972,60 +1979,60 @@ span.errors.sp-errors{ .formrow-repeat li .inline-text { color: #666666; - padding: 0 6px 0 0; + padding: 0 6px 0 0; } .formrow-repeat li .input_text, .formrow-repeat li .input_select { - margin-right:6px; + margin-right:6px; } .formrow-repeat li .hasDatepicker, .formrow-repeat li .input_select { - width:95px; + width:95px; } .formrow-repeat li .hasTimepicker { - width:60px; + width:60px; } .recording-show { - float: right; - background:url(images/record_icon.png) no-repeat 0 0; - width:23px; - height:23px; + float: right; + background:url(images/record_icon.png) no-repeat 0 0; + width:23px; + height:23px; } .datatable td .info-icon { - margin:-4px 3px -3px 0; - float:right; + margin:-4px 3px -3px 0; + float:right; } .time-flow { - float:right; - margin-right:4px; + float:right; + margin-right:4px; } .small-icon { - display:block; - width:20px; - height:10px; - float:right; - margin-left:3px; - margin-top:2px; + display:block; + width:20px; + height:10px; + float:right; + margin-left:3px; + margin-top:2px; } .small-icon.linked { background:url(images/icon_link.png) no-repeat 0 0; margin-top: 0px !important; } .small-icon.recording { - background:url(images/icon_record.png) no-repeat 0 0; + background:url(images/icon_record.png) no-repeat 0 0; margin-top: 0px !important; } .small-icon.rebroadcast { - background:url(images/icon_rebroadcast.png) no-repeat 0 0; + background:url(images/icon_rebroadcast.png) no-repeat 0 0; margin-top: 0px !important; } .small-icon.soundcloud { - background:url(images/icon_soundcloud.png) no-repeat 0 0; - width:21px; + background:url(images/icon_soundcloud.png) no-repeat 0 0; + width:21px; margin-top: 0px !important; } .small-icon.sc-error { - background:url(images/icon_soundcloud_error2.png) no-repeat 0 0; - width:21px; + background:url(images/icon_soundcloud_error2.png) no-repeat 0 0; + width:21px; margin-top: 0px !important; } .small-icon.now-playing { @@ -2033,20 +2040,20 @@ span.errors.sp-errors{ height:10px; } .small-icon.progress { - background:url(images/upload-icon.gif) no-repeat; + background:url(images/upload-icon.gif) no-repeat; background-color:black; background-position:center; - border-radius:2px; - -webkit-border-radius:2px; - -moz-border-radius:2px; + border-radius:2px; + -webkit-border-radius:2px; + -moz-border-radius:2px; margin-top: 0px !important; } .small-icon.alert { - background:url(images/icon_alert.png) no-repeat; - float:left; - width:13px; - margin-right:3px; - margin-left:1px; + background:url(images/icon_alert.png) no-repeat; + float:left; + width:13px; + margin-right:3px; + margin-left:1px; } .small-icon.show-empty { background:url(images/icon_alert_cal_alt.png) no-repeat 0 0; @@ -2063,33 +2070,33 @@ span.errors.sp-errors{ height: 16px !important; } .medium-icon { - display:block; - width:25px; - height:12px; - float:right; - margin-left:4px; + display:block; + width:25px; + height:12px; + float:right; + margin-left:4px; } .medium-icon.recording { - background:url(images/icon_record_m.png) no-repeat 0 0; - width:20px; + background:url(images/icon_record_m.png) no-repeat 0 0; + width:20px; } .medium-icon.rebroadcast { - background:url(images/icon_rebroadcast_m.png) no-repeat 0 0; + background:url(images/icon_rebroadcast_m.png) no-repeat 0 0; } .medium-icon.soundcloud { - background:url(images/icon_soundcloud_m.png) no-repeat 0 0; - width:21px; + background:url(images/icon_soundcloud_m.png) no-repeat 0 0; + width:21px; } .medium-icon.nowplaying, .medium-icon.finishedplaying { - background:url(images/icon_nowplaying_m.png) no-repeat 0 0; - width:12px; - height:9px; - float:left; - margin-left:6px; - margin-right:0; + background:url(images/icon_nowplaying_m.png) no-repeat 0 0; + width:12px; + height:9px; + float:left; + margin-left:6px; + margin-right:0; } .medium-icon.finishedplaying { - background:url(images/icon_finishedplaying_m.png) no-repeat 0 0; + background:url(images/icon_finishedplaying_m.png) no-repeat 0 0; } .preferences { width: 500px; @@ -2116,26 +2123,26 @@ dt.block-display, dd.block-display { padding: 0 0 5px 0; } .preferences dd.block-display, .stream-config dd.block-display { - margin-bottom:4px; + margin-bottom:4px; } .preferences dd.block-display:last-child, .stream-config dd.block-display:last-child { - margin-bottom:0; - padding-bottom:0; + margin-bottom:0; + padding-bottom:0; } .preferences input[type="radio"], .stream-config input[type="radio"] { - margin:0; + margin:0; } .preferences label input[type="radio"], .stream-config label input[type="radio"] { - margin:0 1px 0 0; + margin:0 1px 0 0; } .preferences label input[type="checkbox"], .stream-config label input[type="checkbox"] { - margin:0 5px 0 0; + margin:0 5px 0 0; } dd.radio-inline-list, .preferences dd.radio-inline-list, .stream-config dd.radio-inline-list { - margin-bottom:6px; + margin-bottom:6px; } .radio-inline-list label { - margin-right:12px; + margin-right:12px; } .preferences.simple-formblock dd.block-display { width: 100%; @@ -2158,14 +2165,14 @@ dd.radio-inline-list, .preferences dd.radio-inline-list, .stream-config dd.radio } #show_time_info { - font-size:12px; - height:30px; + font-size:12px; + height:30px; } #show_time_warning { - background:#c83f3f url(images/icon_alert_ffffff.png) no-repeat 5px 4px; - border:1px solid #9d1010; - color:#fff; - padding: 2px 5px 2px 24px; + background:#c83f3f url(images/icon_alert_ffffff.png) no-repeat 5px 4px; + border:1px solid #9d1010; + color:#fff; + padding: 2px 5px 2px 24px; font-size: 12px; line-height: 140%; } @@ -2178,84 +2185,84 @@ button.ui-button.md-cancel { /*--//////////////////////// Changes/add-ons Jun 8th, 2011 ////////////////////////--*/ .dialogPopup.ui-dialog-content { - padding: 0.9em 1em; + padding: 0.9em 1em; } .dialogPopup dl { - margin:0; - padding:0; - clear:both; - width:100%; + margin:0; + padding:0; + clear:both; + width:100%; } .dialogPopup dt { - clear: left; - padding: 0; - float:left; - width:35%; + clear: left; + padding: 0; + float:left; + width:35%; } .dialogPopup dt.block-display { - float:none; - width:100%; - padding: 0 0 10px; + float:none; + width:100%; + padding: 0 0 10px; } .dialogPopup dt label { - font-weight: bold; - line-height:24px; + font-weight: bold; + line-height:24px; } .dialogPopup dd { - padding: 0; - float:left; - width:65%; - margin:0 0 6px 0; + padding: 0; + float:left; + width:65%; + margin:0 0 6px 0; } .dialogPopup dd.block-display { - float:none; - width:100%; - padding: 0 0 10px; - margin:0 0 8px 0; + float:none; + width:100%; + padding: 0 0 10px; + margin:0 0 8px 0; } .dialogPopup fieldset dt:last-child, .dialogPopup fieldset dd:last-child { - margin:0; + margin:0; } .info-text { - font-size:12px; - color:#5b5b5b; - line-height:150%; - padding:0 0 6px; - margin:0; + font-size:12px; + color:#5b5b5b; + line-height:150%; + padding:0 0 6px; + margin:0; } .dialogPopup label input[type="checkbox"] { - float:left; - margin-right:6px; + float:left; + margin-right:6px; } .dialogPopup fieldset { - padding: 0; - clear:both; - border:none; + padding: 0; + clear:both; + border:none; } .dialogPopup fieldset dd input[type="text"], .dialogPopup fieldset dd textarea { - width:99.5%; - padding:0; + width:99.5%; + padding:0; } .dialogPopup fieldset dd input[type="text"] { - height:23px; + height:23px; } .dialogPopup fieldset dd select { - width:100%; + width:100%; } fieldset.display_field { - /*background-color:#d5d5d5; - box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset;*/ - padding:10px; - border: 1px solid #8F8F8F; + /*background-color:#d5d5d5; + box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset;*/ + padding:10px; + border: 1px solid #8F8F8F; } label span { - font-weight:normal; + font-weight:normal; } .dialogPopup .display_field dt, .dialogPopup .display_field dd { @@ -2265,32 +2272,32 @@ label span { margin: 0; padding: 4px 0; text-align: left; - width:auto; + width:auto; } .dialogPopup .display_field dt { clear: left; - font-weight:bold; - width:auto; - min-width:auto; - padding-right:8px; + font-weight:bold; + width:auto; + min-width:auto; + padding-right:8px; } #show_what_sending textarea { background-color:transparent; - border:none; + border:none; box-shadow: none; font-size: 12px; text-indent: 0; - margin:0; - width:99%; - line-height:180%; - resize: none; + margin:0; + width:99%; + line-height:180%; + resize: none; } #show_what_sending textarea:focus { - border:none; + border:none; } #show_what_sending dl { - overflow-x: hidden; + overflow-x: hidden; } #watched-folder-section dd.block-display input[type="text"] { @@ -2298,19 +2305,19 @@ label span { } #watched-folder-section dd.block-display input[type="button"] { - border: 1px solid #5b5b5b; - background-color: #6e6e6e; + border: 1px solid #5b5b5b; + background-color: #6e6e6e; background: -moz-linear-gradient(top, #868686 0, #6e6e6e 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #868686), color-stop(100%, #6e6e6e)); - color: #ffffff; - font-family:Arial, Helvetica, sans-serif; - font-size:12px; - height:25px; - margin:0; - display:block; - margin-left:5px; - line-height:12px; - padding:0 10px 1px 10px; + color: #ffffff; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + height:25px; + margin:0; + display:block; + margin-left:5px; + line-height:12px; + padding:0 10px 1px 10px; } #watched-folder-section a { @@ -2324,53 +2331,53 @@ label span { } #watched-folder-section dd.block-display input[type="button"]:hover { - border: 1px solid #242424; - background-color: #292929; + border: 1px solid #242424; + background-color: #292929; background: -moz-linear-gradient(top, #3b3b3b 0, #292929 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #3b3b3b), color-stop(100%, #292929)); - color: #ffffff; + color: #ffffff; } #watched-folder-section dd.block-display { - clear:both; - min-height:25px; - + clear:both; + min-height:25px; + } #watched-folder-section dd.block-display.selected-item { - clear:both; - background:#9a9a9a; - margin:2px 0 5px 0; - width:84%; - padding:4px 8px 0; - position:relative; - min-height:22px; - border-radius: 4px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - font-size:13px; + clear:both; + background:#9a9a9a; + margin:2px 0 5px 0; + width:84%; + padding:4px 8px 0; + position:relative; + min-height:22px; + border-radius: 4px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + font-size:13px; } #watched-folder-section dd.block-display.selected-item .ui-icon { - position:absolute; - top:4px; - right:5px; - cursor:pointer; + position:absolute; + top:4px; + right:5px; + cursor:pointer; } #watched-folder-section dd.block-display.selected-item .ui-icon.ui-icon-refresh { - position:absolute; - top:4px; - right:20px; - cursor:pointer; - background-image:url(redmond/images/ui-icons_ffffff_256x240.png); - background-position: -128px -63px; + position:absolute; + top:4px; + right:20px; + cursor:pointer; + background-image:url(redmond/images/ui-icons_ffffff_256x240.png); + background-position: -128px -63px; } #watched-folder-section dd.block-display.selected-item .ui-icon:hover { - background-image:url(redmond/images/ui-icons_ff5d1a_256x240.png) + background-image:url(redmond/images/ui-icons_ff5d1a_256x240.png) } #watched-folder-section dd.block-display input { - float:left; + float:left; } fieldset > legend { @@ -2389,7 +2396,7 @@ fieldset.sb-criteria-fieldset{ } fieldset.closed dl, fieldset.closed textarea, fieldset.closed div, fieldset.closed h2 { - display:none; + display:none; } fieldset legend .ui-icon, .ui-widget-content fieldset legend .ui-icon { @@ -2398,31 +2405,31 @@ fieldset legend .ui-icon, .ui-widget-content fieldset legend .ui-icon { } input[type="checkbox"][disabled] { - opacity: 0.6; + opacity: 0.6; } .play_small { - height:11px; - width: 15px; - display:inline-block; - background:url(images/play_pause_small.png) no-repeat 0 0; - margin:0 7px 0 0; - text-indent:-9999px; - overflow:hidden; - line-height:10px; + height:11px; + width: 15px; + display:inline-block; + background:url(images/play_pause_small.png) no-repeat 0 0; + margin:0 7px 0 0; + text-indent:-9999px; + overflow:hidden; + line-height:10px; } .play_small:hover, .play_small.paused { - background-position: 0 -11px; + background-position: 0 -11px; } .play_small.paused:hover { - background-position: 0 -22px; + background-position: 0 -22px; } .play_small.playing { - background-position: -20px 0; + background-position: -20px 0; } .play_small.playing:hover { - background-position: -20px -11px; + background-position: -20px -11px; } .info-text-small { @@ -2431,42 +2438,42 @@ input[type="checkbox"][disabled] { line-height: 150%; margin: 0; padding: 0 0 6px; - font-style:italic; - font-weight:normal; + font-style:italic; + font-weight:normal; } dd .info-text-small { padding: 1px 0 2px; - display:inline-block; + display:inline-block; } .stream-config dt { - width:120px; - padding: 4px 0; + width:120px; + padding: 4px 0; } .stream-config dt.block-display { - width:auto; + width:auto; } .stream-config dd { - margin-bottom:0px; + margin-bottom:0px; } .stream-config dd select { - width:180px; - line-height:140%; + width:180px; + line-height:140%; } .stream-config input[type="text"], .stream-config input[type="password"] { /*width:98.5%;*/ - min-width:172px; + min-width:172px; } .stream-config .display_field dd input[type="text"], .stream-config .display_field dd input[type="password"], .stream-config .display_field dd textarea { - min-width:99%; - padding: 4px 3px; + min-width:99%; + padding: 4px 3px; } .stream-config .display_field dd textarea { - min-height:60px; + min-height:60px; } .simple-formblock .display_field dd { - min-width:68%; + min-width:68%; } .stream-config dd input[id$=port] { width:152px; @@ -2474,25 +2481,25 @@ dd .info-text-small { dt.block-display.info-block { width: auto; - font-size:12px; - padding:10px 0; + font-size:12px; + padding:10px 0; } .top-margin { - margin-top:10px; - float: left; + margin-top:10px; + float: left; } .left-margin { - margin-left:20px; - float: left; + margin-left:20px; + float: left; } .stream-config dd.block-display textarea { width: 99.5%; - height: 110px; + height: 110px; } - + .input-info { - font-size:12px; - padding:0 0 0 5px; + font-size:12px; + padding:0 0 0 5px; } .stream-config dd.block-display input[type="text"].with-info, .stream-config dd.block-display input[type="password"].with-info { @@ -2500,28 +2507,28 @@ dt.block-display.info-block { } .stream-config dd.block-display p { font-size:13px; - margin:4px 0 4px 2px; + margin:4px 0 4px 2px; } .stream-config #output_setting { - width: 96%; + width: 96%; } .stream-config dt.block-display, .stream-config dd.block-display { - /*float: left;*/ + /*float: left;*/ } .collapsible-header-disabled { - cursor:default; - opacity:0.6; + cursor:default; + opacity:0.6; } /*---//////////////////// ERROR PAGE ////////////////////---*/ -.error-content { - background:url(images/404.png) no-repeat 0 0; - width:300px; - margin: 24px 15px; - padding: 0px 10px 0 420px; +.error-content { + background:url(images/404.png) no-repeat 0 0; + width:300px; + margin: 24px 15px; + padding: 0px 10px 0 420px; } .error-content h2 { margin:0; @@ -2530,9 +2537,9 @@ dt.block-display.info-block { font-weight:bold; color:#3e3e3e; text-align:left; - letter-spacing:-.3px; - text-shadow: rgba(248,248,248,.3) 0 1px 0, rgba(0,0,0,.8) 0 -1px 0; - rgba(51,51,51,.9) + letter-spacing:-.3px; + text-shadow: rgba(248,248,248,.3) 0 1px 0, rgba(0,0,0,.8) 0 -1px 0; + rgba(51,51,51,.9) } .error-content p { color: #272727; @@ -2540,37 +2547,37 @@ dt.block-display.info-block { margin: 0; padding:8px 2px; } -.error-content .button-bar { - margin-top:47px; - padding-left:2px; +.error-content .button-bar { + margin-top:47px; + padding-left:2px; } -.error-content .toggle-button { - border: 1px solid #434343; - border-width:1px 1px 0px 1px; - background-color: #636363; +.error-content .toggle-button { + border: 1px solid #434343; + border-width:1px 1px 0px 1px; + background-color: #636363; background: -moz-linear-gradient(top, #737373 0, #545454 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #737373), color-stop(100%, #545454)); - color: #1b1b1b; - font-size:15px; - font-weight:bold; - padding:5px 14px 6px 15px; - text-shadow: rgba(248,248,248,.24) 0 1px 0; - box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.2) 0 2px 2px inset; - -moz-box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.2) 0 2px 2px inset; - -webkit-box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.2) 0 2px 2px inset; - margin: 0 5px 0 0; + color: #1b1b1b; + font-size:15px; + font-weight:bold; + padding:5px 14px 6px 15px; + text-shadow: rgba(248,248,248,.24) 0 1px 0; + box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.2) 0 2px 2px inset; + -moz-box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.2) 0 2px 2px inset; + -webkit-box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.2) 0 2px 2px inset; + margin: 0 5px 0 0; } -.error-content .toggle-button:hover { - border: 1px solid #000; - border-width:1px 1px 0px 1px; - background-color: #353535; +.error-content .toggle-button:hover { + border: 1px solid #000; + border-width:1px 1px 0px 1px; + background-color: #353535; background: -moz-linear-gradient(top, #393939 0, #000000 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #393939), color-stop(100%, #000000)); - color: #ff5d1a; - text-shadow:none; - box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.6) 0 2px 2px inset; - -moz-box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.6) 0 2px 2px inset; - -webkit-box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.6) 0 2px 2px inset; + color: #ff5d1a; + text-shadow:none; + box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.6) 0 2px 2px inset; + -moz-box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.6) 0 2px 2px inset; + -webkit-box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.6) 0 2px 2px inset; } /*---//////////////////// DEFAULT TABLE ////////////////////---*/ @@ -2580,40 +2587,40 @@ table { border-style: solid; border-width: 0; } -tbody tr th { - color: #000000; - background-color: #b1b1b1; +tbody tr th { + color: #000000; + background-color: #b1b1b1; background: -moz-linear-gradient(top, #bebebe 0, #a2a2a2 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #bebebe), color-stop(100%, #a2a2a2)); - font-size: 13px; + font-size: 13px; padding: 5px 5px; border-color: #b1b1b1; border-style: solid; border-width: 1px 0 0 1px; - border-top-color: #5b5b5b; - text-align:left; + border-top-color: #5b5b5b; + text-align:left; } -thead tr th { - color: #FFFFFF; +thead tr th { + color: #FFFFFF; font-size: 12px; padding: 5px 5px; - border-color:#CCCCCC; - background-color: #6e6e6e; + border-color:#CCCCCC; + background-color: #6e6e6e; background: -moz-linear-gradient(top, #868686 0, #6e6e6e 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #868686), color-stop(100%, #6e6e6e)); border-style: solid; border-width: 0 0 0 1px; } -tr td { +tr td { border-color: #b1b1b1; border-style: solid; border-width: 0; font-size: 12px; padding: 5px 5px; } -tfoot tr td, tfoot tr th { - color:#FFFFFF; - background-color: #6e6e6e; +tfoot tr td, tfoot tr th { + color:#FFFFFF; + background-color: #6e6e6e; background: -moz-linear-gradient(top, #6e6e6e 0, #868686 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #6e6e6e), color-stop(100%, #868686)); font-size: 13px; @@ -2622,215 +2629,215 @@ tfoot tr td, tfoot tr th { border-style: solid; border-width: 1px 0 0 1px; } -tfoot tr th { - font-weight:bold; - text-align:left; +tfoot tr th { + font-weight:bold; + text-align:left; } - - + + /*---//////////////////// STATUS TABLE ////////////////////---*/ -.statustable { - background-color: #D8D8D8; +.statustable { + background-color: #D8D8D8; border-width: 2px 1px 1px; } -.statustable tr td, .statustable tr th { - text-align:center; - vertical-align:text-top; - font-size:13px; +.statustable tr td, .statustable tr th { + text-align:center; + vertical-align:text-top; + font-size:13px; } -.statustable tr td { - border-width: 1px 0 0 1px; +.statustable tr td { + border-width: 1px 0 0 1px; } .statustable tr td:first-child, .statustable tr th:first-child { - text-align:left; + text-align:left; border-left-width: 0 !important; } -.checked-icon { - width:100%; - margin:0; - background: url("images/accept.png") no-repeat center center; - height:16px; - margin:0; - display:block; +.checked-icon { + width:100%; + margin:0; + background: url("images/accept.png") no-repeat center center; + height:16px; + margin:0; + display:block; } -.not-available-icon { - width:100%; - margin:0; - background: url("images/delete.png") no-repeat center center; - height:16px; - margin:0; - display:block; +.not-available-icon { + width:100%; + margin:0; + background: url("images/delete.png") no-repeat center center; + height:16px; + margin:0; + display:block; } -.warning-icon { - width:100%; - margin:0; - background: url("images/warning-icon.png") no-repeat center center; - height:16px; - margin:0; - display:block; +.warning-icon { + width:100%; + margin:0; + background: url("images/warning-icon.png") no-repeat center center; + height:16px; + margin:0; + display:block; } -.statustable ul { - margin:4px 0; - padding:0; - list-style-type: none; +.statustable ul { + margin:4px 0; + padding:0; + list-style-type: none; } -.statustable ul li { - background:#bbb; - margin:2px 0 6px 0; - padding:4px 8px 0; - position:relative; - min-height:22px; - border-radius: 4px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - font-size:13px; +.statustable ul li { + background:#bbb; + margin:2px 0 6px 0; + padding:4px 8px 0; + position:relative; + min-height:22px; + border-radius: 4px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + font-size:13px; } -.statustable .big { - width:120px; - height:10px; - background:#444444; +.statustable .big { + width:120px; + height:10px; + background:#444444; background: -moz-linear-gradient(top, #464646 0, #3e3e3e 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #3e3e3e), color-stop(100%, #464646)); - border-bottom:1px solid #fff; - margin: 0 auto; - padding: 1px; - display:inline-block; + border-bottom:1px solid #fff; + margin: 0 auto; + padding: 1px; + display:inline-block; } -.diskspace { - background-color:#e76400; +.diskspace { + background-color:#e76400; background: -moz-linear-gradient(top, #ff6f01 0, #bc5200 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #ff6f01), color-stop(100%, #bc5200)); - height:10px; + height:10px; } -.statustable a { - color: #222; - text-decoration: underline; +.statustable a { + color: #222; + text-decoration: underline; } -.statustable a:visited { - color: #666; - text-decoration: underline; +.statustable a:visited { + color: #666; + text-decoration: underline; } -.statustable a:hover { - color: #e76400; - text-decoration: underline; +.statustable a:hover { + color: #e76400; + text-decoration: underline; } -.strong { - font-weight:bold; +.strong { + font-weight:bold; } /*---//////////////////// PLUPLOAD ERROR ////////////////////---*/ #plupload_error{ - margin-top:10px; + margin-top:10px; } -#plupload_error table { - color:red; - border:1px solid #c83f3f; - background:#c6b4b4; - display:none; +#plupload_error table { + color:red; + border:1px solid #c83f3f; + background:#c6b4b4; + display:none; } #plupload_error table td { - color:#902d2d; - font-size:12px; - font-weight:bold; - padding:2px 4px; - margin-bottom:2px; - border:none; - margin:0; + color:#902d2d; + font-size:12px; + font-weight:bold; + padding:2px 4px; + margin-bottom:2px; + border:none; + margin:0; } /*---//////////////////// TRIAL BOX HEADER ////////////////////---*/ -.trial-box { - width:142px; - height:38px; - display:block; - position:fixed; - left:20px; - bottom:10px; - background-color:#222; - background-color:rgba(0, 0, 0, 0.7); - z-index:100; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - color:#FFF; - font-size:11px; - padding:7px; +.trial-box { + width:142px; + height:38px; + display:block; + position:fixed; + left:20px; + bottom:10px; + background-color:#222; + background-color:rgba(0, 0, 0, 0.7); + z-index:100; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + color:#FFF; + font-size:11px; + padding:7px; } -.trial-box p { - padding:0 0 3px 0; - margin:0 0 5px 0; - float:left; +.trial-box p { + padding:0 0 3px 0; + margin:0 0 5px 0; + float:left; } .trial-box-button a { - width:92px; - height:14px; - display:block; - padding: 1px 3px; - -moz-border-radius: 1px; - -webkit-border-radius: 1px; - border-radius: 1px; - text-transform:uppercase; - text-align:center; - font-family:Arial, Helvetica, sans-serif; - font-weight:bold; - text-decoration:none; - color:#FFFFFF; - background-color:#ff5d1a; + width:92px; + height:14px; + display:block; + padding: 1px 3px; + -moz-border-radius: 1px; + -webkit-border-radius: 1px; + border-radius: 1px; + text-transform:uppercase; + text-align:center; + font-family:Arial, Helvetica, sans-serif; + font-weight:bold; + text-decoration:none; + color:#FFFFFF; + background-color:#ff5d1a; background: -moz-linear-gradient(top, #ff5d1a 0, #dd4202 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #ff5d1a), color-stop(100%, #dd4202)); - box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset; - -moz-box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset; - -webkit-box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset; - float:left; + box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset; + -moz-box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset; + -webkit-box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset; + float:left; } .trial-box-button a:hover { - background-color:#dd4202; + background-color:#dd4202; background: -moz-linear-gradient(top, #dd4202 0, #ff5d1a 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #dd4202), color-stop(100%, #ff5d1a)); - box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset; - -moz-box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset; - -webkit-box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset; + box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset; + -moz-box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset; + -webkit-box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset; } -.trial-box-calendar { - float:right; - text-align:center; - font-weight:bold; +.trial-box-calendar { + float:right; + text-align:center; + font-weight:bold; } -.trial-box-calendar-white { - font-size:18px; - color:#ff5d1a; - background:#FFF; - width:36px; - height:22px; - display:block; - -webkit-border-top-right-radius: 1px; - -moz-border-radius-topright: 1px; - -webkit-border-top-left-radius: 1px; - -moz-border-radius-topleft: 1px; +.trial-box-calendar-white { + font-size:18px; + color:#ff5d1a; + background:#FFF; + width:36px; + height:22px; + display:block; + -webkit-border-top-right-radius: 1px; + -moz-border-radius-topright: 1px; + -webkit-border-top-left-radius: 1px; + -moz-border-radius-topleft: 1px; } -.trial-box-calendar-gray { - width:36px; - height:14px; - display:block; - color:#FFF; - font-size:11px; - padding:1px 0; - text-transform:uppercase; - background-color:#676767; +.trial-box-calendar-gray { + width:36px; + height:14px; + display:block; + color:#FFF; + font-size:11px; + padding:1px 0; + text-transform:uppercase; + background-color:#676767; background: -moz-linear-gradient(top, #7f7f7f 0, #555555 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #7f7f7f), color-stop(100%, #555555)); - -webkit-border-bottom-right-radius: 1px; - -moz-border-radius-bottomright: 1px; - -webkit-border-bottom-left-radius: 1px; - -moz-border-radius-bottomleft: 1px; - box-shadow: rgba(0, 0, 0, 0.4) 0 2px 1px inset; - -moz-box-shadow: rgba(0, 0, 0, 0.4) 0 2px 2px inset; - -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 2px 2px inset; + -webkit-border-bottom-right-radius: 1px; + -moz-border-radius-bottomright: 1px; + -webkit-border-bottom-left-radius: 1px; + -moz-border-radius-bottomleft: 1px; + box-shadow: rgba(0, 0, 0, 0.4) 0 2px 1px inset; + -moz-box-shadow: rgba(0, 0, 0, 0.4) 0 2px 2px inset; + -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 2px 2px inset; } #stream_url {font-size:12px; line-height: 170%;} .stream-setting-content fieldset {border-width:0 1px 1px 1px;} @@ -2848,63 +2855,63 @@ tfoot tr th { /*---//////////////////// STREAM SETTINGS STATUS ////////////////////---*/ .stream-status { - border: 1px solid; - padding:2px 10px 4px 22px; - margin:2px 1px 10px 0px; - width: auto; + border: 1px solid; + padding:2px 10px 4px 22px; + margin:2px 1px 10px 0px; + width: auto; } dd .stream-status { - margin-bottom:1px; + margin-bottom:1px; } .stream-status h3 { - font-size: 12px; - font-weight: bold; - line-height: 12px; - padding:0; - margin:5px 4px 2px 4px; + font-size: 12px; + font-weight: bold; + line-height: 12px; + padding:0; + margin:5px 4px 2px 4px; } .stream-status p { - padding:0; - margin:2px 3px 1px 4px; - color:#4F4F4F; - font-size: 11px; + padding:0; + margin:2px 3px 1px 4px; + color:#4F4F4F; + font-size: 11px; } -.stream-config dd.stream-status { - padding:2px 10px 4px 22px; - margin:4px 0 10px 14px; - width: 65%; +.stream-config dd.stream-status { + padding:2px 10px 4px 22px; + margin:4px 0 10px 14px; + width: 65%; } .status-good { - background:#e3ffc9 url(images/stream_status.png) no-repeat 5px 5px; - border-color:#54b300; + background:#e3ffc9 url(images/stream_status.png) no-repeat 5px 5px; + border-color:#54b300; } .status-good h3 { - color:#54b300; + color:#54b300; } .status-error { - background:#ffeded url(images/stream_status.png) no-repeat 5px -128px; - border-color:#f90000; + background:#ffeded url(images/stream_status.png) no-repeat 5px -128px; + border-color:#f90000; } .status-error h3 { - color:#DA0101; + color:#DA0101; } .status-info { - background:#fff7e0 url(images/stream_status.png) no-repeat 5px -278px; - border-color:#f68826; + background:#fff7e0 url(images/stream_status.png) no-repeat 5px -278px; + border-color:#f68826; } .status-info h3 { - color:#f1830c; + color:#f1830c; } .status-disabled { - background:#c8ccc8 url(images/stream_status.png) no-repeat 5px -429px; - border-color:#7f827f; + background:#c8ccc8 url(images/stream_status.png) no-repeat 5px -429px; + border-color:#7f827f; } .status-disabled h3 { - color:#646664; + color:#646664; } .stream-setting-global dt{ - width: 195px; + width: 195px; } .stream-setting-global dd{ @@ -2914,108 +2921,108 @@ dd .stream-status { .qtip div > span { padding: 5px; } - + .pull-left { - float:left; + float:left; } .pull-right { - float:right; + float:right; } .push-down-8 { - margin-top:8px !important + margin-top:8px !important } .push-down-12 { - margin-top:12px !important + margin-top:12px !important } .push-down-16 { - margin-top:16px !important + margin-top:16px !important } .close-round { - display:block; - float:right; - height:18px; - width:18px; - background:url(images/round_delete.png) no-repeat 0 0; - text-indent: 100%; - white-space: nowrap; - overflow: hidden; - margin: 3px 0 0 10px; - } + display:block; + float:right; + height:18px; + width:18px; + background:url(images/round_delete.png) no-repeat 0 0; + text-indent: 100%; + white-space: nowrap; + overflow: hidden; + margin: 3px 0 0 10px; + } .close-round:hover { - background-position:0 -36px; + background-position:0 -36px; } .close-round:active { - background-position:0 -36px; + background-position:0 -36px; } -/*---//////////////////// NEW BUTTONS //////////////////// +/*---//////////////////// NEW BUTTONS //////////////////// .btn { - display: inline-block; - *display: inline; + display: inline-block; + *display: inline; - - *zoom: 1; - padding: 4px 10px 4px; - margin-bottom: 0; - font-size: 13px; - line-height: 18px; - color: #fff; - text-align: center; - vertical-align: middle; - background-image: -moz-linear-gradient(top, #a3a3a3, #6e6e6e); - background-image: -ms-linear-gradient(top, #a3a3a3, #6e6e6e); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#a3a3a3), to(#6e6e6e)); - background-image: -webkit-linear-gradient(top, #a3a3a3, #6e6e6e); - background-image: -o-linear-gradient(top, #a3a3a3, #6e6e6e); - background-image: linear-gradient(top, #a3a3a3, #6e6e6e); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#a3a3a3', endColorstr='#6e6e6e', GradientType=0); - border:1px solid #575757; - border-bottom-color: #333333; - filter: progid:dximagetransform.microsoft.gradient(enabled=false); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.4), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.4), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.4), 0 1px 2px rgba(0, 0, 0, 0.05); - cursor: pointer; - *margin-left: .3em; + + *zoom: 1; + padding: 4px 10px 4px; + margin-bottom: 0; + font-size: 13px; + line-height: 18px; + color: #fff; + text-align: center; + vertical-align: middle; + background-image: -moz-linear-gradient(top, #a3a3a3, #6e6e6e); + background-image: -ms-linear-gradient(top, #a3a3a3, #6e6e6e); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#a3a3a3), to(#6e6e6e)); + background-image: -webkit-linear-gradient(top, #a3a3a3, #6e6e6e); + background-image: -o-linear-gradient(top, #a3a3a3, #6e6e6e); + background-image: linear-gradient(top, #a3a3a3, #6e6e6e); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#a3a3a3', endColorstr='#6e6e6e', GradientType=0); + border:1px solid #575757; + border-bottom-color: #333333; + filter: progid:dximagetransform.microsoft.gradient(enabled=false); + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.4), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.4), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.4), 0 1px 2px rgba(0, 0, 0, 0.05); + cursor: pointer; + *margin-left: .3em; } .btn.disabled, .btn[disabled] { - background: #fff; + background: #fff; } .btn:active, .btn.active { - background-color: #cccccc \9; + background-color: #cccccc \9; } .btn:first-child { - *margin-left: 0; + *margin-left: 0; } .btn:hover { - color: #fff; - text-decoration: none; - background-color: #e6e6e6; - background-image: -moz-linear-gradient(top, #868686, #535353); - background-image: -ms-linear-gradient(top, #868686, #535353); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#868686), to(#535353)); - background-image: -webkit-linear-gradient(top, #868686, #535353); - background-image: -o-linear-gradient(top, #868686, #535353); - background-image: linear-gradient(top, #868686, #535353); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#868686', endColorstr='#535353', GradientType=0); + color: #fff; + text-decoration: none; + background-color: #e6e6e6; + background-image: -moz-linear-gradient(top, #868686, #535353); + background-image: -ms-linear-gradient(top, #868686, #535353); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#868686), to(#535353)); + background-image: -webkit-linear-gradient(top, #868686, #535353); + background-image: -o-linear-gradient(top, #868686, #535353); + background-image: linear-gradient(top, #868686, #535353); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#868686', endColorstr='#535353', GradientType=0); }---*/ .btn.active, .btn:active { - background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.3), 0 1px 0 rgba(255, 255, 255, 0.2); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.3), 0 1px 0 rgba(255, 255, 255,0.2); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.3), 0 1px 0 rgba(255, 255, 255, 0.2); - background-color: #727272; - outline: 0; - border-top-color:#333333 + background-image: none; + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.3), 0 1px 0 rgba(255, 255, 255, 0.2); + -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.3), 0 1px 0 rgba(255, 255, 255,0.2); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.3), 0 1px 0 rgba(255, 255, 255, 0.2); + background-color: #727272; + outline: 0; + border-top-color:#333333 } .dark_class { From 3b588dcce814717ecc7ee1ac2021ac16fd0de798 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Wed, 5 Nov 2014 17:27:08 -0500 Subject: [PATCH 14/21] Removed unnecessary call to set locale data on the Login page --- airtime_mvc/public/js/airtime/login/login.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/airtime_mvc/public/js/airtime/login/login.js b/airtime_mvc/public/js/airtime/login/login.js index f21043c31..8c17106ed 100644 --- a/airtime_mvc/public/js/airtime/login/login.js +++ b/airtime_mvc/public/js/airtime/login/login.js @@ -1,6 +1,5 @@ -$(window).load(function(){ +$(window).load(function() { $("#username").focus(); - $("#locale").val($.cookie("airtime_locale")!== null?$.cookie("airtime_locale"):$.cookie("default_airtime_locale")); }); $(document).ready(function() { From 3046003a1b6ef2f55121c6b760b1046761c871b8 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Wed, 5 Nov 2014 17:27:41 -0500 Subject: [PATCH 15/21] Removed unnecessary cookie declaration for default locale --- airtime_mvc/public/js/airtime/preferences/preferences.js | 1 - 1 file changed, 1 deletion(-) diff --git a/airtime_mvc/public/js/airtime/preferences/preferences.js b/airtime_mvc/public/js/airtime/preferences/preferences.js index 43d6a9bcb..e774033d0 100644 --- a/airtime_mvc/public/js/airtime/preferences/preferences.js +++ b/airtime_mvc/public/js/airtime/preferences/preferences.js @@ -110,7 +110,6 @@ $(document).ready(function() { $.post(url, {format: "json", data: data}, function(json){ $('#content').empty().append(json.html); - $.cookie("default_airtime_locale", $('#locale').val(), {path: '/'}); setTimeout(removeSuccessMsg, 5000); showErrorSections(); setMailServerInputReadonly(); From 62a915f109270ff3a08c0e12993fedb18a4bae22 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Thu, 6 Nov 2014 11:57:05 -0500 Subject: [PATCH 16/21] Added global define for application name --- airtime_mvc/application/configs/constants.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php index 34f8cab41..f6cc6840c 100644 --- a/airtime_mvc/application/configs/constants.php +++ b/airtime_mvc/application/configs/constants.php @@ -1,5 +1,7 @@ Date: Thu, 6 Nov 2014 18:24:29 -0500 Subject: [PATCH 17/21] Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls. --- .../application/controllers/ApiController.php | 6 ++-- .../application/forms/AddShowLiveStream.php | 2 +- .../application/forms/RegisterAirtime.php | 9 ++++-- .../application/forms/SupportSettings.php | 9 ++++-- .../application/layouts/scripts/login.phtml | 27 ++++++++++++------ airtime_mvc/application/models/Auth.php | 3 +- .../views/scripts/dashboard/about.phtml | 28 +++++++++++-------- .../views/scripts/dashboard/help.phtml | 14 ++++++---- .../form/preferences_watched_dirs.phtml | 3 +- .../views/scripts/form/register-dialog.phtml | 20 +++++++------ .../views/scripts/form/support-setting.phtml | 17 +++++++---- .../views/scripts/login/index.phtml | 2 +- .../views/scripts/partialviews/trialBox.phtml | 2 +- .../views/scripts/systemstatus/index.phtml | 26 ++++++++--------- 14 files changed, 101 insertions(+), 67 deletions(-) diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index 4001f7d50..6448342ae 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -768,7 +768,7 @@ class ApiController extends Zend_Controller_Action //File is not in database anymore. if (is_null($file)) { - $return_hash['error'] = _("File does not exist in Airtime."); + $return_hash['error'] = sprintf(_("File does not exist in %s"), PRODUCT_NAME); } //Updating a metadata change. else { @@ -788,7 +788,7 @@ class ApiController extends Zend_Controller_Action $md['MDATA_KEY_ORIGINAL_PATH'], $con); if (is_null($file)) { - $return_hash['error'] = _('File does not exist in Airtime'); + $return_hash['error'] = sprintf(_('File does not exist in %s'), PRODUCT_NAME); } else { $filepath = $md['MDATA_KEY_FILEPATH']; //$filepath = str_replace("\\", "", $filepath); @@ -800,7 +800,7 @@ class ApiController extends Zend_Controller_Action $file = Application_Model_StoredFile::RecallByFilepath($filepath, $con); if (is_null($file)) { - $return_hash['error'] = _("File doesn't exist in Airtime."); + $return_hash['error'] = sprintf(_('File does not exist in %s'), PRODUCT_NAME); Logging::warn("Attempt to delete file that doesn't exist. Path: '$filepath'"); } else { diff --git a/airtime_mvc/application/forms/AddShowLiveStream.php b/airtime_mvc/application/forms/AddShowLiveStream.php index 65e2a19d3..923c6993d 100644 --- a/airtime_mvc/application/forms/AddShowLiveStream.php +++ b/airtime_mvc/application/forms/AddShowLiveStream.php @@ -7,7 +7,7 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm public function init() { $cb_airtime_auth = new Zend_Form_Element_Checkbox("cb_airtime_auth"); - $cb_airtime_auth->setLabel(_("Use Airtime Authentication:")) + $cb_airtime_auth->setLabel(sprintf(_("Use %s Authentication:"), PRODUCT_NAME)) ->setRequired(false) ->setDecorators(array('ViewHelper')); $this->addElement($cb_airtime_auth); diff --git a/airtime_mvc/application/forms/RegisterAirtime.php b/airtime_mvc/application/forms/RegisterAirtime.php index 2da7083c8..1fcafc840 100644 --- a/airtime_mvc/application/forms/RegisterAirtime.php +++ b/airtime_mvc/application/forms/RegisterAirtime.php @@ -123,7 +123,7 @@ class Application_Form_RegisterAirtime extends Zend_Form // checkbox for publicise $checkboxPublicise = new Zend_Form_Element_Checkbox("Publicise"); - $checkboxPublicise->setLabel(_('Promote my station on Sourcefabric.org')) + $checkboxPublicise->setLabel(sprintf(_('Promote my station on %s'), COMPANY_SITE)) ->setRequired(false) ->setDecorators(array('ViewHelper')) ->setValue(Application_Model_Preference::GetPublicise()); @@ -143,11 +143,14 @@ class Application_Form_RegisterAirtime extends Zend_Form ) )); + $privacyPolicyAnchorOpen = ""; // checkbox for privacy policy $checkboxPrivacy = new Zend_Form_Element_Checkbox("Privacy"); $checkboxPrivacy->setLabel( - sprintf(_("By checking this box, I agree to Sourcefabric's %sprivacy policy%s."), - "", + sprintf(_('By checking this box, I agree to %s\'s %sprivacy policy%s.'), + COMPANY_NAME, + $privacyPolicyAnchorOpen, "")) ->setDecorators(array('ViewHelper')); $this->addElement($checkboxPrivacy); diff --git a/airtime_mvc/application/forms/SupportSettings.php b/airtime_mvc/application/forms/SupportSettings.php index 7ce63bcf0..87e5588de 100644 --- a/airtime_mvc/application/forms/SupportSettings.php +++ b/airtime_mvc/application/forms/SupportSettings.php @@ -119,7 +119,7 @@ class Application_Form_SupportSettings extends Zend_Form // checkbox for publicise $checkboxPublicise = new Zend_Form_Element_Checkbox("Publicise"); - $checkboxPublicise->setLabel(_('Promote my station on Sourcefabric.org')) + $checkboxPublicise->setLabel(sprintf(_('Promote my station on %s'), COMPANY_SITE)) ->setRequired(false) ->setDecorators(array('ViewHelper')) ->setValue(Application_Model_Preference::GetPublicise()); @@ -142,11 +142,14 @@ class Application_Form_SupportSettings extends Zend_Form ) )); + $privacyPolicyAnchorOpen = ""; // checkbox for privacy policy $checkboxPrivacy = new Zend_Form_Element_Checkbox("Privacy"); $checkboxPrivacy->setLabel( - sprintf(_("By checking this box, I agree to Sourcefabric's %sprivacy policy%s."), - "", + sprintf(_('By checking this box, I agree to %s\'s %sprivacy policy%s.'), + COMPANY_NAME, + $privacyPolicyAnchorOpen, "")) ->setDecorators(array('ViewHelper')); $this->addElement($checkboxPrivacy); diff --git a/airtime_mvc/application/layouts/scripts/login.phtml b/airtime_mvc/application/layouts/scripts/login.phtml index aa4030390..6a9879673 100644 --- a/airtime_mvc/application/layouts/scripts/login.phtml +++ b/airtime_mvc/application/layouts/scripts/login.phtml @@ -1,11 +1,11 @@ doctype() ?> - - headTitle() ?> - headLink() ?> - headScript() ?> - google_analytics)?$this->google_analytics:"" ?> + + headTitle() ?> + headLink() ?> + headScript() ?> + google_analytics)?$this->google_analytics:"" ?> @@ -13,9 +13,20 @@ layout()->content ?>
    - ", "" ,"");?> + " + . LICENSE_VERSION + . ""; + $companySiteAnchor = "" + . $company + . ""; + echo sprintf(_('%1$s copyright © %2$s All rights reserved.%3$s' + . 'Maintained and distributed under the %4$s by %5$s'), + PRODUCT_NAME, $company, "
    ", + $licenseSiteAnchor, + $companySiteAnchor); + ?>
    diff --git a/airtime_mvc/application/models/Auth.php b/airtime_mvc/application/models/Auth.php index fd39e0407..34e36bbe4 100644 --- a/airtime_mvc/application/models/Auth.php +++ b/airtime_mvc/application/models/Auth.php @@ -33,7 +33,8 @@ class Application_Model_Auth $message = sprintf(_("Hi %s, \n\nClick this link to reset your password: "), $user->getDbLogin()); $message .= "{$e_link_protocol}://{$e_link_base}:{$e_link_port}{$e_link_path}"; - $success = Application_Model_Email::send(_('Airtime Password Reset'), $message, $user->getDbEmail()); + $str = sprintf(_('%s Password Reset'), PRODUCT_NAME); + $success = Application_Model_Email::send($str, $message, $user->getDbEmail()); return $success; } diff --git a/airtime_mvc/application/views/scripts/dashboard/about.phtml b/airtime_mvc/application/views/scripts/dashboard/about.phtml index f2ccfa02d..98e93e724 100644 --- a/airtime_mvc/application/views/scripts/dashboard/about.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/about.phtml @@ -2,19 +2,25 @@

    ", - "", - $this->airtime_version, - "
    ") + +$productSiteAnchor = "" + . PRODUCT_NAME + . ""; +echo sprintf(_('%1$s %2$s, the open radio software for scheduling and remote station management.'), + $productSiteAnchor, + $this->airtime_version) ?> -
    © 2013 +
    +
    © 2013 ", - "", - "", - "") +$companySiteAnchor = "" + . COMPANY_NAME . " " . COMPANY_SUFFIX + . ""; +$licenseAnchor = "" + . LICENSE_VERSION + . ""; +echo sprintf(_('%1$s %2$s is distributed under the %3$s'), + $companySiteAnchor, PRODUCT_NAME, $licenseAnchor) ?>

    diff --git a/airtime_mvc/application/views/scripts/dashboard/help.phtml b/airtime_mvc/application/views/scripts/dashboard/help.phtml index 66857c7cd..7b4b9f5c8 100644 --- a/airtime_mvc/application/views/scripts/dashboard/help.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/help.phtml @@ -1,7 +1,7 @@
    -

    -

    +

    +

      2. @@ -10,8 +10,12 @@


    -", - "") ?>

    +"; +echo sprintf(_("For more detailed help, read the %suser manual%s."), + $userManualAnchorOpen, "") + +?> +

    diff --git a/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml b/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml index c44dcae4c..37dba574d 100644 --- a/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml @@ -40,9 +40,8 @@
    getExistsFlag())?"":""?>getDirectory());?> - " class="ui-icon ui-icon-refresh"> + " class="ui-icon ui-icon-refresh"> " class="ui-icon ui-icon-close"> -
    diff --git a/airtime_mvc/application/views/scripts/form/register-dialog.phtml b/airtime_mvc/application/views/scripts/form/register-dialog.phtml index 6f00586e6..999eb045d 100644 --- a/airtime_mvc/application/views/scripts/form/register-dialog.phtml +++ b/airtime_mvc/application/views/scripts/form/register-dialog.phtml @@ -3,10 +3,10 @@
    -
    ") ?> +
    ") ?>
    - ", - "")?> + " + . COMPANY_SITE + . ""; + echo sprintf(_("Click the box below to promote your station on %s."), $whosUsingAnchor) + ?>
    - + diff --git a/airtime_mvc/application/views/scripts/form/support-setting.phtml b/airtime_mvc/application/views/scripts/form/support-setting.phtml index 4932cf3f9..b23925d70 100644 --- a/airtime_mvc/application/views/scripts/form/support-setting.phtml +++ b/airtime_mvc/application/views/scripts/form/support-setting.phtml @@ -2,9 +2,10 @@
    - ")?> + ."Click the 'Send support feedback' box and we'll make sure the features you use are constantly improving."), + PRODUCT_NAME, COMPANY_NAME, "
    ")?>
    - ", - "")?> + " + . COMPANY_SITE + . ""; + echo sprintf(_("Click the box below to promote your station on %s."), $whosUsingAnchor) + ?>
    diff --git a/airtime_mvc/application/views/scripts/login/index.phtml b/airtime_mvc/application/views/scripts/login/index.phtml index 178aca493..0ba4d7e0a 100644 --- a/airtime_mvc/application/views/scripts/login/index.phtml +++ b/airtime_mvc/application/views/scripts/login/index.phtml @@ -4,7 +4,7 @@
    - href="https://account.sourcefabric.com/clientarea.php" target="_blank"> + href="https://account.sourcefabric.com/clientarea.php" target="_blank">
    diff --git a/airtime_mvc/application/views/scripts/systemstatus/index.phtml b/airtime_mvc/application/views/scripts/systemstatus/index.phtml index f859f2eab..2a31ac78e 100644 --- a/airtime_mvc/application/views/scripts/systemstatus/index.phtml +++ b/airtime_mvc/application/views/scripts/systemstatus/index.phtml @@ -1,19 +1,19 @@ - - - - - - - + + + + + + + @@ -26,8 +26,8 @@ - - + +
    From efd05c4b7733396ccba6f3e6eb9b09edad21fdf1 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Thu, 6 Nov 2014 18:26:09 -0500 Subject: [PATCH 18/21] Added the _initTranslationGlobals function to bind PHP globals to javascript vars for dynamic translation purposes --- airtime_mvc/application/Bootstrap.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php index fddd5911e..7ae9e7388 100644 --- a/airtime_mvc/application/Bootstrap.php +++ b/airtime_mvc/application/Bootstrap.php @@ -17,7 +17,6 @@ require_once "Timezone.php"; require_once "Auth.php"; require_once __DIR__.'/forms/helpers/ValidationTypes.php'; require_once __DIR__.'/controllers/plugins/RabbitMqPlugin.php'; - require_once (APPLICATION_PATH."/logging/Logging.php"); Logging::setLogPath('/var/log/airtime/zendphp.log'); @@ -51,8 +50,9 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $view = $this->getResource('view'); $baseUrl = Application_Common_OsPath::getBaseDir(); - $view->headScript()->appendScript("var baseUrl = '$baseUrl'"); - + $view->headScript()->appendScript("var baseUrl = '$baseUrl';"); + $this->_initTranslationGlobals($view); + $user = Application_Model_User::GetCurrentUser(); if (!is_null($user)){ $userType = $user->getType(); @@ -60,7 +60,17 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $userType = ""; } $view->headScript()->appendScript("var userType = '$userType';"); - + } + + /** + * Ideally, globals should be written to a single js file once + * from a php init function. This will save us from having to + * reinitialize them every request + */ + private function _initTranslationGlobals($view) { + $view->headScript()->appendScript("var PRODUCT_NAME = '" . PRODUCT_NAME . "';"); + $view->headScript()->appendScript("var USER_MANUAL_URL = '" . USER_MANUAL_URL . "';"); + $view->headScript()->appendScript("var COMPANY_NAME = '" . COMPANY_NAME . "';"); } protected function _initHeadLink() From 8fc7178d82a80c4f1b593fb909cd3e529109b101 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Thu, 6 Nov 2014 18:28:14 -0500 Subject: [PATCH 19/21] Added several global constants for reoccurring strings in Airtime to aid dynamic translations --- airtime_mvc/application/configs/constants.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php index f6cc6840c..7b27bc891 100644 --- a/airtime_mvc/application/configs/constants.php +++ b/airtime_mvc/application/configs/constants.php @@ -1,6 +1,20 @@ Date: Thu, 6 Nov 2014 18:35:13 -0500 Subject: [PATCH 20/21] Replaced reoccurring strings with string formatting to aid dynamic translations --- airtime_mvc/public/js/airtime/library/spl.js | 1846 ++++++++--------- .../public/js/airtime/nowplaying/register.js | 82 +- .../js/airtime/playlist/smart_blockbuilder.js | 2 +- .../js/airtime/preferences/musicdirs.js | 2 +- .../js/airtime/preferences/streamsetting.js | 8 +- 5 files changed, 971 insertions(+), 969 deletions(-) diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index b33a16942..ff0902dc8 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -3,65 +3,65 @@ //-------------------------------------------------------------------------------------------------------------------------------- var AIRTIME = (function(AIRTIME){ - - if (AIRTIME.playlist === undefined) { - AIRTIME.playlist = {}; + + if (AIRTIME.playlist === undefined) { + AIRTIME.playlist = {}; } - - var mod = AIRTIME.playlist, - viewport, - $lib, - $pl, - $togglePl = $(""), - widgetHeight, - resizeTimeout, - width; - - function isTimeValid(time) { - //var regExpr = new RegExp("^\\d{2}[:]\\d{2}[:]\\d{2}([.]\\d{1,6})?$"); - var regExpr = new RegExp("^\\d{2}[:]([0-5]){1}([0-9]){1}[:]([0-5]){1}([0-9]){1}([.]\\d{1})?$"); - - return regExpr.test(time); - } - - function isFadeValid(fade) { + + var mod = AIRTIME.playlist, + viewport, + $lib, + $pl, + $togglePl = $(""), + widgetHeight, + resizeTimeout, + width; + + function isTimeValid(time) { + //var regExpr = new RegExp("^\\d{2}[:]\\d{2}[:]\\d{2}([.]\\d{1,6})?$"); + var regExpr = new RegExp("^\\d{2}[:]([0-5]){1}([0-9]){1}[:]([0-5]){1}([0-9]){1}([.]\\d{1})?$"); + + return regExpr.test(time); + } + + function isFadeValid(fade) { var regExpr = new RegExp("^\\d{1}(\\d{1})?([.]\\d{1})?$"); return regExpr.test(fade); - } - - function playlistError(json) { - alert(json.error); - openPlaylist(json); - } - - function stopAudioPreview() { - // stop any preview playing - $('#jquery_jplayer_1').jPlayer('stop'); - } - - function highlightActive(el) { + } + + function playlistError(json) { + alert(json.error); + openPlaylist(json); + } + + function stopAudioPreview() { + // stop any preview playing + $('#jquery_jplayer_1').jPlayer('stop'); + } + + function highlightActive(el) { - $(el).addClass("ui-state-active"); - } + $(el).addClass("ui-state-active"); + } - function unHighlightActive(el) { + function unHighlightActive(el) { - $(el).removeClass("ui-state-active"); - } + $(el).removeClass("ui-state-active"); + } - function showError(el, error) { - $(el).parent().next() - .empty() - .append(error) - .show(); - } + function showError(el, error) { + $(el).parent().next() + .empty() + .append(error) + .show(); + } - function hideError(el) { - $(el).parent().next() - .empty() - .hide(); - } + function hideError(el) { + $(el).parent().next() + .empty() + .hide(); + } function changeCueIn(event) { event.stopPropagation(); @@ -84,7 +84,7 @@ var AIRTIME = (function(AIRTIME){ if (json.error !== undefined){ playlistError(json); - return; + return; } if (json.cue_error !== undefined) { showError(span, json.cue_error); @@ -152,49 +152,49 @@ var AIRTIME = (function(AIRTIME){ return; } else { - $el.find('.cue-in-error').hide(); + $el.find('.cue-in-error').hide(); } if (!isTimeValid(cueOut)){ - $el.find('.cue-out-error').val($.i18n._("please put in a time '00:00:00 (.0)'")).show(); + $el.find('.cue-out-error').val($.i18n._("please put in a time '00:00:00 (.0)'")).show(); return; } else { - $el.find('.cue-out-error').hide(); + $el.find('.cue-out-error').hide(); } $.post(url, {format: "json", cueIn: cueIn, cueOut: cueOut, id: id, modified: lastMod, type: type}, function(json){ - - $el.dialog('destroy'); - $el.remove(); + + $el.dialog('destroy'); + $el.remove(); if (json.error !== undefined){ playlistError(json); - return; + return; } if (json.cue_error !== undefined) { - - li = $('#side_playlist li[unqid='+id+']'); - - if (json.code === 0) { - - span = $('#spl_cue_in_'+id).find('span'); - showError(span, json.cue_error); - span = $('#spl_cue_out_'+id).find('span'); - showError(span, json.cue_error); - } - else if (json.code === 1) { - - span = $('#spl_cue_in_'+id).find('span'); - showError(span, json.cue_error); - } - else if (json.code === 2) { - - span = $('#spl_cue_out_'+id).find('span'); - showError(span, json.cue_error); - } + + li = $('#side_playlist li[unqid='+id+']'); + + if (json.code === 0) { + + span = $('#spl_cue_in_'+id).find('span'); + showError(span, json.cue_error); + span = $('#spl_cue_out_'+id).find('span'); + showError(span, json.cue_error); + } + else if (json.code === 1) { + + span = $('#spl_cue_in_'+id).find('span'); + showError(span, json.cue_error); + } + else if (json.code === 2) { + + span = $('#spl_cue_out_'+id).find('span'); + showError(span, json.cue_error); + } return; } @@ -218,13 +218,13 @@ var AIRTIME = (function(AIRTIME){ $.post(url, {format: "json", fadeIn: fadeIn, fadeOut: fadeOut, id1: id1, id2: id2, offset: offset, modified: lastMod, type: type}, function(json){ - - $el.dialog('destroy'); - $el.remove(); + + $el.dialog('destroy'); + $el.remove(); if (json.error !== undefined){ playlistError(json); - return; + return; } setPlaylistContent(json); @@ -273,195 +273,195 @@ var AIRTIME = (function(AIRTIME){ }); } - function changeFadeOut(event) { - event.stopPropagation(); + function changeFadeOut(event) { + event.stopPropagation(); - var span = $(this), - id = span.parent().attr("id").split("_").pop(), - url = baseUrl+"Playlist/set-fade", - fadeOut = $.trim(span.text()), - li = span.parents("li"), - unqid = li.attr("unqid"), - lastMod = getModified(), + var span = $(this), + id = span.parent().attr("id").split("_").pop(), + url = baseUrl+"Playlist/set-fade", + fadeOut = $.trim(span.text()), + li = span.parents("li"), + unqid = li.attr("unqid"), + lastMod = getModified(), type = $('#obj_type').val(); - if (!isFadeValid(fadeOut)){ - showError(span, $.i18n._("please put in a time in seconds '00 (.0)'")); - return; - } + if (!isFadeValid(fadeOut)){ + showError(span, $.i18n._("please put in a time in seconds '00 (.0)'")); + return; + } - $.post(url, - {format: "json", fadeOut: fadeOut, id: id, modified: lastMod, type: type}, - function(json){ - - if (json.error !== undefined){ - playlistError(json); - return; + $.post(url, + {format: "json", fadeOut: fadeOut, id: id, modified: lastMod, type: type}, + function(json){ + + if (json.error !== undefined){ + playlistError(json); + return; + } + if (json.fade_error !== undefined) { + showError(span, json.fade_error); + return; } - if (json.fade_error !== undefined) { - showError(span, json.fade_error); - return; - } - - setPlaylistContent(json); - - li = $('#side_playlist li[unqid='+unqid+']'); - li.find('.crossfade').toggle(); - highlightActive(li.find('.spl_fade_control')); - }); - } - - function submitOnEnter(event) { - //enter was pressed - if(event.keyCode === 13) { - event.preventDefault(); - $(this).blur(); - } - } - - function openFadeEditor(event) { - var li; - - event.stopPropagation(); - - li = $(this).parents("li"); - li.find(".crossfade").toggle(); - - if ($(this).hasClass("ui-state-active")) { - unHighlightActive(this); - } - else { - highlightActive(this); - } - } - - function openCueEditor(event) { - var li, icon; - - event.stopPropagation(); - - icon = $(this); - li = $(this).parents("li"); - li.find(".cue-edit").toggle(); - - if (li.hasClass("ui-state-active")) { - unHighlightActive(li); - unHighlightActive(icon); - } - else { - highlightActive(li); - highlightActive(icon); - } - } - function editName() { - var nameElement = $(this), - lastMod = getModified(), - type = $('#obj_type').val(); + setPlaylistContent(json); + + li = $('#side_playlist li[unqid='+unqid+']'); + li.find('.crossfade').toggle(); + highlightActive(li.find('.spl_fade_control')); + }); + } + + function submitOnEnter(event) { + //enter was pressed + if(event.keyCode === 13) { + event.preventDefault(); + $(this).blur(); + } + } + + function openFadeEditor(event) { + var li; + + event.stopPropagation(); + + li = $(this).parents("li"); + li.find(".crossfade").toggle(); + + if ($(this).hasClass("ui-state-active")) { + unHighlightActive(this); + } + else { + highlightActive(this); + } + } + + function openCueEditor(event) { + var li, icon; + + event.stopPropagation(); + + icon = $(this); + li = $(this).parents("li"); + li.find(".cue-edit").toggle(); + + if (li.hasClass("ui-state-active")) { + unHighlightActive(li); + unHighlightActive(icon); + } + else { + highlightActive(li); + highlightActive(icon); + } + } + + function editName() { + var nameElement = $(this), + lastMod = getModified(), + type = $('#obj_type').val(); //remove any newlines if user somehow snuck them in (easy to do if dragging/dropping text) nameElement.text(nameElement.text().replace("\n", "")); - + /* --until we decide whether Playlist name should autosave or not - url = baseUrl+'Playlist/set-playlist-name'; + url = baseUrl+'Playlist/set-playlist-name'; - $.post(url, - {format: "json", name: nameElement.text(), modified: lastMod, type: type}, - function(json){ - - if (json.error !== undefined) { - playlistError(json); - } - else { - setModified(json.modified); - nameElement.text(json.playlistName); - redrawLib(); - } - }); + $.post(url, + {format: "json", name: nameElement.text(), modified: lastMod, type: type}, + function(json){ + + if (json.error !== undefined) { + playlistError(json); + } + else { + setModified(json.modified); + nameElement.text(json.playlistName); + redrawLib(); + } + }); */ - } - - function redrawLib() { - var dt = $lib.find("#library_display").dataTable(); - - dt.fnStandingRedraw(); - AIRTIME.library.redrawChosen(); - } - - function setPlaylistContent(json) { - var $html = $(json.html); - - $('#spl_name > a') - .empty() - .append(json.name); - $('#obj_length') - .empty() - .append(json.length); - $('#fieldset-metadate_change textarea') - .empty() - .val(json.description); - - $('#spl_sortable').off('focusout keydown'); - $('#spl_sortable') + } + + function redrawLib() { + var dt = $lib.find("#library_display").dataTable(); + + dt.fnStandingRedraw(); + AIRTIME.library.redrawChosen(); + } + + function setPlaylistContent(json) { + var $html = $(json.html); + + $('#spl_name > a') + .empty() + .append(json.name); + $('#obj_length') + .empty() + .append(json.length); + $('#fieldset-metadate_change textarea') + .empty() + .val(json.description); + + $('#spl_sortable').off('focusout keydown'); + $('#spl_sortable') .empty() .append($html); - setCueEvents(); - setFadeEvents(); - setModified(json.modified); - AIRTIME.playlist.validatePlaylistElements(); - redrawLib(); - } - - function setFadeIcon(){ - var contents = $("#spl_sortable"); + setCueEvents(); + setFadeEvents(); + setModified(json.modified); + AIRTIME.playlist.validatePlaylistElements(); + redrawLib(); + } + + function setFadeIcon(){ + var contents = $("#spl_sortable"); var show = contents.is(":visible"); - var empty = $(".spl_empty"); - - if (!show || empty.length > 0) { - $("#spl_crossfade").hide(); - } else { - //get list of playlist contents - var list = contents.children(); - - //if first and last items are blocks, hide the fade icon - var first = list.first(); - var last = list.last(); - if (first.find(':first-child').children().attr('blockid') !== undefined && - last.find(':first-child').children().attr('blockid') !== undefined) { - $("#spl_crossfade").hide(); - } else { - $("#spl_crossfade").show(); - } - } - } - - function getId() { - return parseInt($("#obj_id").val(), 10); - } - - function getModified() { - return parseInt($("#obj_lastMod").val(), 10); - } - - function setModified(modified) { - $("#obj_lastMod").val(modified); - } - - function openPlaylist(json) { - $("#side_playlist") - .empty() - .append(json.html); - - setUpPlaylist(); - setCueEvents(); - setFadeEvents(); - + var empty = $(".spl_empty"); + + if (!show || empty.length > 0) { + $("#spl_crossfade").hide(); + } else { + //get list of playlist contents + var list = contents.children(); + + //if first and last items are blocks, hide the fade icon + var first = list.first(); + var last = list.last(); + if (first.find(':first-child').children().attr('blockid') !== undefined && + last.find(':first-child').children().attr('blockid') !== undefined) { + $("#spl_crossfade").hide(); + } else { + $("#spl_crossfade").show(); + } + } + } + + function getId() { + return parseInt($("#obj_id").val(), 10); + } + + function getModified() { + return parseInt($("#obj_lastMod").val(), 10); + } + + function setModified(modified) { + $("#obj_lastMod").val(modified); + } + + function openPlaylist(json) { + $("#side_playlist") + .empty() + .append(json.html); + + setUpPlaylist(); + setCueEvents(); + setFadeEvents(); + // functions in smart_blockbuilder.js setupUI(); appendAddButton(); appendModAddButton(); removeButtonCheck(); - } + } function openPlaylistPanel() { var screenWidth = Math.floor(viewport.width - 40); @@ -537,28 +537,28 @@ var AIRTIME = (function(AIRTIME){ } }); } - - //sets events dynamically for playlist entries (each row in the playlist) - function setPlaylistEntryEvents() { - - $pl.delegate("#spl_sortable .ui-icon-closethick", - {"click": function(ev){ - var id; - id = parseInt($(this).attr("id").split("_").pop(), 10); - AIRTIME.playlist.fnDeleteItems([id]); - }}); + + //sets events dynamically for playlist entries (each row in the playlist) + function setPlaylistEntryEvents() { + + $pl.delegate("#spl_sortable .ui-icon-closethick", + {"click": function(ev){ + var id; + id = parseInt($(this).attr("id").split("_").pop(), 10); + AIRTIME.playlist.fnDeleteItems([id]); + }}); - $pl.delegate(".spl_fade_control", - {"click": openFadeEditor}); - - $pl.delegate(".spl_cue", - {"click": openCueEditor}); - - $pl.delegate(".spl_block_expand", - {"click": function(ev){ - var id = parseInt($(this).attr("id").split("_").pop(), 10); - var blockId = parseInt($(this).attr("blockId"), 10); - if ($(this).hasClass('close')) { + $pl.delegate(".spl_fade_control", + {"click": openFadeEditor}); + + $pl.delegate(".spl_cue", + {"click": openCueEditor}); + + $pl.delegate(".spl_block_expand", + {"click": function(ev){ + var id = parseInt($(this).attr("id").split("_").pop(), 10); + var blockId = parseInt($(this).attr("blockId"), 10); + if ($(this).hasClass('close')) { var sUrl = baseUrl+"playlist/get-block-info"; mod.disableUI(); $.post(sUrl, {format:"json", id:blockId}, function(data){ @@ -599,33 +599,33 @@ var AIRTIME = (function(AIRTIME){ mod.enableUI(); }); $(this).removeClass('close'); - } else { - $pl.find("#block_"+id+"_info").html("").hide(); - $(this).addClass('close'); - } + } else { + $pl.find("#block_"+id+"_info").html("").hide(); + $(this).addClass('close'); + } }}); - } - - //sets events dynamically for the cue editor. - function setCueEvents() { - var temp = $('#spl_sortable'); - temp.on("focusout", ".spl_cue_in span", changeCueIn); - temp.on("keydown", ".spl_cue_in span", submitOnEnter); - - temp.on("focusout", ".spl_cue_out span", changeCueOut); - temp.on("keydown", ".spl_cue_out span", submitOnEnter); - - //remove show waveform buttons since web audio api is not supported. - if (!(window.AudioContext || window.webkitAudioContext)) { - temp.find('.pl-waveform-cues-btn') - .parent() - .html($.i18n._("Waveform features are available in a browser supporting the Web Audio API")); - } - } - - //sets events dynamically for the fade editor. - function setFadeEvents() { - var temp = $('#spl_sortable'); + } + + //sets events dynamically for the cue editor. + function setCueEvents() { + var temp = $('#spl_sortable'); + temp.on("focusout", ".spl_cue_in span", changeCueIn); + temp.on("keydown", ".spl_cue_in span", submitOnEnter); + + temp.on("focusout", ".spl_cue_out span", changeCueOut); + temp.on("keydown", ".spl_cue_out span", submitOnEnter); + + //remove show waveform buttons since web audio api is not supported. + if (!(window.AudioContext || window.webkitAudioContext)) { + temp.find('.pl-waveform-cues-btn') + .parent() + .html($.i18n._("Waveform features are available in a browser supporting the Web Audio API")); + } + } + + //sets events dynamically for the fade editor. + function setFadeEvents() { + var temp = $('#spl_sortable'); temp.on("focusout", ".spl_fade_in span", changeFadeIn); temp.on("keydown", ".spl_fade_in span", submitOnEnter); @@ -633,47 +633,47 @@ var AIRTIME = (function(AIRTIME){ temp.on("keydown", ".spl_fade_out span", submitOnEnter); //remove show waveform buttons since web audio api is not supported. - if (!(window.AudioContext || window.webkitAudioContext)) { - temp.find('.pl-waveform-fades-btn') - .parent() - .html($.i18n._("Waveform features are available in a browser supporting the Web Audio API")); - } - } - - function initialEvents() { - var cachedDescription; - - //main playlist fades events - $pl.on("click", "#spl_crossfade", function() { - var lastMod = getModified(), - type = $('#obj_type').val(); + if (!(window.AudioContext || window.webkitAudioContext)) { + temp.find('.pl-waveform-fades-btn') + .parent() + .html($.i18n._("Waveform features are available in a browser supporting the Web Audio API")); + } + } + + function initialEvents() { + var cachedDescription; + + //main playlist fades events + $pl.on("click", "#spl_crossfade", function() { + var lastMod = getModified(), + type = $('#obj_type').val(); - if ($(this).hasClass("ui-state-active")) { - $(this).removeClass("ui-state-active"); - $pl.find("#crossfade_main").hide(); - } - else { - $(this).addClass("ui-state-active"); + if ($(this).hasClass("ui-state-active")) { + $(this).removeClass("ui-state-active"); + $pl.find("#crossfade_main").hide(); + } + else { + $(this).addClass("ui-state-active"); - var url = baseUrl+'Playlist/get-playlist-fades'; - $.post(url, - {format: "json", modified: lastMod, type: type}, - function(json){ - if (json.error !== undefined){ - playlistError(json); - } - else { - var fadeIn = $pl.find("span.spl_main_fade_in"); - var fadeOut = $pl.find("span.spl_main_fade_out"); - if (json.fadeIn == null) { - fadeIn.parent().prev().hide(); - fadeIn.hide(); - } else { - fadeIn.parent().prev().show(); + var url = baseUrl+'Playlist/get-playlist-fades'; + $.post(url, + {format: "json", modified: lastMod, type: type}, + function(json){ + if (json.error !== undefined){ + playlistError(json); + } + else { + var fadeIn = $pl.find("span.spl_main_fade_in"); + var fadeOut = $pl.find("span.spl_main_fade_out"); + if (json.fadeIn == null) { + fadeIn.parent().prev().hide(); + fadeIn.hide(); + } else { + fadeIn.parent().prev().show(); fadeIn.show(); - fadeIn.empty().append(json.fadeIn); - } - if (json.fadeOut == null) { + fadeIn.empty().append(json.fadeIn); + } + if (json.fadeOut == null) { fadeOut.parent().prev().hide(); fadeOut.hide(); } else { @@ -681,108 +681,108 @@ var AIRTIME = (function(AIRTIME){ fadeOut.show(); fadeOut.empty().append(json.fadeOut); } - if (json.fadeIn != null || json.fadeOut != null) { - $pl.find("#crossfade_main").show(); - } - } - }); - } - }); - - $pl.on("blur", "span.spl_main_fade_in", function(event){ - event.stopPropagation(); + if (json.fadeIn != null || json.fadeOut != null) { + $pl.find("#crossfade_main").show(); + } + } + }); + } + }); + + $pl.on("blur", "span.spl_main_fade_in", function(event){ + event.stopPropagation(); - var url = baseUrl+"Playlist/set-playlist-fades", - span = $(this), - fadeIn = $.trim(span.text()), - lastMod = getModified(), - type = $('#obj_type').val(); - - if (!isFadeValid(fadeIn)){ - showError(span, $.i18n._("please put in a time in seconds '00 (.0)'")); - return; - } + var url = baseUrl+"Playlist/set-playlist-fades", + span = $(this), + fadeIn = $.trim(span.text()), + lastMod = getModified(), + type = $('#obj_type').val(); + + if (!isFadeValid(fadeIn)){ + showError(span, $.i18n._("please put in a time in seconds '00 (.0)'")); + return; + } - $.post(url, - {format: "json", fadeIn: fadeIn, modified: lastMod, type: type}, - function(json){ - hideError(span); - if (json.modified !== undefined) { - setModified(json.modified); - } - }); - }); + $.post(url, + {format: "json", fadeIn: fadeIn, modified: lastMod, type: type}, + function(json){ + hideError(span); + if (json.modified !== undefined) { + setModified(json.modified); + } + }); + }); - $pl.on("blur", "span.spl_main_fade_out", function(event){ - event.stopPropagation(); + $pl.on("blur", "span.spl_main_fade_out", function(event){ + event.stopPropagation(); - var url = baseUrl+"Playlist/set-playlist-fades", - span = $(this), - fadeOut = $.trim(span.text()), - lastMod = getModified(), - type = $('#obj_type').val(); + var url = baseUrl+"Playlist/set-playlist-fades", + span = $(this), + fadeOut = $.trim(span.text()), + lastMod = getModified(), + type = $('#obj_type').val(); - if (!isFadeValid(fadeOut)){ - showError(span, $.i18n._("please put in a time in seconds '00 (.0)'")); - return; - } + if (!isFadeValid(fadeOut)){ + showError(span, $.i18n._("please put in a time in seconds '00 (.0)'")); + return; + } - $.post(url, - {format: "json", fadeOut: fadeOut, modified: lastMod, type: type}, - function(json){ - hideError(span); - if (json.modified !== undefined) { - setModified(json.modified); - } - }); - }); + $.post(url, + {format: "json", fadeOut: fadeOut, modified: lastMod, type: type}, + function(json){ + hideError(span); + if (json.modified !== undefined) { + setModified(json.modified); + } + }); + }); - $pl.on("keydown", "span.spl_main_fade_in, span.spl_main_fade_out", submitOnEnter); + $pl.on("keydown", "span.spl_main_fade_in, span.spl_main_fade_out", submitOnEnter); - $pl.on("click", "#crossfade_main > .ui-icon-closethick", function(){ - $pl.find("#spl_crossfade").removeClass("ui-state-active"); - $pl.find("#crossfade_main").hide(); - }); - //end main playlist fades. + $pl.on("click", "#crossfade_main > .ui-icon-closethick", function(){ + $pl.find("#spl_crossfade").removeClass("ui-state-active"); + $pl.find("#crossfade_main").hide(); + }); + //end main playlist fades. - //edit playlist name event - $pl.on("keydown", "#playlist_name_display", submitOnEnter); - $pl.on("blur", "#playlist_name_display", editName); - - //edit playlist description events - $pl.on("click", "legend", function(){ - var $fs = $(this).parents("fieldset"); + //edit playlist name event + $pl.on("keydown", "#playlist_name_display", submitOnEnter); + $pl.on("blur", "#playlist_name_display", editName); + + //edit playlist description events + $pl.on("click", "legend", function(){ + var $fs = $(this).parents("fieldset"); - if ($fs.hasClass("closed")) { - cachedDescription = $fs.find("textarea").val(); - $fs.removeClass("closed"); - } - else { - $fs.addClass("closed"); - } - }); - + if ($fs.hasClass("closed")) { + cachedDescription = $fs.find("textarea").val(); + $fs.removeClass("closed"); + } + else { + $fs.addClass("closed"); + } + }); + - $pl.on("click", 'button[id="playlist_shuffle_button"]', function(){ - obj_id = $('input[id="obj_id"]').val(); - url = baseUrl+"Playlist/shuffle"; - enableLoadingIcon(); - $.post(url, {format: "json", obj_id: obj_id}, function(json){ + $pl.on("click", 'button[id="playlist_shuffle_button"]', function(){ + obj_id = $('input[id="obj_id"]').val(); + url = baseUrl+"Playlist/shuffle"; + enableLoadingIcon(); + $.post(url, {format: "json", obj_id: obj_id}, function(json){ - if (json.error !== undefined) { - alert(json.error); - } - AIRTIME.playlist.fnOpenPlaylist(json); - if (json.result == "0") { - $pl.find('.success').text($.i18n._('Playlist shuffled')); - $pl.find('.success').show(); - } - disableLoadingIcon(); - setTimeout(removeSuccessMsg, 5000); - }); - }) + if (json.error !== undefined) { + alert(json.error); + } + AIRTIME.playlist.fnOpenPlaylist(json); + if (json.result == "0") { + $pl.find('.success').text($.i18n._('Playlist shuffled')); + $pl.find('.success').show(); + } + disableLoadingIcon(); + setTimeout(removeSuccessMsg, 5000); + }); + }) - $pl.on("click", "#webstream_save", function(){ + $pl.on("click", "#webstream_save", function(){ //get all fields and POST to server //description //stream url @@ -892,12 +892,12 @@ var AIRTIME = (function(AIRTIME){ } setModified(json.modified); if (obj_type == "block") { - callback(json, "save"); + callback(json, "save"); } else { $('.success').text($.i18n._('Playlist saved')); $('.success').show(); setTimeout(removeSuccessMsg, 5000); - dt.fnStandingRedraw(); + dt.fnStandingRedraw(); } setFadeIcon(); disableLoadingIcon(); @@ -910,128 +910,128 @@ var AIRTIME = (function(AIRTIME){ oData = {}; playlistRequest(sUrl, oData); }); - } - - function setUpPlaylist() { - var sortableConf; - - sortableConf = (function(){ - var aReceiveItems, - html, - fnReceive, - fnUpdate; - - fnReceive = function(event, ui) { - var aItems = [], - aSelected, - i, - length; - - AIRTIME.library.addToChosen(ui.item); - - //filter out anything that isn't an audiofile. - aSelected = AIRTIME.library.getSelectedData(); - - for (i = 0, length = aSelected.length; i < length; i++) { - aItems.push(new Array(aSelected[i].id, aSelected[i].ftype)); - } - - aReceiveItems = aItems; - html = ui.helper.html(); - - AIRTIME.library.removeFromChosen(ui.item); - }; - - fnUpdate = function(event, ui) { - var prev, - aItems = [], - iAfter, - sAddType; - - prev = ui.item.prev(); - if (prev.hasClass("spl_empty") || prev.length === 0) { - iAfter = undefined; - sAddType = 'before'; - } - else { - iAfter = parseInt(prev.attr("id").split("_").pop(), 10); - sAddType = 'after'; - } - - //item was dragged in from library datatable - if (aReceiveItems !== undefined) { - - $pl.find("tr.ui-draggable") - .after(html) - .empty(); - - aItems = aReceiveItems; - aReceiveItems = undefined; - - AIRTIME.playlist.fnAddItems(aItems, iAfter, sAddType); - } - //item was reordered. - else { - aItems.push(parseInt(ui.item.attr("id").split("_").pop(), 10)); - AIRTIME.playlist.fnMoveItems(aItems, iAfter); - } - }; - - return { - items: 'li', - //hack taken from - //http://stackoverflow.com/questions/2150002/jquery-ui-sortable-how-can-i-change-the-appearance-of-the-placeholder-object - placeholder: { - element: function(currentItem) { - - return $('
  • ')[0]; - }, - update: function(container, p) { - return; - } - }, - forcePlaceholderSize: true, - handle: 'div.list-item-container', - start: function(event, ui) { - ui.placeholder.height(56); - }, - receive: fnReceive, - update: fnUpdate - }; - }()); - - $pl.find("#spl_sortable").sortable(sortableConf); - AIRTIME.playlist.validatePlaylistElements(); - } - - mod.fnNew = function() { - var url = baseUrl+'Playlist/new'; - - stopAudioPreview(); - - $.post(url, - {format: "json", type: 'playlist'}, - function(json){ - openPlaylist(json); - redrawLib(); - }); - }; + } - mod.fnWsNew = function() { - var url = baseUrl+'Webstream/new'; + function setUpPlaylist() { + var sortableConf; + + sortableConf = (function(){ + var aReceiveItems, + html, + fnReceive, + fnUpdate; + + fnReceive = function(event, ui) { + var aItems = [], + aSelected, + i, + length; + + AIRTIME.library.addToChosen(ui.item); + + //filter out anything that isn't an audiofile. + aSelected = AIRTIME.library.getSelectedData(); + + for (i = 0, length = aSelected.length; i < length; i++) { + aItems.push(new Array(aSelected[i].id, aSelected[i].ftype)); + } + + aReceiveItems = aItems; + html = ui.helper.html(); + + AIRTIME.library.removeFromChosen(ui.item); + }; + + fnUpdate = function(event, ui) { + var prev, + aItems = [], + iAfter, + sAddType; + + prev = ui.item.prev(); + if (prev.hasClass("spl_empty") || prev.length === 0) { + iAfter = undefined; + sAddType = 'before'; + } + else { + iAfter = parseInt(prev.attr("id").split("_").pop(), 10); + sAddType = 'after'; + } + + //item was dragged in from library datatable + if (aReceiveItems !== undefined) { + + $pl.find("tr.ui-draggable") + .after(html) + .empty(); + + aItems = aReceiveItems; + aReceiveItems = undefined; + + AIRTIME.playlist.fnAddItems(aItems, iAfter, sAddType); + } + //item was reordered. + else { + aItems.push(parseInt(ui.item.attr("id").split("_").pop(), 10)); + AIRTIME.playlist.fnMoveItems(aItems, iAfter); + } + }; + + return { + items: 'li', + //hack taken from + //http://stackoverflow.com/questions/2150002/jquery-ui-sortable-how-can-i-change-the-appearance-of-the-placeholder-object + placeholder: { + element: function(currentItem) { + + return $('
  • ')[0]; + }, + update: function(container, p) { + return; + } + }, + forcePlaceholderSize: true, + handle: 'div.list-item-container', + start: function(event, ui) { + ui.placeholder.height(56); + }, + receive: fnReceive, + update: fnUpdate + }; + }()); - stopAudioPreview(); - - $.post(url, - {format: "json"}, - function(json){ - openPlaylist(json); - redrawLib(); - }); - }; - + $pl.find("#spl_sortable").sortable(sortableConf); + AIRTIME.playlist.validatePlaylistElements(); + } + + mod.fnNew = function() { + var url = baseUrl+'Playlist/new'; - mod.fnNewBlock = function() { + stopAudioPreview(); + + $.post(url, + {format: "json", type: 'playlist'}, + function(json){ + openPlaylist(json); + redrawLib(); + }); + }; + + mod.fnWsNew = function() { + var url = baseUrl+'Webstream/new'; + + stopAudioPreview(); + + $.post(url, + {format: "json"}, + function(json){ + openPlaylist(json); + redrawLib(); + }); + }; + + + mod.fnNewBlock = function() { var url = baseUrl+'Playlist/new'; stopAudioPreview(); @@ -1043,64 +1043,64 @@ var AIRTIME = (function(AIRTIME){ redrawLib(); }); }; - - mod.fnEdit = function(id, type, url) { - if ($pl.is(":hidden")) { - openPlaylistPanel(); - } - stopAudioPreview(); - - $.post(url, - {format: "json", id: id, type: type}, - function(json){ - openPlaylist(json); - }); - }; - - - mod.fnDelete = function(plid) { - var url, id, lastMod; - - stopAudioPreview(); - id = (plid === undefined) ? getId() : plid; - lastMod = getModified(); - type = $('#obj_type').val(); - url = baseUrl+'Playlist/delete'; - - $.post(url, - {format: "json", ids: id, modified: lastMod, type: type}, - function(json){ - openPlaylist(json); - redrawLib(); - }); - }; - mod.fnWsDelete = function(wsid) { - var url, id, lastMod; - - stopAudioPreview(); - id = (wsid === undefined) ? getId() : wsid; - lastMod = getModified(); - type = $('#obj_type').val(); - url = baseUrl+'Webstream/delete'; + mod.fnEdit = function(id, type, url) { + if ($pl.is(":hidden")) { + openPlaylistPanel(); + } + stopAudioPreview(); - $.post(url, - {format: "json", ids: id, modified: lastMod, type: type}, - function(json){ - openPlaylist(json); - redrawLib(); - }); - }; - - mod.disableUI = function() { - - $lib.block({ + $.post(url, + {format: "json", id: id, type: type}, + function(json){ + openPlaylist(json); + }); + }; + + + mod.fnDelete = function(plid) { + var url, id, lastMod; + + stopAudioPreview(); + id = (plid === undefined) ? getId() : plid; + lastMod = getModified(); + type = $('#obj_type').val(); + url = baseUrl+'Playlist/delete'; + + $.post(url, + {format: "json", ids: id, modified: lastMod, type: type}, + function(json){ + openPlaylist(json); + redrawLib(); + }); + }; + + mod.fnWsDelete = function(wsid) { + var url, id, lastMod; + + stopAudioPreview(); + id = (wsid === undefined) ? getId() : wsid; + lastMod = getModified(); + type = $('#obj_type').val(); + url = baseUrl+'Webstream/delete'; + + $.post(url, + {format: "json", ids: id, modified: lastMod, type: type}, + function(json){ + openPlaylist(json); + redrawLib(); + }); + }; + + mod.disableUI = function() { + + $lib.block({ message: "", theme: true, applyPlatformOpacityRules: false }); - - $pl.block({ + + $pl.block({ message: "", theme: true, applyPlatformOpacityRules: false @@ -1112,136 +1112,136 @@ var AIRTIME = (function(AIRTIME){ }; mod.enableUI = function() { - - $lib.unblock(); - $pl.unblock(); - - //Block UI changes the postion to relative to display the messages. - $lib.css("position", "static"); - $pl.css("position", "static"); - setupUI(); + + $lib.unblock(); + $pl.unblock(); + + //Block UI changes the postion to relative to display the messages. + $lib.css("position", "static"); + $pl.css("position", "static"); + setupUI(); }; - function playlistResponse(json){ - - if (json.error !== undefined) { - playlistError(json); - } - else { - setPlaylistContent(json); - setFadeIcon(); - } - - mod.enableUI(); - } - - function playlistRequest(sUrl, oData) { - var lastMod, - obj_type = $('#obj_type').val(); - - mod.disableUI(); - - lastMod = getModified(); - - oData["modified"] = lastMod; - oData["obj_type"] = obj_type; - oData["format"] = "json"; - - $.post( - sUrl, - oData, - playlistResponse - ); - } - - mod.fnAddItems = function(aItems, iAfter, sAddType) { - var sUrl = baseUrl+"playlist/add-items"; - oData = {"aItems": aItems, "afterItem": iAfter, "type": sAddType}; - playlistRequest(sUrl, oData); - }; - - mod.fnMoveItems = function(aIds, iAfter) { - var sUrl = baseUrl+"playlist/move-items", - oData = {"ids": aIds, "afterItem": iAfter}; - - playlistRequest(sUrl, oData); - }; - - mod.fnDeleteItems = function(aItems) { - var sUrl = baseUrl+"playlist/delete-items", - oData = {"ids": aItems}; - - playlistRequest(sUrl, oData); - }; - - mod.showFadesWaveform = function(e) { - var $el = $(e.target), - $parent = $el.parents("dl"), - $li = $el.parents("li"), - $fadeOut = $parent.find(".spl_fade_out"), - $fadeIn = $parent.find(".spl_fade_in"), - $html = $($("#tmpl-pl-fades").html()), - tracks = [], - dim = AIRTIME.utilities.findViewportDimensions(), - playlistEditor, - id1, id2, - id = $li.attr("unqid"); - - - function removeDialog() { - playlistEditor.stop(); - - $html.dialog("destroy"); - $html.remove(); + function playlistResponse(json){ + + if (json.error !== undefined) { + playlistError(json); + } + else { + setPlaylistContent(json); + setFadeIcon(); + } + + mod.enableUI(); + } + + function playlistRequest(sUrl, oData) { + var lastMod, + obj_type = $('#obj_type').val(); + + mod.disableUI(); + + lastMod = getModified(); + + oData["modified"] = lastMod; + oData["obj_type"] = obj_type; + oData["format"] = "json"; + + $.post( + sUrl, + oData, + playlistResponse + ); + } + + mod.fnAddItems = function(aItems, iAfter, sAddType) { + var sUrl = baseUrl+"playlist/add-items"; + oData = {"aItems": aItems, "afterItem": iAfter, "type": sAddType}; + playlistRequest(sUrl, oData); + }; + + mod.fnMoveItems = function(aIds, iAfter) { + var sUrl = baseUrl+"playlist/move-items", + oData = {"ids": aIds, "afterItem": iAfter}; + + playlistRequest(sUrl, oData); + }; + + mod.fnDeleteItems = function(aItems) { + var sUrl = baseUrl+"playlist/delete-items", + oData = {"ids": aItems}; + + playlistRequest(sUrl, oData); + }; + + mod.showFadesWaveform = function(e) { + var $el = $(e.target), + $parent = $el.parents("dl"), + $li = $el.parents("li"), + $fadeOut = $parent.find(".spl_fade_out"), + $fadeIn = $parent.find(".spl_fade_in"), + $html = $($("#tmpl-pl-fades").html()), + tracks = [], + dim = AIRTIME.utilities.findViewportDimensions(), + playlistEditor, + id1, id2, + id = $li.attr("unqid"); + + + function removeDialog() { + playlistEditor.stop(); + + $html.dialog("destroy"); + $html.remove(); + } + + if ($fadeOut.length > 0) { + + tracks.push({ + src: $fadeOut.data("fadeout"), + cuein: $fadeOut.data("cuein"), + cueout: $fadeOut.data("cueout"), + fades: [{ + shape: $fadeOut.data("type"), + type: "FadeOut", + end: $fadeOut.data("cueout") - $fadeOut.data("cuein"), + start: $fadeOut.data("cueout") - $fadeOut.data("cuein") - $fadeOut.data("length") + }], + states: { + 'fadein': false, + 'shift': false + } + }); + + id1 = $fadeOut.data("item"); } - - if ($fadeOut.length > 0) { - - tracks.push({ - src: $fadeOut.data("fadeout"), - cuein: $fadeOut.data("cuein"), - cueout: $fadeOut.data("cueout"), - fades: [{ - shape: $fadeOut.data("type"), - type: "FadeOut", - end: $fadeOut.data("cueout") - $fadeOut.data("cuein"), - start: $fadeOut.data("cueout") - $fadeOut.data("cuein") - $fadeOut.data("length") - }], - states: { - 'fadein': false, - 'shift': false - } - }); - - id1 = $fadeOut.data("item"); - } - if ($fadeIn.length > 0) { - - tracks.push({ - src: $fadeIn.data("fadein"), - start: $fadeIn.data("offset"), - cuein: $fadeIn.data("cuein"), - cueout: $fadeIn.data("cueout"), - fades: [{ - shape: $fadeIn.data("type"), - type: "FadeIn", - end: $fadeIn.data("length"), - start: 0 - }], - states: { - 'fadeout': false, - 'shift': false - } - }); - - id2 = $fadeIn.data("item"); - } - - //set the first track to not be moveable (might only be one track depending on what follows) - //tracks[0].states["shift"] = false; - - $html.dialog({ + if ($fadeIn.length > 0) { + + tracks.push({ + src: $fadeIn.data("fadein"), + start: $fadeIn.data("offset"), + cuein: $fadeIn.data("cuein"), + cueout: $fadeIn.data("cueout"), + fades: [{ + shape: $fadeIn.data("type"), + type: "FadeIn", + end: $fadeIn.data("length"), + start: 0 + }], + states: { + 'fadeout': false, + 'shift': false + } + }); + + id2 = $fadeIn.data("item"); + } + + //set the first track to not be moveable (might only be one track depending on what follows) + //tracks[0].states["shift"] = false; + + $html.dialog({ modal: true, title: $.i18n._("Fade Editor"), show: 'clip', @@ -1251,116 +1251,116 @@ var AIRTIME = (function(AIRTIME){ buttons: [ {text: $.i18n._("Cancel"), class: "btn btn-small", click: removeDialog}, {text: $.i18n._("Save"), class: "btn btn-small btn-inverse", click: function() { - var json = playlistEditor.getJson(), - offset, - fadeIn, fadeOut, - fade; - - playlistEditor.stop(); - - if (json.length === 0) - { - id1 = undefined; - id2 = undefined; - } - else if (json.length === 1) { - - fade = json[0]["fades"][0]; - - if (fade["type"] === "FadeOut") { - fadeOut = fade["end"] - fade["start"]; - id2 = undefined; //incase of track decode error. - } - else { - fadeIn = fade["end"] - fade["start"]; - id1 = undefined; //incase of track decode error. - } - } - else { - - offset = json[0]["end"] - json[1]["start"]; - - fade = json[0]["fades"][0]; - fadeOut = fade["end"] - fade["start"]; - - fade = json[1]["fades"][0]; - fadeIn = fade["end"] - fade["start"]; - } - - fadeIn = (fadeIn === undefined) ? undefined : fadeIn.toFixed(1); - fadeOut = (fadeOut === undefined) ? undefined : fadeOut.toFixed(1); - - changeCrossfade($html, id1, id2, fadeIn, fadeOut, offset, id); + var json = playlistEditor.getJson(), + offset, + fadeIn, fadeOut, + fade; + + playlistEditor.stop(); + + if (json.length === 0) + { + id1 = undefined; + id2 = undefined; + } + else if (json.length === 1) { + + fade = json[0]["fades"][0]; + + if (fade["type"] === "FadeOut") { + fadeOut = fade["end"] - fade["start"]; + id2 = undefined; //incase of track decode error. + } + else { + fadeIn = fade["end"] - fade["start"]; + id1 = undefined; //incase of track decode error. + } + } + else { + + offset = json[0]["end"] - json[1]["start"]; + + fade = json[0]["fades"][0]; + fadeOut = fade["end"] - fade["start"]; + + fade = json[1]["fades"][0]; + fadeIn = fade["end"] - fade["start"]; + } + + fadeIn = (fadeIn === undefined) ? undefined : fadeIn.toFixed(1); + fadeOut = (fadeOut === undefined) ? undefined : fadeOut.toFixed(1); + + changeCrossfade($html, id1, id2, fadeIn, fadeOut, offset, id); }} ], open: function (event, ui) { - - var config = new Config({ - resolution: 15000, - state: "cursor", - mono: true, - timescale: true, - waveHeight: 80, - container: $html[0], - UITheme: "jQueryUI", - timeFormat: 'hh:mm:ss.u' - }); - - playlistEditor = new PlaylistEditor(); - playlistEditor.setConfig(config); - playlistEditor.init(tracks); + + var config = new Config({ + resolution: 15000, + state: "cursor", + mono: true, + timescale: true, + waveHeight: 80, + container: $html[0], + UITheme: "jQueryUI", + timeFormat: 'hh:mm:ss.u' + }); + + playlistEditor = new PlaylistEditor(); + playlistEditor.setConfig(config); + playlistEditor.init(tracks); }, - close: removeDialog, - resizeStop: function(event, ui) { - playlistEditor.resize(); + close: removeDialog, + resizeStop: function(event, ui) { + playlistEditor.resize(); } - }); - }; - - mod.showCuesWaveform = function(e) { - var $el = $(e.target), - $li = $el.parents("li"), - id = $li.attr("unqid"), - $parent = $el.parent(), - uri = $parent.data("uri"), - $html = $($("#tmpl-pl-cues").html()), - cueIn = $li.find('.spl_cue_in').data("cueIn"), - cueOut = $li.find('.spl_cue_out').data("cueOut"), - cueInSec = $li.find('.spl_cue_in').data("cueSec"), - cueOutSec = $li.find('.spl_cue_out').data("cueSec"), - tracks = [{ - src: uri, - selected: { - start: cueInSec, - end: cueOutSec - } - }], - dim = AIRTIME.utilities.findViewportDimensions(), - playlistEditor; - - function removeDialog() { - playlistEditor.stop(); - - $html.dialog("destroy"); - $html.remove(); + }); + }; + + mod.showCuesWaveform = function(e) { + var $el = $(e.target), + $li = $el.parents("li"), + id = $li.attr("unqid"), + $parent = $el.parent(), + uri = $parent.data("uri"), + $html = $($("#tmpl-pl-cues").html()), + cueIn = $li.find('.spl_cue_in').data("cueIn"), + cueOut = $li.find('.spl_cue_out').data("cueOut"), + cueInSec = $li.find('.spl_cue_in').data("cueSec"), + cueOutSec = $li.find('.spl_cue_out').data("cueSec"), + tracks = [{ + src: uri, + selected: { + start: cueInSec, + end: cueOutSec + } + }], + dim = AIRTIME.utilities.findViewportDimensions(), + playlistEditor; + + function removeDialog() { + playlistEditor.stop(); + + $html.dialog("destroy"); + $html.remove(); } - - $html.find('.editor-cue-in').html(cueIn); - $html.find('.editor-cue-out').html(cueOut); - - $html.on("click", ".set-cue-in", function(e) { - var cueIn = $html.find('.audio_start').val(); - - $html.find('.editor-cue-in').html(cueIn); - }); - - $html.on("click", ".set-cue-out", function(e) { - var cueOut = $html.find('.audio_end').val(); - - $html.find('.editor-cue-out').html(cueOut); - }); - - $html.dialog({ + + $html.find('.editor-cue-in').html(cueIn); + $html.find('.editor-cue-out').html(cueOut); + + $html.on("click", ".set-cue-in", function(e) { + var cueIn = $html.find('.audio_start').val(); + + $html.find('.editor-cue-in').html(cueIn); + }); + + $html.on("click", ".set-cue-out", function(e) { + var cueOut = $html.find('.audio_end').val(); + + $html.find('.editor-cue-out').html(cueOut); + }); + + $html.dialog({ modal: true, title: $.i18n._("Cue Editor"), show: 'clip', @@ -1370,40 +1370,40 @@ var AIRTIME = (function(AIRTIME){ buttons: [ {text: $.i18n._("Cancel"), class: "btn btn-small", click: removeDialog}, {text: $.i18n._("Save"), class: "btn btn-small btn-inverse", click: function() { - var cueIn = $html.find('.editor-cue-in').html(), - cueOut = $html.find('.editor-cue-out').html(); - - playlistEditor.stop(); - - changeCues($html, id, cueIn, cueOut); + var cueIn = $html.find('.editor-cue-in').html(), + cueOut = $html.find('.editor-cue-out').html(); + + playlistEditor.stop(); + + changeCues($html, id, cueIn, cueOut); }} ], open: function (event, ui) { - - var config = new Config({ - resolution: 15000, - mono: true, - timescale: true, - waveHeight: 80, - container: $html[0], - UITheme: "jQueryUI", - timeFormat: 'hh:mm:ss.u' - }); - - playlistEditor = new PlaylistEditor(); - playlistEditor.setConfig(config); - playlistEditor.init(tracks); + + var config = new Config({ + resolution: 15000, + mono: true, + timescale: true, + waveHeight: 80, + container: $html[0], + UITheme: "jQueryUI", + timeFormat: 'hh:mm:ss.u' + }); + + playlistEditor = new PlaylistEditor(); + playlistEditor.setConfig(config); + playlistEditor.init(tracks); }, close: removeDialog, resizeStop: function(event, ui) { - playlistEditor.resize(); + playlistEditor.resize(); } - }); - }; - - mod.init = function() { - /* - $.contextMenu({ + }); + }; + + mod.init = function() { + /* + $.contextMenu({ selector: '#spl_new, #ws_new', trigger: "left", ignoreRightClick: true, @@ -1414,39 +1414,39 @@ var AIRTIME = (function(AIRTIME){ } }); */ - $('#lib-new-pl').live('click', function(){AIRTIME.playlist.fnNew();}); + $('#lib-new-pl').live('click', function(){AIRTIME.playlist.fnNew();}); $('#lib-new-bl').live('click', function(){AIRTIME.playlist.fnNewBlock();}); $('#lib-new-ws').live('click', function(){AIRTIME.playlist.fnWsNew();}); - /* - $pl.delegate("#spl_new", - {"click": AIRTIME.playlist.fnNew});*/ + /* + $pl.delegate("#spl_new", + {"click": AIRTIME.playlist.fnNew});*/ - $pl.delegate("#spl_delete", {"click": function(ev){ - AIRTIME.playlist.fnDelete(); - }}); + $pl.delegate("#spl_delete", {"click": function(ev){ + AIRTIME.playlist.fnDelete(); + }}); - $pl.delegate("#ws_delete", {"click": function(ev){ + $pl.delegate("#ws_delete", {"click": function(ev){ AIRTIME.playlist.fnWsDelete(); - }}); - - $pl.delegate(".pl-waveform-cues-btn", {"click": function(ev){ + }}); + + $pl.delegate(".pl-waveform-cues-btn", {"click": function(ev){ AIRTIME.playlist.showCuesWaveform(ev); - }}); - - $pl.delegate(".pl-waveform-fades-btn", {"click": function(ev){ + }}); + + $pl.delegate(".pl-waveform-fades-btn", {"click": function(ev){ AIRTIME.playlist.showFadesWaveform(ev); - }}); - - setPlaylistEntryEvents(); - setCueEvents(); - setFadeEvents(); - setFadeIcon(); - - initialEvents(); - setUpPlaylist(); - }; - - function setWidgetSize() { + }}); + + setPlaylistEntryEvents(); + setCueEvents(); + setFadeEvents(); + setFadeIcon(); + + initialEvents(); + setUpPlaylist(); + }; + + function setWidgetSize() { viewport = AIRTIME.utilities.findViewportDimensions(); widgetHeight = viewport.height - 185; width = Math.floor(viewport.width - 80); @@ -1456,8 +1456,8 @@ var AIRTIME = (function(AIRTIME){ if (!$pl.is(':hidden')) { $lib.height(widgetHeight) .find(".dataTables_scrolling") - .css("max-height", libTableHeight) - .end() + .css("max-height", libTableHeight) + .end() .width(Math.floor(width * 0.55)); $pl.height(widgetHeight) @@ -1465,54 +1465,54 @@ var AIRTIME = (function(AIRTIME){ } else { $lib.height(widgetHeight) .find(".dataTables_scrolling") - .css("max-height", libTableHeight) - .end() + .css("max-height", libTableHeight) + .end() .width(width + 40); } - } - - mod.onReady = function() { - $lib = $("#library_content"); - $pl = $("#side_playlist"); + } + + mod.onReady = function() { + $lib = $("#library_content"); + $pl = $("#side_playlist"); - setWidgetSize(); - - AIRTIME.library.libraryInit(); - AIRTIME.playlist.init(); + setWidgetSize(); + + AIRTIME.library.libraryInit(); + AIRTIME.playlist.init(); if ($pl.is(':hidden')) { $lib.find("#library_display_length").append($togglePl.show()); } - $pl.find(".ui-icon-alert").qtip({ - content: { - text: $.i18n._("Airtime is unsure about the status of this file. This can happen when the file is on a remote drive that is unaccessible or the file is in a directory that isn't 'watched' anymore.") - }, - position:{ - adjust: { - resize: true, - method: "flip flip" - }, - at: "right center", - my: "left top", - viewport: $(window) - }, - style: { - classes: "ui-tooltip-dark" - }, - show: 'mouseover', - hide: 'mouseout' - }); - }; - - mod.onResize = function() { - - clearTimeout(resizeTimeout); - resizeTimeout = setTimeout(setWidgetSize, 100); - }; - - return AIRTIME; - + $pl.find(".ui-icon-alert").qtip({ + content: { + text: sprintf($.i18n._("%s is unsure about the status of this file. This can happen when the file is on a remote drive that is unaccessible or the file is in a directory that isn't 'watched' anymore."), PRODUCT_NAME) + }, + position:{ + adjust: { + resize: true, + method: "flip flip" + }, + at: "right center", + my: "left top", + viewport: $(window) + }, + style: { + classes: "ui-tooltip-dark" + }, + show: 'mouseover', + hide: 'mouseout' + }); + }; + + mod.onResize = function() { + + clearTimeout(resizeTimeout); + resizeTimeout = setTimeout(setWidgetSize, 100); + }; + + return AIRTIME; + }(AIRTIME || {})); diff --git a/airtime_mvc/public/js/airtime/nowplaying/register.js b/airtime_mvc/public/js/airtime/nowplaying/register.js index 58a5b1f21..25316e52d 100644 --- a/airtime_mvc/public/js/airtime/nowplaying/register.js +++ b/airtime_mvc/public/js/airtime/nowplaying/register.js @@ -25,7 +25,7 @@ $(document).ready(function(){ data: {format:"json"} }); $(this).dialog("close"); - } + } }, { id: "remind_never", @@ -41,12 +41,12 @@ $(document).ready(function(){ } }, { - id: "help_airtime", - text: $.i18n._("Yes, help Airtime"), - "class": "btn", - click: function() { - $("#register-form").submit(); - } + id: "help_airtime", + text: sprintf($.i18n._("Yes, help %s"), PRODUCT_NAME), + "class": "btn", + click: function() { + $("#register-form").submit(); + } } ] }); @@ -97,12 +97,12 @@ $(document).ready(function(){ } $("#Privacy").live('click', function(){ - var support = $("#SupportFeedback"); - var button = $("#help_airtime"); + var support = $("#SupportFeedback"); + var button = $("#help_airtime"); if($(this).is(':checked') && support.is(':checked')){ - button.removeAttr('disabled').removeClass('ui-state-disabled'); + button.removeAttr('disabled').removeClass('ui-state-disabled'); }else{ - button.attr('disabled', 'disabled' ).addClass('ui-state-disabled'); + button.attr('disabled', 'disabled' ).addClass('ui-state-disabled'); } }); @@ -118,36 +118,36 @@ $(document).ready(function(){ }); $("#Logo").live('change', function(ev){ - var content, res, logoEl; - - content = $(this).val(); - res = content.match(/(jpg|jpeg|png|gif)$/gi); - logoEl = $("#Logo-element"); - - //not an accepted image extension. - if (!res) { - var ul, li; - - ul = logoEl.find('.errors'); - li = $("
  • ").append($.i18n._("Image must be one of jpg, jpeg, png, or gif")); - - //errors ul has already been created. - if (ul.length > 0) { - ul.empty() - .append(li); - } - else { - logoEl - .append('
      ') - .find(".errors") - .append(li); - } - - $(this).val(""); - } - else { - logoEl.find(".errors").remove(); - } + var content, res, logoEl; + + content = $(this).val(); + res = content.match(/(jpg|jpeg|png|gif)$/gi); + logoEl = $("#Logo-element"); + + //not an accepted image extension. + if (!res) { + var ul, li; + + ul = logoEl.find('.errors'); + li = $("
    • ").append($.i18n._("Image must be one of jpg, jpeg, png, or gif")); + + //errors ul has already been created. + if (ul.length > 0) { + ul.empty() + .append(li); + } + else { + logoEl + .append('
        ') + .find(".errors") + .append(li); + } + + $(this).val(""); + } + else { + logoEl.find(".errors").remove(); + } }); }); diff --git a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js index f47a7b8ed..6dc4d2e66 100644 --- a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js +++ b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js @@ -400,7 +400,7 @@ function setupUI() { $(".repeat_tracks_help_icon").qtip({ content: { - text: $.i18n._("The desired block length will not be reached if Airtime cannot find enough unique tracks to match your criteria. Enable this option if you wish to allow tracks to be added multiple times to the smart block.") + text: sprintf($.i18n._("The desired block length will not be reached if %s cannot find enough unique tracks to match your criteria. Enable this option if you wish to allow tracks to be added multiple times to the smart block."), PRODUCT_NAME) }, hide: { delay: 500, diff --git a/airtime_mvc/public/js/airtime/preferences/musicdirs.js b/airtime_mvc/public/js/airtime/preferences/musicdirs.js index da404363a..3de496037 100644 --- a/airtime_mvc/public/js/airtime/preferences/musicdirs.js +++ b/airtime_mvc/public/js/airtime/preferences/musicdirs.js @@ -43,7 +43,7 @@ function setWatchedDirEvents() { $('#storageFolder-ok').click(function(){ var url, chosen; - if(confirm($.i18n._("Are you sure you want to change the storage folder?\nThis will remove the files from your Airtime library!"))){ + if(confirm(sprintf($.i18n._("Are you sure you want to change the storage folder?\nThis will remove the files from your %s library!"), PRODUCT_NAME))){ url = baseUrl+"Preference/change-stor-directory"; chosen = $('#storageFolder').val(); diff --git a/airtime_mvc/public/js/airtime/preferences/streamsetting.js b/airtime_mvc/public/js/airtime/preferences/streamsetting.js index 894f54461..7529783a0 100644 --- a/airtime_mvc/public/js/airtime/preferences/streamsetting.js +++ b/airtime_mvc/public/js/airtime/preferences/streamsetting.js @@ -250,12 +250,14 @@ function setupEventListeners() { showErrorSections(); checkLiquidsoapStatus(); + var userManualAnchorOpen = ""; + // qtip for help text $(".override_help_icon").qtip({ content: { - text: $.i18n._("If Airtime is behind a router or firewall, you may need to configure port forwarding and this field information will be incorrect. In this case you will need to manually update this field so it shows the correct host/port/mount that your DJ's need to connect to. The allowed range is between 1024 and 49151.")+" "+ + text: sprintf($.i18n._("If %s is behind a router or firewall, you may need to configure port forwarding and this field information will be incorrect. In this case you will need to manually update this field so it shows the correct host/port/mount that your DJ's need to connect to. The allowed range is between 1024 and 49151."), PRODUCT_NAME)+" "+ sprintf($.i18n._( - "For more details, please read the %sAirtime Manual%s"), "", "") + "For more details, please read the %s%s Manual%s"), userManualAnchorOpen, PRODUCT_NAME, "") }, hide: { delay: 500, @@ -465,7 +467,7 @@ $(document).ready(function() { getAdminPasswordStatus(); $('#stream_save').live('click', function(){ - var confirm_pypo_restart_text = $.i18n._("If you change the username or password values for an enabled stream the playout engine will be rebooted and your listeners will hear silence for 5-10 seconds. Changing the following fields will NOT cause a reboot: Stream Label (Global Settings), and Switch Transition Fade(s), Master Username, and Master Password (Input Stream Settings). If Airtime is recording, and if the change causes a playout engine restart, the recording will be interrupted."); + var confirm_pypo_restart_text = sprintf($.i18n._("If you change the username or password values for an enabled stream the playout engine will be rebooted and your listeners will hear silence for 5-10 seconds. Changing the following fields will NOT cause a reboot: Stream Label (Global Settings), and Switch Transition Fade(s), Master Username, and Master Password (Input Stream Settings). If %s is recording, and if the change causes a playout engine restart, the recording will be interrupted."), PRODUCT_NAME); if (confirm(confirm_pypo_restart_text)) { var data = $('#stream_form').serialize(); var url = baseUrl+'Preference/stream-setting'; From f6bf2f8cc595c5917aa18f222baf4b64614e6a21 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Fri, 7 Nov 2014 12:05:29 -0500 Subject: [PATCH 21/21] Changed tabs to spaces --- .../controllers/PlaylistController.php | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index 1826bde3b..4f511f4b5 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -38,7 +38,7 @@ class PlaylistController extends Zend_Controller_Action $obj = null; $objInfo = Application_Model_Library::getObjInfo($p_type); - $obj_sess = new Zend_Session_Namespace( UI_PLAYLISTCONTROLLER_OBJ_SESSNAME); + $obj_sess = new Zend_Session_Namespace(UI_PLAYLISTCONTROLLER_OBJ_SESSNAME); if (isset($obj_sess->id)) { $obj = new $objInfo['className']($obj_sess->id); @@ -422,29 +422,29 @@ class PlaylistController extends Zend_Controller_Action public function setCrossfadeAction() { - $id1 = $this->_getParam('id1', null); - $id2 = $this->_getParam('id2', null); - $type = $this->_getParam('type'); - $fadeIn = $this->_getParam('fadeIn', 0); - $fadeOut = $this->_getParam('fadeOut', 0); - $offset = $this->_getParam('offset', 0); + $id1 = $this->_getParam('id1', null); + $id2 = $this->_getParam('id2', null); + $type = $this->_getParam('type'); + $fadeIn = $this->_getParam('fadeIn', 0); + $fadeOut = $this->_getParam('fadeOut', 0); + $offset = $this->_getParam('offset', 0); - try { - $obj = $this->getPlaylist($type); - $response = $obj->createCrossfade($id1, $fadeOut, $id2, $fadeIn, $offset); + try { + $obj = $this->getPlaylist($type); + $response = $obj->createCrossfade($id1, $fadeOut, $id2, $fadeIn, $offset); - if (!isset($response["error"])) { - $this->createUpdateResponse($obj); - } else { - $this->view->error = $response["error"]; - } - } catch (PlaylistOutDatedException $e) { - $this->playlistOutdated($e); - } catch (PlaylistNotFoundException $e) { - $this->playlistNotFound($type); - } catch (Exception $e) { - $this->playlistUnknownError($e); - } + if (!isset($response["error"])) { + $this->createUpdateResponse($obj); + } else { + $this->view->error = $response["error"]; + } + } catch (PlaylistOutDatedException $e) { + $this->playlistOutdated($e); + } catch (PlaylistNotFoundException $e) { + $this->playlistNotFound($type); + } catch (Exception $e) { + $this->playlistUnknownError($e); + } } public function getPlaylistFadesAction()