From 119e21ec8277a50cd202ee18eecab496e2240f67 Mon Sep 17 00:00:00 2001
From: naomiaro <naomiaro@gmail.com>
Date: Sun, 3 Apr 2011 18:32:47 -0400
Subject: [PATCH] CC-2145 : Redesign & layout fixes for the Preferences screen

printing out errors if the element has a problem
---
 .../scripts/form/preferences_general.phtml    | 30 +++++++++++-
 .../scripts/form/preferences_soundcloud.phtml | 49 +++++++++++++++++++
 2 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/application/views/scripts/form/preferences_general.phtml b/application/views/scripts/form/preferences_general.phtml
index ce4654a09..92e7956f4 100644
--- a/application/views/scripts/form/preferences_general.phtml
+++ b/application/views/scripts/form/preferences_general.phtml
@@ -6,12 +6,26 @@
         </dt>
         <dd id="stationName-element" class="block-display">
             <?php echo $this->element->getElement('stationName') ?>
+            <?php if($this->element->getElement('stationName')->hasErrors()) : ?>
+                <ul class='errors'>
+                    <?php foreach($this->element->getElement('stationName')->getMessages() as $error): ?>
+                        <li><?php echo $error; ?></li>
+                    <?php endforeach; ?>
+                </ul>
+            <?php endif; ?>
         </dd>
         <dt id="stationDefaultFade-label" class="block-display">
             <label class="optional" for="stationDefaultFade"><?php echo $this->element->getElement('stationDefaultFade')->getLabel() ?></label>
         </dt>
         <dd id="stationDefaultFade-element" class="block-display">
             <?php echo $this->element->getElement('stationDefaultFade') ?>
+            <?php if($this->element->getElement('stationDefaultFade')->hasErrors()) : ?>
+                <ul class='errors'>
+                    <?php foreach($this->element->getElement('stationDefaultFade')->getMessages() as $error): ?>
+                        <li><?php echo $error; ?></li>
+                    <?php endforeach; ?>
+                </ul>
+            <?php endif; ?>
         </dd>
         <dt id="streamFormat-label" class="block-display">
             <label class="optional"><?php echo $this->element->getElement('streamFormat')->getLabel() ?></label>
@@ -28,6 +42,13 @@
                 </label>
                 <?php $i = $i + 1; ?>
             <?php endforeach; ?>
+            <?php if($this->element->getElement('streamFormat')->hasErrors()) : ?>
+                <ul class='errors'>
+                    <?php foreach($this->element->getElement('streamFormat')->getMessages() as $error): ?>
+                        <li><?php echo $error; ?></li>
+                    <?php endforeach; ?>
+                </ul>
+            <?php endif; ?>
         </dd>
         <dt id="thirdPartyApi-label" class="block-display">
             <label class="optional"><?php echo $this->element->getElement('thirdPartyApi')->getLabel() ?></label>
@@ -43,7 +64,14 @@
                     </input>
                 </label>
             <?php $i = $i + 1; ?>
-            <?php endforeach; ?> 
+            <?php endforeach; ?>
+            <?php if($this->element->getElement('thirdPartyApi')->hasErrors()) : ?>
+                <ul class='errors'>
+                    <?php foreach($this->element->getElement('thirdPartyApi')->getMessages() as $error): ?>
+                        <li><?php echo $error; ?></li>
+                    <?php endforeach; ?>
+                </ul>
+            <?php endif; ?> 
        </dd>
 
     </dl>
diff --git a/application/views/scripts/form/preferences_soundcloud.phtml b/application/views/scripts/form/preferences_soundcloud.phtml
index ea0c46202..3ee3ad54e 100644
--- a/application/views/scripts/form/preferences_soundcloud.phtml
+++ b/application/views/scripts/form/preferences_soundcloud.phtml
@@ -5,42 +5,91 @@
                 <?php echo $this->element->getElement('UseSoundCloud') ?>
                 <strong><?php echo $this->element->getElement('UseSoundCloud')->getLabel() ?></strong>
             </label>
+            <?php if($this->element->getElement('UseSoundCloud')->hasErrors()) : ?>
+                <ul class='errors'>
+                    <?php foreach($this->element->getElement('UseSoundCloud')->getMessages() as $error): ?>
+                        <li><?php echo $error; ?></li>
+                    <?php endforeach; ?>
+                </ul>
+            <?php endif; ?> 
         </dd>
         <dt id="SoundCloudUser-label" class="block-display">
             <label class="optional" for="SoundCloudUser"><?php echo $this->element->getElement('SoundCloudUser')->getLabel() ?></label>
         </dt>
         <dd id="SoundCloudUser-element" class="block-display">
             <?php echo $this->element->getElement('SoundCloudUser') ?>
