From 416b9d1dc2be99dcbc04e04b430319172ade01dc Mon Sep 17 00:00:00 2001
From: Vladimir <vladimir.stefanovic@sourcefabric.org>
Date: Mon, 2 Apr 2012 20:31:26 +0200
Subject: [PATCH] CC-3482

---
 .../public/css/images/source-info_lines.png   | Bin 1893 -> 3350 bytes
 .../css/images/source_to_switch_lines.png     | Bin 0 -> 970 bytes
 airtime_mvc/public/css/masterpanel.css        |  99 ++++++++++++------
 3 files changed, 69 insertions(+), 30 deletions(-)
 create mode 100644 airtime_mvc/public/css/images/source_to_switch_lines.png

diff --git a/airtime_mvc/public/css/images/source-info_lines.png b/airtime_mvc/public/css/images/source-info_lines.png
index 75a1f435d03a8b5193da0a56dba4710a29de1818..2da86de83d1c33c825b3ea03fe78fdd985c04aa5 100644
GIT binary patch
literal 3350
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
J9n}8y{{Y#pBhml>

literal 1893
zcmaJ?4NMbf7_NX?>#)^8#-_q&RWKrLuay=~ip3U29qky>2pK5-xt5CU9qmC&5hDJC
z>dbW1Fe>6AFcbd;jG|17Q>OUChHNrrYz&nRIz_;rF+_H)P)#;=$=!F~m*;)n=Y8Mj
zayt^GANW$<r;tb_Uva!BiCC`@_iget;z{-2tt6KB@Yoc54XVaXasxt&QK1S1h;?!e
zl7z@rdD+cK6p7>ww8<%WiX;J6qB@4$g<+U=7!ge(MXfYra%C2R0|lbd>iP8k1_vEz
zRebu|a0yF-36V@~yv2a5u}G7ZmMmqYioP-$M44fNK!@ORVAgHa8(}k_?&gJwch@nK
z4%`qti%)+oDn*hAgs1@l;S5%olEq~KF2sO1%XvKBGQeg*EGCQ1gxFya59Y9877L7D
zbRwHUrG}G4apSp&9iN_w;~30jnoK5!iNin*8YUDO8R_C+v%?5Pm@!X}%gteW<H89B
z5n@ytv>2{M^}xj_SD-mKpH3)!U4jnt(CUrjZ6X@RG|Mq2#9+BfngB{9{}0vaJZK}H
zguK!FpTx%GJPctbAx1REpd<#TUg%1N!9oKf$5BHvif)|fVqzwWqsB}W1Hv`oV69fK
zLQO_DS|WkPdLu5^D-p4XPbcCTTCEBWk6?uh<G2tn0^&kYEEFMH1;uhB*{dL)FqR_}
zPQ;2(WsVNf;}fx}H?izVV_injVMJyTV$kLysyG9x1MY%h?W9`5<0j=Bk5x^sg*9m`
zlMusnjrFZDPaF~6alLv>OKd#0NA!f(4TPyHC>I^Xx6&aN#Uz{W{n-ggI}+zL${T6}
zE+8#k_RuR!R}@>RJyl>Bl&)^ym<AS~mVNBMf@&+%IQl;cnA4gubbkPQl~WiM$m#kz
z4FDRAO!o2d`rN0s<B^}2_s-g7^QQ(-RCRYFC>c~QuPH^F1p*K1<xG_$$ImM5ygE>j
zy8Q0ex=UX;N20H{%dY(Wjdi_DmfCS9HND+A>VKo7Q@)8xr&SJ_>(5RvT2PZ9-~Sw(
zYrEu^-hQDV?Ox!6e&?)#TiR)Ede-m3oeMyC&~Vije?p5_(NT^&b>lPdfn1Zq?*{d8
z<<UZTF3T_8R$%h8wsdw@@X0?_Z*@z1BhRDObyU9rsBeoe6xB@sl&Fbb@^o;}Fc8@k
zT$-PLY1gb`;rBy3+e6MzoqKe6M^NRFBVD@f{@a#3EeLw(T&gILU+I4ql6~jQqi%io
z@Gs})S}u-ReijrrOS3mU<P9cE+P0kpQqG6iEm_~`!R>|XUQC}7N`42X__UDE#WQFn
zewMt;<^D0A#u3UIH+VxfX`k<|lVIeyz}j;Ew^u!5-+noxX<+R1!REmIzLiF2OnaC8
zDL0>Olj41a`E}oo9<<}3WQb*J=_?Z#&sN`FP|Dw7$E_H(o3<x{(~Es(#{+1vjmX$`
zM)#yCyBvQ#PGhY&M0=uo>-w55?#*i3ChschK5@w1(X0K3V>!J~9Nc`0<$xV889KkD
zOsq-mnKxR<W9CHCIK2sDaU9#M%Z{t%;^GJ*DLFMJzQT@2G@Lwq;5fi?s{+k=mwoYn
zHT`XyjL*R{j@O!qEori&j6;IlhKj1jMJ{_Bb6T`azFD?pzd9+o^eaKeO?BOD@~+;I
z=%D<U<wBov5?XQF`kJ)Wnv$vOz)LeY_-+Dd_FwcsG2@s_Cac<=Uq^Qt+mkUxNBF^h
zJpn$p*N)dWCctSK!SkahM%1GUu4pbP6Zap{X!iXP75KQyJb$>*adyj|+EynR&UWNj
zt!qc_XE_J->pbOb7G$&*5&c`r={<F)-uqX@Vp_?MDymlzq<g-1rq8q=M*qs6?VC{K
zwrQEojvqp?Th+qu(D-Xjb5cTIh>JgZi%S4bWjcHUNDb(yqLq@acK!Iou~N~ART*3U
E0npU0<NyEw

diff --git a/airtime_mvc/public/css/images/source_to_switch_lines.png b/airtime_mvc/public/css/images/source_to_switch_lines.png
new file mode 100644
index 0000000000000000000000000000000000000000..4501b46bda200f7e8177ce00919b76135f64ab53
GIT binary patch
literal 970
zcmaJ=y>HV%95sqmRh5bmT?*65U5R~XH*sxZN@BZhBwR&FP&3xCFOAjOXY4C>yMSP7
z#lVJG`2*TNfPopr#)3MruvJ1414u}ebDE?K1WV`p(0lLqaqo^Ao9pv)x92#Ho3C$}
zO*UU+V{vwd{qKH!b;hP!)auX{>Cx1QF<13S7lV4>?BFJLyn{#YafRawz;AbG$9|x>
zBoLe&BV<9u*c?|`%_7I$#T0b$jvwm$x3}+j;Cnj1RkEQS8MyCn9LBhHxY>3OcU{%v
zSMPyJrZIs4QwL<hUYKZ^&JT4pw$6`59t<ILSLZL2>evlnkQjrK0E;dxLr_Knl9v@l
zxdSAKpa>-qNkyb+vZO%>Mjy|j#a>Tqnrow2Y^U>mN+V4a(=-)QSs?L_h*VY0H6*FX
z5XIymq)t{0lclkOi4!;WBkGe7<cdz0>{Fd*nO>F<L=)LC8MTQuOw61}L;}o98Ut<n
z|Ii?qpcC4}SNZ-^IB6e5SZv~i?8h#<xZYA8D$<M?JCww2LiWa8Z1f2wNuNZ(XqCX0
zA9^HBhG^T?>S02i(8YCA=NVt{eNR(rP_asASurdXAq%arPOFAgwq(^>s~P1n*Cg(K
zfI~XwdRN@iRBmpBAYzeC9Q%*4w-%EC3=7u$>A6T#^+sH8dM@%*uE>%R^K1R<n#V`X
zJNa^ATDF<k9*4~9F*9}T`u9`zAnw=AYCAjY{=B$YEi4pnY%eXIpP&Dh2ZI5EN5{t!
z{POU{$&V**Duvd~=L-e-Gxu`#Q}ydQK<hJ4xdPYxF#qdxrTRL5U3F{IJgIFz`vW28
BFMj|4

literal 0
HcmV?d00001

diff --git a/airtime_mvc/public/css/masterpanel.css b/airtime_mvc/public/css/masterpanel.css
index 1da45dabe..f11bb3f4c 100644
--- a/airtime_mvc/public/css/masterpanel.css
+++ b/airtime_mvc/public/css/masterpanel.css
@@ -33,8 +33,8 @@
 			color:#bdbdbd;
 			margin:0;
 			height:15px;
-			padding-right:20px;
-			background:url(images/source-info_lines.png) no-repeat right 0;
+			padding-right:0;
+			overflow:visible;
 			}
 			.source-info-block li:first-child {
 				background-position: right -50px;
@@ -44,51 +44,90 @@
 				background-position: right -150px;
 				padding-top:3px;
 				}
-			.source-info-block li div {
-				display:inline-block;
-				margin-right:10px;
+			.source-info-block li div.source-label {
+				margin-right:0;
 				min-width:95px;
 				float:left;
 				height:15px;
 				line-height:14px;
 				padding:0 2px 0 3px;
 				background:#3e3e3e;
-				-webkit-border-radius:2px;
-				-moz-border-radius:2px;
-				border-radius:2px;
-				border-right:2px solid #3e3e3e;
+				-webkit-border-radius:2px 0 0 2px;
+				-moz-border-radius:2px 0 0 2px;
+				border-radius:2px 0 0 2px;
 				}
+				.source-info-block li div.source-label.ready {
+					background:#2f2e2e;
+					color:#fff;
+					}
+			.source-info-block li .line-to-switch, .source-info-block li .line-to-switch.off {
+				margin:0;
+				width:12px;
+				float:left;
+				height:15px;
+				padding:0;
+				border-left:2px solid #3e3e3e;
+				background:url(images/source_to_switch_lines.png) repeat-x 0 0;
+				}
+				.source-info-block li .line-to-switch.off {
+					border-color:#3e3e3e;
+					background:url(images/source_to_switch_lines.png) repeat-x 0 0;
+					}
+				.source-info-block li .line-to-switch.on {
+					border-color:#ff611f;
+					background:url(images/source_to_switch_lines.png) repeat-x 0 -15px;
+					}
+			.source-info-block li .line-to-on-air, .source-info-block li .line-to-on-air.off {
+				margin:0;
+				width:20px;
+				float:left;
+				height:15px;
+				padding:0;
+				background:url(images/source_to_switch_lines.png) repeat-x 0 0;
+				}
+				.source-info-block li .line-to-on-air, .source-info-block li .line-to-on-air.off {
+					margin:0;
+					width:20px;
+					float:left;
+					height:15px;
+					padding:0;
+					background:url(images/source-info_lines.png) repeat-x 0 0;
+					}
+					.source-info-block li .line-to-on-air.off  {
+						background:url(images/source-info_lines.png) no-repeat 0 0;
+						}
+					.source-info-block li .line-to-on-air.on {
+						background:url(images/source-info_lines.png) no-repeat 0 -15px;
+						}
 
-.source-info-block li.ready {
+
+.source-info-block li.active {
 	background-position: right -15px;
 	}
-	.source-info-block li.ready:first-child {
+	.source-info-block li.active:first-child {
 		background-position: right -70px;
 		}
-	.source-info-block li.ready:last-child {
+	.source-info-block li.active:last-child {
 		background-position: right -170px;
 		padding-top:3px;
 		}
-.source-info-block li.active {
-	background-position: right -30px;
+	
+.source-info-block li:first-child .line-to-on-air, .source-info-block li:first-child .line-to-on-air.off {
+	background-position: right -50px;
+	margin-bottom:-3px;
+	height:18px;
 	}
-	.source-info-block li.active:first-child {
-		background-position: right -90px;
-		}
-	.source-info-block li.active:last-child {
-		background-position: right -190px;
-		padding-top:3px;
-		}		
-.source-info-block li.ready div, .source-info-block li.active div {
-	background:#2f2e2e;
-	border-color:#ff611f;
-	color:#fff;
+.source-info-block li:first-child .line-to-on-air.on {
+	background-position: right -70px;
 	}
-.source-info-block li.kicked div {
-	color:#737373;
-	}
-
-
+.source-info-block li:last-child .line-to-on-air, .source-info-block li:last-child .line-to-on-air.off {
+	background-position: right -150px;
+	margin-top:-3px;
+	height:18px;
+	}	
+.source-info-block li:last-child .line-to-on-air.on {
+	background-position: right -170px;
+	}	
 
 .source-switch-button {
 	font-size:11px;