*** empty log message ***

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

@@ -17,16 +17,16 @@
             <!-- 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"}>
+                    <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"}>{$i.creator}</td>
+                    <td {include file="library/actionhandler.tpl"} style="cursor: pointer">{$i.creator}</td>
-                    <td {include file="library/actionhandler.tpl"} style="text-align: right">{assign var="_duration" value=$i.duration}{niceTime in=$_duration}</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">
+                    <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>

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')"

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

@@ -33,7 +33,7 @@
                         <!-- 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">##Fade## {$i.fadein_ms|string_format:"%d"} ms</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>
@@ -55,7 +55,7 @@
                         <!-- 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">##Fade## {$i.fadeout_ms|string_format:"%d"} ms</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'}">

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();

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

@@ -33,7 +33,7 @@
 
             {if is_array($_entrys[$_hour])}
                 <tr class="blue1">
-                    <td style="border-left:  1px solid #ccc;" {include file="scheduler/day_additem.tpl"}>{$_hour|string_format:"%02d"}:00</td>
+                    <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 *}

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}

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

@@ -1 +1,2 @@
+style="cursor: pointer"
 onClick="hidealttext(); return contextmenu('scheduleId={$i.scheduleid}', 'SCHEDULER.removeItem')"

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}

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

@@ -23,17 +23,17 @@
                 <!-- start item -->
                 <tr class="{cycle values='blue1, blue2'}">
                     <td><input type="checkbox" class="checkbox" name="{$i.id}"/></td>
-                    <td {include file="scratchpad/actionhandler.tpl"}>
+                    <td {include file="scratchpad/actionhandler.tpl"} style="cursor: pointer">
                         {if $i.type|lower == "playlist"}
                             {if $PL->isAvailable($i.id) == false}
-                                <div style="text-decoration : line-through">
+                                <div style="text-decoration: line-through; cursor: pointer">
                             {else}
-                                <div>
+                                <div style="cursor: pointer">
                             {/if}
                             {if $_PL_activeId == $i.id}
-                                <div style="font-weight : bold">
+                                <div style="font-weight: bold; cursor: pointer">
                             {else}
-                                <div>
+                                <div style="cursor: pointer">
                             {/if}
                                 {$i.title|truncate:12:'...':true}
                             </div></div>
@@ -41,8 +41,8 @@
                             {$i.title|truncate:12:'...':true}
                         {/if}                                         {* on some reason object call doesn´t like usage of array *}
                     </td>                                             {assign var="_duration" value=$i.duration}
-                    <td {include file="scratchpad/actionhandler.tpl"} style="text-align: right">{niceTime in=$_duration}</td>
+                    <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">
+                    <td {include file="scratchpad/actionhandler.tpl"} style="border: 0; text-align: center; cursor: pointer">
                         <img src="img/{$i.type}.gif" border="0" alt="{$i.type|capitalize}" {include file="sub/mouseover.tpl"} />
                     </td>
                 </tr>

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

@@ -1,174 +1,67 @@
-<SCRIPT LANGUAGE="JavaScript">
+<script language="javascript">
-<!-- Original:  Tomleung (lok_2000_tom@hotmail.com) This tag should not be removed-->
-<!--Server time ticking clock v2.0 Updated by js-x.com-->
-<!-- server time ticking clock modified for livesupport.campware.org using above script-->
-
 {literal}
