diff --git a/livesupport/modules/htmlUI/var/formmask/generic.inc.php b/livesupport/modules/htmlUI/var/formmask/generic.inc.php index 7f6c7509b..c9d660903 100755 --- a/livesupport/modules/htmlUI/var/formmask/generic.inc.php +++ b/livesupport/modules/htmlUI/var/formmask/generic.inc.php @@ -212,7 +212,8 @@ $ui_fmask = array( 'element' => 'pass', 'type' => 'password', 'label' => 'Password', - 'required' => TRUE + 'required' => TRUE, + 'requiredmsg' => "" ), array( 'element' => 'cancel', @@ -411,15 +412,15 @@ $ui_fmask = array( array( 'element' => 'clear', 'type' => 'button', - 'label' => 'Reset', - 'attributes' => array('onClick' => "this.form.reset(); hpopup('".UI_HANDLER."?act=SEARCH.clear', 'SF')"), + 'label' => 'Reset Criteria', + 'attributes' => array('class' => 'button_wide', 'onClick' => "this.form.reset(); hpopup('".UI_HANDLER."?act=SEARCH.clear', 'SF')"), 'groupit' => TRUE, ), array( 'element' => 'addrow', 'type' => 'button', 'label' => 'Add Criteria', - 'attributes' => array('onClick' => 'SearchForm_addRow()'), + 'attributes' => array('class' => 'button_wide', 'onClick' => 'SearchForm_addRow()'), 'groupit' => TRUE, ), array( @@ -427,6 +428,7 @@ $ui_fmask = array( 'type' => 'submit', 'label' => 'Submit', 'groupit' => TRUE, + 'attributes' => array('class' => 'button_wide') ), array('group' => array('clear', 'addrow', 'submit') ), @@ -532,7 +534,25 @@ $ui_fmask = array( 100 => 100 ), 'attributes'=> array('onChange' => 'hpopup("'.UI_HANDLER.'?act=BROWSE.setLimit&limit=" + this.form.limit.value)') + ), + /* do we need reset? + array( + 'element' => 'spacer', + 'type' => 'static', + 'constant' => '', + 'groupit' => TRUE + ), + array( + 'element' => 'reset', + 'type' => 'button', + 'label' => 'Reset Criteria', + 'attributes'=> array('class' => 'button_wide', 'onClick' => 'hpopup("'.UI_HANDLER.'?act=BROWSE.setDefaults")'), + 'groupit' => TRUE + ), + array( + 'group' => array('spacer', 'reset') ) + */ ), 'simplesearch' => array( @@ -646,14 +666,14 @@ $ui_fmask = array( 'element' => 'switchdown', 'type' => 'button', 'label' => '-', - 'attributes'=> array('onClick' => 'pl_switchDown()', 'onMousedown' => 'pl_start("Down")', 'onMouseUp' => "pl_stop()", 'onMouseOut' => "pl_stop()"), + 'attributes'=> array('class' => 'button_small', 'onClick' => 'pl_switchDown()', 'onMousedown' => 'pl_start("Down")', 'onMouseUp' => "pl_stop()", 'onMouseOut' => "pl_stop()"), 'groupit' => TRUE ), array( 'element' => 'switchup', 'type' => 'button', 'label' => '+', - 'attributes'=> array('onClick' => 'pl_switchUp()', 'onMousedown' => 'pl_start("Up")', 'onMouseUp' => "pl_stop()", 'onMouseOut' => "pl_stop()"), + 'attributes'=> array('class' => 'button_small', 'onClick' => 'pl_switchUp()', 'onMousedown' => 'pl_start("Up")', 'onMouseUp' => "pl_stop()", 'onMouseOut' => "pl_stop()"), 'groupit' => TRUE ), array( diff --git a/livesupport/modules/htmlUI/var/html/ui_browser.php b/livesupport/modules/htmlUI/var/html/ui_browser.php index c5a53e5a6..94fc396df 100644 --- a/livesupport/modules/htmlUI/var/html/ui_browser.php +++ b/livesupport/modules/htmlUI/var/html/ui_browser.php @@ -61,8 +61,16 @@ if (is_array($_REQUEST['popup'])){ $Smarty->display('popup/PLAYLIST.changeTransition.tpl'); break; - case "PL.deleteActive": - $Smarty->display('popup/PLAYLIST.deleteActive.tpl'); + case "PL.confirmDelete": + $Smarty->display('popup/PLAYLIST.confirmDelete.tpl'); + break; + + case "PL.confirmRevert": + $Smarty->display('popup/PLAYLIST.confirmRevert.tpl'); + break; + + case "PL.confirmRelease": + $Smarty->display('popup/PLAYLIST.confirmRelease.tpl'); break; case "SCHEDULER.addItem": diff --git a/livesupport/modules/htmlUI/var/html/ui_handler.php b/livesupport/modules/htmlUI/var/html/ui_handler.php index 5900e457b..ec7ef8ee4 100644 --- a/livesupport/modules/htmlUI/var/html/ui_handler.php +++ b/livesupport/modules/htmlUI/var/html/ui_handler.php @@ -161,8 +161,8 @@ switch($_REQUEST['act']){ $uiHandler->BROWSE->reOrder($_REQUEST['by']); break; - case "BROWSE.clear": - $uiHandler->BROWSE->clear(); + case "BROWSE.setDefaults": + $uiHandler->BROWSE->setDefaults(TRUE); break; case "BROWSE.setOffset": @@ -219,6 +219,12 @@ switch($_REQUEST['act']){ $uiHandler->PLAYLIST->setReload(); break; + case "PL.revertANDclose": + $uiHandler->PLAYLIST->revert(); + $uiHandler->PLAYLIST->release(); + $uiHandler->PLAYLIST->setReload(); + break; + case"PL.unlook": $uiHandler->PLAYLIST->loadLookedFromPref(); $uiHandler->PLAYLIST->setReload(); @@ -261,7 +267,7 @@ switch($_REQUEST['act']){ break; default: - $uiHandler->_retMsg("Unknown method: $1", $_REQUEST["act"]); + if ($uiHandler->userid) $uiHandler->_retMsg("Unknown method: $1", $_REQUEST["act"]); $uiHandler->redirUrl = UI_BROWSER; if ($_REQUEST['is_popup']) $uiHandler->redirUrl .= '?popup[]=_reload_parent&popup[]=_close'; diff --git a/livesupport/modules/htmlUI/var/locals.cz_CZ.xml b/livesupport/modules/htmlUI/var/locals.cz_CZ.xml index a786aad3d..b0baa7b9d 100755 --- a/livesupport/modules/htmlUI/var/locals.cz_CZ.xml +++ b/livesupport/modules/htmlUI/var/locals.cz_CZ.xml @@ -2,6 +2,22 @@ cz_CZ + + Are you sure to delete file "$1"? + + + + Are you sure to remove playlist "$1"? + + + + Are you sure to delete active Playlist? + + + + Are you sure to logout $1? + + Unable to set "$1" to value "$2". @@ -386,14 +402,14 @@ Edit Editovat - - Edit File - Editovat soubor - Edit Metadata Editovat metadata + + Edit Playlist + + Encoded by Kódoval @@ -702,6 +718,10 @@ Retype Password Zopakujte heslo + + Reset Criteria + + Revert to Saved Vrátit do uloženého stavu @@ -710,10 +730,6 @@ Rows Per Page Počet řádek na stránku - - Rows per Page - Počet řádek na stránku - Sample rate Vzorkovací frekvence @@ -730,10 +746,6 @@ Save and Close this Playlist Uložit a zavřít playlist - - Scheduler - Plánovač - Scheduler Navigation Navigace v plánovači diff --git a/livesupport/modules/htmlUI/var/locals.de_DE.xml b/livesupport/modules/htmlUI/var/locals.de_DE.xml index 64b64872e..03688e3c3 100755 --- a/livesupport/modules/htmlUI/var/locals.de_DE.xml +++ b/livesupport/modules/htmlUI/var/locals.de_DE.xml @@ -2,6 +2,22 @@ de_DE + + Are you sure to delete file "$1"? + + + + Are you sure to remove playlist "$1"? + + + + Are you sure to delete active Playlist? + + + + Are you sure to logout $1? + + Unable to set "$1" to value "$2". @@ -386,14 +402,14 @@ Edit Bearbeiten - - Edit File - Datei bearbeiten - Edit Metadata Metadaten bearbeiten + + Edit Playlist + + Encoded by @@ -702,6 +718,10 @@ Retype Password + + Reset Criteria + + Revert to Saved @@ -710,10 +730,6 @@ Rows Per Page - - Rows per Page - - Sample rate @@ -730,10 +746,6 @@ Save and Close this Playlist - - Scheduler - - Scheduler Navigation diff --git a/livesupport/modules/htmlUI/var/locals.en_GB.xml b/livesupport/modules/htmlUI/var/locals.en_GB.xml index 17f48f8dc..206eeef05 100755 --- a/livesupport/modules/htmlUI/var/locals.en_GB.xml +++ b/livesupport/modules/htmlUI/var/locals.en_GB.xml @@ -1,7 +1,22 @@ - en_GB + + Are you sure to delete file "$1"? + + + + Are you sure to remove playlist "$1"? + + + + Are you sure to delete active Playlist? + + + + Are you sure to logout $1? + + Unable to set "$1" to value "$2". @@ -386,14 +401,14 @@ Duration Duration - - Edit - Edit - Edit File Edit file + + Edit Playlist + Edit playlist + Edit Metadata Edit metadata @@ -532,7 +547,7 @@ Media Library - Media library + Media Library Metadata @@ -576,7 +591,7 @@ New Playlist using this File - New playlist using this File + New playlist using this file New Playlist using this file(s) @@ -636,7 +651,7 @@ Playlist Editor - Playlist editor + Playlist Editor Playlist Metadata @@ -702,6 +717,10 @@ Reset Reset + + Reset Criteria + + Retype Password Retype password @@ -710,10 +729,6 @@ Revert to Saved Revert to saved - - Rows Per Page - - Rows per Page Rows per page @@ -730,10 +745,6 @@ Save and Close Save and close - - Save and Close this Playlist - Save and close this Playlist - Scheduler Scheduler diff --git a/livesupport/modules/htmlUI/var/locals.es_CO.xml b/livesupport/modules/htmlUI/var/locals.es_CO.xml index 8a35e2fdc..9297f1a71 100644 --- a/livesupport/modules/htmlUI/var/locals.es_CO.xml +++ b/livesupport/modules/htmlUI/var/locals.es_CO.xml @@ -2,6 +2,22 @@ es_CO + + Are you sure to delete file "$1"? + + + + Are you sure to remove playlist "$1"? + + + + Are you sure to delete active Playlist? + + + + Are you sure to logout $1? + + Unable to set "$1" to value "$2". @@ -386,14 +402,14 @@ Edit Editar - - Edit File - Editar archivo - Edit Metadata Editar metadatos + + Edit Playlist + + Encoded by Codificado por @@ -702,6 +718,10 @@ Retype Password Reescribir la clave + + Reset Criteria + + Revert to Saved Revertir a lo guardado @@ -710,10 +730,6 @@ Rows Per Page Filas por página - - Rows per Page - Filas por página - Sample rate Tasa de muestreo @@ -730,10 +746,6 @@ Save and Close this Playlist Guardar y cerrar esta lista de reproducción - - Scheduler - Programador - Scheduler Navigation Navegación del programador diff --git a/livesupport/modules/htmlUI/var/locals.hu_HU.xml b/livesupport/modules/htmlUI/var/locals.hu_HU.xml index d1ae0e854..db91327de 100755 --- a/livesupport/modules/htmlUI/var/locals.hu_HU.xml +++ b/livesupport/modules/htmlUI/var/locals.hu_HU.xml @@ -2,6 +2,22 @@ hu_HU + + Are you sure to delete file "$1"? + + + + Are you sure to remove playlist "$1"? + + + + Are you sure to delete active Playlist? + + + + Are you sure to logout $1? + + Unable to set "$1" to value "$2". @@ -387,11 +403,11 @@ - Edit File + Edit Metadata - Edit Metadata + Edit Playlist @@ -702,6 +718,10 @@ Retype Password + + Reset Criteria + + Revert to Saved @@ -710,10 +730,6 @@ Rows Per Page - - Rows per Page - - Sample rate @@ -730,10 +746,6 @@ Save and Close this Playlist - - Scheduler - - Scheduler Navigation diff --git a/livesupport/modules/htmlUI/var/locals.nl_NL.xml b/livesupport/modules/htmlUI/var/locals.nl_NL.xml index 90624075f..2f94b87ef 100755 --- a/livesupport/modules/htmlUI/var/locals.nl_NL.xml +++ b/livesupport/modules/htmlUI/var/locals.nl_NL.xml @@ -2,6 +2,22 @@ nl_NL + + Are you sure to delete file "$1"? + + + + Are you sure to remove playlist "$1"? + + + + Are you sure to delete active Playlist? + + + + Are you sure to logout $1? + + Unable to set "$1" to value "$2". @@ -386,14 +402,14 @@ Edit Bewerken - - Edit File - Bestand bewerken - Edit Metadata Meta-gegevens aanpassen + + Edit Playlist + + Encoded by Geencodeerd door @@ -702,6 +718,10 @@ Retype Password Wachtwoord opnieuw invoeren + + Reset Criteria + + Revert to Saved Ongedaan maken @@ -710,10 +730,6 @@ Rows Per Page Aantal rijen per pagina - - Rows per Page - Aantal rijen per pagina - Sample rate Sample rate @@ -730,10 +746,6 @@ Save and Close this Playlist Playlist opslaan en afsluiten - - Scheduler - Scheduler - Scheduler Navigation Scheduler verkenner diff --git a/livesupport/modules/htmlUI/var/locals.sr_CS.xml b/livesupport/modules/htmlUI/var/locals.sr_CS.xml index 47c1b94e1..452982c34 100755 --- a/livesupport/modules/htmlUI/var/locals.sr_CS.xml +++ b/livesupport/modules/htmlUI/var/locals.sr_CS.xml @@ -2,6 +2,22 @@ sr_CS + + Are you sure to delete file "$1"? + + + + Are you sure to remove playlist "$1"? + + + + Are you sure to delete active Playlist? + + + + Are you sure to logout $1? + + Unable to set "$1" to value "$2". @@ -386,14 +402,14 @@ Edit Promeni - - Edit File - Uredi fajl - Edit Metadata Promeni metapodatke + + Edit Playlist + + Encoded by @@ -702,6 +718,10 @@ Retype Password + + Reset Criteria + + Revert to Saved Vrati se na snimljenu verziju @@ -710,10 +730,6 @@ Rows Per Page - - Rows per Page - - Sample rate @@ -730,10 +746,6 @@ Save and Close this Playlist Snimi i zatvoriti play-listu - - Scheduler - Raspored - Scheduler Navigation Navigacija rasporeda diff --git a/livesupport/modules/htmlUI/var/templates/file/metadataform.tpl b/livesupport/modules/htmlUI/var/templates/file/metadataform.tpl index 1b071dedc..b1c667289 100755 --- a/livesupport/modules/htmlUI/var/templates/file/metadataform.tpl +++ b/livesupport/modules/htmlUI/var/templates/file/metadataform.tpl @@ -20,13 +20,19 @@ {literal} var MData_confirmChangeVisited = false; + function MData_confirmChange(element) { - //if (MData_confirmChangeVisited) return true; - MData_confirmChangeVisited = true; - if (confirm("Are you sure you want to change this information?") == false) element.blur(); -} + if (MData_confirmChangeVisited) return true; + if (confirm("##Are you sure you want to change existing metadata?##")) { + MData_confirmChangeVisited = true; + return true; + } else { + document.forms['langswitch'].elements['target_langid'].focus(); + return false; + } +} function MData_loadLang() { diff --git a/livesupport/modules/htmlUI/var/templates/file/objects.tpl b/livesupport/modules/htmlUI/var/templates/file/objects.tpl index 2b7245cdf..dc95ce017 100755 --- a/livesupport/modules/htmlUI/var/templates/file/objects.tpl +++ b/livesupport/modules/htmlUI/var/templates/file/objects.tpl @@ -18,8 +18,8 @@ {if count($structure.listdata)} {foreach from=$structure.listdata item=i} {assign var="_listen_gunid" value=$i.gunid} - - + + {if $i.type|lower eq 'folder'} [{$i.title|truncate:30}] @@ -32,7 +32,7 @@ {/if} - {$i.type|lower|capitalize} + {$i.type|lower|capitalize}  ##move## diff --git a/livesupport/modules/htmlUI/var/templates/library/actionhandler.tpl b/livesupport/modules/htmlUI/var/templates/library/actionhandler.tpl index afa55d1bc..baa60c7ec 100755 --- a/livesupport/modules/htmlUI/var/templates/library/actionhandler.tpl +++ b/livesupport/modules/htmlUI/var/templates/library/actionhandler.tpl @@ -1,5 +1,5 @@ {include file="sub/mouseover.tpl"} -onClick="return contextmenu('{$i.id}' +onClick="hidealttextnow(); return contextmenu('{$i.id}' , 'SP.addItem' {if $i.type|lower == 'audioclip'} diff --git a/livesupport/modules/htmlUI/var/templates/main.tpl b/livesupport/modules/htmlUI/var/templates/main.tpl index 54b13585f..4c1905a6b 100755 --- a/livesupport/modules/htmlUI/var/templates/main.tpl +++ b/livesupport/modules/htmlUI/var/templates/main.tpl @@ -1,5 +1,3 @@ -{*Smarty template*} - {include file="header.tpl"} {include file="masterpanel.tpl"} diff --git a/livesupport/modules/htmlUI/var/templates/masterpanel.tpl b/livesupport/modules/htmlUI/var/templates/masterpanel.tpl index fea202afe..8a8da73a7 100755 --- a/livesupport/modules/htmlUI/var/templates/masterpanel.tpl +++ b/livesupport/modules/htmlUI/var/templates/masterpanel.tpl @@ -1,6 +1,3 @@ -{*Smarty template*} - - {include file="statusbar.tpl"} {if $showMenuTop} diff --git a/livesupport/modules/htmlUI/var/templates/playlist/actionhandler.tpl b/livesupport/modules/htmlUI/var/templates/playlist/actionhandler.tpl index cf7694ef5..04539a968 100755 --- a/livesupport/modules/htmlUI/var/templates/playlist/actionhandler.tpl +++ b/livesupport/modules/htmlUI/var/templates/playlist/actionhandler.tpl @@ -1,2 +1,2 @@ {include file="sub/mouseover.tpl"} -onClick="return contextmenu('{$i.attrs.id}', {if $i.type|lower == "audioclip"}'listen', '{$i.gunid}', {/if} 'PL.removeItem')" +onClick="hidealttextnow(); return contextmenu('{$i.attrs.id}', {if $i.type|lower == "audioclip"}'listen', '{$i.gunid}', {/if} 'PL.removeItem')" diff --git a/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl b/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl index fe7a370bc..2f4bb8b76 100755 --- a/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl +++ b/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl @@ -63,13 +63,13 @@
- - - + + +
- - + +
diff --git a/livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl b/livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl index 3cdda06c6..bc8636d7f 100755 --- a/livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl +++ b/livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl @@ -14,11 +14,18 @@ {literal} var MData_confirmChangeVisited = false; + function MData_confirmChange(element) { if (MData_confirmChangeVisited) return true; - MData_confirmChangeVisited = true; - if (confirm("##Are you sure you want to change existing metadata?##") == false) element.blur(); + + if (confirm("##Are you sure you want to change existing metadata?##")) { + MData_confirmChangeVisited = true; + return true; + } else { + document.forms['langswitch'].elements['target_langid'].focus(); + return false; + } } function MData_submit() diff --git a/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.changeTransition.tpl b/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.changeTransition.tpl index 1c6b26345..b569f4228 100755 --- a/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.changeTransition.tpl +++ b/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.changeTransition.tpl @@ -1,6 +1,18 @@ {include file="popup/header.tpl"} -{include file="sub/dynForm_plain.tpl"} + + + + +
+
+ + +
+ {include file="sub/dynForm_plain.tpl} +
+
+
diff --git a/livesupport/modules/htmlUI/var/templates/popup/login.tpl b/livesupport/modules/htmlUI/var/templates/popup/login.tpl index 61836f541..4e4d0c30b 100755 --- a/livesupport/modules/htmlUI/var/templates/popup/login.tpl +++ b/livesupport/modules/htmlUI/var/templates/popup/login.tpl @@ -1,6 +1,19 @@ {include file="popup/header.tpl"} -{include file="sub/dynForm_plain.tpl} + + + + +
+
+ + +
+ {include file="sub/dynForm_plain.tpl} +
+
+
+ diff --git a/livesupport/modules/htmlUI/var/templates/popup/logout.tpl b/livesupport/modules/htmlUI/var/templates/popup/logout.tpl index f4530373b..cde099256 100755 --- a/livesupport/modules/htmlUI/var/templates/popup/logout.tpl +++ b/livesupport/modules/htmlUI/var/templates/popup/logout.tpl @@ -1,22 +1,12 @@ {include file="popup/header.tpl"} - - - - -
-
-
- - - -
{tra 0='Are you sure to logout $1' 1=$USER.login}
-   - -
-
-
-
+
+{tra 0='Are you sure to logout $1?' 1=$USER.login} +

+ +  +
+ diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/actionhandler.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/actionhandler.tpl index 075dd8adc..81b7c1ce6 100755 --- a/livesupport/modules/htmlUI/var/templates/scheduler/actionhandler.tpl +++ b/livesupport/modules/htmlUI/var/templates/scheduler/actionhandler.tpl @@ -1,2 +1,2 @@ {include file="sub/mouseover.tpl"} -onClick="return contextmenu('scheduleId={$i.scheduleid}', 'SCHEDULER.removeItem')" +onClick="hidealttextnow(); return contextmenu('scheduleId={$i.scheduleid}', 'SCHEDULER.removeItem')" diff --git a/livesupport/modules/htmlUI/var/templates/script/alttext.js.tpl b/livesupport/modules/htmlUI/var/templates/script/alttext.js.tpl index 37f1cf4f0..ce15da1f8 100755 --- a/livesupport/modules/htmlUI/var/templates/script/alttext.js.tpl +++ b/livesupport/modules/htmlUI/var/templates/script/alttext.js.tpl @@ -6,7 +6,7 @@ alttextHeight = 0; function showalttext(param) { - var alttextHeader = "
"; + var alttextHeader = "
"; var alttextFooter = "
"; var alttextHtml = ''; @@ -57,7 +57,7 @@ } function hidealttextnow() { - document.getElementById('alttext').style.top = -250; + document.getElementById('alttext').style.top = -1000; } diff --git a/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl b/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl index 92f4df874..b7f8a4000 100755 --- a/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl +++ b/livesupport/modules/htmlUI/var/templates/script/basics.js.tpl @@ -26,9 +26,9 @@ var nn=prompt('New folder name:'); if(nn==null) return; location.href='{$UI_HANDLER}?id={$START.id}&act=newFolder&newname='+nn; - {literal}}{/literal} + {literal}} + - {literal} function popup(url, name, width, height) // popup in center of perent window { var screenX; @@ -49,6 +49,7 @@ Pwidth = window.innerWidth; Pheight = window.innerHeight; } + url = url + '&is_popup=1'; screenX = (Xpos + Pwidth/2 - width/2); screenY = (Ypos + Pheight/2 - height/2); diff --git a/livesupport/modules/htmlUI/var/templates/script/contextmenu.js.tpl b/livesupport/modules/htmlUI/var/templates/script/contextmenu.js.tpl index cc7b410b1..f98ca6103 100755 --- a/livesupport/modules/htmlUI/var/templates/script/contextmenu.js.tpl +++ b/livesupport/modules/htmlUI/var/templates/script/contextmenu.js.tpl @@ -14,7 +14,7 @@ function contextmenu(param) { - var contextmenuHeader = "
" + + var contextmenuHeader = "
" + "
    "; var contextmenuFooter = "
"; var contextmenuHtml = ''; @@ -33,7 +33,7 @@ break; case "PL.release": - contextmenuHtml = contextmenuHtml + "
  •  ##Save and Close this Playlist## 
    • "; + contextmenuHtml = contextmenuHtml + "
  •  ##Close playlist## 
    • "; break; case "PL.addItem": @@ -45,7 +45,7 @@ break; case "PL.activate": - contextmenuHtml = contextmenuHtml + "
  •  ##Activate this Playlist## 
    • "; + contextmenuHtml = contextmenuHtml + "
  •  ##Edit Playlist## 
    • "; break; case "PL.create": @@ -86,7 +86,7 @@ break; case "delete": - contextmenuHtml = contextmenuHtml + "
  •  ##Delete File## 
    • "; + contextmenuHtml = contextmenuHtml + "
  •  ##Delete File## 
    • "; break; case "fileList": @@ -94,11 +94,11 @@ break; case "SCHEDULER.addItem": - contextmenuHtml = contextmenuHtml + "
  •  ##Insert Playlist here## 
    • "; + contextmenuHtml = contextmenuHtml + "
  •  ##Insert Playlist here## 
    • "; break; case "SCHEDULER.removeItem": - contextmenuHtml = contextmenuHtml + "
  •  ##Remove Playlist## 
    • "; + contextmenuHtml = contextmenuHtml + "
  •  ##Remove Playlist## 
    • "; break; {literal} } @@ -136,7 +136,7 @@ contextmenuStatus = 0; } } - + diff --git a/livesupport/modules/htmlUI/var/templates/sub/mouseover.tpl b/livesupport/modules/htmlUI/var/templates/sub/mouseover.tpl index 51d83177b..1121fa54e 100755 --- a/livesupport/modules/htmlUI/var/templates/sub/mouseover.tpl +++ b/livesupport/modules/htmlUI/var/templates/sub/mouseover.tpl @@ -1,4 +1,4 @@ {UIBROWSER->getMDataArr id=$i.id assign="_metaarr"} -onMouseover="showalttext('

    ##{$i.type|lower|capitalize}## {if $_PL_activeId == $i.id}##(activated)##{/if}

    {foreach from=$_metaarr.metadata key=_key item=_item}{$_key}: {$_item}
    {/foreach}')" +onMouseover="showalttext('

    ##{$i.type|lower|capitalize}## {if ($_PL_activeId && $_PL_activeId == $i.id)}##(activated)##{/if}

    {foreach from=$_metaarr.metadata key=_key item=_item}{$_key}: {$_item}
    {/foreach}')" onMouseout="hidealttext()" {assign var="_metaarr" value=NULL} diff --git a/livesupport/modules/htmlUI/var/templates/userinfo.tpl b/livesupport/modules/htmlUI/var/templates/userinfo.tpl index 1f3f75ca7..b938f7eb9 100755 --- a/livesupport/modules/htmlUI/var/templates/userinfo.tpl +++ b/livesupport/modules/htmlUI/var/templates/userinfo.tpl @@ -2,10 +2,10 @@ {if $USER.userid}
    ##Signed in## : {$USER.login}
    - + {* - + *} {else} - + {/if} diff --git a/livesupport/modules/htmlUI/var/ui_base.inc.php b/livesupport/modules/htmlUI/var/ui_base.inc.php index 4763d5118..66e2fed5c 100644 --- a/livesupport/modules/htmlUI/var/ui_base.inc.php +++ b/livesupport/modules/htmlUI/var/ui_base.inc.php @@ -199,7 +199,7 @@ class uiBase } ## add required rule ################### if ($v['required']) { - $form->addRule($v['element'], isset($v['requiredmsg'])?tra($v['requiredmsg']):tra('Missing value for $1', tra($v['label'])), 'required', NULL, $side); + $form->addRule($v['element'], isset($v['requiredmsg']) ? tra($v['requiredmsg']) : tra('Missing value for $1', tra($v['label'])), 'required', NULL, $side); } ## add constant value ################## if (isset($v['constant'])) { diff --git a/livesupport/modules/htmlUI/var/ui_browse.class.php b/livesupport/modules/htmlUI/var/ui_browse.class.php index e073b949b..c611c6f58 100755 --- a/livesupport/modules/htmlUI/var/ui_browse.class.php +++ b/livesupport/modules/htmlUI/var/ui_browse.class.php @@ -6,20 +6,14 @@ class uiBrowse $this->Base =& $uiBase; $this->col =& $_SESSION[UI_BROWSE_SESSNAME]['col']; $this->criteria =& $_SESSION[UI_BROWSE_SESSNAME]['criteria']; - $this->results =& $_SESSION[UI_BROWSE_SESSNAME]['results']; + #$this->results =& $_SESSION[UI_BROWSE_SESSNAME]['results']; $this->reloadUrl = UI_BROWSER.'?popup[]=_reload_parent&popup[]=_close'; - $this->criteria['limit'] ? NULL : $this->criteria['limit'] = 5; + $this->criteria['limit'] ? NULL : $this->criteria['limit'] = 10; if (!is_array($this->col)) { - $this->col[1]['category'] = 'dc:type'; - $this->col[2]['category'] = 'dc:creator'; - $this->col[3]['category'] = 'dc:source'; - for ($col=1; $col<=3; $col++) { - $this->setCategory(array('col' => $col, 'category' => $this->col[$col]['category'])); - } + $this->setDefaults(); } - #print_r($this->col); } function setReload() @@ -28,6 +22,27 @@ class uiBrowse } + function setDefaults($reload=FALSE) + { + $this->col[1]['category'] = 'dc:type'; + $this->col[1]['value'][0] = '%%all%%'; + $this->col[2]['category'] = 'dc:creator'; + $this->col[2]['value'][0] = '%%all%%'; + $this->col[3]['category'] = 'dc:source'; + $this->col[3]['value'][0] = '%%all%%'; + for ($col=1; $col<=3; $col++) { + $this->setCategory(array('col' => $col, 'category' => $this->col[$col]['category'], 'value' => array(0=>'%%all%%'))); + } + + $this->setValue(array('col' => 1, + 'category' => 'dc:type', + 'value' => Array(0 => '%%all%%') + ) + ); + + if ($reload === TRUE) $this->setReload(); + } + function getCriteria() { return $this->criteria; @@ -36,6 +51,7 @@ class uiBrowse function getResult() { + $this->searchDB(); return $this->results; } @@ -116,7 +132,7 @@ class uiBrowse #echo "\nvalues: "; print_r($this->col[$next]['values']); $this->clearHierarchy($next); - $this->searchDB(); + #$this->searchDB(); $this->Base->redirUrl = UI_BROWSER.'?act=BROWSE'; } @@ -217,7 +233,7 @@ class uiBrowse $this->criteria['orderby'] = $by; $this->setReload(); - $this->searchDB(); + #$this->searchDB(); } @@ -234,21 +250,21 @@ class uiBrowse $o = $l * ($page-1); } $this->setReload(); - $this->searchDB(); + #$this->searchDB(); } function setLimit($limit) { $this->criteria['limit'] = $limit; $this->setReload(); - $this->searchDB(); + #$this->searchDB(); } function setFiletype($filetype) { $this->criteria['filetype'] = $filetype; $this->setReload(); - $this->searchDB(); + #$this->searchDB(); } } ?> diff --git a/livesupport/modules/htmlUI/var/ui_browser.class.php b/livesupport/modules/htmlUI/var/ui_browser.class.php index 41a7294e1..3d143707c 100644 --- a/livesupport/modules/htmlUI/var/ui_browser.class.php +++ b/livesupport/modules/htmlUI/var/ui_browser.class.php @@ -371,6 +371,8 @@ class uiBrowser extends uiBase { $handler =& new XML_Unserializer; $handler->unserialize($this->getMdata($id)); $arr = $handler->getUnserializedData(); + if (!is_array($arr)) + return FALSE; foreach ($arr['metadata'] as $key=>$val) { if ($relations[$key]) { diff --git a/livesupport/modules/htmlUI/var/ui_handler.class.php b/livesupport/modules/htmlUI/var/ui_handler.class.php index a06f80feb..c985cf433 100644 --- a/livesupport/modules/htmlUI/var/ui_handler.class.php +++ b/livesupport/modules/htmlUI/var/ui_handler.class.php @@ -58,7 +58,7 @@ class uiHandler extends uiBase { $id = $this->gb->getObjId($formdata['login'], $this->gb->storId); if(PEAR::isError($id)) { - $this->_retMsg('Login failed'); + $this->_retMsg('Access to home directory failed.'); $_SESSION['retransferFormData']['login']=$formdata['login']; $this->redirUrl = UI_BROWSER.'?popup[]=login'; return FALSE; diff --git a/livesupport/modules/htmlUI/var/ui_playlist.class.php b/livesupport/modules/htmlUI/var/ui_playlist.class.php index 1a9e2a9d8..b81eb8851 100755 --- a/livesupport/modules/htmlUI/var/ui_playlist.class.php +++ b/livesupport/modules/htmlUI/var/ui_playlist.class.php @@ -47,7 +47,7 @@ class uiPlaylist # look PL # store access token to ls_pref abd session # load PL into session - if($this->token) { + if ($this->token) { if (UI_WARNING) $this->Base->_retMsg('You have an Playlist already activated, first close it'); return FALSE; } @@ -55,7 +55,13 @@ class uiPlaylist if (UI_WARNING) $this->Base->_retMsg('Playlist has been locked by $1', $this->Base->gb->getSubjName($userid)); return FALSE; } - $this->token = $this->Base->gb->lockPlaylistForEdit($plid, $this->Base->sessid); + $token = $this->Base->gb->lockPlaylistForEdit($plid, $this->Base->sessid); + if (PEAR::isError($token)) { + #print_r($this->token); + $this->Base->_retMsg('Unable to activate playlist "$1"'. $this->Base->_getMDataValue($plid, UI_MDATA_KEY_TITLE)); + return FALSE; + } + $this->token = $token; $this->Base->gb->savePref($this->Base->sessid, UI_PL_ACCESSTOKEN_KEY, $plid.':'.$this->token); $this->activeId = $plid; if ($msg && UI_VERBOSE) $this->Base->_retMsg('Playlist "$1" activated', $this->Base->_getMDataValue($plid, UI_MDATA_KEY_TITLE)); @@ -223,20 +229,20 @@ class uiPlaylist function plwalk($arr, $parent=0, $attrs=0) { foreach ($arr['children'] as $node=>$sub) { - if ($sub['elementname']==='playlistElement') { + if (strtolower($sub['elementname'])==='playlistelement') { $this->plwalk($sub, $node, $sub['attrs']); } - if ($sub['elementname']==='audioClip' || $sub['elementname']==='playlist') { + if (strtolower($sub['elementname'])==='audioclip' || strtolower($sub['elementname'])==='playlist') { #$this->flat["$parent.$node"] = $sub['attrs']; #$this->flat["$parent.$node"]['type'] = $sub['elementname']; $this->flat[$parent] = $this->Base->_getMetaInfo($this->Base->gb->_idFromGunid($sub['attrs']['id'])); $this->flat[$parent]['attrs'] = $attrs; } - if ($sub['elementname']==='fadeInfo') { - $this->flat[$parent]['fadein'] = GreenBox::_plTimeToSecs($sub['attrs']['fadeIn']); - $this->flat[$parent]['fadeout'] = GreenBox::_plTimeToSecs($sub['attrs']['fadeOut']); - $this->flat[$parent]['fadein_ms'] = $sub['attrs']['fadeIn'] ? GreenBox::_plTimeToSecs($sub['attrs']['fadeIn']) * 1000 : 0; - $this->flat[$parent]['fadeout_ms'] = $sub['attrs']['fadeOut'] ? GreenBox::_plTimeToSecs($sub['attrs']['fadeOut']) * 1000 : 0; + if (strtolower($sub['elementname'])==='fadeinfo') { + $this->flat[$parent]['fadein'] = GreenBox::_plTimeToSecs($sub['attrs']['fadein']); + $this->flat[$parent]['fadeout'] = GreenBox::_plTimeToSecs($sub['attrs']['fadeout']); + $this->flat[$parent]['fadein_ms'] = $sub['attrs']['fadein'] ? GreenBox::_plTimeToSecs($sub['attrs']['fadein']) * 1000 : 0; + $this->flat[$parent]['fadeout_ms'] = $sub['attrs']['fadeout'] ? GreenBox::_plTimeToSecs($sub['attrs']['fadeout']) * 1000 : 0; } } } @@ -408,9 +414,15 @@ class uiPlaylist function editMetaData(&$formdata) { include dirname(__FILE__).'/formmask/metadata.inc.php'; + $id = $this->activeId; $curr_langid = $formdata['curr_langid']; - $this->Base->redirUrl = UI_BROWSER."?act=PL.editMetaData&id=$id&curr_langid=".$formdata['target_langid']; + + ## if language switched stay on metadataform ## + if ($curr_langid === $formdata['target_langid']) + $this->Base->redirUrl = UI_BROWSER."?act=PL.simpleManagement"; + else + $this->Base->redirUrl = UI_BROWSER."?act=PL.editMetaData&id=$id&curr_langid=".$formdata['target_langid']; foreach ($mask['playlist'] as $k=>$v) { $formdata[$this->Base->_formElementEncode($v['element'])] ? $mData[$this->Base->_formElementDecode($v['element'])] = $formdata[$this->Base->_formElementEncode($v['element'])] : NULL; diff --git a/livesupport/modules/htmlUI/var/ui_search.class.php b/livesupport/modules/htmlUI/var/ui_search.class.php index d970bccae..1da6f1e68 100755 --- a/livesupport/modules/htmlUI/var/ui_search.class.php +++ b/livesupport/modules/htmlUI/var/ui_search.class.php @@ -4,7 +4,7 @@ class uiSearch function uiSearch(&$uiBase) { $this->Base =& $uiBase; - $this->results =& $_SESSION[UI_SEARCH_SESSNAME]['results']; + #$this->results =& $_SESSION[UI_SEARCH_SESSNAME]['results']; $this->criteria =& $_SESSION[UI_SEARCH_SESSNAME]['criteria']; $this->reloadUrl = UI_BROWSER.'?popup[]=_reload_parent&popup[]=_close'; } @@ -14,19 +14,17 @@ class uiSearch $this->Base->redirUrl = $this->reloadUrl; } - function getResult() { + $this->searchDB(); return $this->results; } - function getCriteria() { return $this->criteria; } - function searchForm($id, &$mask2) { #print_r($this->criteria['form']); @@ -98,7 +96,7 @@ class uiSearch } } $this->Base->redirUrl = UI_BROWSER.'?act=SEARCH'; - $this->searchDB(); + #$this->searchDB(); } @@ -140,12 +138,15 @@ class uiSearch ); } $this->Base->redirUrl = UI_BROWSER.'?act=SEARCH'; - $this->searchDB(); + #$this->searchDB(); } function searchDB() { + if (count($this->criteria) === 0) + return FALSE; + $this->results = array('page' => $this->criteria['offset']/$this->criteria['limit']); #print_r($this->criteria); @@ -223,7 +224,7 @@ class uiSearch $this->criteria['orderby'] = $by; $this->setReload(); - $this->searchDB(); + #$this->searchDB(); } @@ -248,7 +249,7 @@ class uiSearch $o = $l * ($page-1); } $this->setReload(); - $this->searchDB(); + #$this->searchDB(); } } ?>