+            <?php if($this->element->getElement('SoundCloudUser')->hasErrors()) : ?>
+                <ul class='errors'>
+                    <?php foreach($this->element->getElement('SoundCloudUser')->getMessages() as $error): ?>
+                        <li><?php echo $error; ?></li>
+                    <?php endforeach; ?>
+                </ul>
+            <?php endif; ?> 
         </dd>
         <dt id="SoundCloudPassword-label" class="block-display">
             <label class="optional" for="SoundCloudPassword"><?php echo $this->element->getElement('SoundCloudPassword')->getLabel() ?></label>
         </dt>
         <dd id="SoundCloudPassword-element" class="block-display">
             <?php echo $this->element->getElement('SoundCloudPassword') ?>
+            <?php if($this->element->getElement('SoundCloudPassword')->hasErrors()) : ?>
+                <ul class='errors'>
+                    <?php foreach($this->element->getElement('SoundCloudPassword')->getMessages() as $error): ?>
+                        <li><?php echo $error; ?></li>
+                    <?php endforeach; ?>
+                </ul>
+            <?php endif; ?> 
         </dd>
         <dt id="SoundCloudTags-label" class="block-display">
             <label class="optional" for="SoundCloudTags"><?php echo $this->element->getElement('SoundCloudTags')->getLabel() ?></label>
         </dt>
         <dd id="SoundCloudTags-element" class="block-display clearfix">
             <?php echo $this->element->getElement('SoundCloudTags') ?>
+            <?php if($this->element->getElement('SoundCloudTags')->hasErrors()) : ?>
+                <ul class='errors'>
+                    <?php foreach($this->element->getElement('SoundCloudTags')->getMessages() as $error): ?>
+                        <li><?php echo $error; ?></li>
+                    <?php endforeach; ?>
+                </ul>
+            <?php endif; ?>
         </dd>
         <dt id="SoundCloudGenre-label" class="block-display">
             <label class="optional" for="SoundCloudGenre"><?php echo $this->element->getElement('SoundCloudGenre')->getLabel() ?></label>
         </dt>
         <dd id="SoundCloudGenre-element" class="block-display">
             <?php echo $this->element->getElement('SoundCloudGenre') ?>
+             <?php if($this->element->getElement('SoundCloudGenre')->hasErrors()) : ?>
+                <ul class='errors'>
+                    <?php foreach($this->element->getElement('SoundCloudGenre')->getMessages() as $error): ?>
+                        <li><?php echo $error; ?></li>
+                    <?php endforeach; ?>
+                </ul>
+            <?php endif; ?>
         </dd>
         <dt id="SoundCloudTrackType-label" class="block-display">
              <label class="optional" for="SoundCloudTrackType"><?php echo $this->element->getElement('SoundCloudTrackType')->getLabel() ?></label>
         </dt>
         <dd id="SoundCloudTrackType-element" class="block-display">
             <?php echo $this->element->getElement('SoundCloudTrackType') ?>
+            <?php if($this->element->getElement('SoundCloudTrackType')->hasErrors()) : ?>
+                <ul class='errors'>
+                    <?php foreach($this->element->getElement('SoundCloudTrackType')->getMessages() as $error): ?>
+                        <li><?php echo $error; ?></li>
+                    <?php endforeach; ?>
+                </ul>
+            <?php endif; ?>
         </dd>
         <dt id="SoundCloudLicense-label" class="block-display">
             <label class="optional" for="SoundCloudLicense"><?php echo $this->element->getElement('SoundCloudLicense')->getLabel() ?></label>
         </dt>
         <dd id="SoundCloudLicense-element" class="block-display">
             <?php echo $this->element->getElement('SoundCloudLicense') ?>
+            <?php if($this->element->getElement('SoundCloudLicense')->hasErrors()) : ?>
+                <ul class='errors'>
+                    <?php foreach($this->element->getElement('SoundCloudLicense')->getMessages() as $error): ?>
+                        <li><?php echo $error; ?></li>
+                    <?php endforeach; ?>
+                </ul>
+            <?php endif; ?>
         </dd>
     </dl>
 </fieldset>