diff --git a/application/models/Shows.php b/application/models/Shows.php index c36a987b2..976bb253f 100644 --- a/application/models/Shows.php +++ b/application/models/Shows.php @@ -737,7 +737,7 @@ class Show_DAL{ $date = $timestamp[0]; $time = $timestamp[1]; - $sql = "SELECT si.starts as start_timestamp, si.ends as end_timestamp, s.name, s.id, si.id as instance_id" + $sql = "SELECT si.starts as start_timestamp, si.ends as end_timestamp, s.name, s.id, si.id as instance_id, si.record" ." FROM $CC_CONFIG[showInstances] si, $CC_CONFIG[showTable] s" ." WHERE si.show_id = s.id" ." AND si.starts <= TIMESTAMP '$timeNow'" diff --git a/application/views/scripts/partialviews/header.phtml b/application/views/scripts/partialviews/header.phtml index 2eea3063c..4905d0d10 100644 --- a/application/views/scripts/partialviews/header.phtml +++ b/application/views/scripts/partialviews/header.phtml @@ -9,13 +9,17 @@
Next:
-
-
 
-
-
-
+
+
 
+
+ + + 00:00 +
+
+
+
-
ON AIR
diff --git a/public/css/images/record_icon.png b/public/css/images/record_icon.png new file mode 100644 index 000000000..5e468705b Binary files /dev/null and b/public/css/images/record_icon.png differ diff --git a/public/js/playlist/playlist.js b/public/js/playlist/playlist.js index 434a19fdb..82f277d1c 100644 --- a/public/js/playlist/playlist.js +++ b/public/js/playlist/playlist.js @@ -165,9 +165,13 @@ function updatePlaybar(){ /* Column 1 update */ $('#playlist').text("Current Show:"); - if (currentShow.length > 0) + if (currentShow.length > 0){ $('#playlist').text(currentShow[0].name); + var recElem = $('.recording-show'); + currentShow[0].record ? recElem.show(): recElem.hide(); + } + $('#show-length').empty(); if (currentShow.length > 0){ $('#show-length').text(convertDateToHHMM(currentShow[0].showStartPosixTime) + " - " + convertDateToHHMM(currentShow[0].showEndPosixTime));