diff --git a/campcaster/src/modules/htmlUI/var/formmask/generic.inc.php b/campcaster/src/modules/htmlUI/var/formmask/generic.inc.php index 975bce456..23c43151a 100644 --- a/campcaster/src/modules/htmlUI/var/formmask/generic.inc.php +++ b/campcaster/src/modules/htmlUI/var/formmask/generic.inc.php @@ -653,7 +653,7 @@ $ui_fmask = array( ) ) ), - 'PL.setItemPlaylength' => array( + 'PL.setClipLength' => array( 'act' => array( 'element' => 'act', 'type' => 'hidden', @@ -670,11 +670,37 @@ $ui_fmask = array( 'element' => 'duration', 'type' => 'hidden' ), - 'playlength' => array( - 'element' => 'playlength', - 'type' => 'date', - 'label' => 'Playlength', - 'options' => array('format' => 'His'), + 'clipStart' => array( + 'element' => 'clipStart', + 'type' => 'select', + 'label' => 'Cue in: ', + 'options' => array(), + 'attributes' => 'onChange="return PL_setClipLength(this)"', + 'groupit' => true + ), + 'clipLength' => array( + 'element' => 'clipLength', + 'type' => 'select', + 'label' => 'Length: ', + 'options' => array(), + 'attributes' => 'onChange="return PL_setClipLength(this)"', + 'groupit' => true + ), + 'clipEnd' => array( + 'element' => 'clipEnd', + 'type' => 'select', + 'label' => 'Cue out: ', + 'options' => array(), + 'attributes' => 'onChange="return PL_setClipLength(this)"', + 'groupit' => true + ), + array( + 'group' => array('clipStart', 'clipLength', 'clipEnd') + ), + array( + 'elemnt' => 'linebreak', + 'type' => 'static', + 'text' => '
' ), array( 'element' => 'cancel', @@ -691,9 +717,8 @@ $ui_fmask = array( ), array( 'element' => 'submitter', - 'type' => 'button', + 'type' => 'submit', 'label' => 'Submit', - 'attributes'=> array('onClick' => 'PL_checkItemPlaylength()'), 'groupit' => TRUE ), array( diff --git a/campcaster/src/modules/htmlUI/var/html/ui_browser.php b/campcaster/src/modules/htmlUI/var/html/ui_browser.php index 243308581..44e883e54 100644 --- a/campcaster/src/modules/htmlUI/var/html/ui_browser.php +++ b/campcaster/src/modules/htmlUI/var/html/ui_browser.php @@ -116,9 +116,9 @@ if (isset($_REQUEST['popup']) && is_array($_REQUEST['popup'])){ $Smarty->display('popup/PLAYLIST.arrangeItems.tpl'); break; - case "PL.setItemPlaylengthForm": - $Smarty->assign('dynform', $uiBrowser->PLAYLIST->setItemPlaylengthForm($_REQUEST['id'], $_REQUEST['elemId'], $ui_fmask['PL.setItemPlaylength'])); - $Smarty->display('popup/PLAYLIST.setItemPlaylength.tpl'); + case "PL.setClipLength": + $Smarty->assign('dynform', $uiBrowser->PLAYLIST->setClipLengthForm($_REQUEST['id'], $_REQUEST['elemId'], $ui_fmask['PL.setClipLength'])); + $Smarty->display('popup/PLAYLIST.setClipLength.tpl'); break; case "PL.export": diff --git a/campcaster/src/modules/htmlUI/var/html/ui_handler.php b/campcaster/src/modules/htmlUI/var/html/ui_handler.php index 346509d75..9e6978ba7 100644 --- a/campcaster/src/modules/htmlUI/var/html/ui_handler.php +++ b/campcaster/src/modules/htmlUI/var/html/ui_handler.php @@ -273,8 +273,8 @@ switch ($_REQUEST['act']) { $uiHandler->PLAYLIST->setReload(); break; - case "PL.setItemPlaylength": - $uiHandler->PLAYLIST->setItemPlaylength($_REQUEST['elemId'], $_REQUEST['playlength']); + case "PL.setClipLength": + $uiHandler->PLAYLIST->setClipLength($_REQUEST['elemId'], $ui_fmask['PL.setClipLength']); $uiHandler->PLAYLIST->setReload(); break; diff --git a/campcaster/src/modules/htmlUI/var/templates/menu.tpl b/campcaster/src/modules/htmlUI/var/templates/menu.tpl index 49dfabc1d..841edf697 100644 --- a/campcaster/src/modules/htmlUI/var/templates/menu.tpl +++ b/campcaster/src/modules/htmlUI/var/templates/menu.tpl @@ -39,7 +39,7 @@ if (window.attachEvent) window.attachEvent("onload", sfHover);{if $PL->reportLookedPL()} - + {else} {/if} diff --git a/campcaster/src/modules/htmlUI/var/templates/popup/PLAYLIST.setClipLength.tpl b/campcaster/src/modules/htmlUI/var/templates/popup/PLAYLIST.setClipLength.tpl new file mode 100644 index 000000000..19c5d7ae0 --- /dev/null +++ b/campcaster/src/modules/htmlUI/var/templates/popup/PLAYLIST.setClipLength.tpl @@ -0,0 +1,43 @@ +{include file="popup/header.tpl"} + + + +
+
|
+