From 86d1aafed478bef64bed16dffde598426b7291f9 Mon Sep 17 00:00:00 2001
From: Naomi <naomi@naomi-DX4840.(none)>
Date: Wed, 9 Feb 2011 16:53:11 -0500
Subject: [PATCH] can now change name/description of a playlist.

---
 application/controllers/LibraryController.php |  3 +
 .../views/scripts/playlist/metadata.phtml     |  5 +-
 public/js/airtime/library/spl.js              | 74 ++++++++++---------
 3 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/application/controllers/LibraryController.php b/application/controllers/LibraryController.php
index 281b33385..6b334c6d0 100644
--- a/application/controllers/LibraryController.php
+++ b/application/controllers/LibraryController.php
@@ -80,6 +80,9 @@ class LibraryController extends Zend_Controller_Action
 								'title' => 'Close');
 			}
 
+            $menu[] = array('action' => array('type' => 'ajax', 'url' => '/Playlist/metadata/format/json/id/#id#', 'callback' => 'window["createPlaylistMetaForm"]'), 
+							'title' => 'Edit Metadata');
+
 			$menu[] = array('action' => array('type' => 'ajax', 'url' => '/Playlist/delete'.$params, 'callback' => 'window["deletePlaylist"]'), 
 							'title' => 'Delete');
 
diff --git a/application/views/scripts/playlist/metadata.phtml b/application/views/scripts/playlist/metadata.phtml
index 41276c253..440203443 100644
--- a/application/views/scripts/playlist/metadata.phtml
+++ b/application/views/scripts/playlist/metadata.phtml
@@ -1,4 +1 @@
-<?php
-
-$this->form->setAction($this->url());
-echo $this->form;
+<?php echo $this->form; ?>
diff --git a/public/js/airtime/library/spl.js b/public/js/airtime/library/spl.js
index 7c2535b82..1885329a8 100644
--- a/public/js/airtime/library/spl.js
+++ b/public/js/airtime/library/spl.js
@@ -328,47 +328,49 @@ function closeSPL() {
 	$.post(url, noOpenPL);
 }
 
+function createPlaylistMetaForm(json) {
+    var submit, form;
+
+	submit = $('<button id="new_playlist_submit">Submit</button>')
+		.button()
+		.click(function(){
+			var url, data;
+
+			url = '/Playlist/metadata/format/json';
+			data = $("#side_playlist form").serialize(); 
+
+			$.post(url, data, function(json){
+				if(json.form){
+
+				}
+
+				openDiffSPL(json);
+			})
+		});
+
+    form = $(json.form);
+
+    form.find("input, textarea")
+        .keydown(function(event){
+            //enter was pressed
+            if(event.keyCode === 13) {
+                event.preventDefault();
+	            $("#new_playlist_submit").click();
+            }
+        })
+
+	$("#side_playlist")
+		.empty()
+		.append(form)
+		.append(submit);
+}
+
 function newSPL() {
 	var url;
 
 	url = '/Playlist/new/format/json';
 
-	$.post(url, function(json){
-		var submit, form;
-
-		submit = $('<button id="new_playlist_submit">Submit</button>')
-			.button()
-			.click(function(){
-				var url, data;
-
-				url = '/Playlist/metadata/format/json';
-				data = $("#side_playlist form").serialize(); 
-
-				$.post(url, data, function(json){
-					if(json.form){
-
-					}
-
-					openDiffSPL(json);
-				})
-			});
-
-        form = $(json.form);
-
-        form.find("input, textarea")
-            .keydown(function(event){
-                //enter was pressed
-	            if(event.keyCode === 13) {
-                    event.preventDefault();
-		            $("#new_playlist_submit").click();
-	            }
-            })
-
-		$("#side_playlist")
-			.empty()
-			.append(form)
-			.append(submit);
-	});
+	$.post(url, createPlaylistMetaForm);
 }
 
 function deleteSPL() {