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

#Campcaster-Web: 'Now Playing' should display running playlist name

This commit is contained in:
sebastian 2010-02-12 14:24:33 +00:00
parent cbadb6e9eb
commit eb47b8248a
3 changed files with 58 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
campcaster/src/modules/htmlUI/var/html/styles_livesupport.css
View File

@ -840,7 +840,7 @@ table.masterpalette td{
padding-right: 5px;
font-family: bitstream-vera, verdana, helvetica;
font: #999;
width: 150px;
width: 300px;
height: 85px;
border-right: 1px solid #ccc;
border-bottom: 1px solid #ccc;
@ -895,13 +895,13 @@ table.masterpalette td{
.whatplaying .title {
font-weight: bold;
font-size: 15px;
font-size: 11px;
}
.whatplaying .scala {
width: 250px;
width: 290px;
height: 8px;
margin-top: 5px;
margin: 2px 0;
background-color: #DADADA;
border-top: 1px solid #B5B5B5;
border-left: 1px solid #B5B5B5;
@ -916,26 +916,53 @@ table.masterpalette td{
}
.whatplaying .time {
width: 250px;
width: 300px;
font-size: 11px;
}
.whatplaying .time .left {
.whatplaying .left {
float: left;
width: 125px;
width: 150px;
}
.whatplaying .left .left_title {
width: 65px;
float: left;
display: block;
overflow: hidden;
margin-right: 3px;
}
.whatplaying .time .right {
width: 125px;
.whatplaying .right {
width: 140px;
float: left;
text-align: right;
}
.whatplaying .next {
.whatplaying .playlist {
width: 350px;
font-size: 11px;
font-weight: bold;
margin: 10px 0 0 0;
vertical-align: baseline;
}
.whatplaying .playlist_title {
height: 1.4em;
overflow: hidden;
display: block;
width: 225px;
}
.whatplaying #next_clip {
clear: both;
display: block;
font-size: 11px;
height: 1.4em;
overflow: hidden;
}
.whatplaying #next_clip .next {
width: 65px;
float: left;
display: block;
overflow: hidden;
margin-right: 3px;
}
.loginname {
@ -952,10 +979,8 @@ table.masterpalette td{
.frequence { font-size: 12px;
margin: 15px 0 8px 0;
}
/* micz */
.whatplaying .title {
max-height: 3em;
overflow: hidden;
}

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

@ -3,11 +3,12 @@
{literal}
// play-progress-bar object
function plPrBar(tit, eh, ei, es, dh, di, ds, next, ntit, nh, ni, ns){
this.tit = tit.slice(0, 40);
function plPrBar(tit, pltit, eh, ei, es, dh, di, ds, next, ntit, nh, ni, ns){
this.tit = tit;
this.pltit = pltit;
this.next = next;
this.interval = 333;
this.ntit = ntit.slice(0, 35);
this.ntit = ntit.slice(0, 22);
this.nh = nh;
this.ni = ni;
this.ns = ns;
@ -32,6 +33,7 @@ function plPrBar(tit, eh, ei, es, dh, di, ds, next, ntit, nh, ni, ns){
function plPrBar_init() {
document.getElementById("now_title").innerHTML = this.tit;
document.getElementById("now_pl_title").innerHTML = this.pltit;
if (this.next == 0) {
document.getElementById("next_clip").innerHTML = '';
@ -99,11 +101,12 @@ function plPrBar_hide() {
{/literal}
{if (is_array($_nowplaying.duration))}
ppb = new plPrBar ("{$_nowplaying.title}",
ppb = new plPrBar ("{$_nowplaying.title|escape:html}",
"{$_nowplaying.pl_title|escape:html}",
{$_nowplaying.elapsed.h|string_format:"%d"}, {$_nowplaying.elapsed.m|string_format:"%d"}, {$_nowplaying.elapsed.s|string_format:"%d"},
{$_nowplaying.duration.h|string_format:"%d"}, {$_nowplaying.duration.m|string_format:"%d"}, {$_nowplaying.duration.s|string_format:"%d"},
{if is_array($_nextplaying)}
1, "{$_nextplaying.title}", {$_nextplaying.duration.h|string_format:'%d'}, {$_nextplaying.duration.m|string_format:'%2d'}, {$_nextplaying.duration.s|string_format:'%2d'}
1, "{$_nextplaying.title|escape:html}", {$_nextplaying.duration.h|string_format:'%d'}, {$_nextplaying.duration.m|string_format:'%2d'}, {$_nextplaying.duration.s|string_format:'%2d'}
{else}
0, "", 0, 0, 0
{/if}

6
campcaster/src/modules/htmlUI/var/ui_scheduler.class.php
View File

@ -624,11 +624,15 @@ class uiScheduler extends uiCalendar {
$elapsed = array_map('round', $elapsed);
$remaining = array_map('round', $remaining);
$percentage = $secondsElapsed ? (100 * $secondsElapsed / ($secondsElapsed + $secondsRemaining)) : 100;
$pl_title = $this->Base->gb->getMetadataValue(BasicStor::IdFromGunid($pl['playlistId']), UI_MDATA_KEY_TITLE, $this->Base->sessid);
return array('title' => $clip['title'],
'duration' => $duration,
'elapsed' => $elapsed,
'remaining' => $remaining,
'percentage'=> $percentage);
'percentage'=> $percentage,
'pl_title' => $pl_title
);
} // fn getNowNextClip