Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CC-2002 

GUI changes done
This commit is contained in:
martin 2011-03-11 13:56:13 -05:00
parent 55745d1a4a
commit a947306222
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/models/Shows.php
View File

@ -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'"

16
application/views/scripts/partialviews/header.phtml
View File

@ -9,13 +9,17 @@
</div>
<div class="text-row next-song"><strong>Next:</strong> <span id='next'></span> <span id='next-length'></span></div>
</div>
<div class="show-block">
<div class="text-row">&nbsp;</div>
<div class="now-playing-info show"> <span id='playlist'></span> <span class="length" id="show-length"></span> </div>
<div class="progressbar">
<div class="progress-show" id='progress-show' style="width:0%;"></div>
<div class="show-block">
<div class="text-row">&nbsp;</div>
<div class="now-playing-info show">
<div class="recording-show" style="display: none;"></div>
<span id="playlist"></span>
<span class="lenght">00:00</span>
</div>
<div class="progressbar">
<div class="progress-show" id='progress-show' style="width:0%;"></div>
</div>
</div>
</div>
<div class="on-air-block">
<div class="on-air-info off" id="on-air-info">ON AIR</div>
</div>

BIN
public/css/images/record_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

6
public/js/playlist/playlist.js
View File

@ -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));