diff --git a/livesupport/modules/htmlUI/var/html/img/dummy b/livesupport/modules/htmlUI/var/html/img/dummy deleted file mode 100644 index e69de29bb..000000000 diff --git a/livesupport/modules/htmlUI/var/templates/file/edit.tpl b/livesupport/modules/htmlUI/var/templates/file/edit.tpl index b49e6fe96..7e42af156 100755 --- a/livesupport/modules/htmlUI/var/templates/file/edit.tpl +++ b/livesupport/modules/htmlUI/var/templates/file/edit.tpl @@ -1,6 +1,6 @@
{if $_REQUEST.act == addFileMData || $_REQUEST.act == addWebstreamMData || $_REQUEST.act == editItem} - {include file="file/tabswitch.tpl"} + {include file="file/tabswitch.js.tpl"} {/if}

@@ -15,7 +15,6 @@ {if $editItem.type == 'audioclip' || $editItem.type == 'file'}
{if $_REQUEST.act == 'addFileData'} - {UIBROWSER->fileForm id=$editItem.id folderId=$editItem.folderId assign="dynform"} {include file="sub/dynForm_plain.tpl} {assign var="_uploadform" value=null} diff --git a/livesupport/modules/htmlUI/var/templates/file/tabswitch.tpl b/livesupport/modules/htmlUI/var/templates/file/tabswitch.js.tpl similarity index 87% rename from livesupport/modules/htmlUI/var/templates/file/tabswitch.tpl rename to livesupport/modules/htmlUI/var/templates/file/tabswitch.js.tpl index d23762c0a..e76f8579f 100755 --- a/livesupport/modules/htmlUI/var/templates/file/tabswitch.tpl +++ b/livesupport/modules/htmlUI/var/templates/file/tabswitch.js.tpl @@ -1,9 +1,9 @@ - - {/literal} + diff --git a/livesupport/modules/htmlUI/var/templates/masterpanel.tpl b/livesupport/modules/htmlUI/var/templates/masterpanel.tpl index 1e4fd4086..5610699aa 100755 --- a/livesupport/modules/htmlUI/var/templates/masterpanel.tpl +++ b/livesupport/modules/htmlUI/var/templates/masterpanel.tpl @@ -7,30 +7,26 @@ {if $USER.userid} {* somebody logged in? *} - {* - {if $structure} - {include file="file/path.tpl"} - {/if} - *} - {if $showScheduler} - - - - + +
- {include file="scheduler/main.tpl"} - -
- {include file="scheduler/calendar.tpl"} - {if $SCRATCHPAD} - {include file="scratchpad/main.tpl"} - {/if} -
-
+ + + - -
+ {include file="scheduler/main.tpl"} + +
+ {include file="scheduler/calendar.tpl"} + {if $SCRATCHPAD} + {include file="scratchpad/main.tpl"} + {/if} +
+
+ + + {else} {if $fileList} diff --git a/livesupport/modules/htmlUI/var/templates/menu.tpl b/livesupport/modules/htmlUI/var/templates/menu.tpl index bf4c76951..f7b1e2def 100755 --- a/livesupport/modules/htmlUI/var/templates/menu.tpl +++ b/livesupport/modules/htmlUI/var/templates/menu.tpl @@ -1,51 +1,67 @@ - -
- +
+ diff --git a/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl b/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl index 6bf5cc4a4..0d52ca79e 100755 --- a/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl +++ b/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl @@ -68,13 +68,14 @@ { var width = 160; var height = 120; - var name = Math.random(); + var name = Math.round(Math.random()*100000); var screenX; var screenY; var Xpos; var Ypos; var Pwidth; var Pheight; + var popupwin; if (ie5) { Xpos = window.screenLeft; diff --git a/livesupport/modules/htmlUI/var/templates/script/progressbar.js.tpl b/livesupport/modules/htmlUI/var/templates/script/progressbar.js.tpl index 7ef81c12c..e97488044 100755 --- a/livesupport/modules/htmlUI/var/templates/script/progressbar.js.tpl +++ b/livesupport/modules/htmlUI/var/templates/script/progressbar.js.tpl @@ -3,12 +3,14 @@ {literal} // play-progress-bar object -function plPrBar(tit, eh, ei, es, dh, di, ds, next, ntit, ndur){ +function plPrBar(tit, eh, ei, es, dh, di, ds, next, ntit, nh, ni, ns){ this.tit = tit; this.next = next; this.interval = 333; this.ntit = ntit; - this.ndur = ndur; + this.nh = nh; + this.ni = ni; + this.ns = ns; // inits: this.elapsed = new Date(); @@ -16,7 +18,7 @@ function plPrBar(tit, eh, ei, es, dh, di, ds, next, ntit, ndur){ this.remaining = new Date(); this.elapsed.setTime (Date.UTC(1970, 0, 1, eh, ei, es)); this.duration.setTime(Date.UTC(1970, 0, 1, dh, di, ds)); - //alert("elapsed:" + this.elapsed.getUTCSeconds() + " duration:" + this.duration.getUTCSeconds()); + // methods: this.init = plPrBar_init; this.tick = plPrBar_tick; @@ -35,7 +37,7 @@ function plPrBar_init() { document.getElementById("next_clip").innerHTML = ''; } else { document.getElementById("next_title").innerHTML = this.ntit; - document.getElementById("next_duration").innerHTML = this.ndur; + document.getElementById("next_duration").innerHTML = '(' + twoDigit(this.nh) + ':' + twoDigit(this.ni) + ':' + twoDigit(this.ns) + ')'; } this.show(); @@ -78,7 +80,7 @@ function plPrBar_create(jscomRes) { ppb = new plPrBar(parms[0], parms[1], parms[2], parms[3], parms[4], parms[5], parms[6], - parms[7], parms[8], parms[9] + parms[7], parms[8], parms[9], parms[10], parms[11] ); ppb.init(); } else { @@ -102,9 +104,9 @@ function plPrBar_hide() { {$_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|truncate:22}", "{$_nextplaying.duration.h}:{$_nextplaying.duration.m}:{$_nextplaying.duration.s|truncate:2:""}" + 1, "{$_nextplaying.title|truncate:22}", {$_nextplaying.duration.h|string_format:'%d'}, {$_nextplaying.duration.m|string_format:'%2d'}, {$_nextplaying.duration.s|string_format:'%2d'} {else} - 0, "", "" + 0, "", 0, 0, 0 {/if} ); ppb.init(); diff --git a/livesupport/modules/htmlUI/var/templates/statusbar.tpl b/livesupport/modules/htmlUI/var/templates/statusbar.tpl index e675da671..e0bb2add3 100755 --- a/livesupport/modules/htmlUI/var/templates/statusbar.tpl +++ b/livesupport/modules/htmlUI/var/templates/statusbar.tpl @@ -50,7 +50,7 @@
{if $_nextplaying} -

##Playing Next##:

+

##Playing Next##:  

{/if}
diff --git a/livesupport/modules/htmlUI/var/ui_scheduler.class.php b/livesupport/modules/htmlUI/var/ui_scheduler.class.php index 6a3025d4d..ff3447170 100755 --- a/livesupport/modules/htmlUI/var/ui_scheduler.class.php +++ b/livesupport/modules/htmlUI/var/ui_scheduler.class.php @@ -27,7 +27,7 @@ class uiScheduler extends uiCalendar $this->uiCalendar(); $this->initXmlRpc(); - $this->startDaemon(); + //$this->startDaemon(); } @@ -412,8 +412,10 @@ class uiScheduler extends uiCalendar 'duration.m' => $curr['duration']['m'], 'duration.s' => $curr['duration']['s'], 'next' => $next ? 1 : 0, - 'nexttitle' => $next ? $next['title'] : "", - 'nextduration' => $next ? $next['duration']['h'].':'.$next['duration']['m'].':'.sprintf('%d', $next['duration']['s']) : "", + 'next.title' => $next ? $next['title'] : "", + 'next.dur.h' => $next ? $next['duration']['h'] : 0, + 'next.dur.m' => $next ? $next['duration']['m'] : 0, + 'next.dur.s' => $next ? $next['duration']['s'] : 0, ); } else { return FALSE;