diff --git a/src/modules/htmlUI/var/html/styles_campcaster.css b/src/modules/htmlUI/var/html/styles_campcaster.css index 2ef280f14..2cfb09b95 100644 --- a/src/modules/htmlUI/var/html/styles_campcaster.css +++ b/src/modules/htmlUI/var/html/styles_campcaster.css @@ -839,7 +839,7 @@ table.masterpalette td{ padding-right: 5px; font-family: bitstream-vera, verdana, helvetica; font: #999; - width: 350px; + width: 460px; height: 85px; border-right: 1px solid #ccc; border-bottom: 1px solid #ccc; @@ -900,7 +900,7 @@ table.masterpalette td{ } .whatplaying .scala { - width: 340px; + width: 450px; height: 8px; margin: 2px 0; background-color: #DADADA; @@ -1000,6 +1000,7 @@ table.masterpalette td{ #now_pltitle_, #next_title_, #upcoming_pltitle_, -#upcoming_title_ { +#upcoming_title_, +#upcoming_plstart { visibility: hidden; } \ No newline at end of file diff --git a/src/modules/htmlUI/var/templates/script/progressbar.js.tpl b/src/modules/htmlUI/var/templates/script/progressbar.js.tpl index 3b89c29a3..7991be0f5 100644 --- a/src/modules/htmlUI/var/templates/script/progressbar.js.tpl +++ b/src/modules/htmlUI/var/templates/script/progressbar.js.tpl @@ -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) { //plPrBar_debug('init::next: ' + next); this.next = true; - this.n_tit = n_tit.slice(0, 22); - this.n_pltit = n_pltit.slice(0, 22); + this.n_tit = n_tit.slice(0, 35); + this.n_pltit = n_pltit.slice(0, 35); this.n_duration = new Date; 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) { this.show('upcoming'); 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.getUTCSeconds()) + ')'; + + ':' + twoDigit(this.u_plstart.getUTCSeconds()); document.getElementById("upcoming_title").innerHTML = this.u_tit; document.getElementById("upcoming_duration").innerHTML = '(' + twoDigit(this.u_duration.getUTCHours()) + ':' + twoDigit(this.u_duration.getUTCMinutes()) @@ -156,6 +156,7 @@ function plPrBar_show(what) { } if (what == 'upcoming') { document.getElementById("upcoming_pltitle_").style.visibility = 'visible'; + document.getElementById("upcoming_plstart").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").innerHTML = ''; document.getElementById("upcoming_title_").style.visibility = 'hidden'; - document.getElementById("upcoming_title").innerHTML = ''; + document.getElementById("upcoming_plstart").innerHTML = ''; } } diff --git a/src/modules/htmlUI/var/templates/statusbar.tpl b/src/modules/htmlUI/var/templates/statusbar.tpl index c9089c1bf..4267c6f7d 100644 --- a/src/modules/htmlUI/var/templates/statusbar.tpl +++ b/src/modules/htmlUI/var/templates/statusbar.tpl @@ -1,20 +1,21 @@
- - +
+ + @@ -22,48 +23,44 @@ +
+ {assign var="_now value=$SCHEDULER->getSchedulerTime(true)} + {if !$_now} + {assign var="_now" value=$smarty.now} + {/if}
- ##Station Time## - {assign var="_now value=$SCHEDULER->getSchedulerTime(true)} - {if !$_now} - {assign var="_now" value=$smarty.now} - {/if} -

{$_now|date_format:"%H:%M:%S"}

+ Station time + {$_now|date_format:"%H:%M:%S"} {$_now|date_format:"%Z"}
-
##Now Playing##:
+
Now playing:
-
 
+
 
- ##Elapsed:## + Elapsed: - ##Remaining:## + Remaining:
- ##Playlist:## + Playlist: -
+
-
+
- ##Next File##: + Next File:  
- ##Upcoming Playlist##: + Next List: -   -
- -
- ##Upcoming Title##: - -   +   + , starting with +
@@ -71,17 +68,18 @@
-
##Playing Scheduled Item##
-
##Off Air##
+
Playing Scheduled Item
+
Off Air
-
+