diff --git a/livesupport/modules/htmlUI/var/html/ui_browser.php b/livesupport/modules/htmlUI/var/html/ui_browser.php index 89abce486..1a010f618 100644 --- a/livesupport/modules/htmlUI/var/html/ui_browser.php +++ b/livesupport/modules/htmlUI/var/html/ui_browser.php @@ -87,6 +87,10 @@ if (is_array($_REQUEST['popup'])){ $Smarty->display('popup/PLAYLIST.confirmRelease.tpl'); break; + case "PL.arrangeItems": + $Smarty->display('popup/PLAYLIST.arrangeItems.tpl'); + break; + case "SCHEDULER.addItem": $Smarty->display('popup/SCHEDULER.addItem.tpl'); break; diff --git a/livesupport/modules/htmlUI/var/html/ui_handler.php b/livesupport/modules/htmlUI/var/html/ui_handler.php index fcff72da6..d2f5f85e2 100644 --- a/livesupport/modules/htmlUI/var/html/ui_handler.php +++ b/livesupport/modules/htmlUI/var/html/ui_handler.php @@ -231,6 +231,11 @@ switch($_REQUEST['act']){ $uiHandler->PLAYLIST->setReturn(); break; + case "PL.reArrange": + $uiHandler->PLAYLIST->reOrder($_REQUEST['pl_items']); + $uiHandler->PLAYLIST->setReload(); + break; + case "PL.editMetaData": $uiHandler->PLAYLIST->editMetaData($_REQUEST); $uiHandler->SCRATCHPAD->addItem($_REQUEST['id']); diff --git a/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl b/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl index a6f351529..55db9d0ea 100755 --- a/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl +++ b/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl @@ -1,145 +1,90 @@ -
+ +
-
-

##Playlist Editor##

-

{$PL->title}   {getHour time=$PL->duration}##h## {getMinute time=$PL->duration}##m## {getSecond time=$PL->duration}##s##

-
+
+

##Playlist Editor##

+

{$PL->title}   {getHour time=$PL->duration}##h## {getMinute time=$PL->duration}##m## {getSecond time=$PL->duration}##s##

+
-
-
 
-
 
-
 
-
+
+
 
+
 
+
 
+
+
+ + + + + + + + + + + + + + + {foreach from=$PL->getFlat($PL->activeId) key='pos' item='i'} + + + + + + + + + + + + + + + {/foreach} + {if $n} + + + + + + {else} + + + + {/if} + + +
##Title## ##Duration####Artist####Type####Move##
##Fade## {$i.fadein_ms|string_format:"%d"} ms
{$i.title} + {assign var="_duration" value=$i.duration}{niceTime in=$_duration} + {$i.creator} + {$i.type|capitalize} + + ##move up## + ##move down## +
##Fade## {$i.fadeout_ms|string_format:"%d"} ms
##No Entry##
+
+ +
+ + + +
+
+ {if $UI_PL_DRAG_ENABLED} + + {/if} + + +
+
-
- -
- - - - - - - - - - - - - -
##Name####Duration####Artist####Type####Move##
- - -
- - {foreach from=$PL->getFlat($PL->activeId) key='pos' item='i'} - -
- - - - - - - - - - - - - - - - - - - - -
##Fade## {$i.fadein_ms|string_format:"%d"} ms
{$i.title} - {assign var="_duration" value=$i.duration}{niceTime in=$_duration} - {$i.creator} - {$i.type|capitalize} - - ##move up## - ##move down## -
- - -
- - {/foreach} -
- - - {if $n} - - - - - - {else} - - - - - {/if} - - -
##Fade## {$i.fadeout_ms|string_format:"%d"} ms
##No Entry##
-
- - - -
- - - -
- -
- - - -
- -
-
- -{assign var="_duration" value=null} - - - - - \ No newline at end of file +{assign var="_duration" value=null} \ No newline at end of file diff --git a/livesupport/modules/htmlUI/var/templates/playlist/editor_dragitem.tpl b/livesupport/modules/htmlUI/var/templates/playlist/editor_dragitem.tpl index a6f351529..5d4a07563 100755 --- a/livesupport/modules/htmlUI/var/templates/playlist/editor_dragitem.tpl +++ b/livesupport/modules/htmlUI/var/templates/playlist/editor_dragitem.tpl @@ -23,7 +23,7 @@ - ##Name## + ##Title## ##Duration## ##Artist## ##Type## diff --git a/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.arrangeItems.tpl b/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.arrangeItems.tpl new file mode 100755 index 000000000..368a45083 --- /dev/null +++ b/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.arrangeItems.tpl @@ -0,0 +1,96 @@ +{include file="popup/header.tpl"} +{include file="script/alttext.js.tpl"} + +
+
+

##Reorder Playlist##

+

{$PL->title}   {getHour time=$PL->duration}##h## {getMinute time=$PL->duration}##m## {getSecond time=$PL->duration}##s##

+
+ +

+ {$UI_PL_DRAG_INTRO} + +
+ +
+ + + + + + + +
##Title####Duration####Artist####Type##
+ +
+
+ + {foreach from=$PL->getFlat($PL->activeId) key='pos' item='i'} + +
+ + + + + + + + + + + + +
{$i.title}{assign var="_duration" value=$i.duration}{niceTime in=$_duration}{$i.creator}{$i.type|capitalize}
+ + +
+ + {/foreach} + +
+ +
+ +
+
+
+
+ +
+
+
+ +{assign var="_duration" value=null} + + + + + + + +