*** empty log message ***

livesupport/modules/htmlUI/var/html/ui_browser.php

@@ -21,6 +21,11 @@ if (is_array($_REQUEST['popup'])){
                 $Smarty->display('popup/_redirector.tpl');
             break;
 
+            case "_2PL.editMetaData":
+                $Smarty->assign('target', 'PL.editMetaData');
+                $Smarty->display('popup/_redirector.tpl');
+            break;
+
             case "login":
                 $Smarty->assign('dynform', $uiBrowser->login($ui_fmask));
                 $Smarty->display('popup/login.tpl');

livesupport/modules/htmlUI/var/html/ui_handler.php

@@ -187,7 +187,7 @@ switch($_REQUEST['act']){
             if ($_REQUEST['id']) $uiHandler->SCRATCHPAD->addItem($_REQUEST['id']);
             $uiHandler->SCRATCHPAD->addItem($ui_tmpid);
         }
-        $uiHandler->PLAYLIST->setRedirect();
+        $uiHandler->PLAYLIST->setRedirect('_2PL.editMetaData'); 
     break;
 
     case "PL.addItem":

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

@@ -51,7 +51,7 @@
     {/if}
 
     {if $PL_simpleManagement}
-        {include file="playlist/simpleManagement.tpl"}
+        {include file="playlist/main.tpl"}
     {/if}
 
     <div class="content">

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

@@ -1,7 +1,7 @@
 <!-- start playlist editor -->
     <div class="container_elements" style="width: 607px;">
-            <form name="PL">
+
-                <h1>##Playlist Editor##</h1>
+                <h1>##Playlist Editor##: <a href="{$UI_BROWSER}?act=PL.editMetaData" style="color: #666666">{$PL->title}</a></h1>
                 <div class="head" style="width: 574px;">
                     <div class="left">&nbsp;</div>
                     <div class="right">&nbsp;</div>
@@ -9,7 +9,7 @@
                 </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>
@@ -57,6 +57,7 @@
                             </tr>
                         {/if}
                     <!-- end item -->
+                        </form>
                     </table>
                 </div>
                 <div class="footer" style="width: 569px;">
@@ -73,59 +74,7 @@
                     <input type="button" class="button_large" value="##Metadata##" onClick="location.href='{$UI_BROWSER}?act=PL.editMetaData'">
                 </div>
             </div>
-            </form>
+
         <!-- end playlist editor -->
 
 
-{*
-<form name="PL">
-<table border="0">
-<tr><th colspan="4">active Playlist: {$PL.children.0.children.0.content}</th></tr>
-<tr align="center" style="background-color: {cycle values='#eeeeee, #dadada'}"><td></td><td>Title</td><td>Duration</td><td>Type</td></tr>
-
-{foreach from=$PL->getFlat() key='pos' item='i'}
-    <!-- {$n++} -->
-    <tr onMouseOver="highlight()"
-        onMouseOut="darklight()"
-        onContextmenu="return menu('{$i.attrs.id}', {if $n == 1}'PL.changeFadeIn'{else}'PL.changeTransition'{/if})}" style="background-color: lightblue">
-        <td colspan="4" align="center">{$i.fadein_ms|string_format:"%d"} ms</td>
-    </tr>
-    <tr onMouseOver="highlight()"
-        onMouseOut="darklight()"
-        onContextmenu="return menu('{$i.attrs.id}', 'PL.removeItem')" style="background-color: {cycle values='#eeeeee, #dadada'}">
-        <td>
-            <input type="checkbox" name="{$i.attrs.id}">
-            <font size="+1">
-            <a href="#" onClick="hpopup('{$UI_HANDLER}?act=PL.moveItem&id={$i.attrs.id}&pos={$pos-1}')">&uarr;</a>
-            <a href="#" onClick="hpopup('{$UI_HANDLER}?act=PL.moveItem&id={$i.attrs.id}&pos={$pos+1}')">&darr;</a>
-            </font>
-        </td>
-        <td>{$i.title}</td>
-        <td>{$i.duration}</td>
-        <td>{$i.type}</td>
-    </tr>
-{/foreach}
-    {if $n}
-    <tr onMouseOver="highlight()"
-        onMouseOut="darklight()"
-        onContextmenu="return menu('{$i.attrs.id}', 'PL.changeFadeOut')" style="background-color: lightblue">
-        <td colspan="4" align="center">{$i.fadeout_ms|string_format:"%d"} ms</td>
-    </tr>
-    {/if}
-
-<tr style="background-color: {cycle values='#eeeeee, #dadada'}">
-    <td><input type="checkbox" name="all" onClick="collector_switchAll('PL')"></td>
-    <td align="center" colspan="2"><a href="#" onClick="collector_submit('PL', 'PL.removeItem')">[Remove Selected]</a></th>
-    <td align="center" colspan="2"><a href="#" onClick="collector_clearAll('PL', 'PL.removeItem')">[Clear]</a></th>
-</tr>
-
-<tr>
-    <td><input type="button" value="Save" onClick="hpopup('{$UI_HANDLER}?act=PL.save')"></td>
-    <td><input type="button" value="Revert" onClick="hpopup('{$UI_HANDLER}?act=PL.revert')"></td>
-    <td><input type="button" value="Release" onClick="hpopup('{$UI_HANDLER}?act=PL.release')"></td>
-    <td><input type="button" value="MData" onClick="location.href='{$UI_BROWSER}?act=PL.editMetaData'"></td>
-    <td><input type="button" value="Delete" onClick="popup('{$UI_BROWSER}?popup[]=PL.deleteActive', 'PL.deleteActive', 400, 200)"></td>
-</tr>
-</table>
-</form>
-*}

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

@@ -0,0 +1,21 @@
+<div class="content">
+
+{if $PL_editMetaData}
+    {include file="playlist/metadata.tpl"}
+
+{elseif is_array($PL->get())}           {* already activated Playlist *}
+    {include file="playlist/editor.tpl"}
+
+{else}                                  {* no active Playlist *}
+    <div class="container_elements" style="width: 607px;">
+    <h1>##Playlist Editor##</h1>
+        <p>&nbsp;</p>
+        {if $PL->reportLookedPL()}
+            <input type="button" value="##Open last Playlist##" onClick="hpopup('{$UI_HANDLER}?act=PL.unlook')" class="button_wide">
+        {else}
+            <input type="button" value="##New empty Playlist##" onClick="hpopup('{$UI_HANDLER}?act=PL.create')" class="button_wide">
+        {/if}
+    </div>
+{/if}
+
+</div>

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

@@ -1,5 +1,5 @@
 <div class="container_elements" style="width: 607px;">
-<h1>##Playlist Metadata##</h1>
+<h1>##Playlist Metadata##: {$PL->title}</h1>
 {assign var="_form" value=$PL->metaDataForm($_PL.curr_langid)}
 
 {assign var="dynform" value=$_form.langswitch}

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

@@ -1,19 +0,0 @@
-<div class="content">
-
-{if $PL_editMetaData}
-        {include file="playlist/metadata.tpl"}
-{elseif is_array($PL->get())}           {* already activated Playlist *}
-    {include file="playlist/editor.tpl"}
-{else}                                  {* no active Playlist *}
-
-<div class="container_elements" style="width: 607px;">
-<h1>##Playlist Editor##</h1>
-    <p>&nbsp;</p>
-    {if $PL->reportLookedPL()}
-        <input type="button" value="##Open last Playlist##" onClick="hpopup('{$UI_HANDLER}?act=PL.unlook')" class="button_wide">
-    {else}
-        <input type="button" value="##New empty Playlist##" onClick="hpopup('{$UI_HANDLER}?act=PL.create')" class="button_wide">
-    {/if}
-</div>
-{/if}
-</div>

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

@@ -1,4 +1,8 @@
 <script type="text/javascript">
-    opener.location.href = "{$UI_BROWSER}?act={$target}";
+
+    if (opener.location.href.indexOf("{$target}") !== -1)
         opener.location.reload();
+    else
+        opener.location.href = "{$UI_BROWSER}?act={$target}";
+
 </script>

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

@@ -6,11 +6,13 @@
 ie5 = (document.getElementById && document.all && document.styleSheets) ? 1 : 0;
 nn6 = (document.getElementById && !document.all) ? 1 : 0;
 contextmenuStatus = 0;
-document.onmouseup = hidecontextmenu;
-document.write('<div id="contextmenucontainer"></div>');
 contextmenuWidth  = 0,
 contextmenuHeight = 0;
 
+document.onclick = hidecontextmenu;
+
+document.write('<div id="contextmenucontainer"></div>');
+
 function contextmenu(param) {
     var contextmenuHeader  = "<div class='contextmenu' id='contextmenu' style='position: absolute; top: -250; left: 0; z-index: 100'>" +
                                 "<ul>";
@@ -108,7 +110,7 @@ function contextmenu(param) {
 }
 
 
-function showcontextmenu(e) {
+function showcontextmenu(e) {   //alert("show:" + contextmenuStatus);
     if (ie5) {
         if (event.clientX > contextmenuWidth)  xPos = event.clientX - contextmenuWidth + document.body.scrollLeft;
         else                            xPos = event.clientX + document.body.scrollLeft;
@@ -123,7 +125,7 @@ function showcontextmenu(e) {
     }
 
     document.getElementById("contextmenu").style.left = xPos;
-    document.getElementById("contextmenu").style.top  = yPos;
+    setTimeout("document.getElementById('contextmenu').style.top  = yPos", 10);
     //document.getElementById('contextmenustyle').innerHTML = '<style type="text/css">#contextmenu {top: 50px; left: 300px; }</style>';
 
     contextmenuStatus = 1;
@@ -131,9 +133,9 @@ function showcontextmenu(e) {
 }
 
 
-function hidecontextmenu(e) {
+function hidecontextmenu(e) {    //alert("hide:" + contextmenuStatus);
     if (contextmenuStatus == 1) {
-        setTimeout("document.getElementById('contextmenu').style.top =- 250", 100);
+        setTimeout("document.getElementById('contextmenu').style.top =- 250", 0);
         contextmenuStatus = 0;
     }
 }

livesupport/modules/htmlUI/var/ui_browser_init.php

@@ -1,4 +1,5 @@
 <?php
+header("Content-type: text/html; charset=utf-8");
 session_start();
 
 ## LS classes/functions #############################################

livesupport/modules/htmlUI/var/ui_handler_init.php

@@ -1,4 +1,5 @@
 <?php
+header("Content-type: text/html; charset=utf-8");
 session_start();
 
 ## LS classes/functions #############################################

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

@@ -5,6 +5,7 @@ class uiPlaylist
     {
         $this->Base      =& $uiBase;
         $this->activeId  =& $_SESSION[UI_PLAYLIST_SESSNAME]['activeId'];
+        $this->title     = $this->Base->_getMDataValue($this->activeId, UI_MDATA_KEY_TITLE);
         $this->token     =& $_SESSION[UI_PLAYLIST_SESSNAME]['token'];
         $this->reloadUrl   = UI_BROWSER.'?popup[]=_reload_parent&popup[]=_close';
         $this->redirectUrl = UI_BROWSER.'?popup[]=_2PL.simpleManagement&popup[]=_close';
@@ -15,8 +16,11 @@ class uiPlaylist
         $this->Base->redirUrl = $this->reloadUrl;
     }
 
-    function setRedirect()
+    function setRedirect($target=FALSE)
     {
+        if ($target!==FALSE)
+            $this->Base->redirUrl = UI_BROWSER."?popup[]=$target&popup[]=_close";
+        else
             $this->Base->redirUrl = $this->redirectUrl;
     }