From c57e19983c1cbfa37eaac5c6aa5af1e998c0978e Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Tue, 15 Jan 2013 14:06:02 -0500
Subject: [PATCH] -fix merge mistakes from devel

---
 .../application/views/scripts/form/preferences_general.phtml | 5 +++++
 airtime_mvc/public/js/airtime/preferences/preferences.js     | 1 +
 2 files changed, 6 insertions(+)

diff --git a/airtime_mvc/application/views/scripts/form/preferences_general.phtml b/airtime_mvc/application/views/scripts/form/preferences_general.phtml
index 96d7fb607..3a75aed95 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_general.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences_general.phtml
@@ -64,6 +64,11 @@
             <?php if($this->element->getElement('widgetCode')->hasErrors()) : ?>
                 <ul class='errors'>
                     <?php foreach($this->element->getElement('widgetCode')->getMessages() as $error): ?>
+                          <li><?php echo $error; ?></li>
+                      <?php endforeach; ?>
+                </ul>
+            <?php endif; ?>
+        </dd>
         <dt id="locale-label" class="block-display">
             <label class="required" for="locale"><?php echo $this->element->getElement('locale')->getLabel() ?>:
             </label>
diff --git a/airtime_mvc/public/js/airtime/preferences/preferences.js b/airtime_mvc/public/js/airtime/preferences/preferences.js
index 595881ca8..0c50762b0 100644
--- a/airtime_mvc/public/js/airtime/preferences/preferences.js
+++ b/airtime_mvc/public/js/airtime/preferences/preferences.js
@@ -121,6 +121,7 @@ function createWidgetHelpDescription() {
             at: "right center"
         },
     });
+}
 
 function setSoundCloudCheckBoxListener() {
     var subCheckBox= $("#UseSoundCloud,#SoundCloudDownloadbleOption");