Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

airtime_mvc/public/js/airtime/dashboard/playlist.js

@@ -249,6 +249,8 @@ function setupQtip(){
     }
 }
 
+var stream_window = null;
+
 function init() {
     //begin producer "thread"
     getScheduleFromServer();
@@ -259,8 +261,9 @@ function init() {
     setupQtip();
     
     $('#on-air-info').click(function() {
-        newwindow=window.open("Dashboard/stream-player", 'name', 'width=380,height=168');
-        if (window.focus) {newwindow.focus()}
+        if (stream_window == null || stream_window.closed)
+            stream_window=window.open(baseUrl+"Dashboard/stream-player", 'name', 'width=400,height=216');
+        stream_window.focus();
         return false;
     });
 }

airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.css

@@ -19,9 +19,27 @@
     height: 100%;
     margin: 0;
     padding: 0;
+	width:400px;
 }
+
+.jp-container h1	{
+	background: #282828;
+	font-size:18px;
+	text-align:center;
+	color:#CCC;
+    margin: 0;
+    padding: 8px 0;
+	font-weight:normal;
+	border-bottom:1px solid #000;
+	background-color:#3D3D3D;
+	background: linear-gradient(top, #3c3c3c 0, #1a1a1a 100%);
+	background: -moz-linear-gradient(top, #3c3c3c 0, #1a1a1a 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #3c3c3c), color-stop(100%, #1a1a1a));
+	text-shadow: 0px -1px 1px #000;
+}
+
 .jp-logo	{
-	width:380px;
+	width:400px;
 	height: 67px;
 	background:#282828 url(../../../css/images/airtime_logo_jp.png) no-repeat 120px 14px;
 	background: url(../../../css/images/airtime_logo_jp.png) no-repeat 120px 14px, -moz-radial-gradient(200px 0px, circle cover, rgba(70,70,70,1) 0%, rgba(40,40,40,1) 90%);
@@ -29,7 +47,7 @@
 	display:block;
 }
 .jp-stream	{
-	height: 18px;
+	height: 27px;
 	display:block;
 	border-top:1px solid #050505;
 	color:#ff5d1a;
@@ -41,6 +59,7 @@
 	box-shadow: rgba(248,248,248,.3) 0px 1px 0px, rgba(0, 0, 0, 0.2) 0 2px 2px inset;
 	-moz-box-shadow: rgba(0, 0, 0, 0.7) 0 0 5px inset;
 	-webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 0 5px inset;
+	line-height:23px;
 }
 .jp-stream-text,
 .jp-stream form	{
@@ -56,6 +75,23 @@
 }
 .jp-stream label input[type="radio"]	{
 }
+
+.jp-stream form input[type="text"], .jp-stream form select	{
+    background-color: #212121;
+    border: 1px solid #1a1a1a;
+    box-shadow: 0 2px 2px rgba(0, 0, 0, 0.5) inset;
+	-moz-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.5) inset;
+	-webkit-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.5) inset;
+    color: #767676;
+    font-family: Arial,Helvetica,sans-serif;
+    font-size: 12px;
+    height: 25px;
+    margin: 0;
+    padding: 2px 2px 2px 0;
+    vertical-align: top;
+	width:200px;
+}
+
 div.jp-audio,
 div.jp-video {
 
@@ -282,14 +318,15 @@ div.jp-seeking-bg {
 }
 
 a.jp-mute,
-a.jp-unmute {
-	width:30px;
-	height:30px;
+a.jp-unmute,
+a.jp-volume-max {
+	width:20px;
+	height:20px;
 }
 div.jp-audio div.jp-type-single a.jp-mute,
 div.jp-audio div.jp-type-single a.jp-unmute {
-	top:22px;
-	left:300px;
+	top:30px;
+	left:227px;
 }
 div.jp-audio div.jp-type-playlist a.jp-mute,
 div.jp-audio div.jp-type-playlist a.jp-unmute {
@@ -317,29 +354,45 @@ div.jp-video-360p div.jp-type-playlist a.jp-unmute {
 	left:443px;
 }
 a.jp-mute {
-	background: url("jplayer.png") 0 -110px no-repeat;
+	background: url("jplayer.png") 0 -90px no-repeat;
 }
 a.jp-mute:hover {
-	background: url("jplayer.png") -30px -80px no-repeat;
+	background: url("jplayer.png") -30px -90px no-repeat;
 }
 a.jp-unmute {
-	background: url("jplayer.png") 0 -80px no-repeat;
+	background: url("jplayer.png") -61px -90px no-repeat;
 	display: none;
 }
 a.jp-unmute:hover {
-	background: url("jplayer.png") -30px -110px no-repeat;
+	background: url("jplayer.png") -91px -90px no-repeat;
+}
+div.jp-interface ul.jp-controls a.jp-volume-max {
+    background: url("jplayer.png") no-repeat scroll 0 -110px transparent;
+}
+div.jp-interface ul.jp-controls a.jp-volume-max:hover {
+    background: url("jplayer.png") no-repeat scroll -30px -110px transparent;
+}
+div.jp-audio ul.jp-controls a.jp-volume-max {
+    left: 340px;
+    top: 28px;
 }
 div.jp-volume-bar {
 	position: absolute;
 	overflow:hidden;
-	background: url("jplayer.png") 0 -250px repeat-x;
-	width:46px;
-	height:5px;
+	background:#393939;
+	-moz-box-shadow: rgba(0, 0, 0, 0.5) 0 0 1px inset;
+	-webkit-box-shadow: rgba(0, 0, 0, 0.5) 0 0 1px inset;
+	border-bottom:1px solid #5e5e5e;
+	border-top:1px solid #262526;
+	border-left:1px solid #262526;
+	border-right:1px solid #262526;
+	width:130px;
+	height:4px;
 	cursor: pointer;
 }
 div.jp-audio div.jp-type-single div.jp-volume-bar {
-	top:37px;
-	left:302px;
+	top:48px;
+	left:225px;
 }
 div.jp-audio div.jp-type-playlist div.jp-volume-bar {
 	top:37px;
@@ -361,9 +414,11 @@ div.jp-video-360p div.jp-type-playlist div.jp-volume-bar {
 	left:471px;
 }
 div.jp-volume-bar-value {
-	background: url("jplayer.png") 0 -256px repeat-x;
+	background-color:#fb7018;
+    background: -moz-linear-gradient(top, #fc9318 0, #e56815 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #fc9318), color-stop(100%, #e56815));
 	width:0px;
-	height:5px;
+	height:3px;
 }
 div.jp-current-time,
 div.jp-duration {