From 0ec58f0bc33d7fbe8ceb062e03b7a5612867037a Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Wed, 11 Apr 2012 17:24:26 -0400
Subject: [PATCH] CC-3250: UI design for mount monitor for media monitor (
 Manage Media Folder and Playlist Builder screen)

- adding tooltip and fixed a minor bug
---
 .../application/controllers/ApiController.php |  5 ++---
 .../form/preferences_watched_dirs.phtml       |  2 +-
 airtime_mvc/public/js/airtime/library/spl.js  |  2 +-
 .../js/airtime/preferences/musicdirs.js       | 20 ++++++++++++++++++-
 python_apps/api_clients/api_client.py         |  5 ++++-
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 514fcf6d5..284c4aaff 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -875,11 +875,10 @@ class ApiController extends Zend_Controller_Action
         $watched_dirs = Application_Model_MusicDir::getWatchedDirs(null,null);
 
             foreach( $added_list as $ad){
+                $ad .= '/';
                 foreach( $watched_dirs as $dir ){
                     $dirPath = $dir->getDirectory();
 
-                    $ad .= '/';
-
                     // if mount path itself was watched
                     if($dirPath == $ad){
                         Application_Model_MusicDir::addWatchedDir($dirPath, false);
@@ -901,9 +900,9 @@ class ApiController extends Zend_Controller_Action
                 }
             }
             foreach( $removed_list as $rd){
+                $rd .= '/';
                 foreach( $watched_dirs as $dir ){
                     $dirPath = $dir->getDirectory();
-                    $rd .= '/';
                     // if dir contains any dir in removed_list( if watched dir resides on new mounted path )
                     if(substr($dirPath, 0, strlen($rd)) === $rd && $dir->getExistsFlag() == true){
                         Application_Model_MusicDir::removeWatchedDir($dirPath, false);
diff --git a/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml b/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
index 192c40474..88b7a804d 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
@@ -38,7 +38,7 @@
         <?php if (count($watched_dirs) > 0): ?>
             <?php foreach($watched_dirs as $watched_dir): ?>
                 <dd class="block-display selected-item">
-                    <span><?php echo ($watched_dir->getExistsFlag())?"":"<img src='/css/images/warning-icon.png'>"?></span><span><?php echo $watched_dir->getDirectory();?></span></span><span class="ui-icon ui-icon-close"></span>
+                    <?php echo ($watched_dir->getExistsFlag())?"":"<span class='ui-icon-alert'><img src='/css/images/warning-icon.png'></span>"?><span><?php echo $watched_dir->getDirectory();?></span></span><span class="ui-icon ui-icon-close"></span>
                 </dd>
             <?php endforeach; ?>
         <?php else: ?>
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js
index adb3d9891..a3b01f335 100644
--- a/airtime_mvc/public/js/airtime/library/spl.js
+++ b/airtime_mvc/public/js/airtime/library/spl.js
@@ -764,7 +764,7 @@ var AIRTIME = (function(AIRTIME){
 		
 		$pl.find(".ui-icon-alert").qtip({
 	        content: {
-	            text: "File does not exist on disk..."
+	            text: "Airtime is unsure about the status of this file. This can happen when the file is on a remote drive that is unaccessible or the file is in a directory that isn't \"watched\" anymore."
 	        },
 	        position:{
 	            adjust: {
diff --git a/airtime_mvc/public/js/airtime/preferences/musicdirs.js b/airtime_mvc/public/js/airtime/preferences/musicdirs.js
index 796baec96..7e70b8650 100644
--- a/airtime_mvc/public/js/airtime/preferences/musicdirs.js
+++ b/airtime_mvc/public/js/airtime/preferences/musicdirs.js
@@ -98,5 +98,23 @@ function setWatchedDirEvents() {
 $(document).ready(function() {
 
     setWatchedDirEvents();
-
+    $(".ui-icon-alert").qtip({
+        content: {
+            text: "This path is currently not accessible."
+        },
+        position:{
+            adjust: {
+            resize: true,
+            method: "flip flip"
+            },
+            at: "right center",
+            my: "left top",
+            viewport: $(window)
+        },
+        style: {
+            classes: "ui-tooltip-dark"
+        },
+        show: 'mouseover',
+        hide: 'mouseout'
+    });
 });
diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py
index 1f32a993b..747f26300 100755
--- a/python_apps/api_clients/api_client.py
+++ b/python_apps/api_clients/api_client.py
@@ -442,7 +442,10 @@ class AirTimeApiClient(ApiClientInterface):
 
         except Exception, e:
             response = None
-            logger.error("Exception with file %s: %s", md, e)
+            import traceback
+            top = traceback.format_exc()
+            logger.error('Exception: %s', e)
+            logger.error("traceback: %s", top)
 
         return response