*** empty log message ***

This commit is contained in:
sebastian 2005-04-29 15:00:49 +00:00
parent 1dc66e71a3
commit 8cff2c1d3c
15 changed files with 104 additions and 85 deletions

View file

@ -677,8 +677,12 @@ $ui_fmask = array(
'groupit' => TRUE 'groupit' => TRUE
), ),
array( array(
'group' => array('duration', 'switchdown', 'switchup'), 'group' => array('duration'),
'label' => 'Duration' 'label' => 'Duration (ms)'
),
array(
'group' => array('switchdown', 'switchup'),
'label' => ' '
), ),
array( array(
'element' => 'cancel', 'element' => 'cancel',

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<language> <language>
<status />
<Id>en_GB</Id> <Id>en_GB</Id>
<item> <item>
<key>Are you sure to delete file &quot;$1&quot;?</key> <key>Are you sure to delete file &quot;$1&quot;?</key>
@ -12,7 +11,7 @@
</item> </item>
<item> <item>
<key>Are you sure to delete active Playlist?</key> <key>Are you sure to delete active Playlist?</key>
<value /> <value>Are you sure to delete open Playlist?</value>
</item> </item>
<item> <item>
<key>Are you sure to logout $1?</key> <key>Are you sure to logout $1?</key>
@ -44,7 +43,7 @@
</item> </item>
<item> <item>
<key>Already active Playlist</key> <key>Already active Playlist</key>
<value>Already active playlist.</value> <value>Already open playlist.</value>
</item> </item>
<item> <item>
<key>Audioclip Data saved</key> <key>Audioclip Data saved</key>
@ -132,7 +131,7 @@
</item> </item>
<item> <item>
<key>No Item(s) selected</key> <key>No Item(s) selected</key>
<value>No file(s) selected.</value> <value>No files selected.</value>
</item> </item>
<item> <item>
<key>No Playlist is locked by You.</key> <key>No Playlist is locked by You.</key>
@ -140,7 +139,7 @@
</item> </item>
<item> <item>
<key>Note: Station Preferences not setup proberly.</key> <key>Note: Station Preferences not setup proberly.</key>
<value>Note: Station Preferences not setup proberly.</value> <value>Note: Station Preferences not setup properly.</value>
</item> </item>
<item> <item>
<key>Old password was incorrect.</key> <key>Old password was incorrect.</key>
@ -244,11 +243,11 @@
</item> </item>
<item> <item>
<key>Add file(s) to ScratchPad</key> <key>Add file(s) to ScratchPad</key>
<value>Add file(s) to ScratchPad</value> <value>Add files to ScratchPad</value>
</item> </item>
<item> <item>
<key>Add file(s) to active Playlist</key> <key>Add file(s) to active Playlist</key>
<value>Add file(s) to active Playlist</value> <value>Add files to open Playlist</value>
</item> </item>
<item> <item>
<key>Add to ScratchPad</key> <key>Add to ScratchPad</key>
@ -256,7 +255,7 @@
</item> </item>
<item> <item>
<key>Add to active Playlist</key> <key>Add to active Playlist</key>
<value>Add to active Playlist</value> <value>Add to open Playlist</value>
</item> </item>
<item> <item>
<key>Album</key> <key>Album</key>
@ -596,11 +595,11 @@
</item> </item>
<item> <item>
<key>New Playlist using this File</key> <key>New Playlist using this File</key>
<value>New playlist using this file</value> <value>New playlist using file</value>
</item> </item>
<item> <item>
<key>New Playlist using this file(s)</key> <key>New Playlist using this file(s)</key>
<value>New playlist using this file(s)</value> <value>New playlist using files</value>
</item> </item>
<item> <item>
<key>New empty Playlist</key> <key>New empty Playlist</key>
@ -696,7 +695,7 @@
</item> </item>
<item> <item>
<key>Remove file(s)</key> <key>Remove file(s)</key>
<value>Remove file(s)</value> <value>Remove files</value>
</item> </item>
<item> <item>
<key>Remove from Scratchpad</key> <key>Remove from Scratchpad</key>

View file

@ -33,22 +33,24 @@
{if is_array($_entrys[$_hour])} {if is_array($_entrys[$_hour])}
<tr class="blue1"> <tr class="blue1">
<td style="border-left: 1px solid #ccc;" {include file="scheduler/day_onclick.tpl"}>{$_hour|string_format:"%02d"}:00</td> <td style="border-left: 1px solid #ccc;" {include file="scheduler/day_additem.tpl"}>{$_hour|string_format:"%02d"}:00</td>
<td style="border-right: 1px solid #ccc;"> <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 *} {foreach from=$_entrys[$_hour] item="i"} {* hier werden die Einträge welche in der jeweil. h beginnen durchlaufen *}
<div {include file="scheduler/day_onclick.tpl"}> <div {include file="scheduler/removeitem.tpl"}>
<b>{$i.title}</b> <img src="img/playlist.gif" border="0" {include file="sub/mouseover.tpl"}>
{$i.start}-{$i.end} &nbsp;
{$i.creator} <b>{$i.title}</b>
{$i.start}-{$i.end}
{$i.creator}
</div> </div>
{* <div style="background-color: #FF6F1F; height: 3px" onClick="return contextmenu('year={$SCHEDULER->curr.year}&month={$SCHEDULER->curr.month}&day={$SCHEDULER->curr.day}&hour={getHour time=$i.end}&minute={getMinute time=$i.end}&second={getSecond time=$i.end plus=1}', 'SCHEDULER.addItem')"></div> *} {* <div style="background-color: #FF6F1F; height: 3px" {include file="scheduler/week_additem.tpl"}></div> *}
{/foreach} {/foreach}
</td> </td>
</tr> </tr>
{else} {else}
<tr class="blue2" {include file="scheduler/day_onclick.tpl"}> <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-left: 1px solid #ccc;">{$_hour|string_format:"%02d"}:00</td>
<td style="border-right: 1px solid #ccc;"></td> <td style="border-right: 1px solid #ccc;"></td>
</tr> </tr>

View file

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

View file

@ -31,7 +31,7 @@
<td class="firstrow_secondcol" style="border-left: 1px solid #ccc"></td> <td class="firstrow_secondcol" style="border-left: 1px solid #ccc"></td>
{foreach from=$SCHEDULER->Week item="_Day"} {* hier werden die Tagesnummern angezeigt *} {foreach from=$SCHEDULER->Week item="_Day"} {* hier werden die Tagesnummern angezeigt *}
<td class="date_secondcol"> <td class="date_secondcol">
<a href="#" {include file="scheduler/week_onclick.tpl"}><b>{$_Day.day}</b></a> <a href="#" {include file="scheduler/week_additem.tpl"}><b>{$_Day.day}</b></a>
</td> </td>
<td class="day_secondcol"></td> <td class="day_secondcol"></td>
{/foreach} {/foreach}
@ -46,20 +46,22 @@
<td class="firstrow" style="border-left: 1px solid #ccc">{$_hour}</td> <td class="firstrow" style="border-left: 1px solid #ccc">{$_hour}</td>
{foreach from=$SCHEDULER->Week item="_day"} {foreach from=$SCHEDULER->Week item="_day"}
{if is_array($_entrys[$_day.day][$_hour])} {if is_array($_entrys[$_day.day][$_hour])}
<td class="date_full" {include file="scheduler/week_onclick.tpl"}></td> <td class="date_full" {include file="scheduler/week_additem.tpl"}></td>
<td class="day_full"> <td class="day_full">
{foreach from=$_entrys[$_day.day][$_hour] item="i"} {foreach from=$_entrys[$_day.day][$_hour] item="i"}
<div {include file="scheduler/actionhandler.tpl"}> <div {include file="scheduler/removeitem.tpl"}>
<h2>{$i.title|truncate:12}</h2> <img src="img/playlist.gif" border="0" {include file="sub/mouseover.tpl"}>
<p>{$i.start|truncate:8:""} - {$i.end|truncate:8:""}</p> &nbsp;
<p>{$i.creator}</p> <h2>{$i.title|truncate:12}</h2>
<p>{$i.start|truncate:8:""} - {$i.end|truncate:8:""}</p>
<p>{$i.creator}</p>
</div> </div>
{* <div style="background-color: #FF6F1F; height: 3px" {$_onClick}></div> *} {* <div style="background-color: #FF6F1F; height: 3px" {include file="scheduler/week_additem.tpl"}></div> *}
{/foreach} {/foreach}
</td> </td>
{else} {else}
<td class="date" {include file="scheduler/week_onclick.tpl"}></td> <td class="date" {include file="scheduler/week_additem.tpl"}></td>
<td class="day" {include file="scheduler/week_onclick.tpl"}></td> <td class="day" {include file="scheduler/week_additem.tpl"}></td>
{/if} {/if}
{/foreach} {/foreach}
</tr> </tr>

View file

@ -25,7 +25,7 @@
<td><input type="checkbox" class="checkbox" name="{$i.id}"/></td> <td><input type="checkbox" class="checkbox" name="{$i.id}"/></td>
<td {include file="scratchpad/actionhandler.tpl"}> <td {include file="scratchpad/actionhandler.tpl"}>
{if $i.type|lower == "playlist"} {if $i.type|lower == "playlist"}
{if $PL->isAvailable($i.id) == FALSE} {if $PL->isAvailable($i.id) == false}
<div style="text-decoration : line-through"> <div style="text-decoration : line-through">
{else} {else}
<div> <div>

View file

@ -25,7 +25,7 @@
//return false; //return false;
} }
function showalttextthan(e) { // alert("now"); function showalttextthan(e) {
if (ie5) { if (ie5) {
if (event.clientX + contextmenuWidth > document.body.clientWidth) xPos = event.clientX - contextmenuWidth + document.body.scrollLeft; if (event.clientX + contextmenuWidth > document.body.clientWidth) xPos = event.clientX - contextmenuWidth + document.body.scrollLeft;
else xPos = event.clientX + document.body.scrollLeft; else xPos = event.clientX + document.body.scrollLeft;
@ -65,17 +65,17 @@
<style type="text/css"> <style type="text/css">
#alttext { #alttext {
font-size : 80%; font-size : 80%;
float: left; float: left;
width: 200px; width: 200px;
list-style: none; list-style: none;
line-height: 20px; line-height: 16px;
padding: 4px; padding: 4px;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
display: block; display: block;
clear: left; clear: left;
background: yellow; background: #FFFACD;
border: 1px solid #ACB3BA; border: 1px solid #ACB3BA;
} }
</style> </style>
{/literal} {/literal}

View file

@ -49,15 +49,15 @@
break; break;
case "PL.changeFadeIn": case "PL.changeFadeIn":
contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href=\"javascript: popup('{$UI_BROWSER}?popup[]=PL.changeTransition&type=fadeIn&id="+param+"', 'PL', '400', '100')\" "+oF+">&nbsp;##Change Fadein##&nbsp;</a></li>"; contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href=\"javascript: popup('{$UI_BROWSER}?popup[]=PL.changeTransition&type=fadeIn&id="+param+"', 'PL', '400', '150')\" "+oF+">&nbsp;##Change Fadein##&nbsp;</a></li>";
break; break;
case "PL.changeTransition": case "PL.changeTransition":
contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href=\"javascript: popup('{$UI_BROWSER}?popup[]=PL.changeTransition&type=transition&id="+param+"', 'PL', '400', '100')\" "+oF+">&nbsp;##Change Transition##&nbsp;</a></li>"; contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href=\"javascript: popup('{$UI_BROWSER}?popup[]=PL.changeTransition&type=transition&id="+param+"', 'PL', '400', '150')\" "+oF+">&nbsp;##Change Transition##&nbsp;</a></li>";
break; break;
case "PL.changeFadeOut": case "PL.changeFadeOut":
contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href=\"javascript: popup('{$UI_BROWSER}?popup[]=PL.changeTransition&type=fadeOut&id="+param+"', 'PL', '400', '100')\" "+oF+">&nbsp;##Change Fadeout##&nbsp;</a></li>"; contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href=\"javascript: popup('{$UI_BROWSER}?popup[]=PL.changeTransition&type=fadeOut&id="+param+"', 'PL', '400', '150')\" "+oF+">&nbsp;##Change Fadeout##&nbsp;</a></li>";
break; break;
case "SP.addItem": case "SP.addItem":

View file

@ -1,4 +1,6 @@
{UIBROWSER->getMDataArr id=$i.id assign="_metaarr"} {UIBROWSER->getMDataArr id=$i.id assign="_metaarr"}
onMouseover="showalttext('<h3>##{$i.type|lower|capitalize}## {if ($_PL_activeId && $_PL_activeId == $i.id)}##(activated)##{/if}</h3>{foreach from=$_metaarr.metadata key=_key item=_item}{$_key}: {$_item}<br>{/foreach}')"
onMouseout="hidealttext()" onMouseover = "showalttext('<div style=&quot;font-size: 120%; font-weight: bold&quot;>##{$i.type|lower|capitalize}##: {$_metaarr.metadata.Title} {if $PL->isUSedBy($i.id) != false}##(used by {$PL->isUSedBy($i.id)})##{/if}</div>{foreach from=$_metaarr.metadata key=_key item=_item}{if $_key != 'Title'}{$_key}: {$_item}<br>{/if}{/foreach}')"
{assign var="_metaarr" value=NULL} onMouseout = "hidealttext()"
{assign var="_metaarr" value=null}

View file

@ -84,6 +84,6 @@
<!-- end add group member --> <!-- end add group member -->
</div> </div>
<input type="button" class="button" value="##Cancel##" onClick="location.href='{$UI_BROWSER}?act=SUBJECTS'"> <input type="button" class="button" value="##Close##" onClick="location.href='{$UI_BROWSER}?act=SUBJECTS'">
</div> </div>

View file

@ -73,6 +73,17 @@ define('UI_BROWSE_DEFAULT_LIMIT', 10);
define('UI_SCHEDULER_FIRSTWEEKDAY', 1); define('UI_SCHEDULER_FIRSTWEEKDAY', 1);
define('UI_SCHEDULER_PAUSE_PL2PL', '5 seconds'); define('UI_SCHEDULER_PAUSE_PL2PL', '5 seconds');
## File types
define('UI_FILETYPE_PLAYLIST', 'playlist');
define('UI_FILETYPE_AUDIOCLIP', 'audioClip');
define('UI_FILETYPE_WEBSTREAM', 'webstream');
## Playlist elements
define('UI_PL_ELEM_PLAYLIST', 'playlistElement');
define('UI_PL_ELEM_FADEINFO', 'fadeInfo');
define('UI_PL_ELEM_FADEIN', 'fadeIn');
define('UI_PL_ELEM_FADEOUT', 'fadeOut');
## LS stuff ## LS stuff

View file

@ -220,6 +220,7 @@ class uiPlaylist
function getFlat() function getFlat()
{ {
#print_r($this->get());
$this->plwalk($this->get()); $this->plwalk($this->get());
#echo '<pre><div align="left">'; print_r($this->flat); echo '</div></pre>'; #echo '<pre><div align="left">'; print_r($this->flat); echo '</div></pre>';
return $this->flat; return $this->flat;
@ -229,20 +230,20 @@ class uiPlaylist
function plwalk($arr, $parent=0, $attrs=0) function plwalk($arr, $parent=0, $attrs=0)
{ {
foreach ($arr['children'] as $node=>$sub) { foreach ($arr['children'] as $node=>$sub) {
if (strtolower($sub['elementname'])==='playlistelement') { if ($sub['elementname']===UI_PL_ELEM_PLAYLIST) {
$this->plwalk($sub, $node, $sub['attrs']); $this->plwalk($sub, $node, $sub['attrs']);
} }
if (strtolower($sub['elementname'])==='audioclip' || strtolower($sub['elementname'])==='playlist') { if ($sub['elementname']===UI_FILETYPE_AUDIOCLIP || $sub['elementname']===UI_FILETYPE_PLAYLIST) {
#$this->flat["$parent.$node"] = $sub['attrs']; #$this->flat["$parent.$node"] = $sub['attrs'];
#$this->flat["$parent.$node"]['type'] = $sub['elementname']; #$this->flat["$parent.$node"]['type'] = $sub['elementname'];
$this->flat[$parent] = $this->Base->_getMetaInfo($this->Base->gb->_idFromGunid($sub['attrs']['id'])); $this->flat[$parent] = $this->Base->_getMetaInfo($this->Base->gb->_idFromGunid($sub['attrs']['id']));
$this->flat[$parent]['attrs'] = $attrs; $this->flat[$parent]['attrs'] = $attrs;
} }
if (strtolower($sub['elementname'])==='fadeinfo') { if ($sub['elementname']===UI_PL_ELEM_FADEINFO) {
$this->flat[$parent]['fadein'] = GreenBox::_plTimeToSecs($sub['attrs']['fadein']); $this->flat[$parent][UI_PL_ELEM_FADEIN] = GreenBox::_plTimeToSecs($sub['attrs'][UI_PL_ELEM_FADEIN]);
$this->flat[$parent]['fadeout'] = GreenBox::_plTimeToSecs($sub['attrs']['fadeout']); $this->flat[$parent][UI_PL_ELEM_FADEOUT] = GreenBox::_plTimeToSecs($sub['attrs'][UI_PL_ELEM_FADEOUT]);
$this->flat[$parent]['fadein_ms'] = $sub['attrs']['fadein'] ? GreenBox::_plTimeToSecs($sub['attrs']['fadein']) * 1000 : 0; $this->flat[$parent]['fadein_ms'] = $sub['attrs'][UI_PL_ELEM_FADEIN] ? GreenBox::_plTimeToSecs($sub['attrs'][UI_PL_ELEM_FADEIN]) * 1000 : 0;
$this->flat[$parent]['fadeout_ms'] = $sub['attrs']['fadeout'] ? GreenBox::_plTimeToSecs($sub['attrs']['fadeout']) * 1000 : 0; $this->flat[$parent]['fadeout_ms'] = $sub['attrs'][UI_PL_ELEM_FADEOUT] ? GreenBox::_plTimeToSecs($sub['attrs'][UI_PL_ELEM_FADEOUT]) * 1000 : 0;
} }
} }
} }
@ -257,30 +258,30 @@ class uiPlaylist
switch ($type) { switch ($type) {
case "fadeX": case "fadeX":
$item[$prev['attrs']['id']] = $item[$prev['attrs']['id']] =
array('fadeIn' => GreenBox::_secsToPlTime($prev['fadein']), array(UI_PL_ELEM_FADEIN => GreenBox::_secsToPlTime($prev[UI_PL_ELEM_FADEIN]),
'fadeOut' => GreenBox::_secsToPlTime($duration/1000)); UI_PL_ELEM_FADEOUT => GreenBox::_secsToPlTime($duration/1000));
$item[$id] = array('fadeIn' => GreenBox::_secsToPlTime($duration/1000), $item[$id] = array(UI_PL_ELEM_FADEIN => GreenBox::_secsToPlTime($duration/1000),
'fadeOut' => GreenBox::_secsToPlTime($curr['fadeout'])); UI_PL_ELEM_FADEOUT => GreenBox::_secsToPlTime($curr[UI_PL_ELEM_FADEOUT]));
break; break;
case "pause": case "pause":
$item[$prev['attrs']['id']] = $item[$prev['attrs']['id']] =
array('fadeIn' => GreenBox::_secsToPlTime($prev['fadein']), array(UI_PL_ELEM_FADEIN => GreenBox::_secsToPlTime($prev[UI_PL_ELEM_FADEIN]),
'fadeOut' => GreenBox::_secsToPlTime(-$duration/1000)); UI_PL_ELEM_FADEOUT => GreenBox::_secsToPlTime(-$duration/1000));
$item[$id] = array('fadeIn' => GreenBox::_secsToPlTime(-$duration/1000), $item[$id] = array(UI_PL_ELEM_FADEIN => GreenBox::_secsToPlTime(-$duration/1000),
'fadeOut' => GreenBox::_secsToPlTime($curr['fadeout'])); UI_PL_ELEM_FADEOUT => GreenBox::_secsToPlTime($curr[UI_PL_ELEM_FADEOUT]));
break; break;
case "fadeIn": case "fadeIn":
$item[$id] = array('fadeIn' => GreenBox::_secsToPlTime($duration/1000), $item[$id] = array(UI_PL_ELEM_FADEIN => GreenBox::_secsToPlTime($duration/1000),
'fadeOut' => GreenBox::_secsToPlTime($curr['fadeout'])); UI_PL_ELEM_FADEOUT => GreenBox::_secsToPlTime($curr[UI_PL_ELEM_FADEOUT]));
break; break;
case "fadeOut": case "fadeOut":
$item[$id] = array('fadeIn' => GreenBox::_secsToPlTime($curr['fadein']), $item[$id] = array(UI_PL_ELEM_FADEIN => GreenBox::_secsToPlTime($curr[UI_PL_ELEM_FADEIN]),
'fadeOut' => GreenBox::_secsToPlTime($duration/1000)); UI_PL_ELEM_FADEOUT => GreenBox::_secsToPlTime($duration/1000));
break; break;
} }
#print_r($item); #print_r($item);
foreach ($item as $i=>$val) { foreach ($item as $i=>$val) {
$r = $this->Base->gb->changeFadeInfo($this->token, $i, $val['fadeIn'], $val['fadeOut'], $this->Base->sessid); $r = $this->Base->gb->changeFadeInfo($this->token, $i, $val[UI_PL_ELEM_FADEIN], $val[UI_PL_ELEM_FADEOUT], $this->Base->sessid);
#print_r($r); #print_r($r);
if (PEAR::isError($r)) { if (PEAR::isError($r)) {
if (UI_VERBOSE) print_r($r); if (UI_VERBOSE) print_r($r);
@ -454,26 +455,23 @@ class uiPlaylist
function isAvailable($id) function isAvailable($id)
{ {
if (strtolower($this->Base->gb->getFileType($id))==="playlist" && $this->Base->gb->playlistIsAvailable($id, $this->Base->sessid) === TRUE) if ($this->Base->gb->getFileType($id) !== UI_FILETYPE_PLAYLIST)
return TRUE; return TRUE;
if ($this->Base->gb->playlistIsAvailable($id, $this->Base->sessid) === TRUE)
return TRUE;
return FALSE; return FALSE;
} }
function isUsedBy($id)
function _plTimeToSecs($plt, $length=4)
{ {
$arr = split(':', $plt); if ($this->Base->gb->getFileType($id) !== UI_FILETYPE_PLAYLIST)
if(isset($arr[2])){ return ($arr[0]*60 + $arr[1])*60 + $arr[2]; } return FALSE;
if(isset($arr[1])){ return $arr[0]*60 + $arr[1]; }
return $arr[0];
}
function _secsToPlTime($s0) if (($userid = $this->Base->gb->playlistIsAvailable($id, $this->Base->sessid)) !== TRUE)
{ return $this->Base->gb->getSubjName($userid);
$m = intval($s0 / 60);
$r = $s0 - $m*60; return FALSE;
$h = $m / 60;
$m = $m % 60;
return sprintf("%02d:%02d:%09.6f", $h, $m, $r);
} }
} }