From 3df0f2d26e605716ef9a5a17f9263e417b26eacf Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Thu, 26 Jul 2012 12:45:31 -0400
Subject: [PATCH 1/2] CC-84: Smart Playlists

- added 'add' option to smart playlist context menu
---
 airtime_mvc/application/controllers/LibraryController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php
index fe783d953..159c5a6b3 100644
--- a/airtime_mvc/application/controllers/LibraryController.php
+++ b/airtime_mvc/application/controllers/LibraryController.php
@@ -72,6 +72,9 @@ class LibraryController extends Zend_Controller_Action
                 $obj = new Application_Model_Playlist($id);
             } else {
                 $obj = new Application_Model_Block($id);
+                if ($isAdminOrPM || $obj->getCreatorId() == $user->getId()) {
+                    $menu["pl_add"] = array("name"=> "Add to ".ucfirst($this->obj_sess->type), "icon" => "add-playlist", "icon" => "copy");
+                }
             }
             
             if ($this->obj_sess->id !== $id && $screen == "playlist") {

From a828c46d32f9f97e3787fd77266ea1793b312f0c Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Thu, 26 Jul 2012 13:16:29 -0400
Subject: [PATCH 2/2] CC-84: Smart Playlists

- changed name of 'block' to 'smart playlist' on UI only
---
 .../application/controllers/LibraryController.php    | 12 ++++++++++--
 .../application/controllers/PlaylistController.php   |  2 +-
 airtime_mvc/public/js/airtime/library/library.js     |  6 +-----
 airtime_mvc/public/js/airtime/library/spl.js         |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php
index 159c5a6b3..8f5a97a8c 100644
--- a/airtime_mvc/application/controllers/LibraryController.php
+++ b/airtime_mvc/application/controllers/LibraryController.php
@@ -57,7 +57,11 @@ class LibraryController extends Zend_Controller_Action
                     $obj = new Application_Model_Block($this->obj_sess->id);
                 }
                 if ($isAdminOrPM || $obj->getCreatorId() == $user->getId()) {
-                    $menu["pl_add"] = array("name"=> "Add to ".ucfirst($this->obj_sess->type), "icon" => "add-playlist", "icon" => "copy");
+                    if ($this->obj_sess->type === "playlist") {
+                        $menu["pl_add"] = array("name"=> "Add to Playlist", "icon" => "add-playlist", "icon" => "copy");
+                    } else {
+                        $menu["pl_add"] = array("name"=> "Add to Smart Playlist", "icon" => "add-playlist", "icon" => "copy");
+                    }
                 }
             }
             if ($isAdminOrPM) {
@@ -73,7 +77,11 @@ class LibraryController extends Zend_Controller_Action
             } else {
                 $obj = new Application_Model_Block($id);
                 if ($isAdminOrPM || $obj->getCreatorId() == $user->getId()) {
-                    $menu["pl_add"] = array("name"=> "Add to ".ucfirst($this->obj_sess->type), "icon" => "add-playlist", "icon" => "copy");
+                    if ($this->obj_sess->type === "playlist") {
+                        $menu["pl_add"] = array("name"=> "Add to Playlist", "icon" => "add-playlist", "icon" => "copy");
+                    } else {
+                        $menu["pl_add"] = array("name"=> "Add to Smart Playlist", "icon" => "add-playlist", "icon" => "copy");
+                    }
                 }
             }
             
diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php
index abac5d840..570f35326 100644
--- a/airtime_mvc/application/controllers/PlaylistController.php
+++ b/airtime_mvc/application/controllers/PlaylistController.php
@@ -219,7 +219,7 @@ class PlaylistController extends Zend_Controller_Action
         
         $name = 'Untitled Playlist';
         if ($type == 'block') {
-            $name = 'Untitled Smart Block';
+            $name = 'Untitled Smart Playlist';
         }
 
         $obj = new $objInfo['className']();
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index b2c890795..d64fa26de 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -614,11 +614,7 @@ var AIRTIME = (function(AIRTIME) {
                         }
                         else {
                             callback = function() {
-                                if (data.ftype === "playlist") {
-                                    AIRTIME.playlist.fnEdit(data.id, 'playlist');
-                                } else {
-                                    AIRTIME.playlist.fnEdit(data.id, 'block');
-                                }
+                                AIRTIME.playlist.fnEdit(data.id, data.ftype);
                             };
                         }
                         oItems.edit.callback = callback;
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js
index f270a305b..a394b6e14 100644
--- a/airtime_mvc/public/js/airtime/library/spl.js
+++ b/airtime_mvc/public/js/airtime/library/spl.js
@@ -759,7 +759,7 @@ var AIRTIME = (function(AIRTIME){
             ignoreRightClick: true,
             items: {
                 "sp": {name: "New Playlist", callback: AIRTIME.playlist.fnNew},
-                "sb": {name: "New Smart Block", callback: AIRTIME.playlist.fnNewBlock}
+                "sb": {name: "New Smart Playlist", callback: AIRTIME.playlist.fnNewBlock}
             }
         });
 	    /*