From 54be542f0558f7fb0fead6ee0634330a65aedaa9 Mon Sep 17 00:00:00 2001 From: sebastian Date: Thu, 9 Jun 2005 13:48:37 +0000 Subject: [PATCH] #840 --- .../modules/htmlUI/var/html/ui_browser.php | 5 + .../htmlUI/var/templates/playlist/editor.tpl | 3 +- .../htmlUI/var/templates/script/clock.js.tpl | 12 +- .../var/templates/script/collector.js.tpl | 9 +- .../modules/htmlUI/var/ui_base.inc.php | 4 +- .../modules/htmlUI/var/ui_browser.class.php | 30 +++-- .../modules/htmlUI/var/ui_playlist.class.php | 108 ++++++++++++------ .../modules/htmlUI/var/ui_scheduler.class.php | 4 +- 8 files changed, 107 insertions(+), 68 deletions(-) diff --git a/livesupport/modules/htmlUI/var/html/ui_browser.php b/livesupport/modules/htmlUI/var/html/ui_browser.php index 24ac49e26..000e5f2af 100644 --- a/livesupport/modules/htmlUI/var/html/ui_browser.php +++ b/livesupport/modules/htmlUI/var/html/ui_browser.php @@ -66,6 +66,11 @@ if (is_array($_REQUEST['popup'])){ $Smarty->display('popup/PLAYLIST.changeTransition.tpl'); break; + case "PL.changeAllTransitions"; + $Smarty->assign('dynform', $uiBrowser->PLAYLIST->changeAllTransitionsForm($ui_fmask['PL.changeTransition'])); + $Smarty->display('popup/PLAYLIST.changeAllTransitions.tpl'); + break; + case "PL.confirmDelete": $Smarty->display('popup/PLAYLIST.confirmDelete.tpl'); break; diff --git a/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl b/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl index 257d7a7de..c818835bb 100755 --- a/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl +++ b/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl @@ -67,7 +67,8 @@
diff --git a/livesupport/modules/htmlUI/var/templates/script/clock.js.tpl b/livesupport/modules/htmlUI/var/templates/script/clock.js.tpl index e1fd20a67..cd4ae2ec1 100644 --- a/livesupport/modules/htmlUI/var/templates/script/clock.js.tpl +++ b/livesupport/modules/htmlUI/var/templates/script/clock.js.tpl @@ -34,7 +34,7 @@ function myClock(eh, ei, es, dh, di, ds, next, interval) { clock['elapsed'] = new Date(); clock['duration'] = new Date(); clock['remaining'] = new Date(); - clock['elapsed'].setTime(Date.UTC(1970, 0, 1, eh, ei, es)); + clock['elapsed'].setTime (Date.UTC(1970, 0, 1, eh, ei, es)); clock['duration'].setTime(Date.UTC(1970, 0, 1, dh, di, ds)); clock['run'] = setInterval("incClock();", clock['interval']); } @@ -45,7 +45,7 @@ function incClock() { clock['elapsed'].setTime(clock['elapsed'].getTime() + clock['interval']); clock['remaining'].setTime(clock['duration'].getTime() - clock['elapsed'].getTime()); - document.getElementById("statusbar_elapsed").innerHTML = twoDigit(clock['elapsed'].getUTCHours()) + ":" + twoDigit(clock['elapsed'].getUTCMinutes()) + ":" + twoDigit(clock['elapsed'].getUTCSeconds()); + document.getElementById("statusbar_elapsed").innerHTML = twoDigit(clock['elapsed'].getUTCHours()) + ":" + twoDigit(clock['elapsed'].getUTCMinutes()) + ":" + twoDigit(clock['elapsed'].getUTCSeconds()); document.getElementById("statusbar_remaining").innerHTML = twoDigit(clock['remaining'].getUTCHours()) + ":" + twoDigit(clock['remaining'].getUTCMinutes()) + ":" + twoDigit(clock['remaining'].getUTCSeconds()); document.getElementById("statusbar_scala").style.width = (100 / clock['duration'].getTime() * clock['elapsed'].getTime()) + "%"; } @@ -62,10 +62,14 @@ function stopClock() { {/literal} -pre0_myClock({$smarty.now|date_format:"%Y, %m, %d, %H, %M, %S"}, 1000); +pre0_myClock({$smarty.now|date_format:"%Y"|string_format:"%d"}, {$smarty.now|date_format:"%m"|string_format:"%d"}, {$smarty.now|date_format:"%d"|string_format:"%d"}, + {$smarty.now|date_format:"%H"|string_format:"%d"}, {$smarty.now|date_format:"%M"|string_format:"%d"}, {$smarty.now|date_format:"%S"|string_format:"%d"}, + 1000); {if (is_array($_nowplaying.duration))} - myClock ({$_nowplaying.elapsed.h}, {$_nowplaying.elapsed.m}, {$_nowplaying.elapsed.s|truncate:2:""}, {$_nowplaying.duration.h}, {$_nowplaying.duration.m}, {$_nowplaying.duration.s|truncate:2:""}, {if is_array($_nextplaying)}1{else}0{/if}, 333); + myClock ({$_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{else}0{/if}, 333); {/if} diff --git a/livesupport/modules/htmlUI/var/templates/script/collector.js.tpl b/livesupport/modules/htmlUI/var/templates/script/collector.js.tpl index 0f422e6de..f9e6a7dae 100755 --- a/livesupport/modules/htmlUI/var/templates/script/collector.js.tpl +++ b/livesupport/modules/htmlUI/var/templates/script/collector.js.tpl @@ -1,10 +1,11 @@ {literal}