From 18391604b55639af8cf33b1604b8ba2d14e9ba01 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Thu, 12 Apr 2012 10:26:11 -0400
Subject: [PATCH] CC-3424: UI Design for new drop down menu

- html integration
---
 .../application/controllers/LibraryController.php      | 10 +++++-----
 .../application/controllers/ScheduleController.php     |  6 +++---
 .../application/controllers/ShowbuilderController.php  |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php
index b3ca1dc79..8845583b6 100644
--- a/airtime_mvc/application/controllers/LibraryController.php
+++ b/airtime_mvc/application/controllers/LibraryController.php
@@ -45,7 +45,7 @@ class LibraryController extends Zend_Controller_Action
             $file = Application_Model_StoredFile::Recall($id);
 
             if (isset($this->pl_sess->id) && $screen == "playlist") {
-                $menu["pl_add"] = array("name"=> "Add to Playlist", "icon" => "copy");
+                $menu["pl_add"] = array("name"=> "Add to Playlist", "icon" => "add-playlist", "icon" => "copy");
             }
             
             
@@ -56,7 +56,7 @@ class LibraryController extends Zend_Controller_Action
             }
 
             $url = $file->getRelativeFileUrl($baseUrl).'/download/true';
-            $menu["download"] = array("name" => "Download", "url" => $url);
+            $menu["download"] = array("name" => "Download", "icon" => "download", "url" => $url);
 
             if (Application_Model_Preference::GetUploadToSoundcloudOption()) {
 
@@ -75,11 +75,11 @@ class LibraryController extends Zend_Controller_Action
                     $text = "Upload to SoundCloud";
                 }
 
-                $menu["soundcloud"]["items"]["upload"] = array("name" => $text, "url" => "/library/upload-file-soundcloud/id/{$id}");
+                $menu["soundcloud"]["items"]["upload"] = array("name" => $text, "icon" => "soundcloud", "url" => "/library/upload-file-soundcloud/id/{$id}");
 
                 if ($scid > 0){
                     $url = $file->getSoundCloudLinkToFile();
-                    $menu["soundcloud"]["items"]["view"] = array("name" => "View on Soundcloud", "url" => $url);
+                    $menu["soundcloud"]["items"]["view"] = array("name" => "View on Soundcloud", "icon" => "soundcloud", "url" => $url);
                 }
             }
         }
@@ -93,7 +93,7 @@ class LibraryController extends Zend_Controller_Action
         }
 
         //Open a jPlayer window and play the audio clip.
-        $menu["play"] = array("name"=> "Play", "icon" => "big_play");
+        $menu["play"] = array("name"=> "Play", "icon" => "play");
             
         $this->view->items = $menu;
     }
diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php
index fe9c96ef8..5431256ab 100644
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@@ -232,10 +232,10 @@ class ScheduleController extends Zend_Controller_Action
                 && !$instance->isRecorded()
                 && !$instance->isRebroadcast()) {
 
-                $menu["schedule"] = array("name"=> "Add / Remove Content",
+                $menu["schedule"] = array("name"=> "Add / Remove Content", "icon" => "add-remove-content",
                     "url" => "/showbuilder/builder-dialog/");
 
-                $menu["clear"] = array("name"=> "Remove All Content", "icon" => "delete",
+                $menu["clear"] = array("name"=> "Remove All Content", "icon" => "remove-all-content",
                     "url" => "/schedule/clear-show");
             }
 
@@ -243,7 +243,7 @@ class ScheduleController extends Zend_Controller_Action
 
         if (!$instance->isRecorded()) {
 
-            $menu["content"] = array("name"=> "Show Content", "url" => "/schedule/show-content-dialog");
+            $menu["content"] = array("name"=> "Show Content", "icon" => "overview", "url" => "/schedule/show-content-dialog");
         }
 
         if ($showEndLocalDT->getTimestamp() <= $epochNow
diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php
index b68c7d7bf..85780ef88 100644
--- a/airtime_mvc/application/controllers/ShowbuilderController.php
+++ b/airtime_mvc/application/controllers/ShowbuilderController.php
@@ -167,10 +167,10 @@ class ShowbuilderController extends Zend_Controller_Action
         $item = CcScheduleQuery::create()->findPK($id);
         $instance = $item->getCcShowInstances();
     
-        $menu["preview"] = array("name"=> "Preview");
+        $menu["preview"] = array("name"=> "Preview","icon" => "overview");
         //select the cursor
-        $menu["selCurs"] = array("name"=> "Select Cursor");
-        $menu["delCurs"] = array("name"=> "Remove Cursor");
+        $menu["selCurs"] = array("name"=> "Select Cursor","icon" => "select-cursor");
+        $menu["delCurs"] = array("name"=> "Remove Cursor","icon" => "select-cursor");
     
         if ($now < floatval($item->getDbEnds("U.u")) && $user->canSchedule($instance->getDbShowId())) {