From e8265614ba91904cea97cd105383a9355381dc2b Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Mon, 27 Jun 2011 18:05:28 +0200
Subject: [PATCH 1/2] CC-2456 : Multiple storage folders show up on the same
 line

---
 .../views/scripts/form/preferences_watched_dirs.phtml | 11 +++++++----
 .../public/js/airtime/preferences/musicdirs.js        |  6 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

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 4195bce75..ca6704678 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
@@ -34,15 +34,18 @@
             <?php endif; ?>
         </dd>
         <?php $watched_dirs = MusicDir::getWatchedDirs(); ?>
-        <dd id="watchedFolder-table" class="block-display selected-item">
+
         <?php if (count($watched_dirs) > 0): ?>
             <?php foreach($watched_dirs as $watched_dir): ?>
-                 <span><?php echo $watched_dir->getDirectory(); ?></span><span class="ui-icon ui-icon-close"></span>
+                <dd class="block-display selected-item">
+                    <span><?php echo $watched_dir->getDirectory(); ?></span><span class="ui-icon ui-icon-close"></span>
+                </dd>
             <?php endforeach; ?>
         <?php else: ?>
-            <span>You are not watching any music folders.</span>
+            <dd class="block-display selected-item">
+                <span>You are not watching any music folders.</span>
+            </dd>
         <?php endif; ?>
-        </dd>
 
     </dl>
 </fieldset>
diff --git a/airtime_mvc/public/js/airtime/preferences/musicdirs.js b/airtime_mvc/public/js/airtime/preferences/musicdirs.js
index 18b5a5283..47df6d58a 100644
--- a/airtime_mvc/public/js/airtime/preferences/musicdirs.js
+++ b/airtime_mvc/public/js/airtime/preferences/musicdirs.js
@@ -16,7 +16,7 @@ function setWatchedDirEvents() {
         systemImageUrl: 'img/browser/',
         handlerUrl: '/Preference/server-browse/format/json',
         title: 'Choose Storage Folder',
-        basePath: '/home',
+        basePath: '',
         requestMethod: 'POST',
     });
 
@@ -36,7 +36,7 @@ function setWatchedDirEvents() {
         systemImageUrl: 'img/browser/',
         handlerUrl: '/Preference/server-browse/format/json',
         title: 'Choose Folder to Watch',
-        basePath: '/home',
+        basePath: '',
         requestMethod: 'POST',
     });
 
@@ -72,7 +72,7 @@ function setWatchedDirEvents() {
             });
     });
 
-    $('#watchedFolder-table').find('.ui-icon-close').click(function(){
+    $('.selected-item').find('.ui-icon-close').click(function(){
         var row = $(this).parent();
         var folder = $(this).prev().text();
 

From f3746ff1977a28b5c707d5820cb94695dbd883b0 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Mon, 27 Jun 2011 18:30:52 +0200
Subject: [PATCH 2/2] cc-1799 : filesystem

---
 .../media-monitor/airtimefilemonitor/airtimenotifier.py  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py b/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py
index 25053362d..976910156 100644
--- a/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py
+++ b/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py
@@ -30,10 +30,9 @@ class AirtimeNotifier(Notifier):
         while not self.init_rabbit_mq():
             logger.error("Error connecting to RabbitMQ Server. Trying again in few seconds")
             time.sleep(5)
-        
+
     def init_rabbit_mq(self):
-        logger = logging.getLogger('fetch')
-        logger.info("Initializing RabbitMQ stuff")
+        self.logger.info("Initializing RabbitMQ stuff")
         try:
             schedule_exchange = Exchange("airtime-media-monitor", "direct", durable=True, auto_delete=True)
             schedule_queue = Queue("media-monitor", exchange=schedule_exchange, key="filesystem")
@@ -43,9 +42,9 @@ class AirtimeNotifier(Notifier):
             consumer.register_callback(self.handle_message)
             consumer.consume()
         except Exception, e:
-            logger.error(e)
+            self.logger.error(e)
             return False
-            
+
         return True
 
     def handle_message(self, body, message):