From 9b4f9c8aa4a2f6dc98f7bbd6a9f77ccc2236571a Mon Sep 17 00:00:00 2001
From: naomiaro <naomiaro@gmail.com>
Date: Sun, 16 Jan 2011 20:40:34 -0500
Subject: [PATCH] changed cue in edit to happen when cliplength clicked to
 avoid event problems with moving playlist items.

---
 application/layouts/scripts/library.phtml     |  2 +-
 .../views/scripts/playlist/index.phtml        |  6 +--
 public/css/playlist_builder.css               | 42 ++++++++++++++++---
 public/js/airtime/library/spl.js              | 19 +++++----
 4 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/application/layouts/scripts/library.phtml b/application/layouts/scripts/library.phtml
index 300e56444..5540b3241 100644
--- a/application/layouts/scripts/library.phtml
+++ b/application/layouts/scripts/library.phtml
@@ -14,7 +14,7 @@
 <div id="library_quick_search"><?php echo $this->layout()->quick_search ?></div>
 <div id="library_content"><?php echo $this->layout()->library ?></div>
 
-<div id="side_playlist" class="ui-widget-content"><?php echo $this->layout()->spl ?></div>
+<div id="side_playlist" class="ui-widget ui-widget-content ui-corner-all"><?php echo $this->layout()->spl ?></div>
  
 </body>
 </html>
diff --git a/application/views/scripts/playlist/index.phtml b/application/views/scripts/playlist/index.phtml
index f411cc58f..ee53fad7e 100644
--- a/application/views/scripts/playlist/index.phtml
+++ b/application/views/scripts/playlist/index.phtml
@@ -1,7 +1,7 @@
-<span id="spl_new">New</span>
+<button id="spl_new">New</button>
 <?php if (isset($this->pl)) : ?>
-<span id="spl_delete">Delete</span>
-<span id="spl_close">Close</span>
+<button id="spl_delete">Delete</button>
+<button id="spl_close">Close</button>
 <?php endif; ?>
 
 <?php if (isset($this->pl)) : ?>
diff --git a/public/css/playlist_builder.css b/public/css/playlist_builder.css
index 03001b057..7b0543fcf 100644
--- a/public/css/playlist_builder.css
+++ b/public/css/playlist_builder.css
@@ -1,16 +1,36 @@
 #side_playlist {
 	width: 500px;
+	padding: 0.5em;
+	font-size: 16px;
 }
 
-#side_playlist, #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, 
+#side_playlist button {
 	float: left;
 }
 
-#spl_sortable, #spl_sortable > li, .spl_artist, #side_playlist > div{
+#spl_sortable, 
+#spl_sortable > li, 
+#side_playlist > div,
+#spl_editor,
+.spl_artist,
+.spl_cue_in,
+.spl_fade_in,
+.spl_cue_out,
+.spl_fade_out {
 	clear: left;
 }
 
-#side_playlist input, #side_playlist textarea {
+#side_playlist button {
+	font-size: 12px;
+}
+
+#side_playlist input, 
+#side_playlist textarea {
 	width: 200px;
 }
 
@@ -39,9 +59,21 @@
 }
 
 .spl_fade_control {
-	position: relative;
-	margin-top: -30px;
+	padding: 0.2em;
+	margin-top: -34px;
 	margin-left: -50px;
 	z-index: 2;
 }
 
+#spl_editor > div > span {
+	display: inline-block;
+	width: 150px;
+}
+
+.ui-icon-close,
+.spl_fade_control,
+.spl_playlength {
+	cursor: pointer;
+}
+
+
diff --git a/public/js/airtime/library/spl.js b/public/js/airtime/library/spl.js
index 7e51bf021..a28cde1b1 100644
--- a/public/js/airtime/library/spl.js
+++ b/public/js/airtime/library/spl.js
@@ -33,13 +33,14 @@ function openFadeEditor(event) {
 function openCueEditor(event) {
 	event.stopPropagation();
 
-	var pos, url;
+	var pos, url, li;
 	
-	pos = $(this).attr("id").split("_").pop();
+	li = $(this).parent();
+	pos = li.attr("id").split("_").pop();
 	url = '/Playlist/set-cue/format/json';
 	url = url + '/pos/' + pos;
 
-	highlightActive(this);
+	highlightActive(li);
 
 	$.get(url, setEditorContent);	
 }
@@ -57,10 +58,14 @@ function setSPLContent(json) {
 		.append(json.length);		
 	$('#spl_sortable').empty()
 		.append(json.html);	
+	$("#spl_editor")
+		.empty();
 
 	$(".ui-icon-close").click(deleteSPLItem);
 	$(".spl_fade_control").click(openFadeEditor);
-	$("#spl_sortable li").click(openCueEditor);
+	$(".spl_playlength").click(openCueEditor);
+
+	return false;
 }
 
 function addSPLItem(event, ui){
@@ -95,7 +100,7 @@ function deleteSPLItem(event){
 
 function moveSPLItem(event, ui) {	
 	var li, newPos, oldPos, url;
-	
+
 	li = ui.item;
 	
     newPos = li.index();
@@ -135,7 +140,7 @@ function newSPL() {
 	$.post(url, function(json){
 		var submit;
 
-		submit = $('<span>Submit</span>')
+		submit = $('<button>Submit</button>')
 			.button()
 			.click(function(){
 				var url, data;
@@ -195,7 +200,7 @@ function setUpSPL() {
 
 	$(".ui-icon-close").click(deleteSPLItem);
 	$(".spl_fade_control").click(openFadeEditor);
-	$("#spl_sortable li").click(openCueEditor);
+	$(".spl_playlength").click(openCueEditor);
 
 	$("#spl_sortable").droppable();
 	$("#spl_sortable" ).bind( "drop", addSPLItem);