replaced gif?s with png?s

livesupport/modules/htmlUI/var/html/img/test.m3u

@@ -0,0 +1 @@
+http://fm4.amd.co.at/m3us/listen-high.m3u

livesupport/modules/htmlUI/var/templates/file/objects.tpl

@@ -1,77 +1,77 @@
-{assign var="_PL_activeId" value=$PL->getActiveId()}
-
-<div class="contenttabnav">
-{if $START.pid}
-    <a href="{$UI_BROWSER}?act=fileList&id={$START.pid}">##go up##</a>
-{/if}
-
-{include file="file/path.tpl"}
-
-</div>
-    <div class="head" style="width:555px; height: 21px;">&nbsp;
-</div>
-
-<div class="container_table" style="width: 555px; height: auto;">
-<table>
-    <tr class="blue_head">
-        <td style="width: 280px">##Title##</td>
-        <td style="width: 20px">##Type##</td>
-        <td style="width: 255px; border: 0">##Action##</td>
-    </tr>
-    {if count($structure.listdata)}
-        {foreach from=$structure.listdata item=i}
-            {assign var="_listen_gunid" value=$i.gunid}
-            <tr class="{cycle values='blue1, blue2'}" {assign var="moreContextBefore" value=", 'SP.addItem'"}>
-              <td style="cursor: pointer" {include file="sub/contextmenu.tpl"}>
-                <span id="ID{$i.id}">
-                    {if $i.type|lower eq 'folder'}
-                         <a href="{$UI_BROWSER}?act=fileList&id={$i.id}" >[{$i.title|truncate:30}]</b>
-                    {else}
-                        {if $_PL_activeId == $i.id}
-                            <b>{$i.title|truncate:30}</b>
-                        {else}
-                            {$i.title|truncate:30}
-                        {/if}
-                    {/if}
-                </span>
-              </td>
-              <td><img src="img/{$i.type|lower}.gif" border="0" alt="{$i.type|lower|capitalize}" {include file="sub/mouseover.tpl"} /></td>
-              <td style="border: 0">
-                  {* &nbsp;<a href="javascript:frename('{$i.name}', '{$i.id}')">[rename]</a> *}
-                  &nbsp;<a href="javascript:fmove('{$i.id}', '.')">##move##</a>
-                  &nbsp;<a href="javascript:fcopy('{$i.id}', '.')">##copy##</a>
-                  &nbsp;<a href="{$UI_BROWSER}?act=permissions&id={$i.id}">##permissions##</a>
-
-                  {*
-                  {if ($delOverride eq $i.id)}
-                      <a href="{$UI_HANDLER}?act=delete&id={$i.id}&delOverride={$i.id}"
-                        onClick="return confirm('Really delete non empty Folder &quot;{$i.name}&quot; now?')">[DEL]</a>
-                  {else}
-                      <a href="{$UI_HANDLER}?act=delete&id={$i.id}"
-                        onClick="return confirm('Delete &quot;{$i.name}&quot;?')">[DEL]</a>
-                  {/if}
-
-                  {if $i.type|lower != 'folder'}
-                      &nbsp;<a href="{$UI_BROWSER}?act=getMData&id={$i.id}">##MDataXML##</a>
-                      &nbsp;<a href="{$UI_BROWSER}?act=editMetaData&id={$i.id}">[MDataForm]</a>
-
-                      {if $i.type|lower eq 'webstream'}
-                          &nbsp;<a href="{$UI_BROWSER}?act=editWebstream&id={$i.id}">##Edit##</a>
-                      {elseif $i.type|lower eq 'audioclip'}
-                          &nbsp;<a href="{$UI_BROWSER}?act=editFile&id={$i.id}">##Edit##</a>
-                          &nbsp;<a href="{$CONFIG.accessRawAudioUrl}?id={$i.gunid}&sessid={$START.sessid}">##Access##</a>
-                          &nbsp;<a href="{$UI_BROWSER}?act=_analyzeFile&id={$i.id}">##RawAnalyze##</a>
-                      {/if}
-
-                      &nbsp;<a href="#" onclick="hpopup('{$UI_HANDLER}?act=SP.addItem&id={$i.id}', '2SP')">[SP]</a>
-                  {/if}
-                  *}
-                  &nbsp;
-              </td>
-           </tr>
-        {/foreach}
-    {else}
-        <tr><td align="center" colspan="3" width="400" style="border:0">##No objects##</td></tr>
-    {/if}
-</table>
-</div>
+{assign var="_PL_activeId" value=$PL->getActiveId()}
+
+<div class="contenttabnav">
+{if $START.pid}
+    <a href="{$UI_BROWSER}?act=fileList&id={$START.pid}">##go up##</a>
+{/if}
+
+{include file="file/path.tpl"}
+
+</div>
+    <div class="head" style="width:555px; height: 21px;">&nbsp;
+</div>
+
+<div class="container_table" style="width: 555px; height: auto;">
+<table>
+    <tr class="blue_head">
+        <td style="width: 280px">##Title##</td>
+        <td style="width: 20px">##Type##</td>
+        <td style="width: 255px; border: 0">##Action##</td>
+    </tr>
+    {if count($structure.listdata)}
+        {foreach from=$structure.listdata item=i}
+            {assign var="_listen_gunid" value=$i.gunid}
+            <tr class="{cycle values='blue1, blue2'}" {assign var="moreContextBefore" value=", 'SP.addItem'"}>
+              <td style="cursor: pointer" {include file="sub/contextmenu.tpl"}>
+                <span id="ID{$i.id}">
+                    {if $i.type|lower eq 'folder'}
+                         <a href="{$UI_BROWSER}?act=fileList&id={$i.id}" >[{$i.title|truncate:30}]</b>
+                    {else}
+                        {if $_PL_activeId == $i.id}
+                            <b>{$i.title|truncate:30}</b>
+                        {else}
+                            {$i.title|truncate:30}
+                        {/if}
+                    {/if}
+                </span>
+              </td>
+              <td><img src="img/{$i.type|lower}.png" border="0" alt="{$i.type|lower|capitalize}" {include file="sub/mouseover.tpl"} /></td>
+              <td style="border: 0">
+                  {* &nbsp;<a href="javascript:frename('{$i.name}', '{$i.id}')">[rename]</a> *}
+                  &nbsp;<a href="javascript:fmove('{$i.id}', '.')">##move##</a>
+                  &nbsp;<a href="javascript:fcopy('{$i.id}', '.')">##copy##</a>
+                  &nbsp;<a href="{$UI_BROWSER}?act=permissions&id={$i.id}">##permissions##</a>
+
+                  {*
+                  {if ($delOverride eq $i.id)}
+                      <a href="{$UI_HANDLER}?act=delete&id={$i.id}&delOverride={$i.id}"
+                        onClick="return confirm('Really delete non empty Folder &quot;{$i.name}&quot; now?')">[DEL]</a>
+                  {else}
+                      <a href="{$UI_HANDLER}?act=delete&id={$i.id}"
+                        onClick="return confirm('Delete &quot;{$i.name}&quot;?')">[DEL]</a>
+                  {/if}
+
+                  {if $i.type|lower != 'folder'}
+                      &nbsp;<a href="{$UI_BROWSER}?act=getMData&id={$i.id}">##MDataXML##</a>
+                      &nbsp;<a href="{$UI_BROWSER}?act=editMetaData&id={$i.id}">[MDataForm]</a>
+
+                      {if $i.type|lower eq 'webstream'}
+                          &nbsp;<a href="{$UI_BROWSER}?act=editWebstream&id={$i.id}">##Edit##</a>
+                      {elseif $i.type|lower eq 'audioclip'}
+                          &nbsp;<a href="{$UI_BROWSER}?act=editFile&id={$i.id}">##Edit##</a>
+                          &nbsp;<a href="{$CONFIG.accessRawAudioUrl}?id={$i.gunid}&sessid={$START.sessid}">##Access##</a>
+                          &nbsp;<a href="{$UI_BROWSER}?act=_analyzeFile&id={$i.id}">##RawAnalyze##</a>
+                      {/if}
+
+                      &nbsp;<a href="#" onclick="hpopup('{$UI_HANDLER}?act=SP.addItem&id={$i.id}', '2SP')">[SP]</a>
+                  {/if}
+                  *}
+                  &nbsp;
+              </td>
+           </tr>
+        {/foreach}
+    {else}
+        <tr><td align="center" colspan="3" width="400" style="border:0">##No objects##</td></tr>
+    {/if}
+</table>
+</div>

livesupport/modules/htmlUI/var/templates/library/results.tpl

