+
Airtime, the open radio software for scheduling and remote station management.
+© 2011
Sourcefabric o.p.s 2011. Airtime is distributed under the
GNU GPL v.3
+
diff --git a/public/css/images/progressbar_show_red.png b/public/css/images/progressbar_show_red.png
index 59f7a899b..2d585370e 100644
Binary files a/public/css/images/progressbar_show_red.png and b/public/css/images/progressbar_show_red.png differ
diff --git a/public/js/playlist/nowplayingdatagrid.js b/public/js/playlist/nowplayingdatagrid.js
index da8fb5472..ce65d2a00 100644
--- a/public/js/playlist/nowplayingdatagrid.js
+++ b/public/js/playlist/nowplayingdatagrid.js
@@ -76,11 +76,11 @@ function createDataGrid(){
"aoColumns": columns,
"fnRowCallback": function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
if (aData[aData.length-2] == "t")
- $(nRow).attr("style", "background-color:#166622");
+ $(nRow).attr("class", "playing-list");
if (aData[0] == "c")
- $(nRow).attr("style", "background-color:#61B329");
+ $(nRow).attr("class", "playing-song");
else if (aData[0] == "b")
- $(nRow).attr("style", "background-color:#EE3B3B");
+ $(nRow).attr("class", "gap");
return nRow;
},
"bAutoWidth":false
diff --git a/public/js/playlist/playlist.js b/public/js/playlist/playlist.js
index 7ba2b689f..0116cc5d0 100644
--- a/public/js/playlist/playlist.js
+++ b/public/js/playlist/playlist.js
@@ -241,6 +241,18 @@ function init() {
//begin consumer "thread"
secondsTimer();
+
+ $('#about-link').qtip({
+ content: $('#about-txt').html(),
+ show: 'mouseover',
+ hide: { when: 'mouseout', fixed: true },
+ position: {
+ corner: {
+ target: 'center',
+ tooltip: 'topRight'
+ }
+ }
+ });
}
$(document).ready(function() {
diff --git a/pypo/liquidsoap/liquidsoap32 b/pypo/liquidsoap/liquidsoap32
old mode 100755
new mode 100644
index f7511e843..3550892f0
Binary files a/pypo/liquidsoap/liquidsoap32 and b/pypo/liquidsoap/liquidsoap32 differ
diff --git a/pypo/liquidsoap/liquidsoap64 b/pypo/liquidsoap/liquidsoap64
old mode 100755
new mode 100644
index 986911326..b3d279485
Binary files a/pypo/liquidsoap/liquidsoap64 and b/pypo/liquidsoap/liquidsoap64 differ
diff --git a/tests/application/controllers/DashboardControllerTest.php b/tests/application/controllers/DashboardControllerTest.php
new file mode 100644
index 000000000..afd891617
--- /dev/null
+++ b/tests/application/controllers/DashboardControllerTest.php
@@ -0,0 +1,20 @@
+