From a1a0dd2b6219025190fd499fb69bda55e4b439a3 Mon Sep 17 00:00:00 2001
From: naomiaro <naomiaro@gmail.com>
Date: Wed, 6 Oct 2010 14:59:39 -0400
Subject: [PATCH] playlist sidebar done.

---
 htmlUI/html/css/playlist.css         | 14 ++++++++++++++
 htmlUI/html/styles_campcaster.css    |  2 +-
 htmlUI/templates/playlist/editor.tpl |  2 +-
 htmlUI/ui_handler.php                |  4 ++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/htmlUI/html/css/playlist.css b/htmlUI/html/css/playlist.css
index d473c9e5f..cf2b85e16 100644
--- a/htmlUI/html/css/playlist.css
+++ b/htmlUI/html/css/playlist.css
@@ -166,6 +166,20 @@
 	color: #ffffff;
 }
 
+#spl_info {
+	margin: 1em 0;
+}
+
+#spl_info div{
+	padding-top: 5px;
+}
+
+#spl_info .sub{
+	font-weight: bold;
+	margin-right: 3px;
+	margin-left: 15px;
+}
+
 .spl_title {
 	width: 73px;
 }
diff --git a/htmlUI/html/styles_campcaster.css b/htmlUI/html/styles_campcaster.css
index 7338584b1..527bbc232 100644
--- a/htmlUI/html/styles_campcaster.css
+++ b/htmlUI/html/styles_campcaster.css
@@ -16,7 +16,7 @@ img {
 
 form {
     font-size: 12px;
-    margin: 15px 0 15px 0;
+    margin: 5px 0;
 }
 
 
diff --git a/htmlUI/templates/playlist/editor.tpl b/htmlUI/templates/playlist/editor.tpl
index 1b25b70e1..8b07dd8ac 100644
--- a/htmlUI/templates/playlist/editor.tpl
+++ b/htmlUI/templates/playlist/editor.tpl
@@ -57,7 +57,7 @@
         <input type="button" class="button_large" onClick="collector_clearAll('PL', 'PL.removeItem')" value="##Clear Playlist##" />
     </div>
     <div class="pl_container_button">
-        <input type="button" class="button_large" onClick="location.href='{$UI_HANDLER}?act=PL.release'" value="##Close Playlist##">
+        <input type="button" class="button_large" onClick="popup('{$UI_BROWSER}?popup[]=PL.confirmRelease', 'PL.confirmRelease', 400, 50)" value="##Close Playlist##">
         <input type="button" class="button_large" value="##Description##"      onClick="location.href='{$UI_BROWSER}?act=PL.editMetaData'">
         <input type="button" class="button_large" value="##Delete Playlist##"  onClick="popup('{$UI_BROWSER}?popup[]=PL.confirmDelete',  'PL.deleteActive',   400, 50)">
     </div>
diff --git a/htmlUI/ui_handler.php b/htmlUI/ui_handler.php
index 351235134..7ce931a10 100644
--- a/htmlUI/ui_handler.php
+++ b/htmlUI/ui_handler.php
@@ -299,7 +299,7 @@ switch ($_REQUEST['act']) {
 	    if ($uiHandler->PLAYLIST->activate($_REQUEST['id']) === TRUE) {
 	    	$uiHandler->SCRATCHPAD->addItem($_REQUEST['id'], TRUE);
 	    }
-	    $uiHandler->PLAYLIST->setRedirect();
+	    $uiHandler->PLAYLIST->setReload();
 	    break;
 
     case "PL.create":
@@ -337,7 +337,7 @@ switch ($_REQUEST['act']) {
 
     case "PL.release":
 	    $uiHandler->PLAYLIST->release();
-	    $uiHandler->PLAYLIST->setReturn();
+	    $uiHandler->PLAYLIST->setReload();
 	    break;
 
     case "PL.save":