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

Fixing CC-466 (LS Station: 'Now Playing' still not working)

This commit is contained in:
Sebastian 2010-08-18 16:19:19 +02:00
parent 29f65a6258
commit ee4ddf27a8
3 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/htmlUI/var/html/styles_campcaster.css
View File

@ -839,7 +839,7 @@ table.masterpalette td{
padding-right: 5px; padding-right: 5px;
font-family: bitstream-vera, verdana, helvetica; font-family: bitstream-vera, verdana, helvetica;
font: #999; font: #999;
width: 350px; width: 460px;
height: 85px; height: 85px;
border-right: 1px solid #ccc; border-right: 1px solid #ccc;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
@ -900,7 +900,7 @@ table.masterpalette td{
} }
.whatplaying .scala { .whatplaying .scala {
width: 340px; width: 450px;
height: 8px; height: 8px;
margin: 2px 0; margin: 2px 0;
background-color: #DADADA; background-color: #DADADA;
@ -1000,6 +1000,7 @@ table.masterpalette td{
#now_pltitle_, #now_pltitle_,
#next_title_, #next_title_,
#upcoming_pltitle_, #upcoming_pltitle_,
#upcoming_title_ { #upcoming_title_,
#upcoming_plstart {
visibility: hidden; visibility: hidden;
} }

11
src/modules/htmlUI/var/templates/script/progressbar.js.tpl
View File

@ -39,8 +39,8 @@ function plPrBar_init(current, c_tit, c_pltit, c_eh, c_ei, c_es, c_dh, c_di, c_d
if (next == 1) { if (next == 1) {
//plPrBar_debug('init::next: ' + next); //plPrBar_debug('init::next: ' + next);
this.next = true; this.next = true;
this.n_tit = n_tit.slice(0, 22); this.n_tit = n_tit.slice(0, 35);
this.n_pltit = n_pltit.slice(0, 22); this.n_pltit = n_pltit.slice(0, 35);
this.n_duration = new Date; this.n_duration = new Date;
this.n_duration.setTime(Date.UTC(1970, 0, 1, n_dh, n_di, n_ds)); this.n_duration.setTime(Date.UTC(1970, 0, 1, n_dh, n_di, n_ds));
} }
@ -77,9 +77,9 @@ function plPrBar_init(current, c_tit, c_pltit, c_eh, c_ei, c_es, c_dh, c_di, c_d
if (this.upcoming) { if (this.upcoming) {
this.show('upcoming'); this.show('upcoming');
document.getElementById("upcoming_pltitle").innerHTML = this.u_pltit; document.getElementById("upcoming_pltitle").innerHTML = this.u_pltit;
document.getElementById("upcoming_plstart").innerHTML = '(at ' + twoDigit(this.u_plstart.getUTCHours()) document.getElementById("upcoming_plstart").innerHTML = 'at ' + twoDigit(this.u_plstart.getUTCHours())
+ ':' + twoDigit(this.u_plstart.getUTCMinutes()) + ':' + twoDigit(this.u_plstart.getUTCMinutes())
+ ':' + twoDigit(this.u_plstart.getUTCSeconds()) + ')'; + ':' + twoDigit(this.u_plstart.getUTCSeconds());
document.getElementById("upcoming_title").innerHTML = this.u_tit; document.getElementById("upcoming_title").innerHTML = this.u_tit;
document.getElementById("upcoming_duration").innerHTML = '(' + twoDigit(this.u_duration.getUTCHours()) document.getElementById("upcoming_duration").innerHTML = '(' + twoDigit(this.u_duration.getUTCHours())
+ ':' + twoDigit(this.u_duration.getUTCMinutes()) + ':' + twoDigit(this.u_duration.getUTCMinutes())
@ -156,6 +156,7 @@ function plPrBar_show(what) {
} }
if (what == 'upcoming') { if (what == 'upcoming') {
document.getElementById("upcoming_pltitle_").style.visibility = 'visible'; document.getElementById("upcoming_pltitle_").style.visibility = 'visible';
document.getElementById("upcoming_plstart").style.visibility = 'visible';
document.getElementById("upcoming_title_").style.visibility = 'visible'; document.getElementById("upcoming_title_").style.visibility = 'visible';
} }
} }
@ -182,7 +183,7 @@ function plPrBar_hide(what) {
document.getElementById("upcoming_pltitle_").style.visibility = 'hidden'; document.getElementById("upcoming_pltitle_").style.visibility = 'hidden';
document.getElementById("upcoming_pltitle").innerHTML = ''; document.getElementById("upcoming_pltitle").innerHTML = '';
document.getElementById("upcoming_title_").style.visibility = 'hidden'; document.getElementById("upcoming_title_").style.visibility = 'hidden';
document.getElementById("upcoming_title").innerHTML = ''; document.getElementById("upcoming_plstart").innerHTML = '';
} }
} }

