diff --git a/livesupport/modules/htmlUI/var/templates/library/results.tpl b/livesupport/modules/htmlUI/var/templates/library/results.tpl index 8d6cd1a7f..a9e85314d 100755 --- a/livesupport/modules/htmlUI/var/templates/library/results.tpl +++ b/livesupport/modules/htmlUI/var/templates/library/results.tpl @@ -17,16 +17,16 @@ - + {if $PLAYLIST.id == $i.id} {$i.title|truncate:30} {else} {$i.title|truncate:30} {/if} - {$i.creator} - {assign var="_duration" value=$i.duration}{niceTime in=$_duration} - + {$i.creator} + {assign var="_duration" value=$i.duration}{niceTime in=$_duration} + {$i.type|lower|capitalize} diff --git a/livesupport/modules/htmlUI/var/templates/playlist/actionhandler.tpl b/livesupport/modules/htmlUI/var/templates/playlist/actionhandler.tpl index 617f0b84a..d3bcc1b6a 100755 --- a/livesupport/modules/htmlUI/var/templates/playlist/actionhandler.tpl +++ b/livesupport/modules/htmlUI/var/templates/playlist/actionhandler.tpl @@ -1 +1,2 @@ +style="cursor: pointer" onClick="return contextmenu('{$i.attrs.id}', {if $i.type|lower == "audioclip"}'listen', '{$i.gunid}', {/if} 'PL.removeItem')" diff --git a/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl b/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl index 15f7c6f79..166e492f1 100755 --- a/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl +++ b/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl @@ -33,7 +33,7 @@ - ##Fade## {$i.fadein_ms|string_format:"%d"} ms + ##Fade## {$i.fadein_ms|string_format:"%d"} ms @@ -55,7 +55,7 @@ - ##Fade## {$i.fadeout_ms|string_format:"%d"} ms + ##Fade## {$i.fadeout_ms|string_format:"%d"} ms {else} diff --git a/livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.addItem.tpl b/livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.addItem.tpl index 39e4b5941..7c79f5b18 100755 --- a/livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.addItem.tpl +++ b/livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.addItem.tpl @@ -60,7 +60,7 @@ function SCHEDULE_snap2Next() //alert(nextD.toLocaleString()); //alert(durationD.toLocaleString()); - //alert (beginD.toLocaleString()); + //alert(beginD.toLocaleString()); document.forms["schedule"].elements["time[H]"].value = beginD.getHours(); document.forms["schedule"].elements["time[i]"].value = beginD.getMinutes(); diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/day.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/day.tpl index 83e4bb90f..0b4c3f389 100755 --- a/livesupport/modules/htmlUI/var/templates/scheduler/day.tpl +++ b/livesupport/modules/htmlUI/var/templates/scheduler/day.tpl @@ -33,7 +33,7 @@ {if is_array($_entrys[$_hour])} - {$_hour|string_format:"%02d"}:00 + {$_hour|string_format:"%02d"}:00 {foreach from=$_entrys[$_hour] item="i"} {* hier werden die Einträge welche in der jeweil. h beginnen durchlaufen *} diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/day_additem.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/day_additem.tpl index e5b36f5c8..b3d7160f3 100755 --- a/livesupport/modules/htmlUI/var/templates/scheduler/day_additem.tpl +++ b/livesupport/modules/htmlUI/var/templates/scheduler/day_additem.tpl @@ -1,3 +1,5 @@ +style="cursor: pointer" + {getHour time=$i.end assign="_endH"} {if $_endH == $_hour} diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/removeitem.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/removeitem.tpl index 1dc2f1fcb..1b5446ef6 100755 --- a/livesupport/modules/htmlUI/var/templates/scheduler/removeitem.tpl +++ b/livesupport/modules/htmlUI/var/templates/scheduler/removeitem.tpl @@ -1 +1,2 @@ +style="cursor: pointer" onClick="hidealttext(); return contextmenu('scheduleId={$i.scheduleid}', 'SCHEDULER.removeItem')" diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/week_additem.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/week_additem.tpl index 45398750c..356354973 100755 --- a/livesupport/modules/htmlUI/var/templates/scheduler/week_additem.tpl +++ b/livesupport/modules/htmlUI/var/templates/scheduler/week_additem.tpl @@ -1,3 +1,5 @@ +style="cursor: pointer" + {getHour time=$i.end assign="_endH"} {if $_endH == $_hour} diff --git a/livesupport/modules/htmlUI/var/templates/scratchpad/main.tpl b/livesupport/modules/htmlUI/var/templates/scratchpad/main.tpl index 793af6959..fcb46682f 100755 --- a/livesupport/modules/htmlUI/var/templates/scratchpad/main.tpl +++ b/livesupport/modules/htmlUI/var/templates/scratchpad/main.tpl @@ -23,17 +23,17 @@ - + {if $i.type|lower == "playlist"} {if $PL->isAvailable($i.id) == false} -
+
{else} -
+
{/if} {if $_PL_activeId == $i.id} -
+
{else} -
+
{/if} {$i.title|truncate:12:'...':true}
@@ -41,8 +41,8 @@ {$i.title|truncate:12:'...':true} {/if} {* on some reason object call doesn´t like usage of array *} {assign var="_duration" value=$i.duration} - {niceTime in=$_duration} - + {niceTime in=$_duration} + {$i.type|capitalize} diff --git a/livesupport/modules/htmlUI/var/templates/script/clock.js.tpl b/livesupport/modules/htmlUI/var/templates/script/clock.js.tpl index 5f30f8c7b..b3eb29613 100644 --- a/livesupport/modules/htmlUI/var/templates/script/clock.js.tpl +++ b/livesupport/modules/htmlUI/var/templates/script/clock.js.tpl @@ -1,174 +1,67 @@ - - - + diff --git a/livesupport/modules/htmlUI/var/templates/statusbar.tpl b/livesupport/modules/htmlUI/var/templates/statusbar.tpl index a89f255f5..ccd547546 100755 --- a/livesupport/modules/htmlUI/var/templates/statusbar.tpl +++ b/livesupport/modules/htmlUI/var/templates/statusbar.tpl @@ -20,7 +20,7 @@
-
+
{if $_nowplaying} on air {else} @@ -31,7 +31,7 @@

