*** empty log message ***
This commit is contained in:
parent
7b3a7bcb57
commit
4c8cca35b0
14 changed files with 69 additions and 75 deletions
|
@ -111,49 +111,20 @@ $mask = array(
|
|||
'label' => 'File format',
|
||||
'required' => TRUE,
|
||||
'options' => array(
|
||||
'' => '',
|
||||
'File' => 'File',
|
||||
'live stream' => 'Live Stream',
|
||||
'networked file'=> 'Networked File',
|
||||
),
|
||||
'attributes'=> array('disabled' => 'on'),
|
||||
'id3' => FALSE
|
||||
),
|
||||
array(
|
||||
'element' => 'dcterms:extent',
|
||||
'type' => 'text',
|
||||
'label' => 'Length',
|
||||
'attributes'=> array('readonly' => 'on'),
|
||||
'attributes'=> array('disabled' => 'on'),
|
||||
'id3' => FALSE
|
||||
),
|
||||
/*
|
||||
array(
|
||||
'element' => 'Format_Extent_h',
|
||||
'type' => 'select',
|
||||
'options' => getDArr('h'),
|
||||
'groupit' => TRUE
|
||||
),
|
||||
array(
|
||||
'element' => 'Format_Extent_m',
|
||||
'type' => 'select',
|
||||
'options' => getDArr('m'),
|
||||
'groupit' => TRUE
|
||||
),
|
||||
array(
|
||||
'element' => 'Format_Extent_s',
|
||||
'type' => 'select',
|
||||
'options' => getDArr('h'),
|
||||
'groupit' => TRUE
|
||||
),
|
||||
array(
|
||||
'group' => array('Main__Format_Extent_h', 'Main__Format_Extent_m', 'Main__Format_Extent_s'),
|
||||
#'name' => 'gr_Format_Extent',
|
||||
'label' => 'Format_Extent',
|
||||
'rule' => 'required',
|
||||
#'grouprule' => 'regex',
|
||||
#'format' => '/([1-9]0)|([1-9]{2})|(0[1-9])/',
|
||||
#'arg1' => 'Please enter Format_Extent',
|
||||
#'howmany' => 1
|
||||
), */
|
||||
),
|
||||
'Music' => array(
|
||||
array(
|
||||
|
@ -212,11 +183,11 @@ $mask = array(
|
|||
'type' => 'select',
|
||||
'label' => 'Format',
|
||||
'options' => array(
|
||||
'' => '',
|
||||
'File' => 'File',
|
||||
'live stream' => 'Live Stream',
|
||||
'networked file'=> 'Networked File'
|
||||
),
|
||||
'attributes'=> array('disabled' => 'on'),
|
||||
'id3' => FALSE
|
||||
),
|
||||
array(
|
||||
|
@ -237,7 +208,7 @@ $mask = array(
|
|||
'element' => 'dcterms:extent',
|
||||
'type' => 'text',
|
||||
'label' => 'Length',
|
||||
'attributes'=> array('readonly' => 'on'),
|
||||
'attributes'=> array('disabled' => 'on'),
|
||||
'id3' => FALSE
|
||||
),
|
||||
array(
|
||||
|
@ -486,11 +457,11 @@ $mask = array(
|
|||
'type' => 'select',
|
||||
'label' => 'Format',
|
||||
'options' => array(
|
||||
'' => '',
|
||||
'File' => 'File',
|
||||
'live stream' => 'Live Stream',
|
||||
'networked file'=> 'Networked File',
|
||||
)
|
||||
'File' => 'File',
|
||||
'live stream' => 'Live Stream',
|
||||
'networked file'=> 'Networked File'
|
||||
),
|
||||
'attributes'=> array('disabled' => 'on')
|
||||
),
|
||||
array(
|
||||
'element' => 'dc:contributor',
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
{include file="statusbar.tpl"}
|
||||
|
||||
{if $showMenuTop}
|
||||
{include file="menu_top.tpl"}
|
||||
{include file="menu.tpl"}
|
||||
{/if}
|
||||
|
||||
{if $structure}
|
||||
|
@ -34,12 +34,8 @@
|
|||
{include file="file/edit.tpl"}
|
||||
{/if}
|
||||
|
||||
{if $editMetaData}
|
||||
{include file="editMetaData.tpl"}
|
||||
{/if}
|
||||
|
||||
{if $changeStationPrefs}
|
||||
{include file="changeStationPrefs.tpl"}
|
||||
{include file="stationprefs.tpl"}
|
||||
{/if}
|
||||
|
||||
{if $PL_simpleManagement}
|
||||
|
@ -52,7 +48,7 @@
|
|||
{/if}
|
||||
|
||||
{if $SCRATCHPAD}
|
||||
{include file="scratchPad.tpl"}
|
||||
{include file="scratchpad.tpl"}
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
{assign var="_hour" value=$_Hour.hour}
|
||||
|
||||
<tr>
|
||||
<td onContextmenu="return menu('year={$_year}&month={$_month}&day={$_day}&hour={$_hour}', 'SCHEDULER.addItem')" bgcolor="grey" height="50" valign="top">
|
||||
<td onContextmenu="return contextmenu('year={$_year}&month={$_month}&day={$_day}&hour={$_hour}', 'SCHEDULER.addItem')" bgcolor="grey" height="50" valign="top">
|
||||
<a href="#" onClick="hpopup('{$UI_HANDLER}?act=SCHEDULER.set&hour={$_Hour.hour}')">{$_Hour.hour}</a>
|
||||
</td>
|
||||
|
||||
|
@ -41,7 +41,7 @@
|
|||
|
||||
{foreach from=$_usage item="_entry"}
|
||||
{if $_entry.pos >= $_Hour.timestamp && $_entry.pos < $_Hour.timestamp+3600}
|
||||
<td rowspan="{$_entry.span}" onContextmenu="return menu('gunid={$_entry.id}', 'SCHEDULER.removeItem')" valign="top" bgcolor="#ffcacb">
|
||||
<td rowspan="{$_entry.span}" onContextmenu="return contextmenu('gunid={$_entry.id}', 'SCHEDULER.removeItem')" valign="top" bgcolor="#ffcacb">
|
||||
<b>{$_entry.title}</b>
|
||||
{$_entry.start|regex_replace:"/[0-9]+T/":""|truncate:5:""}-{$_entry.end|regex_replace:"/[0-9]+T/":""|truncate:5:""}
|
||||
<br>
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
<table border="1" cellspacing="0" cellpadding="0">
|
||||
{foreach from=$_scale item="_hour"}
|
||||
<tr height="20" style="font-family: monospace;" valign="top">
|
||||
<td bgcolor="grey" onContextmenu="return menu('year={$_year}&month={$_month}&day={$_day}&hour={$_hour}', 'SCHEDULER.addItem')">
|
||||
<td bgcolor="grey" onContextmenu="return contextmenu('year={$_year}&month={$_month}&day={$_day}&hour={$_hour}', 'SCHEDULER.addItem')">
|
||||
<div style="padding: 1px">{$_hour|string_format:'%02d'}</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
@ -55,9 +55,9 @@
|
|||
<tr height="{$SCHEDULER->_oneOrMore($i.length/$_divisor)}" style="font-family: monospace;" valign="top">
|
||||
{if is_array($i.entry)}
|
||||
{if $i.length/$_divisor > $_minwidth}
|
||||
<td bgcolor="#ffcacb" width="70" onContextmenu="return menu('gunid={$i.entry.id}', 'SCHEDULER.removeItem')"><div style="padding: 1px"><small><b>{$_title}</b><br>{$_period}<br>{$_creator}</small></div></td>
|
||||
<td bgcolor="#ffcacb" width="70" onContextmenu="return contextmenu('gunid={$i.entry.id}', 'SCHEDULER.removeItem')"><div style="padding: 1px"><small><b>{$_title}</b><br>{$_period}<br>{$_creator}</small></div></td>
|
||||
{else}
|
||||
<td bgcolor="#ffcacb" width="70" onContextmenu="return menu('gunid={$i.entry.id}', 'SCHEDULER.removeItem')" onMouseover="mouseoverShow('<small><b>{$_title}</b><br>{$_period}<br>{$_creator}</small>')" onMouseout="mouseoverHide()"></td>
|
||||
<td bgcolor="#ffcacb" width="70" onContextmenu="return contextmenu('gunid={$i.entry.id}', 'SCHEDULER.removeItem')" onMouseover="mouseoverShow('<small><b>{$_title}</b><br>{$_period}<br>{$_creator}</small>')" onMouseout="mouseoverHide()"></td>
|
||||
{/if}
|
||||
{else}
|
||||
<td bgcolor="#97bacf" width="70"></td>
|
||||
|
|
|
@ -59,10 +59,10 @@
|
|||
}
|
||||
|
||||
function hpopup(url, name)
|
||||
{
|
||||
{ //, 'width=1, height=1'
|
||||
url = url + '&is_popup=1';
|
||||
popupwin = window.open(url, name, 'width=1, height=1');
|
||||
window.parent.focus();
|
||||
popupwin = window.open(url, name);
|
||||
//window.parent.focus();
|
||||
}
|
||||
{/literal}
|
||||
|
||||
|
|
|
@ -84,7 +84,7 @@ function contextmenu(param) {
|
|||
break;
|
||||
|
||||
case "delete":
|
||||
contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='{$UI_HANDLER}?act=delete&id="+param+"'"+oF+"> !Delete Item! </a></li>";
|
||||
contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"hpopup('{$UI_HANDLER}?act=delete&id="+param+"')\" "+oF+"> !Delete Item! </a></li>";
|
||||
break;
|
||||
|
||||
case "fileList":
|
||||
|
|
|
@ -39,17 +39,22 @@
|
|||
<!-- end station time -->
|
||||
<!-- start what playing -->
|
||||
<div class="whatplaying">
|
||||
{* {$SCHEDULER->getNowNextClip()} *}
|
||||
<div class="nowplaying">Now Playing: Don Quixote</div>
|
||||
<div class="scala">
|
||||
<div class="scala_in" style="width: 100px;"> </div>
|
||||
</div>
|
||||
<div class="time">
|
||||
<div class="left">Elapsed:<strong>00:05:24</strong></div>
|
||||
<div class="right">Remaining:<strong>00:02:05</strong></div>
|
||||
</div>
|
||||
{assign var='_nowplaying' value=$SCHEDULER->getNowNextClip()}
|
||||
{assign var='_nextplaying' value=$SCHEDULER->getNowNextClip(1)}
|
||||
{if $_nowplaying}
|
||||
<div class="nowplaying">Now Playing: {$_nowplaying.title}</div>
|
||||
<div class="scala">
|
||||
<div class="scala_in" style="width: {$_nowplaying.percentage}%;"> </div>
|
||||
</div>
|
||||
<div class="time">
|
||||
<div class="left">Elapsed: <strong>{$_nowplaying.elapsed|truncate:8:""}</strong></div>
|
||||
<div class="right">Remaining: <strong>{$_nowplaying.remaining|truncate:8:""}</strong></div>
|
||||
</div>
|
||||
{/if}
|
||||
<div class="clearer"></div>
|
||||
<p>Playing Next: Diego Diego 00:03:25</p>
|
||||
{if $_nextplaying}
|
||||
<p>Playing Next: {$_nextplaying.title} {$_nextplaying.duration|truncate:8:""}</p>
|
||||
{/if}
|
||||
</div>
|
||||
<!-- end what playing -->
|
||||
</div>
|
||||
|
|
|
@ -3,7 +3,7 @@ define('UI_VERBOSE', FALSE);
|
|||
define('UI_WARNING', TRUE);
|
||||
define('UI_ERROR', TRUE);
|
||||
#define('UI_TIMEZONE', ' +100');
|
||||
define('UI_TIMEZONEOFFSET', date('Z'));
|
||||
define('UI_TIMEZONEOFFSET', date('Z'));
|
||||
|
||||
define('UI_HANDLER', 'ui_handler.php');
|
||||
define('UI_BROWSER', 'ui_browser.php');
|
||||
|
@ -34,6 +34,9 @@ define('UI_MDATA_KEY_TITLE', 'dc:title');
|
|||
define('UI_MDATA_KEY_CREATOR', 'dc:creator');
|
||||
define('UI_MDATA_KEY_DURATION', 'dcterms:extent');
|
||||
define('UI_MDATA_KEY_URL', 'ls:url');
|
||||
define('UI_MDATA_KEY_FORMAT', 'dc:format');
|
||||
define('UI_MDATA_VALUE_FORMAT_FILE', 'File');
|
||||
define('UI_MDATA_VALUE_FORMAT_STREAM', 'live stream');
|
||||
|
||||
## Simple Search Preferences
|
||||
define('UI_SIMPLESEARCH_FILETYPE', 'File');
|
||||
|
|
|
@ -186,7 +186,8 @@ class uiHandler extends uiBase {
|
|||
$s = $ia['playtime_seconds'];
|
||||
$extent = date('H:i:s', floor($s)-date('Z')).substr(number_format($s, 6), strpos(number_format($s, 6), '.'));
|
||||
$this->_setMdataValue($id, UI_MDATA_KEY_DURATION, $extent);
|
||||
|
||||
$this->gb->setMDataValue($r, UI_MDATA_KEY_FORMAT, $this->sessid, UI_MDATA_VALUE_FORMAT_FILE);
|
||||
|
||||
foreach ($mask['pages'] as $key=>$val) {
|
||||
foreach ($mask['pages'][$key] as $k=>$v) {
|
||||
if ($v['id3'] != FALSE) {
|
||||
|
@ -232,6 +233,7 @@ class uiHandler extends uiBase {
|
|||
$length = sprintf('%02d', $formdata['length']['H']).':'.sprintf('%02d', $formdata['length']['i']).':'.sprintf('%02d', $formdata['length']['s']).'.000000';
|
||||
$this->gb->setMDataValue($r, UI_MDATA_KEY_TITLE, $this->sessid, $formdata['title']);
|
||||
$this->gb->setMDataValue($r, UI_MDATA_KEY_DURATION, $this->sessid, $length);
|
||||
$this->gb->setMDataValue($r, UI_MDATA_KEY_FORMAT, $this->sessid, UI_MDATA_VALUE_FORMAT_STREAM);
|
||||
$this->redirUrl = UI_BROWSER."?act=editWebstream&id=$r";
|
||||
$this->_retMsg('Stream Data saved');
|
||||
return $r;
|
||||
|
@ -361,14 +363,17 @@ class uiHandler extends uiBase {
|
|||
*/
|
||||
function delete($id, $delOverride=FALSE)
|
||||
{
|
||||
$this->redirUrl = UI_BROWSER."?act=fileList&id=".$this->pid;
|
||||
#$this->redirUrl = UI_BROWSER."?act=fileList&id=".$this->pid;
|
||||
$this->redirUrl = UI_BROWSER."?popup[]=_reload_parent&popup[]=_close";
|
||||
|
||||
/* no folder support yet
|
||||
if (!($delOverride==$id) && (count($this->gb->getObjType($id)=='Folder'?
|
||||
$this->gb->listFolder($id, $this->sessid):NULL))) {
|
||||
$this->_retMsg("Folder is not empty. You can override this protection by clicking DEL again");
|
||||
$this->redirUrl = UI_BROWSER."?act=fileList&id=".$this->pid."&delOverride=$id";
|
||||
return FALSE;
|
||||
}
|
||||
*/
|
||||
|
||||
if ($this->gb->getFileType($id)=='playlist') {
|
||||
$r = $this->gb->deletePlaylist($id, $this->sessid);
|
||||
|
|
|
@ -143,7 +143,7 @@ class uiPlaylist
|
|||
foreach ($elemIds as $elemId) {
|
||||
$r = $this->Base->gb->addAudioClipToPlaylist($this->token, $elemId, $this->Base->sessid);
|
||||
if (PEAR::isError($r)) {
|
||||
if (UI_VERBOSE) print_r($r);
|
||||
#print_r($r);
|
||||
$this->Base->_retMsg('Error on add item to Playlist');
|
||||
return FALSE;
|
||||
}
|
||||
|
|
|
@ -205,6 +205,27 @@ class uiScheduler extends uiCalendar
|
|||
}
|
||||
|
||||
|
||||
function getNowNextClip($distance=0)
|
||||
{
|
||||
$datetime = strftime('%Y-%m-%dT%H:%M:%S');
|
||||
$xmldatetime = str_replace('-', '', $datetime);
|
||||
$pl = $this->displayScheduleMethod($xmldatetime, $xmldatetime);
|
||||
if(count($pl) == 0)
|
||||
return FALSE;
|
||||
$pl = current($pl);
|
||||
$offset = strftime('%H:%M:%S', $this->_strtotime($datetime) - $this->_datetime2timestamp($pl['start']) - UI_TIMEZONEOFFSET);
|
||||
$clip = $this->Base->gb->displayPlaylistClipAtOffset($this->Base->sessid, $pl['playlistId'], $offset, $distance);
|
||||
|
||||
return array(
|
||||
'title' => $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($clip['gunid']), UI_MDATA_KEY_TITLE),
|
||||
'duration' => $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($clip['gunid']), UI_MDATA_KEY_DURATION),
|
||||
'elapsed' => $clip['elapsed'],
|
||||
'remaining' => $clip['remaining'],
|
||||
'percentage'=> 50
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
function _copyPlFromSP()
|
||||
{
|
||||
foreach ($this->Base->SCRATCHPAD->get() as $val) {
|
||||
|
@ -217,13 +238,6 @@ class uiScheduler extends uiCalendar
|
|||
}
|
||||
|
||||
|
||||
function getNowNextClip()
|
||||
{
|
||||
$playingNow = $this->GeneratePlayReportMethod(strftime('%Y%m%dT%H:%M:%S'), strftime('%Y%m%dT%H:%M:%S'));
|
||||
#print_r ($playingNow);
|
||||
}
|
||||
|
||||
|
||||
function _oneOrMore($in)
|
||||
{
|
||||
return $id < 1 ? ceil($in) : round($in);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue