From 7cf55e020154a7234a60811662c536a895c70025 Mon Sep 17 00:00:00 2001
From: naomiaro <naomiaro@gmail.com>
Date: Sun, 16 Jan 2011 23:43:12 -0500
Subject: [PATCH] side playlist looks good.

---
 application/controllers/LibraryController.php |  2 +-
 application/layouts/scripts/library.phtml     |  2 +-
 .../scripts/playlist/sidebarcontent.phtml     | 19 +++++---
 public/css/media_library.css                  |  4 ++
 public/css/playlist_builder.css               | 45 ++++++++++++++++---
 public/js/airtime/library/spl.js              |  4 +-
 6 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/application/controllers/LibraryController.php b/application/controllers/LibraryController.php
index 718a0ca03..51d3ad918 100644
--- a/application/controllers/LibraryController.php
+++ b/application/controllers/LibraryController.php
@@ -32,7 +32,6 @@ class LibraryController extends Zend_Controller_Action
         $this->view->headScript()->appendFile('/js/airtime/onready/library.js','text/javascript');
 		$this->view->headScript()->appendFile('/js/contextmenu/jjmenu.js','text/javascript');
 		$this->view->headLink()->appendStylesheet('/css/contextmenu.css');
-		//$this->view->headLink()->appendStylesheet('/css/media_library.css');
 	
 		$this->_helper->layout->setLayout('library');
 
@@ -123,6 +122,7 @@ class LibraryController extends Zend_Controller_Action
     public function contentsAction()
     {
         $this->view->headScript()->appendFile('/js/airtime/library/library.js','text/javascript');
+		$this->view->headLink()->appendStylesheet('/css/media_library.css');
 
 		$this->_helper->viewRenderer->setResponseSegment('library'); 
 
diff --git a/application/layouts/scripts/library.phtml b/application/layouts/scripts/library.phtml
index 5540b3241..c4c1295bb 100644
--- a/application/layouts/scripts/library.phtml
+++ b/application/layouts/scripts/library.phtml
@@ -12,7 +12,7 @@
 <div id="nav"><?php echo $this->navigation()->menu()->setRenderInvisible(true) ?></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" class="ui-widget ui-widget-content ui-corner-all"><?php echo $this->layout()->library ?></div>
 
 <div id="side_playlist" class="ui-widget ui-widget-content ui-corner-all"><?php echo $this->layout()->spl ?></div>
  
diff --git a/application/views/scripts/playlist/sidebarcontent.phtml b/application/views/scripts/playlist/sidebarcontent.phtml
index 5a24e2c3f..e7a775d15 100644
--- a/application/views/scripts/playlist/sidebarcontent.phtml
+++ b/application/views/scripts/playlist/sidebarcontent.phtml
@@ -1,9 +1,14 @@
 <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_playlength"><?php echo $this->cliplength ?></span>
-	<span class="ui-icon ui-icon-close"></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; ?>
+	<div>
+		<span class="ui-icon ui-icon-play"></span>
+	</div>
+	<div>
+		<span class="spl_title"><?php echo $this->CcFiles['track_title'] ?></span>
+		<span class="spl_playlength"><?php echo $this->cliplength ?></span>
+		<span class="ui-icon ui-icon-close"></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; ?>
+	<div>
 </li>
diff --git a/public/css/media_library.css b/public/css/media_library.css
index e69de29bb..4fac97058 100644
--- a/public/css/media_library.css
+++ b/public/css/media_library.css
@@ -0,0 +1,4 @@
+#library_content {
+	float: left;
+	width: 750px;
+}
diff --git a/public/css/playlist_builder.css b/public/css/playlist_builder.css
index 7b0543fcf..35af63f19 100644
--- a/public/css/playlist_builder.css
+++ b/public/css/playlist_builder.css
@@ -1,5 +1,5 @@
 #side_playlist {
-	width: 500px;
+	width: 450px;
 	padding: 0.5em;
 	font-size: 16px;
 }
@@ -41,36 +41,69 @@
 #spl_sortable {
 	list-style: none;
 	padding:0;
+	height: 300px;
+	width: 450px;
+	overflow: auto;
+}
+
+#side_playlist li {
+	width: 425px;
+}
+
+#side_playlist li > div {
+	height: 50px;
+}
+
+#spl_name {
+	margin-top: 0.5em;
+}
+
+.ui-icon-play {
+	margin-top: 17px;
+}
+
+.ui-icon-close {
+	margin-top: 7px;
 }
 
 .spl_title {
 	display: inline-block;
-	width: 325px;
+	width: 260px;
+	margin-left: 20px;
 }
 
 .spl_playlength {
 	display: inline-block;
-	width: 150px;
+	width: 100px;
+	font-size: 85%;
+	margin-top: 15px;
 }
 
 .spl_artist {
 	font-size: 90%;
-	width: 300px;
+	width: 275px;
+	margin-left: 25px;
+	margin-top: -8px;
 }
 
 .spl_fade_control {
 	padding: 0.2em;
-	margin-top: -34px;
-	margin-left: -50px;
+	margin-top: -45px;
+	margin-left: -80px;
 	z-index: 2;
 }
 
+#spl_editor {
+	height: 50px;
+}
+
 #spl_editor > div > span {
 	display: inline-block;
 	width: 150px;
 }
 
 .ui-icon-close,
+.ui-icon-play,
 .spl_fade_control,
 .spl_playlength {
 	cursor: pointer;
diff --git a/public/js/airtime/library/spl.js b/public/js/airtime/library/spl.js
index a28cde1b1..1ed467804 100644
--- a/public/js/airtime/library/spl.js
+++ b/public/js/airtime/library/spl.js
@@ -35,7 +35,7 @@ function openCueEditor(event) {
 
 	var pos, url, li;
 	
-	li = $(this).parent();
+	li = $(this).parent().parent();
 	pos = li.attr("id").split("_").pop();
 	url = '/Playlist/set-cue/format/json';
 	url = url + '/pos/' + pos;
@@ -90,7 +90,7 @@ function deleteSPLItem(event){
 
 	event.stopPropagation();
 
-	pos = $(this).parent().attr("id").split("_").pop();
+	pos = $(this).parent().parent().attr("id").split("_").pop();
 
 	url = '/Playlist/delete-item/format/json';
 	url = url + '/pos/' + pos;