+
live; ?>
isSaas()){?>
diff --git a/airtime_mvc/public/css/media_library.css b/airtime_mvc/public/css/media_library.css
index 24808247f..2db478196 100644
--- a/airtime_mvc/public/css/media_library.css
+++ b/airtime_mvc/public/css/media_library.css
@@ -31,7 +31,7 @@
}
#library_display th {
- text-align: left;
+ text-align: left;
}
#library_content #library_display {
@@ -53,14 +53,6 @@
padding-top:16px;
}
-.lib-content table th.ui-state-default {
- 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: #363636;
-}
-
.paginationControl {
font-size: 12px;
background-color: #9a9a9a;
diff --git a/airtime_mvc/public/css/playouthistory.css b/airtime_mvc/public/css/playouthistory.css
new file mode 100644
index 000000000..e195e0ffa
--- /dev/null
+++ b/airtime_mvc/public/css/playouthistory.css
@@ -0,0 +1,29 @@
+@CHARSET "UTF-8";
+
+.dataTables_filter input {
+ width: 30%;
+}
+
+#history_content input.input_text.hasDatepicker {
+ width: 95px;
+}
+
+#history_content input.input_text.hasTimepicker {
+ width: 60px;
+}
+
+div.his-timerange {
+ position: relative;
+ margin-bottom: 5px;
+}
+
+div.his-timerange div {
+ position: absolute;
+ bottom: 0px;
+ padding: 3px;
+ margin-left: 5px;
+}
+
+table.dataTable tbody tr {
+ cursor: auto;
+}
\ No newline at end of file
diff --git a/airtime_mvc/public/css/showbuilder.css b/airtime_mvc/public/css/showbuilder.css
index 84a0151c7..dad808785 100644
--- a/airtime_mvc/public/css/showbuilder.css
+++ b/airtime_mvc/public/css/showbuilder.css
@@ -95,6 +95,17 @@
width:60px;
}
+div.sb-timerange {
+ position: relative;
+}
+
+div.sb-timerange div {
+ position: absolute;
+ bottom: 0px;
+ padding: 3px;
+ margin-left: 5px;
+}
+
.sb-starts,
.sb-ends {
text-align: center;
@@ -174,6 +185,17 @@ table.datatable tr.cursor-selected-row td, table.datatable tr.cursor-selected-ro
padding: 8px 8px 8px 16px;
}
+table.dataTable tr.sb-past,
+table.dataTable tr.sb-header,
+table.dataTable tr.sb-footer,
+table.dataTable tr.sb-not-allowed {
+ cursor: auto;
+}
+
+table.dataTable td.sb-image {
+ cursor: pointer;
+}
+
table.datatable tr.sb-header.odd td, table.datatable tr.sb-header.even td,
table.datatable tr.sb-header.odd:hover td, table.datatable tr.sb-header.even:hover td{
background: -moz-linear-gradient(top, #a4a4a4 0, #bcbcbc 100%);
@@ -191,14 +213,6 @@ table.datatable tr.sb-header.odd:hover td, table.datatable tr.sb-header.even:hov
float: left;
}
-.sb-content table th.ui-state-default {
- 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: #363636;
-}
-
.sb-content input.ui-button {
padding: 3px 1em;
}
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index d63df34e6..e35027dd2 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -134,7 +134,7 @@ select {
.info-tooltip:hover span {
box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.1); -webkit-box-shadow: 5px 5px rgba(0, 0, 0, 0.1); -moz-box-shadow: 5px 5px rgba(0, 0, 0, 0.1);
position: absolute; left: 25px; top: -18px; z-index: 99;
- margin-left: 0; width: 250px;
+ margin-left: 0; width: 200px;
}
/* Info Tooltip Ends */
@@ -654,14 +654,19 @@ dl.inline-list dd {
padding: 2px 2px 2px 0;
vertical-align: top;
}
-#library_display thead th, #library_display tbody td {
+table.dataTable tbody tr,
+table.dataTable span.DataTables_sort_icon {
cursor: pointer;
}
-#library_display thead th.library_checkbox,
-#library_display thead th.library_id,
-#library_display thead th.library_title {
- cursor: default;
+
+table.dataTable th.ui-state-default {
+ 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: #363636;
}
+
.ColVis.TableTools .ui-button {
height: 21px;
}
@@ -2607,12 +2612,12 @@ dd .stream-status {
overflow: hidden;
margin: 3px 0 0 10px;
}
- .close-round:hover {
- background-position:0 -18px;
- }
- .close-round:active {
- background-position:0 -36px;
- }
+.close-round:hover {
+ background-position:0 -36px;
+}
+.close-round:active {
+ background-position:0 -36px;
+}
/*---//////////////////// NEW BUTTONS ////////////////////---*/
diff --git a/airtime_mvc/public/css/users.css b/airtime_mvc/public/css/users.css
new file mode 100644
index 000000000..e21feea85
--- /dev/null
+++ b/airtime_mvc/public/css/users.css
@@ -0,0 +1,9 @@
+@charset "utf-8";
+
+.dataTables_filter input {
+ margin-left: 0;
+}
+
+.dataTables_processing {
+ top: 20px;
+}
\ No newline at end of file
diff --git a/airtime_mvc/public/js/airtime/dashboard/dashboard.js b/airtime_mvc/public/js/airtime/dashboard/dashboard.js
index 7e0770bc0..a09e909eb 100644
--- a/airtime_mvc/public/js/airtime/dashboard/dashboard.js
+++ b/airtime_mvc/public/js/airtime/dashboard/dashboard.js
@@ -47,8 +47,10 @@ function secondsTimer(){
function newSongStart(){
nextSongPrepare = true;
- currentSong = nextSong;
- nextSong = null;
+ if (nextSong.type == 'track') {
+ currentSong = nextSong;
+ nextSong = null;
+ }
}
function nextShowStart(){
@@ -74,12 +76,14 @@ function updateProgressBarValue(){
var scheduled_play_line_to_switch = scheduled_play_div.parent().find(".line-to-switch");
if (currentSong !== null){
+ var songElpasedTime = 0;
songPercentDone = (estimatedSchedulePosixTime - currentSong.songStartPosixTime)/currentSong.songLengthMs*100;
+ songElapsedTime = estimatedSchedulePosixTime - currentSong.songStartPosixTime;
if (songPercentDone < 0 || songPercentDone > 100){
songPercentDone = 0;
currentSong = null;
} else {
- if (currentSong.media_item_played == true && currentShow.length > 0) {
+ if ((currentSong.media_item_played == true && currentShow.length > 0) || songElapsedTime < 5000) {
scheduled_play_line_to_switch.attr("class", "line-to-switch on");
scheduled_play_div.addClass("ready");
scheduled_play_source = true;
@@ -320,8 +324,8 @@ function controlOnAirLight(){
if ((scheduled_play_on_air && scheduled_play_source) || live_dj_on_air || master_dj_on_air) {
$('#on-air-info').attr("class", "on-air-info on");
onAirOffIterations = 0;
- } else if (onAirOffIterations < 15) {
- //if less than 3 seconds have gone by (< 15 executions of this function)
+ } else if (onAirOffIterations < 20) {
+ //if less than 4 seconds have gone by (< 20 executions of this function)
//then keep the ON-AIR light on. Only after at least 3 seconds have gone by,
//should we be allowed to turn it off. This is to stop the light from temporarily turning
//off between tracks: CC-3725
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index 051094ab4..401eb041e 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -217,6 +217,25 @@ var AIRTIME = (function(AIRTIME) {
libraryInit = function() {
$libContent = $("#library_content");
+
+ /*
+ * Icon hover states in the toolbar.
+ */
+ $libContent.on("mouseenter", ".fg-toolbar ul li", function(ev) {
+ $el = $(this);
+
+ if (!$el.hasClass("ui-state-disabled")) {
+ $el.addClass("ui-state-hover");
+ }
+ });
+ $libContent.on("mouseleave", ".fg-toolbar ul li", function(ev) {
+ $el = $(this);
+
+ if (!$el.hasClass("ui-state-disabled")) {
+ $el.removeClass("ui-state-hover");
+ }
+ });
+
$libTable = $libContent.find("table");
var tableHeight = $libContent.height() - 130;
diff --git a/airtime_mvc/public/js/airtime/playouthistory/historytable.js b/airtime_mvc/public/js/airtime/playouthistory/historytable.js
index ff981feb5..35c8fdb96 100644
--- a/airtime_mvc/public/js/airtime/playouthistory/historytable.js
+++ b/airtime_mvc/public/js/airtime/playouthistory/historytable.js
@@ -62,7 +62,7 @@ var AIRTIME = (function(AIRTIME) {
"bJQueryUI": true,
"bAutoWidth": true,
- "sDom": 'lfr<"H"T><"dataTables_scrolling"t><"F"ip>',
+ "sDom": 'lf<"dt-process-rel"r><"H"T><"dataTables_scrolling"t><"F"ip>',
"oTableTools": {
"sSwfPath": "/js/datatables/plugin/TableTools/swf/copy_cvs_xls_pdf.swf"
@@ -93,6 +93,16 @@ $(document).ready(function(){
dateEndId = "#his_date_end",
timeEndId = "#his_time_end";
+ /*
+ * Icon hover states for search.
+ */
+ history_content.on("mouseenter", ".his-timerange .ui-button", function(ev) {
+ $(this).addClass("ui-state-hover");
+ });
+ history_content.on("mouseleave", ".his-timerange .ui-button", function(ev) {
+ $(this).removeClass("ui-state-hover");
+ });
+
history_content
.height(widgetHeight)
.width(screenWidth);
diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index 22364c915..bab69b0f3 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -257,6 +257,24 @@ var AIRTIME = (function(AIRTIME){
$lib = $("#library_content"),
$sbTable = $sbContent.find('table');
+ /*
+ * Icon hover states in the toolbar.
+ */
+ $sbContent.on("mouseenter", ".fg-toolbar ul li", function(ev) {
+ $el = $(this);
+
+ if (!$el.hasClass("ui-state-disabled")) {
+ $el.addClass("ui-state-hover");
+ }
+ });
+ $sbContent.on("mouseleave", ".fg-toolbar ul li", function(ev) {
+ $el = $(this);
+
+ if (!$el.hasClass("ui-state-disabled")) {
+ $el.removeClass("ui-state-hover");
+ }
+ });
+
oSchedTable = $sbTable.dataTable( {
"aoColumns": [
/* checkbox */ {"mDataProp": "allowed", "sTitle": "", "sWidth": "15px", "sClass": "sb-checkbox"},
diff --git a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
index 1b7b731c1..687184584 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
@@ -87,6 +87,16 @@ AIRTIME = (function(AIRTIME) {
$builder = $("#show_builder");
$fs = $builder.find('fieldset');
+ /*
+ * Icon hover states for search.
+ */
+ $builder.on("mouseenter", ".sb-timerange .ui-button", function(ev) {
+ $(this).addClass("ui-state-hover");
+ });
+ $builder.on("mouseleave", ".sb-timerange .ui-button", function(ev) {
+ $(this).removeClass("ui-state-hover");
+ });
+
$builder.find(dateStartId).datepicker(oBaseDatePickerSettings);
$builder.find(timeStartId).timepicker(oBaseTimePickerSettings);
$builder.find(dateEndId).datepicker(oBaseDatePickerSettings);
diff --git a/airtime_mvc/public/js/airtime/user/user.js b/airtime_mvc/public/js/airtime/user/user.js
index 15e97301d..9dd4280ea 100644
--- a/airtime_mvc/public/js/airtime/user/user.js
+++ b/airtime_mvc/public/js/airtime/user/user.js
@@ -87,7 +87,9 @@ $(document).ready(function() {
"bLengthChange": false,
"oLanguage": {
"sSearch": ""
- }
+ },
+
+ "sDom": '<"H"lf<"dt-process-rel"r>>t<"F"ip>',
});
//$('#user_details').hide();
diff --git a/airtime_mvc/public/js/jplayer/skin/jplayer.airtime.audio.preview.css b/airtime_mvc/public/js/jplayer/skin/jplayer.airtime.audio.preview.css
index b40407a19..eeec7ade5 100644
--- a/airtime_mvc/public/js/jplayer/skin/jplayer.airtime.audio.preview.css
+++ b/airtime_mvc/public/js/jplayer/skin/jplayer.airtime.audio.preview.css
@@ -190,7 +190,7 @@ div.jp-audio div.jp-type-single a.jp-unmute {
div.jp-volume-block {
position: absolute;
- top: 35px;
+ top: 33px;
left: 350px;
width: 120px;
}