set up fade buttons with some style. simple javascript to highlight the active choice for either editing fades or cues.

This commit is contained in:
naomiaro 2011-01-16 18:37:02 -05:00
parent ccb36c8106
commit 3674989461
4 changed files with 77 additions and 7 deletions

View File

@ -14,7 +14,7 @@
<div id="library_quick_search"><?php echo $this->layout()->quick_search ?></div> <div id="library_quick_search"><?php echo $this->layout()->quick_search ?></div>
<div id="library_content"><?php echo $this->layout()->library ?></div> <div id="library_content"><?php echo $this->layout()->library ?></div>
<div id="side_playlist"><?php echo $this->layout()->spl ?></div> <div id="side_playlist" class="ui-widget-content"><?php echo $this->layout()->spl ?></div>
</body> </body>
</html> </html>

View File

@ -1,6 +1,9 @@
<li class="spl_row" id="spl_<?php echo $this->partialCounter-1 ?>"> <li class="ui-state-default" id="spl_<?php echo $this->partialCounter-1 ?>">
<span class="spl_title"><?php echo $this->CcFiles['track_title'] ?></span> <span class="spl_title"><?php echo $this->CcFiles['track_title'] ?></span>
<span class="spl_playlength"><?php echo $this->cliplength ?></span> <span class="spl_playlength"><?php echo $this->cliplength ?></span>
<span class="ui-icon ui-icon-close"></span> <span class="ui-icon ui-icon-close"></span>
<span class="spl_artist"><?php echo $this->CcFiles['artist_name'] ?></span> <span class="spl_artist"><?php echo $this->CcFiles['artist_name'] ?></span>
<?php if($this->partialCounter-1 > 0): ?>
<div id="fade_<?php echo $this->partialCounter-1 ?>" class="spl_fade_control ui-state-default ui-corner-all">Fade</div>
<?php endif; ?>
</li> </li>

View File

@ -2,7 +2,7 @@
width: 500px; width: 500px;
} }
#side_playlist div, #side_playlist span, #side_playlist ul, #side_playlist li { #side_playlist, #side_playlist div, #side_playlist span, #side_playlist ul, #side_playlist li {
float: left; float: left;
} }
@ -18,3 +18,30 @@
height: 100px; height: 100px;
} }
#spl_sortable {
list-style: none;
padding:0;
}
.spl_title {
display: inline-block;
width: 325px;
}
.spl_playlength {
display: inline-block;
width: 150px;
}
.spl_artist {
font-size: 90%;
width: 300px;
}
.spl_fade_control {
position: relative;
margin-top: -30px;
margin-left: -50px;
z-index: 2;
}

View File

@ -2,6 +2,26 @@
//Side Playlist Functions //Side Playlist Functions
//-------------------------------------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------------------------------------
function highlightActive(el) {
$("#spl_sortable")
.find(".ui-state-active")
.removeClass("ui-state-active");
$(el).addClass("ui-state-active");
}
function openFadeEditor(event) {
event.stopPropagation();
highlightActive(this);
}
function openCueEditor(event) {
event.stopPropagation();
highlightActive(this);
}
function setSPLContent(json) { function setSPLContent(json) {
if(json.message) { if(json.message) {
@ -17,6 +37,8 @@ function setSPLContent(json) {
.append(json.html); .append(json.html);
$(".ui-icon-close").click(deleteSPLItem); $(".ui-icon-close").click(deleteSPLItem);
$(".spl_fade_control").click(openFadeEditor);
$("#spl_sortable li").click(openCueEditor);
} }
function addSPLItem(event, ui){ function addSPLItem(event, ui){
@ -36,9 +58,11 @@ function addSPLItem(event, ui){
$.post(url, setSPLContent); $.post(url, setSPLContent);
} }
function deleteSPLItem(){ function deleteSPLItem(event){
var url, pos; var url, pos;
event.stopPropagation();
pos = $(this).parent().attr("id").split("_").pop(); pos = $(this).parent().attr("id").split("_").pop();
url = '/Playlist/delete-item/format/json'; url = '/Playlist/delete-item/format/json';
@ -67,6 +91,10 @@ function noOpenPL(json) {
$("#side_playlist") $("#side_playlist")
.empty() .empty()
.append(json.html); .append(json.html);
$("#spl_new")
.button()
.click(newSPL);
} }
function closeSPL() { function closeSPL() {
@ -86,6 +114,7 @@ function newSPL() {
var submit; var submit;
submit = $('<span>Submit</span>') submit = $('<span>Submit</span>')
.button()
.click(function(){ .click(function(){
var url, data; var url, data;
@ -130,10 +159,21 @@ function setUpSPL() {
$("#spl_sortable").sortable(); $("#spl_sortable").sortable();
$("#spl_sortable" ).bind( "sortstop", moveSPLItem); $("#spl_sortable" ).bind( "sortstop", moveSPLItem);
$("#spl_remove_selected").click(deleteSPLItem); $("#spl_remove_selected").click(deleteSPLItem);
$("#spl_new").click(newSPL); $("#spl_new")
$("#spl_close").click(closeSPL); .button()
$("#spl_delete").click(deleteSPL); .click(newSPL);
$("#spl_close")
.button()
.click(closeSPL);
$("#spl_delete")
.button()
.click(deleteSPL);
$(".ui-icon-close").click(deleteSPLItem); $(".ui-icon-close").click(deleteSPLItem);
$(".spl_fade_control").click(openFadeEditor);
$("#spl_sortable li").click(openCueEditor);
$("#spl_sortable").droppable(); $("#spl_sortable").droppable();
$("#spl_sortable" ).bind( "drop", addSPLItem); $("#spl_sortable" ).bind( "drop", addSPLItem);