From a7baf17231e22dc6d50a25b21ff45bbb226137a9 Mon Sep 17 00:00:00 2001 From: sebastian Date: Wed, 13 Apr 2005 13:08:02 +0000 Subject: [PATCH] *** empty log message *** --- .../modules/htmlUI/var/html/ui_handler.php | 5 ++- .../modules/htmlUI/var/localizer/data.inc.php | 3 +- .../htmlUI/var/localizer/display.inc.php | 27 ++++++------- .../var/templates/scheduler/actionhandler.tpl | 39 ++----------------- .../htmlUI/var/templates/scheduler/day.tpl | 2 +- .../htmlUI/var/templates/scheduler/week.tpl | 2 +- .../modules/htmlUI/var/ui_handler.class.php | 1 + .../modules/htmlUI/var/ui_scheduler.class.php | 8 ++-- 8 files changed, 30 insertions(+), 57 deletions(-) diff --git a/livesupport/modules/htmlUI/var/html/ui_handler.php b/livesupport/modules/htmlUI/var/html/ui_handler.php index 1b84920ec..92a9c21a5 100644 --- a/livesupport/modules/htmlUI/var/html/ui_handler.php +++ b/livesupport/modules/htmlUI/var/html/ui_handler.php @@ -6,7 +6,8 @@ switch($_REQUEST['act']){ case "login": if ($uiHandler->login($_REQUEST, $ui_fmask["login"]) === TRUE) { $uiHandler->loadStationPrefs($ui_fmask['stationPrefs'], TRUE); - $uiHandler->PLAYLIST->reportLookedPL(TRUE); + # $uiHandler->PLAYLIST->reportLookedPL(); + $uiHandler->PLAYLIST->loadLookedFromPref(); } break; @@ -187,7 +188,7 @@ switch($_REQUEST['act']){ if ($_REQUEST['id']) $uiHandler->SCRATCHPAD->addItem($_REQUEST['id']); $uiHandler->SCRATCHPAD->addItem($ui_tmpid); } - $uiHandler->PLAYLIST->setRedirect('_2PL.editMetaData'); + $uiHandler->PLAYLIST->setRedirect('_2PL.editMetaData'); break; case "PL.addItem": diff --git a/livesupport/modules/htmlUI/var/localizer/data.inc.php b/livesupport/modules/htmlUI/var/localizer/data.inc.php index 59c3859a8..612ec48d0 100755 --- a/livesupport/modules/htmlUI/var/localizer/data.inc.php +++ b/livesupport/modules/htmlUI/var/localizer/data.inc.php @@ -31,7 +31,8 @@ class Data { function _realTransPath($file, $Id, $type='xml') { $s = '/'; - return $_SERVER[DOCUMENT_ROOT].$s.dirname($_SERVER[SCRIPT_NAME]).$s.Data::langPath($file, $Id, $type); + #return $_SERVER[DOCUMENT_ROOT].$s.dirname($_SERVER[SCRIPT_NAME]).$s.Data::langPath($file, $Id, $type); + return dirname(__FILE__).$s.Data::langPath($file, $Id, $type); } function langPath($file, $Id, $type) diff --git a/livesupport/modules/htmlUI/var/localizer/display.inc.php b/livesupport/modules/htmlUI/var/localizer/display.inc.php index 8ab1ecdff..a2578742e 100755 --- a/livesupport/modules/htmlUI/var/localizer/display.inc.php +++ b/livesupport/modules/htmlUI/var/localizer/display.inc.php @@ -31,19 +31,6 @@ class Display { $file['sourceId'] = _DEFAULT_LANG_; } - $html .= '
- - '. - Display::sourceLangMenu($file[sourceId], $file).' - - - - -
- - - '; - } $s = Data::convArr2GS($source); $t = Data::convArr2GS($target); @@ -119,6 +106,20 @@ class Display { } } + $html .= '
+ + '. + Display::sourceLangMenu($file[sourceId], $file).' + + + + +
+ + + '; + } + $html .= '
diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/actionhandler.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/actionhandler.tpl index aff403335..766916993 100755 --- a/livesupport/modules/htmlUI/var/templates/scheduler/actionhandler.tpl +++ b/livesupport/modules/htmlUI/var/templates/scheduler/actionhandler.tpl @@ -1,40 +1,7 @@ -{UIBROWSER->getMDataArr id=$i.id assign="_metaarr"} +{UIBROWSER->getMDataArr id=$i.plid assign="_metaarr"} -onMouseover="showalttext('{foreach from=$_metaarr.metadata key=_key item=_item}{$_key}: {$_item}
{/foreach}')" +onMouseover="showalttext('{foreach from=$_metaarr.metadata key=_key item=_item}{$_key}: {$_item}
{/foreach}')" *} onMouseout="hidealttext()" -onClick="hidealttextnow(); return contextmenu('{$i.id}' - , 'SP.removeItem' - - {if $i.type == 'audioclip'} - , 'listen', '{$i.gunid}' - {if $_PL_activeId} - , 'PL.addItem' - {else} - , 'PL.create' - {/if} - , 'edit', 'delete' - {/if} - - {if $i.type == 'webstream'} - {if $_PL_activeId} - , 'PL.addItem' - {else} - , 'PL.create' - {/if} - , 'edit', 'delete' - {/if} - - {if $i.type == 'playlist'} - {if $_PL_activeId} - {if $_PL_activeId == $i.id} - , 'PL.release' - {else} - , 'PL.addItem', 'delete' - {/if} - {else} - , 'PL.activate', 'PL.create', 'delete' - {/if} - {/if} -)" +onClick="return contextmenu('scheduleId={$i.scheduleid}', 'SCHEDULER.removeItem')" {assign var="_metaarr" value=NULL} diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/day.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/day.tpl index 34c2cdf45..8fa98840f 100755 --- a/livesupport/modules/htmlUI/var/templates/scheduler/day.tpl +++ b/livesupport/modules/htmlUI/var/templates/scheduler/day.tpl @@ -37,7 +37,7 @@ {foreach from=$_entrys[$_hour] item="i"} {* hier werden die Einträge welche in der jeweil. h beginnen durchlaufen *} -
+
{$i.title} {$i.start}-{$i.end} {$i.creator} diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl index 47f6cb28e..817806fc2 100755 --- a/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl +++ b/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl @@ -49,7 +49,7 @@ {foreach from=$_entrys[$_day.day][$_hour] item="i"} -
+

{$i.title|truncate:12}

{$i.start|truncate:5:""} - {$i.end|truncate:5:""}

{$i.creator}

diff --git a/livesupport/modules/htmlUI/var/ui_handler.class.php b/livesupport/modules/htmlUI/var/ui_handler.class.php index fb5203287..468e89665 100644 --- a/livesupport/modules/htmlUI/var/ui_handler.class.php +++ b/livesupport/modules/htmlUI/var/ui_handler.class.php @@ -55,6 +55,7 @@ class uiHandler extends uiBase { #setcookie($this->config['authCookieName'], $sessid); echo ""; ob_flush(); + $id = $this->gb->getObjId($formdata['login'], $this->gb->storId); if(PEAR::isError($id)) { $this->_retMsg('Login failed'); diff --git a/livesupport/modules/htmlUI/var/ui_scheduler.class.php b/livesupport/modules/htmlUI/var/ui_scheduler.class.php index 5fe5d73d5..1c3f242e6 100755 --- a/livesupport/modules/htmlUI/var/ui_scheduler.class.php +++ b/livesupport/modules/htmlUI/var/ui_scheduler.class.php @@ -89,7 +89,8 @@ class uiScheduler extends uiCalendar foreach ($arr as $key => $val) { $items[strftime('%d', $this->_datetime2timestamp($val['start']))][number_format(strftime('%H', $this->_datetime2timestamp($val['start'])))][]= array ( - 'id' => $val['id'], + 'scheduleid'=> $val['id'], + 'plid' => $this->Base->gb->_idFromGunid($val['playlistId']), 'start' => substr($val['start'], strpos($val['start'], 'T')+1), 'end' => substr($val['end'], strpos($val['end'], 'T') + 1), 'title' => $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($val['playlistId']), UI_MDATA_KEY_TITLE), @@ -115,7 +116,8 @@ class uiScheduler extends uiCalendar foreach ($arr as $key => $val) { $items[number_format(strftime('%H', $this->_datetime2timestamp($val['start'])))][]= array ( - 'id' => $val['id'], + 'plid' => $this->Base->gb->_idFromGunid($val['playlistId']), + 'scheduleid'=> $val['id'], 'start' => substr($val['start'], strpos($val['start'], 'T')+1), 'end' => substr($val['end'], strpos($val['end'], 'T') + 1), 'title' => $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($val['playlistId']), UI_MDATA_KEY_TITLE), @@ -388,7 +390,7 @@ class uiScheduler extends uiCalendar function _isError($r) { if (is_array($r['error'])) { - #$this->Base->_retMsg('Error: $1', str_replace("\n", "\\n", addslashes($r['error']['message']))); + $this->Base->_retMsg('Error: $1', str_replace("\n", "\\n", addslashes($r['error']['message']))); return TRUE; } return FALSE;