From 23683ccccb70f838288582d8a1ce9cca2bfc1ddd Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Thu, 9 Aug 2012 17:43:12 -0400
Subject: [PATCH 1/2] Smart Playlists: changed positioning of error message on
 click 'Save'

---
 .../application/views/scripts/playlist/smart-block.phtml    | 1 +
 .../public/js/airtime/playlist/smart_playlistbuilder.js     | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
index 35e581858..d720ae7a0 100644
--- a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
@@ -24,6 +24,7 @@ if (isset($this->obj)) {
         </h3>
         <h4 id="obj_length"><?php echo $this->length; ?></h4>
     </div>
+    <div id='sp-success-saved' class='success' style='display:none'></div>
 
     <fieldset class="toggle closed" id="fieldset-metadate_change">
         <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>View / edit description</legend>
diff --git a/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
index 058f51060..0a4637b24 100644
--- a/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
+++ b/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
@@ -475,7 +475,7 @@ function callback(data, type) {
             AIRTIME.playlist.fnOpenPlaylist(json);
             form = $('#smart-playlist-form');
             if (type == 'shuffle') {
-                form.find('.success').text('Playlist shuffled');
+                form.find('.success').text('Smart playlist shuffled');
             } else if (type == 'generate') {
             	form.find('.success').text('Smart playlist generated and saved');
             	//redraw library table so the length gets updated
@@ -484,8 +484,8 @@ function callback(data, type) {
     	    form.find('.success').show();
     	    form.find('#smart_playlist_options').removeClass("closed");
         } else {
-            form.find('.success').text('Smart Playlist saved');
-            form.find('.success').show();
+            $('#sp-success-saved').text('Smart playlist saved');
+            $('#sp-success-saved').show();
             
             /* Update number of files that meet criteria and change icon to success/warning
              * as appropriate. This is also done in the form but we do not pass the form

From 321e6c65242e8a889e509526b1190e946a49cafc Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Thu, 9 Aug 2012 17:55:08 -0400
Subject: [PATCH 2/2] CC-4197: Media Library -> Regular Playlist: Some
 character get cut off in context view

-fixed
---
 .../views/scripts/library/get-file-metadata.ajax.phtml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml b/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
index 468bcf57c..82c74b2ec 100644
--- a/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
+++ b/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
@@ -53,7 +53,7 @@
         <?php foreach($this->contents as $row) : ?>
             <?php
             $titleMaxStrLen = 35;
-            if (strlen($row["track_title"]) > $titleMaxStrLen) {
+            if (mb_strlen($row["track_title"], 'UTF-8') > $titleMaxStrLen) {
                 $row["track_title"] = substr($row["track_title"], 0, 34)."...";
             }
             $artistMaxStrLen = 22;