54
src/modules/htmlUI/var/templates/statusbar.tpl
View File

@ -1,20 +1,21 @@
<div id="masterpalette"> <div id="masterpalette">
<table border="0" class="masterpalette"> <table class="masterpalette" border="0">
<tr> <tbody>
<tr>
<td> <td>
<div id="logo"> <div id="logo">
<img src="img/logo.png"> <img src="ui_browser.php-Dateien/logo.png">
</div> </div>
</td> </td>
<td> <td>
{assign var="_now value=$SCHEDULER->getSchedulerTime(true)}
{if !$_now}
{assign var="_now" value=$smarty.now}
{/if}
<div id="time"> <div id="time">
##Station Time## Station time
{assign var="_now value=$SCHEDULER->getSchedulerTime(true)} <span id="servertime" class="clock">{$_now|date_format:"%H:%M:%S"}</span>
{if !$_now}
{assign var="_now" value=$smarty.now}
{/if}
<h1><span id="servertime" class="clock">{$_now|date_format:"%H:%M:%S"}</span></h1>
{$_now|date_format:"%Z"} {$_now|date_format:"%Z"}
</div> </div>
</td> </td>
@ -22,48 +23,44 @@
<td> <td>
<div id="nowplaying"> <div id="nowplaying">
<div class="whatplaying"> <div class="whatplaying">
<div class="title" id="now_title_">##Now Playing##: <span id="now_title"></span></div> <div class="title" id="now_title_">Now playing: <span id="now_title"></span></div>
<div class="scala" id="now_scala_"> <div class="scala" id="now_scala_">
<div class="scala_in" id="now_scala" style="width: 0%;">&nbsp;</div> <div class="scala_in" id="now_scala">&nbsp;</div>
</div> </div>
<div class="time"> <div class="time">
<span class="left"> <span class="left">
<span class="left_title" id="now_elapsed_">##Elapsed:##</span> <span class="left_title" id="now_elapsed_">Elapsed:</span>
<strong id="now_elapsed"></strong> <strong id="now_elapsed"></strong>
</span> </span>
<span class="right"> <span class="right">
<span id="now_remaining_">##Remaining:##</span> <span id="now_remaining_">Remaining:</span>
<strong id="now_remaining"></strong> <strong id="now_remaining"></strong>
</span> </span>
</div> </div>
<div class="playlist"> <div class="playlist">
<span class="left"> <span class="left">
<span class="left_title" id="now_pltitle_">##Playlist:##</span> <span class="left_title" id="now_pltitle_">Playlist:</span>
<span> <span>
<strong class="playlist_title" id="now_pltitle"></strong> <strong class="playlist_title" id="now_pltitle"></strong>
</div> </span></span></div>
<div style="height:3px"> </div> <div style="height: 3px;"> </div>
<div id="next_clip"> <div id="next_clip">
<span class="next" id="next_title_">##Next File##:</span> <span class="next" id="next_title_">Next File:</span>
<strong id="next_title"></strong> <strong id="next_title"></strong>
&nbsp;<span id="next_duration"></span> &nbsp;<span id="next_duration"></span>
</div> </div>
<div id="upcoming_playlist"> <div id="upcoming_playlist">
<span class="next" id="upcoming_pltitle_">##Upcoming Playlist##:</span> <span class="next" id="upcoming_pltitle_">Next List:</span>
<strong id="upcoming_pltitle"></strong> <strong id="upcoming_pltitle"></strong>
&nbsp;<span id="upcoming_plstart"></span> &nbsp;
</div> <span id="upcoming_plstart"></span><span id="upcoming_title_">, starting with </span><strong id="upcoming_title"></strong>
<span id="upcoming_duration"></span>
<div id="upcoming_clip">
<span class="next" id="upcoming_title_">##Upcoming Title##:</span>
<strong id="upcoming_title"></strong>
&nbsp;<span id="upcoming_duration"></span>
</div> </div>
</div> </div>
</div> </div>
@ -71,17 +68,18 @@
<td> <td>
<div id="nowplaying_indicator"> <div id="nowplaying_indicator">
<div id="onair">##Playing Scheduled Item##</div> <div id="onair">Playing Scheduled Item</div>
<div id="offair">##Off Air##</div> <div id="offair">Off Air</div>
</div> </div>
</td> </td>
<td> <td>
<div id="debug_console" style="width: 180px; height: 140px; overflow: auto"> <div id="debug_console" style="overflow: auto; width: 180px; height: 140px;">
</div> </div>
</td> </td>
</tr> </tr>
</tbody>
</table> </table>
</div> </div>