##Station Time##

-
{$smarty.now|date_format:"%H:%M:%S"} +
{$smarty.now|date_format:"%H:%M:%S"}
cet
{* @@ -44,15 +44,15 @@
-
+
{if $_nowplaying}
Now Playing: {$_nowplaying.title}
 
-
Elapsed: {$_nowplaying.elapsed|truncate:8:""}
-
Remaining: {$_nowplaying.remaining|truncate:8:""}
+
Elapsed: {$_nowplaying.elapsed.h}:{$_nowplaying.elapsed.m}:{$_nowplaying.elapsed.s|truncate:2:""}
+
Remaining: {$_nowplaying.remaining.h}:{$_nowplaying.remaining.m}:{$_nowplaying.remaining.s|truncate:2:""}
{/if}
diff --git a/livesupport/modules/htmlUI/var/ui_handler.class.php b/livesupport/modules/htmlUI/var/ui_handler.class.php index 6a6af8433..8249fc9ed 100644 --- a/livesupport/modules/htmlUI/var/ui_handler.class.php +++ b/livesupport/modules/htmlUI/var/ui_handler.class.php @@ -199,6 +199,7 @@ class uiHandler extends uiBase { #$this->gb->replaceMetadata($id, $this->_analyzeFile($id, 'xml'), 'string', $this->sessid); $ia = $this->gb->analyzeFile($id, $this->sessid); + #print_r($ia); $this->_setMdataValue($id, UI_MDATA_KEY_DURATION, $this->gb->_secsToPlTime($ia['playtime_seconds'])); $this->_setMDataValue($id, UI_MDATA_KEY_FORMAT, UI_MDATA_VALUE_FORMAT_FILE); diff --git a/livesupport/modules/htmlUI/var/ui_scheduler.class.php b/livesupport/modules/htmlUI/var/ui_scheduler.class.php index 53220d2fd..752f55b9f 100755 --- a/livesupport/modules/htmlUI/var/ui_scheduler.class.php +++ b/livesupport/modules/htmlUI/var/ui_scheduler.class.php @@ -375,15 +375,20 @@ class uiScheduler extends uiCalendar $pl = current($pl); $offset = strftime('%H:%M:%S', time() - $this->_datetime2timestamp($pl['start']) - 3600); ## subtract 3600 sec. becausefor some reason strftime('%H:%M:%S', 0) is 01:00:00 + $clip = $this->Base->gb->displayPlaylistClipAtOffset($this->Base->sessid, $pl['playlistId'], $offset, $distance); if (!$clip['gunid']) return FALSE; + list($duration['h'], $duration['m'], $duration['s']) = explode(':', $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($clip['gunid']), UI_MDATA_KEY_DURATION)); + list($elapsed['h'], $elapsed['m'], $elapsed['s']) = explode(':', $clip['elapsed']); + list($remaining['h'], $remaining['m'], $remaining['s']) = explode(':', $clip['remaining']); + return array( 'title' => $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($clip['gunid']), UI_MDATA_KEY_TITLE), - 'duration' => $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($clip['gunid']), UI_MDATA_KEY_DURATION), - 'elapsed' => $clip['elapsed'], - 'remaining' => $clip['remaining'], + 'duration' => $duration, + 'elapsed' => $elapsed, + 'remaining' => $remaining, 'percentage'=> 100 * $this->Base->gb->_plTimeToSecs($clip['elapsed']) / ( $this->Base->gb->_plTimeToSecs($clip['elapsed']) + $this->Base->gb->_plTimeToSecs($clip['remaining'])) ); }