-function twoDigit(_v)
+function twoDigit(i) {
-{
+    i = Math.round(i);
-  _v = Math.round(_v);
+    if(i < 10) i = "0" + i;
-  if(_v<10) _v="0"+_v;
+
-  return _v;
+    return i;
-}
-function MakeArrayday(size)
-{
-  this.length = size;
-  for(var i = 1; i <= size; i++)
-    this[i] = "";
-  return this;
-}
-function MakeArraymonth(size)
-{
-  this.length = size;
-  for(var i = 1; i <= size; i++)
-    this[i] = "";
-  return this;
 }
 
-var hours;
+
-var minutes;
+function pre0_myClock(y, m, d, h, i ,s, interval) {
-var seconds;
+    pre0_clock = new Array();
-var timer=null;
+    pre0_clock['interval']  = interval;
-function sClock()
+    pre0_clock['time']      = new Date(y, m, d, h, i ,s);
-{
+    pre0_clock['run']       = setInterval("pre0_incClock();", pre0_clock['interval']);
-  sinterval = 1000;      // milliseconds
-  {/literal}
-  hours   = {$smarty.now|date_format:"%H"|string_format:"%d"};
-  minutes = {$smarty.now|date_format:"%M"|string_format:"%d"};
-  seconds = {$smarty.now|date_format:"%S"|string_format:"%d"};
-  {literal}
-  if(timer){clearInterval(timer);timer=null;}
-  timer=setInterval("work();", sinterval);
 }
 
-function work()
+function pre0_incClock() {
-{
+    pre0_clock['time'].setTime(pre0_clock['time'].getTime() + pre0_clock['interval']);
-  if (!document.layers && !document.all && !document.getElementById) return;
+    document.getElementById("servertime").innerHTML = twoDigit(pre0_clock['time'].getHours()) + ":" + twoDigit(pre0_clock['time'].getMinutes()) + ":" + twoDigit(pre0_clock['time'].getSeconds());
-  var runTime = new Date();
+}
-  var shours = hours;
-  var sminutes = minutes;
-  var sseconds = seconds;
 
-  //if (shours >= 12)
-  //{
-  //  dn = "PM";              //change here for 12h format//
-  //  shours-=12;
-  //}
-  //if (!shours) shours = 12;
-  //var dn = "AM";
-  var dn= ''
 
-  sminutes=twoDigit(sminutes);
+function elapsed_myClock(y, m, d, h, i, s, interval) {
-  sseconds=twoDigit(sseconds);
+    elapsed_clock = new Array();
-  shours  =twoDigit(shours  );
+    elapsed_clock['interval']  = interval;
-  movingtime = ""+ shours + ":" + sminutes +":"+sseconds+"" + dn;
+    elapsed_clock['time']      = new Date(y, m, d, h, i, s);
-  if (document.getElementById)
+    elapsed_clock['run']       = setInterval("elapsed_incClock();", elapsed_clock['interval']);
-    document.getElementById("servertime").innerHTML=movingtime;
+}
-  else if (document.layers)
-  {
-    document.layers.clock.document.open();
-    document.layers.clock.document.write(movingtime);
-    document.layers.clock.document.close();
-  }
-  else if (document.all)
-    clock.innerHTML = movingtime;
 
-  if((seconds=seconds + sinterval/1000)>59)
+function elapsed_incClock() {
-  {
+    elapsed_clock['time'].setTime(elapsed_clock['time'].getTime() + elapsed_clock['interval']);
-    seconds=0;
+    document.getElementById("nowplaying_elapsed").innerHTML = twoDigit(elapsed_clock['time'].getHours()) + ":" + twoDigit(elapsed_clock['time'].getMinutes()) + ":" + twoDigit(elapsed_clock['time'].getSeconds());
-    if(++minutes>59)
+}
-    {
+
-      minutes=0;
+
-      if(++hours>23)
+function remaining_myClock(y, m, d, h, i, s, interval) {
-      {
+    remaining_clock = new Array();
-        hours=0;
+    remaining_clock['interval']  = interval;
-      }
+    remaining_clock['time']      = new Date(y, m, d, h, i, s);
+    remaining_clock['run']       = setInterval("remaining_incClock();", remaining_clock['interval']);
+}
+
+function remaining_incClock() {
+    remaining_clock['time'].setTime(remaining_clock['time'].getTime() - remaining_clock['interval']);
+    document.getElementById("nowplaying_remaining").innerHTML = twoDigit(remaining_clock['time'].getHours()) + ":" + twoDigit(remaining_clock['time'].getMinutes()) + ":" + twoDigit(remaining_clock['time'].getSeconds());
+
+    if (remaining_clock['time'].getHours() == 0 && remaining_clock['time'].getMinutes() == 0 && remaining_clock['time'].getSeconds() == 0) {
+        clearInterval(elapsed_clock['run']);
+        clearInterval(remaining_clock['run']);
+        document.getElementById("onair").innerHTML       = '<img src="img/el_offair.gif" alt="off air">';
+        document.getElementById("whatplaying").innerHTML = '';
     }
-  }
-}
-</script>
-
-<SCRIPT LANGUAGE="JavaScript">
-<!-- Original:  Tomleung (lok_2000_tom@hotmail.com) This tag should not be removed-->
-<!-- Local time ticking clock modified for livesupport.campware.org using above script-->
-function lMakeArrayday(size)
-{
-  this.length = size;
-  for(var i = 1; i <= size; i++)
-    this[i] = "";
-  return this;
-}
-function lMakeArraymonth(size)
-{
-  this.length = size;
-  for(var i = 1; i <= size; i++)
-    this[i] = "";
-  return this;
 }
 
-var lhours;
-var lminutes;
-var lseconds;
-var ltimer=null;
-function lClock()
-{
-  linterval = 1000;      // milliseconds
-  var tDate = new Date();
-  lhours   = tDate.getHours();
-  lminutes = tDate.getMinutes();
-  lseconds = tDate.getSeconds();
-  if(ltimer){clearInterval(ltimer);ltimer=null;}
-  ltimer=setInterval("lwork();", linterval);
-}
-
-function lwork()
-{
-  if (!document.layers && !document.all && !document.getElementById) return;
-  var runTime = new Date();
-  var shours = lhours;
-  var sminutes = lminutes;
-  var sseconds = lseconds;
-
-  //if (shours >= 12)
-  //{
-  //  dn = "PM";              //change here for 12h format//
-  //  shours-=12;
-  //}
-  //if (!shours) shours = 12;
-  //var dn = "AM";
-  var dn= ''
-
-  sminutes=twoDigit(sminutes);
-  sseconds=twoDigit(sseconds);
-  shours  =twoDigit(shours  );
-  movingtime = ""+ shours + ":" + sminutes +":"+sseconds+"" + dn;
-  if (document.getElementById)
-    document.getElementById("localtime").innerHTML=movingtime;
-  else if (document.layers)
-  {
-    document.layers.clock.document.open();
-    document.layers.clock.document.write(movingtime);
-    document.layers.clock.document.close();
-  }
-  else if (document.all)
-    clock.innerHTML = movingtime;
-
-  if((lseconds=lseconds + linterval/1000)>59)
-  {
-    lseconds=0;
-    if(++lminutes>59)
-    {
-      lminutes=0;
-      if(++lhours>23)
-      {
-        lhours=0;
-      }
-    }
-  }
-}
 {/literal}
 
-sClock();
+pre0_myClock({$smarty.now|date_format:"%Y, %m, %d, %H, %M, %S"}, 1000);
-{* lClock(); *}
+
+{if (is_array($_nowplaying.duration))}
+    elapsed_myClock  ({$smarty.now|date_format:"%Y, %m, %d"}, {$_nowplaying.elapsed.h},   {$_nowplaying.elapsed.m},   {$_nowplaying.elapsed.s|truncate:2:""},   100);
+    remaining_myClock({$smarty.now|date_format:"%Y, %m, %d"}, {$_nowplaying.remaining.h}, {$_nowplaying.remaining.m}, {$_nowplaying.remaining.s|truncate:2:""}, 100);
+{/if}
+
 </script>
 
+

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

@@ -20,7 +20,7 @@
             </div>
             <!-- end station information -->
             <!-- start onair information -->
-            <div class="onair">
+            <div class="onair" id="onair">
                 {if $_nowplaying}
                     <img src="img/el_onair.gif" alt="on air" />
                 {else}
@@ -31,7 +31,7 @@
             <!-- start station time -->
             <div class="stationtime">
                 <h1>##Station Time##</h1>
-                <div class="time"><span id=servertime class="clock" style="position:relative;">{$smarty.now|date_format:"%H:%M:%S"}</span>
+                <div class="time"><span id="servertime" class="clock" style="position:relative;">{$smarty.now|date_format:"%H:%M:%S"}</span>
                     <div class="timezone">cet</div>
                 </div>
                 {*
@@ -44,15 +44,15 @@
             </div>
             <!-- end station time -->
             <!-- start what playing -->
-            <div class="whatplaying">
+            <div class="whatplaying" id="whatplaying">
                 {if $_nowplaying}
                     <div class="nowplaying">Now Playing: {$_nowplaying.title}</div>
                     <div class="scala">
                         <div class="scala_in" style="width: {$_nowplaying.percentage}%;">&nbsp;</div>
                     </div>
                     <div class="time">
-                        <div class="left">Elapsed: <strong>{$_nowplaying.elapsed|truncate:8:""}</strong></div>
+                        <div class="left">Elapsed:    <strong id="nowplaying_elapsed">{$_nowplaying.elapsed.h}:{$_nowplaying.elapsed.m}:{$_nowplaying.elapsed.s|truncate:2:""}</strong></div>
-                        <div class="right">Remaining: <strong>{$_nowplaying.remaining|truncate:8:""}</strong></div>
+                        <div class="right">Remaining: <strong id="nowplaying_remaining">{$_nowplaying.remaining.h}:{$_nowplaying.remaining.m}:{$_nowplaying.remaining.s|truncate:2:""}</strong></div>
                     </div>
                 {/if}
                 <div class="clearer"></div>

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);

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),
+                'duration'  => $duration,
-                'elapsed'   => $clip['elapsed'],
+                'elapsed'   => $elapsed,
-                'remaining' => $clip['remaining'],
+                'remaining' => $remaining,
                 'percentage'=> 100 * $this->Base->gb->_plTimeToSecs($clip['elapsed']) / ( $this->Base->gb->_plTimeToSecs($clip['elapsed']) + $this->Base->gb->_plTimeToSecs($clip['remaining']))
                );
     }