@@ -1,82 +1,82 @@
-{assign var="_PL_activeId" value=$PL->getActiveId()}
-
-{if $_results.cnt > 0}
-    <form name="SEARCHRESULTS">
-    <div class="head" style="width:535px; height: 21px;">&nbsp;</div>
-    <div class="container_table"  style="width: 555px; height: auto;">
-
-            <table style="width: 535px;">
-                <tr class="blue_head">
-                    <td style="width: 30px"><input type="checkbox" name="all" onClick="collector_switchAll('SEARCHRESULTS')"></td>
-                    <td style="width: 200px"><a href="#" onClick="hpopup('{$UI_HANDLER}?act={$_act_prefix}.reOrder&by=title', 'order');" id="blue_head">##Title##</a></td>
-                    <td style="width: 195px"><a href="#" onClick="hpopup('{$UI_HANDLER}?act={$_act_prefix}.reOrder&by=creator', 'order');" id="blue_head">##Creator##</a></td>
-                    <td><a href="#"  onClick="hpopup('{$UI_HANDLER}?act={$_act_prefix}.reOrder&by=extent', 'order');" id="blue_head">##Duration##</a></td>
-                    <td style="width: 41px; border: 0; text-align: center"><a href="#" onClick="hpopup('{$UI_HANDLER}?act={$_act_prefix}.reOrder&by=type', 'order');" id="blue_head">##Type##</a></td>
-                </tr>
-                {foreach from=$_results.items item=i}
-            <!-- start item -->
-                <tr class="background-color: {cycle values='blue1, blue2'}">
-                    <td><input type="checkbox" class="checkbox" name="{$i.id}"/></td>
-                    <td {include file="library/actionhandler.tpl"} style="cursor: pointer">
-                        {if $PLAYLIST.id == $i.id}
-                            <b>{$i.title|truncate:30}</b>
-                        {else}
-                            {$i.title|truncate:30}
-                        {/if}
-                    </td>
-                    <td {include file="library/actionhandler.tpl"} style="cursor: pointer">{$i.creator}</td>
-                    <td {include file="library/actionhandler.tpl"} style="text-align: right; cursor: pointer">{assign var="_duration" value=$i.duration}{niceTime in=$_duration}</td>
-                    <td {include file="library/actionhandler.tpl"} style="border: 0; text-align: center; cursor: pointer">
-                        <img src="img/{$i.type|lower}.gif" border="0" alt="{$i.type|lower|capitalize}" {include file="sub/mouseover.tpl"} />
-                    </td>
-                </tr>
-            <!-- end item -->
-                {/foreach}
-            </table>
-
-    </div>
-    <div class="footer" style="width: 530px;">
-
-         <div class="counter">
-            {* {if $_results.prev}<a href="#" onClick="hpopup('{$UI_HANDLER}?act={$_act_prefix}.setOffset&page=prev', 'pager')" id="blue_head">##previous##</a>{/if}  *}
-
-            {foreach from=$_results.pagination item=p key=k}
-                {if $k != $_results.page+1}
-                    <a href="#" onClick="hpopup('{$UI_HANDLER}?act={$_act_prefix}.setOffset&page={$k}', 'pager')" id="blue_head">{$p}</a>
-                {else}
-                    {$p}
-                {/if}
-            {/foreach}
-
-            {* {if $_results.next}<a href="#" onClick="hpopup('{$UI_HANDLER}?act={$_act_prefix}.setOffset&page=next', 'pager')" id="blue_head">##next##</a>{/if}  *}
-            &nbsp;&nbsp;
-            ##Range##:&nbsp;{$_criteria.offset+1}-{if ($_criteria.offset+$_criteria.limit)>$_results.cnt}{$_results.cnt}{else}{$_criteria.offset+$_criteria.limit}{/if}&nbsp;
-            ##Count##:&nbsp;{$_results.cnt}&nbsp;
-            {* ##Page##:&nbsp;&nbsp;{$_results.page+1}&nbsp;&nbsp; *}
-
-         </div>
-
-         <select name="SEARCHRESULTS_multiaction" onChange="collector_submit('SEARCHRESULTS', this.value)">
-                <option>##Multiple Action:##</option>
-                <option value="SP.addItem">##Add file(s) to ScratchPad##</option>
-                {if $_PL_activeId}
-                    <option value="PL.addItem">##Add file(s) to active Playlist##</option>
-                {else}
-                    <option value="PL.create">##New Playlist using this file(s)##</option>
-                {/if}
-         </select>
-         <script type="text/javascript">
-            document.forms['SEARCHRESULTS'].elements['SEARCHRESULTS_multiaction'].options[0].selected=true;
-            //document.forms['SEARCHRESULTS'].elements['all'].checked = false;
-            //collector_switchAll('SEARCHRESULTS')
-         </script>
-
-    </div>
-   </form>
-
-{else}
-    ##No match found.##
-{/if}
-
-{assign var="_PL_activeId" value=null}
-{assign var="_duration"    value=null}
+{assign var="_PL_activeId" value=$PL->getActiveId()}
+
+{if $_results.cnt > 0}
+    <form name="SEARCHRESULTS">
+    <div class="head" style="width:535px; height: 21px;">&nbsp;</div>
+    <div class="container_table"  style="width: 555px; height: auto;">
+
+            <table style="width: 535px;">
+                <tr class="blue_head">
+                    <td style="width: 30px"><input type="checkbox" name="all" onClick="collector_switchAll('SEARCHRESULTS')"></td>
+                    <td style="width: 200px"><a href="#" onClick="hpopup('{$UI_HANDLER}?act={$_act_prefix}.reOrder&by=title', 'order');" id="blue_head">##Title##</a></td>
+                    <td style="width: 195px"><a href="#" onClick="hpopup('{$UI_HANDLER}?act={$_act_prefix}.reOrder&by=creator', 'order');" id="blue_head">##Creator##</a></td>
+                    <td><a href="#"  onClick="hpopup('{$UI_HANDLER}?act={$_act_prefix}.reOrder&by=extent', 'order');" id="blue_head">##Duration##</a></td>
+                    <td style="width: 41px; border: 0; text-align: center"><a href="#" onClick="hpopup('{$UI_HANDLER}?act={$_act_prefix}.reOrder&by=type', 'order');" id="blue_head">##Type##</a></td>
+                </tr>
+                {foreach from=$_results.items item=i}
+            <!-- start item -->
+                <tr class="background-color: {cycle values='blue1, blue2'}">
+                    <td><input type="checkbox" class="checkbox" name="{$i.id}"/></td>
+                    <td {include file="library/actionhandler.tpl"} style="cursor: pointer">
+                        {if $PLAYLIST.id == $i.id}
+                            <b>{$i.title|truncate:30}</b>
+                        {else}
+                            {$i.title|truncate:30}
+                        {/if}
+                    </td>
+                    <td {include file="library/actionhandler.tpl"} style="cursor: pointer">{$i.creator}</td>
+                    <td {include file="library/actionhandler.tpl"} style="text-align: right; cursor: pointer">{assign var="_duration" value=$i.duration}{niceTime in=$_duration}</td>
+                    <td {include file="library/actionhandler.tpl"} style="border: 0; text-align: center; cursor: pointer">
+                        <img src="img/{$i.type|lower}.png" border="0" alt="{$i.type|lower|capitalize}" {include file="sub/mouseover.tpl"} />
+                    </td>
+                </tr>
+            <!-- end item -->
+                {/foreach}
+            </table>
+
+    </div>
+    <div class="footer" style="width: 530px;">
+
+         <div class="counter">
+            {* {if $_results.prev}<a href="#" onClick="hpopup('{$UI_HANDLER}?act={$_act_prefix}.setOffset&page=prev', 'pager')" id="blue_head">##previous##</a>{/if}  *}
+
+            {foreach from=$_results.pagination item=p key=k}
+                {if $k != $_results.page+1}
+                    <a href="#" onClick="hpopup('{$UI_HANDLER}?act={$_act_prefix}.setOffset&page={$k}', 'pager')" id="blue_head">{$p}</a>
+                {else}
+                    {$p}
+                {/if}
+            {/foreach}
+
+            {* {if $_results.next}<a href="#" onClick="hpopup('{$UI_HANDLER}?act={$_act_prefix}.setOffset&page=next', 'pager')" id="blue_head">##next##</a>{/if}  *}
+            &nbsp;&nbsp;
+            ##Range##:&nbsp;{$_criteria.offset+1}-{if ($_criteria.offset+$_criteria.limit)>$_results.cnt}{$_results.cnt}{else}{$_criteria.offset+$_criteria.limit}{/if}&nbsp;
+            ##Count##:&nbsp;{$_results.cnt}&nbsp;
+            {* ##Page##:&nbsp;&nbsp;{$_results.page+1}&nbsp;&nbsp; *}
+
+         </div>
+
+         <select name="SEARCHRESULTS_multiaction" onChange="collector_submit('SEARCHRESULTS', this.value)">
+                <option>##Multiple Action:##</option>
+                <option value="SP.addItem">##Add file(s) to ScratchPad##</option>
+                {if $_PL_activeId}
+                    <option value="PL.addItem">##Add file(s) to active Playlist##</option>
+                {else}
+                    <option value="PL.create">##New Playlist using this file(s)##</option>
+                {/if}
+         </select>
+         <script type="text/javascript">
+            document.forms['SEARCHRESULTS'].elements['SEARCHRESULTS_multiaction'].options[0].selected=true;
+            //document.forms['SEARCHRESULTS'].elements['all'].checked = false;
+            //collector_switchAll('SEARCHRESULTS')
+         </script>
+
+    </div>
+   </form>
+
+{else}
+    ##No match found.##
+{/if}
+
+{assign var="_PL_activeId" value=null}
+{assign var="_duration"    value=null}

livesupport/modules/htmlUI/var/templates/loader/index.tpl

@@ -1,8 +1,7 @@
-<html>
-<head>
-</head>
-<body>
-<center>
-<img src="img/ls_logo_animated.gif">
-</center>
-
+<html>
+<head>
+</head>
+<body>
+<center>
+<img src="img/ls_logo_animated.gif">
+</center>

livesupport/modules/htmlUI/var/templates/playlist/editor.tpl

@@ -1,87 +1,87 @@
-<!-- start playlist editor -->
-    <div class="container_elements" style="width: 607px;">
-
-                <div style="width: 574px;">
-                    <div style="float: left;"><h1>##Playlist Editor## </h1></div>
-                    <div style="float: right;"><h1><a href="{$UI_BROWSER}?act=PL.editMetaData" style="color: #666666">{$PL->title} &nbsp; {getHour time=$PL->duration}##h##&nbsp;{getMinute time=$PL->duration}##m##&nbsp;{getSecond time=$PL->duration}##s##</a></h1></div>
-                </div>
-
-                <div class="head" style="width: 574px;">
-                    <div class="left">&nbsp;</div>
-                    <div class="right">&nbsp;</div>
-                    <div class="clearer">&nbsp;</div>
-                </div>
-                <div class="container_table" style="width: 594px;">
-                    <table style="width: 574px;">
-                        <form name="PL">
-                    <!-- start repeat after 14 columns -->
-                        <tr class="blue_head">
-                            <td style="width: 30px"><input type="checkbox" name="all" onClick="collector_switchAll('PL')"></td>
-                                <script type="text/javascript">
-                                    document.forms['PL'].elements['all'].checked = false;
-                                </script>
-                            <td style="width: 200px">##Name##</td>
-                            <td>                     ##Duration##</td>
-                            <td style="width: 200px">##Artist##</td>
-                            <td style="width: 30px;">##Type##</td>
-                            <td style="width: 30px; border: 0">##Move##</td>
-                        </tr>
-                    <!-- end repeat after 14 columns -->
-                    <!-- start item -->
-                    {foreach from=$PL->getFlat($PL->activeId) key='pos' item='i'}
-                        <!-- {$n++} -->
-                        <!-- fade information -->
-                        <tr onClick="return contextmenu('{$i.attrs.id}', {if $n == 1}'PL.changeFadeIn'{else}'PL.changeTransition'{/if})" style="background-color: #bbb">
-                            <td></td>
-                            <td colspan="5" style="border: 0; cursor: pointer">##Fade## {$i.fadein_ms|string_format:"%d"} ms</td>
-                        </tr>
-                        <tr class="{cycle values='blue1, blue2'}">
-                            <td><input type="checkbox" class="checkbox" name="{$i.attrs.id}"/></td>
-                            <td {include file="playlist/actionhandler.tpl"}>{$i.title}</td>
-                            <td {include file="playlist/actionhandler.tpl"} style="text-align: right">
-                                {assign var="_duration" value=$i.duration}{niceTime in=$_duration}
-                            </td>
-                            <td {include file="playlist/actionhandler.tpl"}>{$i.creator}</td>
-                            <td {include file="playlist/actionhandler.tpl"}>
-                                <img src="img/{$i.type}.gif" border="0" alt="{$i.type|capitalize}" {include file="sub/mouseover.tpl"} />
-                            </td>
-                            <td style="border: 0">
-                                <a href="#" onClick="hpopup('{$UI_HANDLER}?act=PL.moveItem&id={$i.attrs.id}&pos={$pos-1}')"><img src="img/bt_top_xsm.gif"    alt="##move up##" vspace=1 hspace=1/></a>
-                                <a href="#" onClick="hpopup('{$UI_HANDLER}?act=PL.moveItem&id={$i.attrs.id}&pos={$pos+1}')"><img src="img/bt_bottom_xsm.gif" alt="##move down##" vspace=1 hspace=1/></a>
-                            </td>
-                        </tr>
-                    {/foreach}
-                        {if $n}
-                        <!-- fade information -->
-                        <tr onClick="return contextmenu('{$i.attrs.id}', {if $n == 1}'PL.changeFadeIn'{else}'PL.changeFadeOut'{/if})" style="background-color: #bbb">
-                            <td></td>
-                            <td colspan="5" style="border: 0; cursor: pointer">##Fade## {$i.fadeout_ms|string_format:"%d"} ms</td>
-                        </tr>
-                        {else}
-                            <tr class="{cycle values='blue1, blue2'}">
-                                <td style="border: 0" colspan="6" align="center">##No Entry##</td>
-                            </tr>
-                        {/if}
-                    <!-- end item -->
-                        </form>
-                    </table>
-                </div>
-                <div class="footer" style="width: 569px;">
-                    <input type="button" class="button_large" onClick="collector_submit('PL', '0&popup[]=PL.changeAllTransitions', '{$UI_BROWSER}', 'chgAllTrans', 400, 150)" value="##Change Fades##" />
-                    <input type="button" class="button_large" onClick="collector_submit('PL', 'PL.removeItem')"   value="##Remove Selected##" />
-                    <input type="button" class="button_large" onClick="collector_clearAll('PL', 'PL.removeItem')" value="##Clear Playlist##" />
-                </div>
-                <div class="container_button">
-                    <input type="button" class="button_large" value="##Save Playlist##"   onClick="hpopup('{$UI_HANDLER}?act=PL.save')">
-                    <input type="button" class="button_large" value="##Revert to Saved##" onClick="popup('{$UI_BROWSER}?popup[]=PL.confirmRevert', 'PL.revertChanges', 400, 50)">
-                    <input type="button" class="button_large" value="##Delete Playlist##" onClick="popup('{$UI_BROWSER}?popup[]=PL.confirmDelete', 'PL.deleteActive', 400, 50)">
-                </div>
-                <div class="container_button">
-                    <input type="button" class="button_large" value="##Close Playlist##"  onClick="popup('{$UI_BROWSER}?popup[]=PL.confirmRelease', 'PL.confirmRelease', 400, 50)">
-                    <input type="button" class="button_large" value="##Description##"        onClick="location.href='{$UI_BROWSER}?act=PL.editMetaData'">
-                </div>
-            </div>
-
-        <!-- end playlist editor -->
-
-{assign var="_duration"    value=null}
+<!-- start playlist editor -->
+    <div class="container_elements" style="width: 607px;">
+
+                <div style="width: 574px;">
+                    <div style="float: left;"><h1>##Playlist Editor## </h1></div>
+                    <div style="float: right;"><h1><a href="{$UI_BROWSER}?act=PL.editMetaData" style="color: #666666">{$PL->title} &nbsp; {getHour time=$PL->duration}##h##&nbsp;{getMinute time=$PL->duration}##m##&nbsp;{getSecond time=$PL->duration}##s##</a></h1></div>
+                </div>
+
+                <div class="head" style="width: 574px;">
+                    <div class="left">&nbsp;</div>
+                    <div class="right">&nbsp;</div>
+                    <div class="clearer">&nbsp;</div>
+                </div>
+                <div class="container_table" style="width: 594px;">
+                    <table style="width: 574px;">
+                        <form name="PL">
+                    <!-- start repeat after 14 columns -->
+                        <tr class="blue_head">
+                            <td style="width: 30px"><input type="checkbox" name="all" onClick="collector_switchAll('PL')"></td>
+                                <script type="text/javascript">
+                                    document.forms['PL'].elements['all'].checked = false;
+                                </script>
+                            <td style="width: 200px">##Name##</td>
+                            <td>                     ##Duration##</td>
+                            <td style="width: 200px">##Artist##</td>
+                            <td style="width: 30px;">##Type##</td>
+                            <td style="width: 30px; border: 0">##Move##</td>
+                        </tr>
+                    <!-- end repeat after 14 columns -->
+                    <!-- start item -->
+                    {foreach from=$PL->getFlat($PL->activeId) key='pos' item='i'}
+                        <!-- {$n++} -->
+                        <!-- fade information -->
+                        <tr onClick="return contextmenu('{$i.attrs.id}', {if $n == 1}'PL.changeFadeIn'{else}'PL.changeTransition'{/if})" style="background-color: #bbb">
+                            <td></td>
+                            <td colspan="5" style="border: 0; cursor: pointer">##Fade## {$i.fadein_ms|string_format:"%d"} ms</td>
+                        </tr>
+                        <tr class="{cycle values='blue1, blue2'}">
+                            <td><input type="checkbox" class="checkbox" name="{$i.attrs.id}"/></td>
+                            <td {include file="playlist/actionhandler.tpl"}>{$i.title}</td>
+                            <td {include file="playlist/actionhandler.tpl"} style="text-align: right">
+                                {assign var="_duration" value=$i.duration}{niceTime in=$_duration}
+                            </td>
+                            <td {include file="playlist/actionhandler.tpl"}>{$i.creator}</td>
+                            <td {include file="playlist/actionhandler.tpl"}>
+                                <img src="img/{$i.type}.png" border="0" alt="{$i.type|capitalize}" {include file="sub/mouseover.tpl"} />
+                            </td>
+                            <td style="border: 0">
+                                <a href="#" onClick="hpopup('{$UI_HANDLER}?act=PL.moveItem&id={$i.attrs.id}&pos={$pos-1}')"><img src="img/bt_top_xsm.png"    alt="##move up##" vspace=1 hspace=1/></a>
+                                <a href="#" onClick="hpopup('{$UI_HANDLER}?act=PL.moveItem&id={$i.attrs.id}&pos={$pos+1}')"><img src="img/bt_bottom_xsm.png" alt="##move down##" vspace=1 hspace=1/></a>
+                            </td>
+                        </tr>
+                    {/foreach}
+                        {if $n}
+                        <!-- fade information -->
+                        <tr onClick="return contextmenu('{$i.attrs.id}', {if $n == 1}'PL.changeFadeIn'{else}'PL.changeFadeOut'{/if})" style="background-color: #bbb">
+                            <td></td>
+                            <td colspan="5" style="border: 0; cursor: pointer">##Fade## {$i.fadeout_ms|string_format:"%d"} ms</td>
+                        </tr>
+                        {else}
+                            <tr class="{cycle values='blue1, blue2'}">
+                                <td style="border: 0" colspan="6" align="center">##No Entry##</td>
+                            </tr>
+                        {/if}
+                    <!-- end item -->
+                        </form>
+                    </table>
+                </div>
+                <div class="footer" style="width: 569px;">
+                    <input type="button" class="button_large" onClick="collector_submit('PL', '0&popup[]=PL.changeAllTransitions', '{$UI_BROWSER}', 'chgAllTrans', 400, 150)" value="##Change Fades##" />
+                    <input type="button" class="button_large" onClick="collector_submit('PL', 'PL.removeItem')"   value="##Remove Selected##" />
+                    <input type="button" class="button_large" onClick="collector_clearAll('PL', 'PL.removeItem')" value="##Clear Playlist##" />
+                </div>
+                <div class="container_button">
+                    <input type="button" class="button_large" value="##Save Playlist##"   onClick="hpopup('{$UI_HANDLER}?act=PL.save')">
+                    <input type="button" class="button_large" value="##Revert to Saved##" onClick="popup('{$UI_BROWSER}?popup[]=PL.confirmRevert', 'PL.revertChanges', 400, 50)">
+                    <input type="button" class="button_large" value="##Delete Playlist##" onClick="popup('{$UI_BROWSER}?popup[]=PL.confirmDelete', 'PL.deleteActive', 400, 50)">
+                </div>
+                <div class="container_button">
+                    <input type="button" class="button_large" value="##Close Playlist##"  onClick="popup('{$UI_BROWSER}?popup[]=PL.confirmRelease', 'PL.confirmRelease', 400, 50)">
+                    <input type="button" class="button_large" value="##Description##"        onClick="location.href='{$UI_BROWSER}?act=PL.editMetaData'">
+                </div>
+            </div>
+
+        <!-- end playlist editor -->
+
+{assign var="_duration"    value=null}

livesupport/modules/htmlUI/var/templates/popup/help.tpl

@@ -80,7 +80,7 @@ DIV.blockquote
  <div class="container">
 <div class="content">
 <div class="container_elements">
-<img src="img/logo_livesupport.gif" border="0" />
+<img src="img/logo_livesupport.png" border="0" />
 
 <h1>Quick Start - {$UI_VERSION_FULLNAME}</h1>
 <div class="copyright">{$UI_VERSION} &copy;2005 <a href="http://www.mdlf.org" target="_blank">MDLF</a> - maintained and distributed under GNU/GPL by <a href="http://www.campware.org" target="_blank">CAMPWARE</a></div>

livesupport/modules/htmlUI/var/templates/scheduler/day.tpl

@@ -1,73 +1,73 @@
-{$SCHEDULER->buildDay()}
-{assign var="_scale"  value=$SCHEDULER->getDayTimingScale()}
-{assign var="_entrys" value=$SCHEDULER->getDayEntrys()}
-
-<div class="content">
-<div class="container_elements">
-    <h1>##Daily View##</h1>
-    <div class="clearer">&nbsp;</div>
-    <p>##{$SCHEDULER->curr.monthname}## {$SCHEDULER->curr.day}, {$SCHEDULER->curr.year}</p>
-
-    <form name="SCHEDULER">
-    <table class="scheduler_day" style="width: 606px;">
-
-        {*    Tag vor/zurück + code um heutigen Tag abzufragen
-        <tr>
-            <th><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&day=--')"><<</a></th>
-            <th colspan="3" {if $SCHEDULER->curr.isToday} bgcolor="grey"{/if}>##{$SCHEDULER->curr.dayname}##, ##{$SCHEDULER->curr.year}##-##{$SCHEDULER->curr.month}##-##{$SCHEDULER->curr.day}##</th>
-            <th><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&day=%2B%2B')">>></a></th>
-        </tr>
-        *}
-
-        <tr class="blue_head">
-
-            {*  Multi-action checkboxen, die brauchen wir aber höchstens bei den Einträgen um mehere auf einmal zu löschen ?
-            <td style="width: 30px"><input type="checkbox" name="all" onClick="collector_switchAll('SCHEDULER')"></td>
-            *}
-
-            <td style="border-left: 1px solid #ccc; width: 95px">##Time##</td>
-            <td style="width: 481px; border-right: 0;">##Show Info##</td>
-        </tr>
-
-        {foreach from=$_scale item="_hour"}
-
-            {if is_array($_entrys[$_hour])}
-                <tr class="blue1">
-                    <td style="border-left:  1px solid #ccc; cursor: pointer" {include file="scheduler/day_additem.tpl"}>{$_hour|string_format:"%02d"}:00</td>
-                    <td style="border-right: 1px solid #ccc;">
-
-                    {foreach from=$_entrys[$_hour] item="i"}    {* hier werden die Einträge welche in der jeweil. h beginnen durchlaufen *}
-                        <div {include file="scheduler/removeitem.tpl"}>
-                            <img src="img/playlist.gif" border="0" {include file="sub/mouseover.tpl"}>
-                            &nbsp;
-                            <b>{$i.title}</b>
-                            {$i.start}-{$i.end}
-                            {$i.creator}
-                        </div>
-                       {include file="scheduler/between_additem.tpl"}
-                    {/foreach}
-
-                    </td>
-                </tr>
-            {else}
-                <tr class="blue2" {include file="scheduler/day_additem.tpl"}>
-                    <td style="border-left: 1px solid #ccc;">{$_hour|string_format:"%02d"}:00</td>
-                    <td style="border-right: 1px solid #ccc;"></td>
-                </tr>
-            {/if}
-        {/foreach}
-    </table>
-    </form>
-
-    {*  Multiaction buttons
-    <div class="container_button" style="float: right; margin-top: 10px;">
-        <input type="button" class="button_large" value="Edit Playlist" />
-        <input type="button" class="button_large" value="Delete Playlist" />
-        <input type="button" class="button_large" value="Add Playlist" />
-    </div>
-    <div class="clearer">&nbsp;</div>
-     *}
-
-</div>
-</div>
-
+{$SCHEDULER->buildDay()}
+{assign var="_scale"  value=$SCHEDULER->getDayTimingScale()}
+{assign var="_entrys" value=$SCHEDULER->getDayEntrys()}
+
+<div class="content">
+<div class="container_elements">
+    <h1>##Daily View##</h1>
+    <div class="clearer">&nbsp;</div>
+    <p>##{$SCHEDULER->curr.monthname}## {$SCHEDULER->curr.day}, {$SCHEDULER->curr.year}</p>
+
+    <form name="SCHEDULER">
+    <table class="scheduler_day" style="width: 606px;">
+
+        {*    Tag vor/zurück + code um heutigen Tag abzufragen
+        <tr>
+            <th><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&day=--')"><<</a></th>
+            <th colspan="3" {if $SCHEDULER->curr.isToday} bgcolor="grey"{/if}>##{$SCHEDULER->curr.dayname}##, ##{$SCHEDULER->curr.year}##-##{$SCHEDULER->curr.month}##-##{$SCHEDULER->curr.day}##</th>
+            <th><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&day=%2B%2B')">>></a></th>
+        </tr>
+        *}
+
+        <tr class="blue_head">
+
+            {*  Multi-action checkboxen, die brauchen wir aber höchstens bei den Einträgen um mehere auf einmal zu löschen ?
+            <td style="width: 30px"><input type="checkbox" name="all" onClick="collector_switchAll('SCHEDULER')"></td>
+            *}
+
+            <td style="border-left: 1px solid #ccc; width: 95px">##Time##</td>
+            <td style="width: 481px; border-right: 0;">##Show Info##</td>
+        </tr>
+
+        {foreach from=$_scale item="_hour"}
+
+            {if is_array($_entrys[$_hour])}
+                <tr class="blue1">
+                    <td style="border-left:  1px solid #ccc; cursor: pointer" {include file="scheduler/day_additem.tpl"}>{$_hour|string_format:"%02d"}:00</td>
+                    <td style="border-right: 1px solid #ccc;">
+
+                    {foreach from=$_entrys[$_hour] item="i"}    {* hier werden die Einträge welche in der jeweil. h beginnen durchlaufen *}
+                        <div {include file="scheduler/removeitem.tpl"}>
+                            <img src="img/playlist.png" border="0" {include file="sub/mouseover.tpl"}>
+                            &nbsp;
+                            <b>{$i.title}</b>
+                            {$i.start}-{$i.end}
+                            {$i.creator}
+                        </div>
+                       {include file="scheduler/between_additem.tpl"}
+                    {/foreach}
+
+                    </td>
+                </tr>
+            {else}
+                <tr class="blue2" {include file="scheduler/day_additem.tpl"}>
+                    <td style="border-left: 1px solid #ccc;">{$_hour|string_format:"%02d"}:00</td>
+                    <td style="border-right: 1px solid #ccc;"></td>
+                </tr>
+            {/if}
+        {/foreach}
+    </table>
+    </form>
+
+    {*  Multiaction buttons
+    <div class="container_button" style="float: right; margin-top: 10px;">
+        <input type="button" class="button_large" value="Edit Playlist" />
+        <input type="button" class="button_large" value="Delete Playlist" />
+        <input type="button" class="button_large" value="Add Playlist" />
+    </div>
+    <div class="clearer">&nbsp;</div>
+     *}
+
+</div>
+</div>
+

livesupport/modules/htmlUI/var/templates/scheduler/week.tpl

@@ -1,75 +1,75 @@
-{$SCHEDULER->buildWeek()}
-{assign var="_scale" value=$SCHEDULER->getDayTimingScale()}
-
-<div class="content" style="width: auto;">
-<!-- start scheduler -->
-    <div class="container_elements" style="width: 790px;">
-        <div class="head_scheduler" style=""><h1>##Weekly View##</h1></div>
-
-        {*
-        <div class="container_button_scheduler">
-            <input type="button" class="button_large" value="Start Scheduler" />
-            <input type="button" class="button_large" value="Stop Scheduler" />
-        </div>
-        *}
-
-        <div class="clearer">&nbsp;</div>
-        <p>{$SCHEDULER->curr.week}. ##calendar week## {$SCHEDULER->curr.year}</p>
-
-        <table class="scheduler_week">
-            <tr>
-                {* Link Woche zurück <a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&week=--')"><<</a> *}
-                <th class="firstrow" style="border-left: 1px solid #ccc"></th>
-            {foreach from=$SCHEDULER->Week item="_Day"}      {* hier werden die Tagesnamen angezeigt *}
-                <th class="date"></th>
-                <th class="day"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&view=day&day={$_Day.day}&month={$_Day.month}&year={$_Day.year}')">##{$_Day.label.full}##</a></th>
-            {/foreach}
-                {* Link Woche vor <a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&week=%2B%2B')">>></a> *}
-            </tr>
-
-            <tr>
-                <td class="firstrow_secondcol" style="border-left: 1px solid #ccc"></td>
-            {foreach from=$SCHEDULER->Week item="_Day"}     {* hier werden die Tagesnummern angezeigt *}
-                <td class="date_secondcol">
-                    <a href="#" {include file="scheduler/week_additem.tpl"}><b>{$_Day.day}</b></a>
-                </td>
-                <td class="day_secondcol"></td>
-            {/foreach}
-            </tr>
-
-        {assign var="_entrys" value=$SCHEDULER->getWeekEntrys()}
-        {foreach from=$_scale item="_hour"}
-            {assign var="_year"  value=$_Day.year}
-            {assign var="_month" value=$_Day.month}
-
-            <tr>
-                <td class="firstrow" style="border-left: 1px solid #ccc">{$_hour}</td>
-            {foreach from=$SCHEDULER->Week item="_day"}
-            {if is_array($_entrys[$_day.day][$_hour])}
-                <td class="date_full" {include file="scheduler/week_additem.tpl"}></td>
-                <td class="day_full">
-                {foreach from=$_entrys[$_day.day][$_hour] item="i"}
-                    <div {include file="scheduler/removeitem.tpl"}>
-                        <img src="img/playlist.gif" border="0" {include file="sub/mouseover.tpl"}>
-                        &nbsp;
-                        <h2>{$i.title|truncate:12}</h2>
-                        <p>{$i.start|truncate:8:""} - {$i.end|truncate:8:""}</p>
-                        <p>{$i.creator}</p>
-                    </div>
-                   {include file="scheduler/between_additem.tpl"}
-                {/foreach}
-                </td>
-            {else}
-                <td class="date" {include file="scheduler/week_additem.tpl"}></td>
-                <td class="day"  {include file="scheduler/week_additem.tpl"}></td>
-            {/if}
-            {/foreach}
-            </tr>
-        {/foreach}
-
-        </table>
-        </div>
-        <div class="clearer">&nbsp;</div>
-    </div>
-<!-- end playlist editor -->
-</div>
+{$SCHEDULER->buildWeek()}
+{assign var="_scale" value=$SCHEDULER->getDayTimingScale()}
+
+<div class="content" style="width: auto;">
+<!-- start scheduler -->
+    <div class="container_elements" style="width: 790px;">
+        <div class="head_scheduler" style=""><h1>##Weekly View##</h1></div>
+
+        {*
+        <div class="container_button_scheduler">
+            <input type="button" class="button_large" value="Start Scheduler" />
+            <input type="button" class="button_large" value="Stop Scheduler" />
+        </div>
+        *}
+
+        <div class="clearer">&nbsp;</div>
+        <p>{$SCHEDULER->curr.week}. ##calendar week## {$SCHEDULER->curr.year}</p>
+
+        <table class="scheduler_week">
+            <tr>
+                {* Link Woche zurück <a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&week=--')"><<</a> *}
+                <th class="firstrow" style="border-left: 1px solid #ccc"></th>
+            {foreach from=$SCHEDULER->Week item="_Day"}      {* hier werden die Tagesnamen angezeigt *}
+                <th class="date"></th>
+                <th class="day"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&view=day&day={$_Day.day}&month={$_Day.month}&year={$_Day.year}')">##{$_Day.label.full}##</a></th>
+            {/foreach}
+                {* Link Woche vor <a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&week=%2B%2B')">>></a> *}
+            </tr>
+
+            <tr>
+                <td class="firstrow_secondcol" style="border-left: 1px solid #ccc"></td>
+            {foreach from=$SCHEDULER->Week item="_Day"}     {* hier werden die Tagesnummern angezeigt *}
+                <td class="date_secondcol">
+                    <a href="#" {include file="scheduler/week_additem.tpl"}><b>{$_Day.day}</b></a>
+                </td>
+                <td class="day_secondcol"></td>
+            {/foreach}
+            </tr>
+
+        {assign var="_entrys" value=$SCHEDULER->getWeekEntrys()}
+        {foreach from=$_scale item="_hour"}
+            {assign var="_year"  value=$_Day.year}
+            {assign var="_month" value=$_Day.month}
+
+            <tr>
+                <td class="firstrow" style="border-left: 1px solid #ccc">{$_hour}</td>
+            {foreach from=$SCHEDULER->Week item="_day"}
+            {if is_array($_entrys[$_day.day][$_hour])}
+                <td class="date_full" {include file="scheduler/week_additem.tpl"}></td>
+                <td class="day_full">
+                {foreach from=$_entrys[$_day.day][$_hour] item="i"}
+                    <div {include file="scheduler/removeitem.tpl"}>
+                        <img src="img/playlist.png" border="0" {include file="sub/mouseover.tpl"}>
+                        &nbsp;
+                        <h2>{$i.title|truncate:12}</h2>
+                        <p>{$i.start|truncate:8:""} - {$i.end|truncate:8:""}</p>
+                        <p>{$i.creator}</p>
+                    </div>
+                   {include file="scheduler/between_additem.tpl"}
+                {/foreach}
+                </td>
+            {else}
+                <td class="date" {include file="scheduler/week_additem.tpl"}></td>
+                <td class="day"  {include file="scheduler/week_additem.tpl"}></td>
+            {/if}
+            {/foreach}
+            </tr>
+        {/foreach}
+
+        </table>
+        </div>
+        <div class="clearer">&nbsp;</div>
+    </div>
+<!-- end playlist editor -->
+</div>

livesupport/modules/htmlUI/var/templates/scratchpad/main.tpl

@@ -40,10 +40,10 @@
                     <td {include file="scratchpad/actionhandler.tpl"} style="text-align: right; cursor: pointer">{niceTime in=$_duration}</td>
                     <td {include file="scratchpad/actionhandler.tpl"} style="border: 0; text-align: center; cursor: pointer">
                         {if $PL->isAvailable($i.id) == false}
-                            <div align="left"><img src="img/ico_lock.gif">
-                            <img src="img/{$i.type}.gif" border="0" alt="{$i.type|capitalize}" {include file="sub/mouseover.tpl"} /></div>
+                            <div align="left"><img src="img/ico_lock.png">
+                            <img src="img/{$i.type}.png" border="0" alt="{$i.type|capitalize}" {include file="sub/mouseover.tpl"} /></div>
                         {else}
-                        <img src="img/{$i.type}.gif" border="0" alt="{$i.type|capitalize}" {include file="sub/mouseover.tpl"} /> {/if}
+                        <img src="img/{$i.type}.png" border="0" alt="{$i.type|capitalize}" {include file="sub/mouseover.tpl"} /> {/if}
                     </td>
                 </tr>
                 <!-- end item -->

livesupport/modules/htmlUI/var/templates/script/progressbar.js.tpl

@@ -1,121 +1,121 @@
-<script language="javascript">
-
-{literal}
-// play-progress-bar object
-
-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.nh         = nh;
-    this.ni         = ni;
-    this.ns         = ns;
-
-    // inits:
-    this.elapsed    = new Date();
-    this.duration   = new Date();
-    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));
-
-    // methods:
-    this.init   = plPrBar_init;
-    this.tick   = plPrBar_tick;
-    this.update = plPrBar_update;
-    this.stop   = plPrBar_stop;
-    this.show   = plPrBar_show;
-    this.hide   = plPrBar_hide;
-    this.create = plPrBar_create;
-    this.run    = setInterval("ppb.tick();", this.interval);
-}
-
-function plPrBar_init() {
-    document.getElementById("now_title").innerHTML              = this.tit;
-
-    if (this.next == 0) {
-        document.getElementById("next_clip").innerHTML          = '';
-    } else {
-        document.getElementById("next_title").innerHTML         = this.ntit;
-        document.getElementById("next_duration").innerHTML      = '(' + twoDigit(this.nh) + ':' + twoDigit(this.ni) + ':' + twoDigit(this.ns) + ')';
-    }
-
-    this.show();
-    this.update();
-}
-
-function plPrBar_tick() {
-    if (this.remaining.getTime() <= this.interval*2)  {
-        this.stop();
-        return;
-    }
-
-    this.elapsed.setTime(this.elapsed.getTime() + this.interval);
-    this.remaining.setTime(this.duration.getTime() - this.elapsed.getTime());
-
-    this.update();
-}
-
-function plPrBar_update() {
-    document.getElementById("now_elapsed").innerHTML   = twoDigit(this.elapsed.getUTCHours())   + ":" + twoDigit(this.elapsed.getUTCMinutes())   + ":" + twoDigit(this.elapsed.getUTCSeconds());
-    document.getElementById("now_remaining").innerHTML = twoDigit(this.remaining.getUTCHours()) + ":" + twoDigit(this.remaining.getUTCMinutes()) + ":" + twoDigit(this.remaining.getUTCSeconds());
-    document.getElementById("now_scala").style.width   = (100 / this.duration.getTime() * this.elapsed.getTime()) + "%";
-}
-
-function plPrBar_stop() {
-    clearInterval(this.run);
-
-    if (this.next == 0) {
-        // just if no next item to play
-        this.hide();
-    } else {
-        // all values for next clip needed here:
-        jsCom("jscom_wrapper", ["uiBrowser", "SCHEDULER", "getNowNextClip4jscom"], this.create);
-    }
-}
-
-function plPrBar_create(jscomRes) {
-        if (jscomRes !== '') {
-            eval('var parms = ' + 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[10], parms[11] 
-                             );
-            ppb.init();
-        } else {
-            plPrBar_hide();
-        };
-}
-
-function plPrBar_show() {
-    document.getElementById("statusbar_indicator").innerHTML      = '<img src="img/el_onair.gif" alt="on air">';
-    document.getElementById("statusbar_whatsplaying").className   = 'whatplaying';
-}
-
-function plPrBar_hide() {
-    document.getElementById("statusbar_indicator").innerHTML    = '<img src="img/el_offair.gif" alt="off air">';
-    document.getElementById("statusbar_whatsplaying").innerHTML = "";
-}
-{/literal}
-
-{if (is_array($_nowplaying.duration))}
-    ppb = new plPrBar  ("{$_nowplaying.title|truncate:33}",
-                        {$_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|string_format:'%d'}, {$_nextplaying.duration.m|string_format:'%2d'}, {$_nextplaying.duration.s|string_format:'%2d'}
-                        {else}
-                            0, "", 0, 0, 0
-                        {/if}
-                       );
-    ppb.init();
-{/if}
-
-
-{$JSCOM->genJsCode()}
-
-</script>
-
-
-
+<script language="javascript">
+
+{literal}
+// play-progress-bar object
+
+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.nh         = nh;
+    this.ni         = ni;
+    this.ns         = ns;
+
+    // inits:
+    this.elapsed    = new Date();
+    this.duration   = new Date();
+    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));
+
+    // methods:
+    this.init   = plPrBar_init;
+    this.tick   = plPrBar_tick;
+    this.update = plPrBar_update;
+    this.stop   = plPrBar_stop;
+    this.show   = plPrBar_show;
+    this.hide   = plPrBar_hide;
+    this.create = plPrBar_create;
+    this.run    = setInterval("ppb.tick();", this.interval);
+}
+
+function plPrBar_init() {
+    document.getElementById("now_title").innerHTML              = this.tit;
+
+    if (this.next == 0) {
+        document.getElementById("next_clip").innerHTML          = '';
+    } else {
+        document.getElementById("next_title").innerHTML         = this.ntit;
+        document.getElementById("next_duration").innerHTML      = '(' + twoDigit(this.nh) + ':' + twoDigit(this.ni) + ':' + twoDigit(this.ns) + ')';
+    }
+
+    this.show();
+    this.update();
+}
+
+function plPrBar_tick() {
+    if (this.remaining.getTime() <= this.interval*2)  {
+        this.stop();
+        return;
+    }
+
+    this.elapsed.setTime(this.elapsed.getTime() + this.interval);
+    this.remaining.setTime(this.duration.getTime() - this.elapsed.getTime());
+
+    this.update();
+}
+
+function plPrBar_update() {
+    document.getElementById("now_elapsed").innerHTML   = twoDigit(this.elapsed.getUTCHours())   + ":" + twoDigit(this.elapsed.getUTCMinutes())   + ":" + twoDigit(this.elapsed.getUTCSeconds());
+    document.getElementById("now_remaining").innerHTML = twoDigit(this.remaining.getUTCHours()) + ":" + twoDigit(this.remaining.getUTCMinutes()) + ":" + twoDigit(this.remaining.getUTCSeconds());
+    document.getElementById("now_scala").style.width   = (100 / this.duration.getTime() * this.elapsed.getTime()) + "%";
+}
+
+function plPrBar_stop() {
+    clearInterval(this.run);
+
+    if (this.next == 0) {
+        // just if no next item to play
+        this.hide();
+    } else {
+        // all values for next clip needed here:
+        jsCom("jscom_wrapper", ["uiBrowser", "SCHEDULER", "getNowNextClip4jscom"], this.create);
+    }
+}
+
+function plPrBar_create(jscomRes) {
+        if (jscomRes !== '') {
+            eval('var parms = ' + 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[10], parms[11] 
+                             );
+            ppb.init();
+        } else {
+            plPrBar_hide();
+        };
+}
+
+function plPrBar_show() {
+    document.getElementById("statusbar_indicator").innerHTML      = '<img src="img/el_onair.png" alt="on air">';
+    document.getElementById("statusbar_whatsplaying").className   = 'whatplaying';
+}
+
+function plPrBar_hide() {
+    document.getElementById("statusbar_indicator").innerHTML    = '<img src="img/el_offair.png" alt="off air">';
+    document.getElementById("statusbar_whatsplaying").innerHTML = "";
+}
+{/literal}
+
+{if (is_array($_nowplaying.duration))}
+    ppb = new plPrBar  ("{$_nowplaying.title|truncate:33}",
+                        {$_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|string_format:'%d'}, {$_nextplaying.duration.m|string_format:'%2d'}, {$_nextplaying.duration.s|string_format:'%2d'}
+                        {else}
+                            0, "", 0, 0, 0
+                        {/if}
+                       );
+    ppb.init();
+{/if}
+
+
+{$JSCOM->genJsCode()}
+
+</script>
+
+
+

livesupport/modules/htmlUI/var/templates/statusbar.tpl

@@ -1,66 +1,66 @@
-{assign var='_nowplaying'  value=$SCHEDULER->getNowNextClip()}
-{assign var='_nextplaying' value=$SCHEDULER->getNowNextClip(1)}
-
-    <!-- start header -->
-        <!-- start header left -->
-        <div class="headLeft">
-            <img src="img/logo_livesupport.gif" alt="Livesupport Logo" />
-            <div class="container">
-                {include file="userinfo.tpl"}
-            </div>
-        </div>
-        <!-- end header left -->
-        <!-- start header right -->
-        <div class="headRight">
-            <!-- start station information -->
-            <div class="station">
-                <img src="{$STATIONPREFS.stationLogoPath}" alt="{$STATIONPREFS.stationName}" width='127' height='34'>
-                <div class="frequence">{$STATIONPREFS.stationFrequency}</div>
-            </div>
-            <!-- end station information -->
-            <!-- start onair information -->
-            <div class="onair" id="statusbar_indicator">
-                {if $_nowplaying}
-                    <img src="img/el_onair.gif" alt="on air" />
-                {else}
-                    <img src="img/el_offair.gif" alt="off air">
-                {/if}
-            </div>
-            <!-- end onair information -->
-            <!-- start station time -->
-            <div class="stationtime">
-                <h1>##Station Time##</h1>
-                <div class="time"><span id="statusbar_servertime" class="clock" style="position:relative;">{$smarty.now|date_format:"%H:%M:%S"}</span>
-                    <div class="timezone">cet</div>
-                </div>
-            </div>
-            <!-- end station time -->
-            <!-- start what playing -->
-            <div class="whatplaying" id="statusbar_whatsplaying">
-                {if $_nowplaying}
-                    <div class="nowplaying">##Now Playing##: <strong id="now_title"></strong></div>
-                    <div class="scala">
-                        <div class="scala_in" id="now_scala" style="width: {$_nowplaying.percentage}%;">&nbsp;</div>
-                    </div>
-                    <div class="time">
-                        <div class="left">Elapsed:    <strong id="now_elapsed"></strong></div>
-                        <div class="right">Remaining: <strong id="now_remaining"></strong></div>
-                    </div>
-                {/if}
-                <div class="clearer"></div>
-                <div id="next_clip">
-                {if $_nextplaying}
-                    <p>##Playing Next##: <span id="next_title"></span> &nbsp;<span id="next_duration"></span></p>
-                {/if}
-                </div>
-            </div>
-            <!-- end what playing -->
-        </div>
-        <!-- end header right -->
-    <!-- end header -->
-
-{include file="script/clock.js.tpl"}
-{include file="script/progressbar.js.tpl"}
-
-{assign var='_nowplaying'  value=null}
-{assign var='_nextplaying' value=null}
+{assign var='_nowplaying'  value=$SCHEDULER->getNowNextClip()}
+{assign var='_nextplaying' value=$SCHEDULER->getNowNextClip(1)}
+
+    <!-- start header -->
+        <!-- start header left -->
+        <div class="headLeft">
+            <img src="img/logo_livesupport.png" alt="Livesupport Logo" />
+            <div class="container">
+                {include file="userinfo.tpl"}
+            </div>
+        </div>
+        <!-- end header left -->
+        <!-- start header right -->
+        <div class="headRight">
+            <!-- start station information -->
+            <div class="station">
+                <img src="{$STATIONPREFS.stationLogoPath}" alt="{$STATIONPREFS.stationName}" width='127' height='34'>
+                <div class="frequence">{$STATIONPREFS.stationFrequency}</div>
+            </div>
+            <!-- end station information -->
+            <!-- start onair information -->
+            <div class="onair" id="statusbar_indicator">
+                {if $_nowplaying}
+                    <img src="img/el_onair.png" alt="on air" />
+                {else}
+                    <img src="img/el_offair.png" alt="off air">
+                {/if}
+            </div>
+            <!-- end onair information -->
+            <!-- start station time -->
+            <div class="stationtime">
+                <h1>##Station Time##</h1>
+                <div class="time"><span id="statusbar_servertime" class="clock" style="position:relative;">{$smarty.now|date_format:"%H:%M:%S"}</span>
+                    <div class="timezone">cet</div>
+                </div>
+            </div>
+            <!-- end station time -->
+            <!-- start what playing -->
+            <div class="whatplaying" id="statusbar_whatsplaying">
+                {if $_nowplaying}
+                    <div class="nowplaying">##Now Playing##: <strong id="now_title"></strong></div>
+                    <div class="scala">
+                        <div class="scala_in" id="now_scala" style="width: {$_nowplaying.percentage}%;">&nbsp;</div>
+                    </div>
+                    <div class="time">
+                        <div class="left">Elapsed:    <strong id="now_elapsed"></strong></div>
+                        <div class="right">Remaining: <strong id="now_remaining"></strong></div>
+                    </div>
+                {/if}
+                <div class="clearer"></div>
+                <div id="next_clip">
+                {if $_nextplaying}
+                    <p>##Playing Next##: <span id="next_title"></span> &nbsp;<span id="next_duration"></span></p>
+                {/if}
+                </div>
+            </div>
+            <!-- end what playing -->
+        </div>
+        <!-- end header right -->
+    <!-- end header -->
+
+{include file="script/clock.js.tpl"}
+{include file="script/progressbar.js.tpl"}
+
+{assign var='_nowplaying'  value=null}
+{assign var='_nextplaying' value=null}

livesupport/modules/htmlUI/var/templates/subjects/manageGroupMember.tpl

@@ -1,102 +1,102 @@
-{assign var="_gname" value=$SUBJECTS->Base->gb->getSubjName($_REQUEST.id)}
-
-<div class="container_elements" style="width: 607px;">
-    <h1>{tra 0='Manage Group: $1' 1=$_gname}</h1>
-
-    <div class="container_table" style="width: 594px;">
-
-        <!-- start current group member -->
-        <div class="container_elements" style="float: left">
-            <h1>##Current Members##</h1>
-            <div class="head" style="width:255px; height: 21px;">&nbsp;</div>
-            <div class="container_table" style="width:275px;">
-                <table style="width:255px;">
-                    <form name="GRP">
-                    <tr class="blue_head">
-                        <td style="width: 30px"><input type="checkbox" name="all" onClick="collector_switchAll('GRP')"></td>
-                        <td style="width: 164px">##Login##</td>
-                        <td style="width: 41px; border: 0; text-align: center">##Type##</td>
-                    </tr>
-
-                    {assign var="_member" value=$SUBJECTS->getGroupMember($_REQUEST.id)}
-                    {if (is_array($_member) && count($_member)>0)}
-                        {foreach from=$_member item="i"}
-                            <tr class="{cycle values='blue1, blue2'}">
-                                <td><input type="checkbox" class="checkbox" name="{$i.id}"/></td>
-                                <td onClick="return contextmenu('login={urlencode str=$i.login}&gname={urlencode str=$_gname}', 'SUBJECTS.removeSubjFromGr')">{$i.login}</td>
-                                <td style="border: 0; text-align: center"
-                                    onClick="return contextmenu('login={urlencode str=$i.login}&gname={urlencode str=$_gname}', 'SUBJECTS.removeSubjFromGr')">
-                                    {if $i.type|lower == 'u'}
-                                        <img src="img/user.gif" border="0" alt="User" />
-                                    {else}
-                                        <img src="img/group.gif" border="0" alt="Group" />
-                                    {/if}
-                                </td>
-                            </tr>
-                        {/foreach}
-                    {else}
-                        <tr><td colspan="3" align="center" style="border: 0">##No group members##</td></tr>
-                    {/if}
-                    </form>
-                </table>
-            </div>
-            <div class="footer" style="width:250px;">
-                <a href="" onClick="collector_submit('GRP', 'SUBJECTS.removeSubjFromGr&gname={urlencode str=$_gname}')" id="blue_head">##Remove selected##</a>
-            </div>
-        </div>
-        <!-- end current group member -->
-
-
-
-        <!-- start add group member -->
-        <div class="container_elements" style="float: right">
-            <h1>##Add Members##</h1>
-            <div class="head" style="width:255px; height: 21px;">&nbsp;</div>
-            <div class="container_table" style="width:275px;">
-                <table style="width:255px;">
-                <form name="NOGRP">
-                <!-- start table header -->
-                    <tr class="blue_head">
-                        <td style="width: 30px"><input type="checkbox" name="all" onClick="collector_switchAll('NOGRP')"></td>
-                        <td style="width: 164px">##Login##</td>
-                        <td style="width: 41px; border: 0">##Type##</td>
-                    </tr>
-                <!-- end table header -->
-
-                    {assign var="_nonmember" value=$SUBJECTS->getNonGroupMember($_REQUEST.id)}
-                    {foreach from=$_nonmember item=i}
-                        {if $i.login !== $_gname}
-                            {assign var="_loop" value=true}
-                            <!-- start item -->
-                            <tr class="{cycle values='blue1, blue2'}">
-                                <td><input type="checkbox" class="checkbox" name="{$i.id}"/></td>
-                                <td onClick="return contextmenu('login={urlencode str=$i.login}&gname={urlencode str=$_gname}', 'SUBJECTS.addSubj2Gr')">{$i.login}</td>
-                                <td style="border: 0; text-align: center"
-                                    onClick="return contextmenu('login={urlencode str=$i.login}&gname={urlencode str=$_gname}', 'SUBJECTS.removeSubjFromGr')">
-                                    {if $i.type|lower == 'u'}
-                                        <img src="img/user.gif" border="0" alt="User" />
-                                    {else}
-                                        <img src="img/group.gif" border="0" alt="Group" />
-                                    {/if}
-                                </td>
-                            </tr>
-                            <!-- end item -->
-                        {/if}
-                    {/foreach}
-
-                    {if $_loop != true}
-                        <tr><td colspan="3" align="center" style="border: 0">##Nothing left##</td></tr>
-                    {/if}
-                </form>
-                </table>
-            </div>
-            <div class="footer" style="width:250px;">
-                <a href="" onClick="collector_submit('NOGRP', 'SUBJECTS.addSubj2Gr&gname={urlencode str=$_gname}')" id="blue_head">##Add selected##</a>
-            </div>
-        </div>
-        <!-- end add group member -->
-    </div>
-
-    <input type="button" class="button_wide" value="##Back to overview##" onClick="location.href='{$UI_BROWSER}?act=SUBJECTS'">
-</div>
-
+{assign var="_gname" value=$SUBJECTS->Base->gb->getSubjName($_REQUEST.id)}
+
+<div class="container_elements" style="width: 607px;">
+    <h1>{tra 0='Manage Group: $1' 1=$_gname}</h1>
+
+    <div class="container_table" style="width: 594px;">
+
+        <!-- start current group member -->
+        <div class="container_elements" style="float: left">
+            <h1>##Current Members##</h1>
+            <div class="head" style="width:255px; height: 21px;">&nbsp;</div>
+            <div class="container_table" style="width:275px;">
+                <table style="width:255px;">
+                    <form name="GRP">
+                    <tr class="blue_head">
+                        <td style="width: 30px"><input type="checkbox" name="all" onClick="collector_switchAll('GRP')"></td>
+                        <td style="width: 164px">##Login##</td>
+                        <td style="width: 41px; border: 0; text-align: center">##Type##</td>
+                    </tr>
+
+                    {assign var="_member" value=$SUBJECTS->getGroupMember($_REQUEST.id)}
+                    {if (is_array($_member) && count($_member)>0)}
+                        {foreach from=$_member item="i"}
+                            <tr class="{cycle values='blue1, blue2'}">
+                                <td><input type="checkbox" class="checkbox" name="{$i.id}"/></td>
+                                <td onClick="return contextmenu('login={urlencode str=$i.login}&gname={urlencode str=$_gname}', 'SUBJECTS.removeSubjFromGr')">{$i.login}</td>
+                                <td style="border: 0; text-align: center"
+                                    onClick="return contextmenu('login={urlencode str=$i.login}&gname={urlencode str=$_gname}', 'SUBJECTS.removeSubjFromGr')">
+                                    {if $i.type|lower == 'u'}
+                                        <img src="img/user.png" border="0" alt="User" />
+                                    {else}
+                                        <img src="img/group.png" border="0" alt="Group" />
+                                    {/if}
+                                </td>
+                            </tr>
+                        {/foreach}
+                    {else}
+                        <tr><td colspan="3" align="center" style="border: 0">##No group members##</td></tr>
+                    {/if}
+                    </form>
+                </table>
+            </div>
+            <div class="footer" style="width:250px;">
+                <a href="" onClick="collector_submit('GRP', 'SUBJECTS.removeSubjFromGr&gname={urlencode str=$_gname}')" id="blue_head">##Remove selected##</a>
+            </div>
+        </div>
+        <!-- end current group member -->
+
+
+
+        <!-- start add group member -->
+        <div class="container_elements" style="float: right">
+            <h1>##Add Members##</h1>
+            <div class="head" style="width:255px; height: 21px;">&nbsp;</div>
+            <div class="container_table" style="width:275px;">
+                <table style="width:255px;">
+                <form name="NOGRP">
+                <!-- start table header -->
+                    <tr class="blue_head">
+                        <td style="width: 30px"><input type="checkbox" name="all" onClick="collector_switchAll('NOGRP')"></td>
+                        <td style="width: 164px">##Login##</td>
+                        <td style="width: 41px; border: 0">##Type##</td>
+                    </tr>
+                <!-- end table header -->
+
+                    {assign var="_nonmember" value=$SUBJECTS->getNonGroupMember($_REQUEST.id)}
+                    {foreach from=$_nonmember item=i}
+                        {if $i.login !== $_gname}
+                            {assign var="_loop" value=true}
+                            <!-- start item -->
+                            <tr class="{cycle values='blue1, blue2'}">
+                                <td><input type="checkbox" class="checkbox" name="{$i.id}"/></td>
+                                <td onClick="return contextmenu('login={urlencode str=$i.login}&gname={urlencode str=$_gname}', 'SUBJECTS.addSubj2Gr')">{$i.login}</td>
+                                <td style="border: 0; text-align: center"
+                                    onClick="return contextmenu('login={urlencode str=$i.login}&gname={urlencode str=$_gname}', 'SUBJECTS.removeSubjFromGr')">
+                                    {if $i.type|lower == 'u'}
+                                        <img src="img/user.png" border="0" alt="User" />
+                                    {else}
+                                        <img src="img/group.png" border="0" alt="Group" />
+                                    {/if}
+                                </td>
+                            </tr>
+                            <!-- end item -->
+                        {/if}
+                    {/foreach}
+
+                    {if $_loop != true}
+                        <tr><td colspan="3" align="center" style="border: 0">##Nothing left##</td></tr>
+                    {/if}
+                </form>
+                </table>
+            </div>
+            <div class="footer" style="width:250px;">
+                <a href="" onClick="collector_submit('NOGRP', 'SUBJECTS.addSubj2Gr&gname={urlencode str=$_gname}')" id="blue_head">##Add selected##</a>
+            </div>
+        </div>
+        <!-- end add group member -->
+    </div>
+
+    <input type="button" class="button_wide" value="##Back to overview##" onClick="location.href='{$UI_BROWSER}?act=SUBJECTS'">
+</div>
+

livesupport/modules/htmlUI/var/templates/subjects/overview.tpl

@@ -1,42 +1,42 @@
-<div class="container_elements" style="width: 607px;">
-    <h1>##User/Group Management##</h1>
-
-    <div class="container_table" style="width: 594px;">
-        <table style="width: 574px;">
-
-            <tr class="blue_head">
-                <td>##Login##</td>
-                <td style="width: 40px; text-align: center">##Members##</td>
-                <td style="width: 40px; border: 0; text-align: center">##Type##</td>
-            </tr>
-
-        {foreach from=$SUBJECTS->getSubjectsWCnt() item=i}
-            {if $i.type|lower == 'g'}{assign var="_type" value="group"}{else}{assign var="_type" value="user"}{/if}
-            <tr class="{cycle values='blue1, blue2'}"
-                onClick="return contextmenu('id={$i.id}&login={urlencode str=$i.login}', {if $i.type|lower eq 'g'}'SUBJECTS.manageGroupMember', {else}'SUBJECTS.chgPasswd', {/if} 'SUBJECTS.removeSubj')"
-            >
-                <td>{$i.login}</td>
-                <td style="width: 30px; text-align: center;">
-                    {if $i.type|lower == 'g'}
-                        {$i.cnt}
-                    {else}
-                        -
-                    {/if}
-                </td>
-                <td style="border: 0; text-align: center;"><img src="img/{$_type}.gif" border="0" alt="{$_type|capitalize}" /></td>
-
-            </tr>
-        {/foreach}
-
-        </table>
-
-        <br>
-        <div class="container_button">
-            <input type="button" class="button" value="##Add User##"  onclick="location.href='{$UI_BROWSER}?act=SUBJECTS.addUser'">
-            <input type="button" class="button" value="##Add Group##" onclick="location.href='{$UI_BROWSER}?act=SUBJECTS.addGroup'">
-        </div>
-
-    </div>
-</div>
-
-{assign var="_type" value=null}
+<div class="container_elements" style="width: 607px;">
+    <h1>##User/Group Management##</h1>
+
+    <div class="container_table" style="width: 594px;">
+        <table style="width: 574px;">
+
+            <tr class="blue_head">
+                <td>##Login##</td>
+                <td style="width: 40px; text-align: center">##Members##</td>
+                <td style="width: 40px; border: 0; text-align: center">##Type##</td>
+            </tr>
+
+        {foreach from=$SUBJECTS->getSubjectsWCnt() item=i}
+            {if $i.type|lower == 'g'}{assign var="_type" value="group"}{else}{assign var="_type" value="user"}{/if}
+            <tr class="{cycle values='blue1, blue2'}"
+                onClick="return contextmenu('id={$i.id}&login={urlencode str=$i.login}', {if $i.type|lower eq 'g'}'SUBJECTS.manageGroupMember', {else}'SUBJECTS.chgPasswd', {/if} 'SUBJECTS.removeSubj')"
+            >
+                <td>{$i.login}</td>
+                <td style="width: 30px; text-align: center;">
+                    {if $i.type|lower == 'g'}
+                        {$i.cnt}
+                    {else}
+                        -
+                    {/if}
+                </td>
+                <td style="border: 0; text-align: center;"><img src="img/{$_type}.png" border="0" alt="{$_type|capitalize}" /></td>
+
+            </tr>
+        {/foreach}
+
+        </table>
+
+        <br>
+        <div class="container_button">
+            <input type="button" class="button" value="##Add User##"  onclick="location.href='{$UI_BROWSER}?act=SUBJECTS.addUser'">
+            <input type="button" class="button" value="##Add Group##" onclick="location.href='{$UI_BROWSER}?act=SUBJECTS.addGroup'">
+        </div>
+
+    </div>
+</div>
+
+{assign var="_type" value=null}

livesupport/modules/htmlUI/var/ui_browser_init.php

@@ -20,7 +20,7 @@ $jscom->handler();
 
 
 ## load Smarty+filters ##############################################
-require_once  dirname(__FILE__).'/SmartyExtensions.inc.php';
+require_once  dirname(__FILE__).'/ui_smartyExtensions.inc.php';
 #$Smarty->load_filter('output', 'trimwhitespace');
 #$Smarty->load_filter('post', 'template_marker');
 $Smarty->load_filter('output', 'localizer');

livesupport/modules/htmlUI/var/ui_conf.php

@@ -141,7 +141,7 @@ require_once dirname(__FILE__).'/formmask/generic.inc.php';
 require_once dirname(__FILE__).'/ui_calendar.class.php';
 require_once dirname(__FILE__).'/ui_scheduler.class.php';
 require_once dirname(__FILE__).'/ui_subjects.class.php';
-require_once dirname(__FILE__).'/jscom.php';
+require_once dirname(__FILE__).'/ui_jscom.php';
 
 ## well known classes
 require_once 'DB.php';

livesupport/modules/htmlUI/var/ui_scheduler.class.php

@@ -525,7 +525,7 @@ class uiScheduler extends uiCalendar
     ## XML-RPC wrapper methods ############################################################################################
     function initXmlRpc()
     {
-        include_once dirname(__FILE__).'/SchedulerPhpClient.class.php';
+        include_once dirname(__FILE__).'/ui_schedulerPhpClient.class.php';
         $this->spc =& SchedulerPhpClient::factory($this->Base->dbc, $mdefs, $this->Base->config, FALSE, FALSE);
     }
 

livesupport/modules/htmlUI/var/ui_schedulerPhpClient.class.php

@@ -23,8 +23,8 @@
 
 
     Author   : $Author: sebastian $
-    Version  : $Revision: 1.3 $
-    Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/htmlUI/var/Attic/SchedulerPhpClient.class.php,v $
+    Version  : $Revision: 1.1 $
+    Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/htmlUI/var/ui_schedulerPhpClient.class.php,v $
 
 ------------------------------------------------------------------------------*/