From eb312ae4544ae17c395f4a094afd77a344178c82 Mon Sep 17 00:00:00 2001
From: Naomi <naomi@naomi-DX4840.(none)>
Date: Fri, 15 Apr 2011 10:51:06 -0400
Subject: [PATCH] fixes to template, javascript to handle error arrays.

---
 .../form/add-show-rebroadcast-absolute.phtml  | 26 ++++++++---------
 .../scripts/form/add-show-rebroadcast.phtml   | 28 +++++++++----------
 .../public/js/airtime/schedule/add-show.js    |  2 +-
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/form/add-show-rebroadcast-absolute.phtml b/airtime_mvc/application/views/scripts/form/add-show-rebroadcast-absolute.phtml
index 3d46ca8c9..af562738a 100644
--- a/airtime_mvc/application/views/scripts/form/add-show-rebroadcast-absolute.phtml
+++ b/airtime_mvc/application/views/scripts/form/add-show-rebroadcast-absolute.phtml
@@ -18,21 +18,21 @@
                         <span class="ui-button-text">Remove</span>
                     </a>
                 <?php endif; ?>
-            </li>
-            <?php if(($this->element->getElement('add_show_rebroadcast_date_absolute_'.$i)->hasErrors()) 
+                <?php if(($this->element->getElement('add_show_rebroadcast_date_absolute_'.$i)->hasErrors()) 
                   || ($this->element->getElement('add_show_rebroadcast_time_absolute_'.$i)->hasErrors())) : ?>
-                <ul class='errors'>
-                    <?php $errors = array_merge(
-                            $this->element->getElement('add_show_rebroadcast_date_absolute_'.$i)->getMessages(),
-                            $this->element->getElement('add_show_rebroadcast_time_absolute_'.$i)->getMessages()
-                            );
-                    ?> 
+                    <ul class='errors'>
+                        <?php $errors = array_merge(
+                                $this->element->getElement('add_show_rebroadcast_date_absolute_'.$i)->getMessages(),
+                                $this->element->getElement('add_show_rebroadcast_time_absolute_'.$i)->getMessages()
+                                );
+                        ?> 
 
-                    <?php foreach($errors as $error): ?>
-                        <li><?php echo $error; ?></li>
-                    <?php endforeach; ?>
-                </ul>
-            <?php endif; ?>
+                        <?php foreach($errors as $error): ?>
+                            <li><?php echo $error; ?></li>
+                        <?php endforeach; ?>
+                    </ul>
+                <?php endif; ?>
+            </li>
         <?php endfor; ?>
     </ul>
     <a class="ui-button ui-button-icon-only  ui-widget ui-state-default add_absolute_rebroadcast_day">
diff --git a/airtime_mvc/application/views/scripts/form/add-show-rebroadcast.phtml b/airtime_mvc/application/views/scripts/form/add-show-rebroadcast.phtml
index 870be276c..41a4fce79 100644
--- a/airtime_mvc/application/views/scripts/form/add-show-rebroadcast.phtml
+++ b/airtime_mvc/application/views/scripts/form/add-show-rebroadcast.phtml
@@ -18,22 +18,22 @@
                             <span class="ui-button-text">Remove</span>
                         </a>
                     <?php endif; ?>
+                    <?php if(($this->element->getElement('add_show_rebroadcast_date_'.$i)->hasErrors()) 
+                      || ($this->element->getElement('add_show_rebroadcast_time_'.$i)->hasErrors())) : ?>
+                        <ul class='errors'>
+                            <?php $errors = array_merge(
+                                    $this->element->getElement('add_show_rebroadcast_date_'.$i)->getMessages(),
+                                    $this->element->getElement('add_show_rebroadcast_time_'.$i)->getMessages()
+                                    );
+                            ?> 
+
+                            <?php foreach($errors as $error): ?>
+                                <li><?php echo $error; ?></li>
+                            <?php endforeach; ?>
+                        </ul>
+                    <?php endif; ?>
                 </li>
 
-                <?php if(($this->element->getElement('add_show_rebroadcast_date_'.$i)->hasErrors()) 
-                      || ($this->element->getElement('add_show_rebroadcast_time_'.$i)->hasErrors())) : ?>
-                    <ul class='errors'>
-                        <?php $errors = array_merge(
-                                $this->element->getElement('add_show_rebroadcast_date_'.$i)->getMessages(),
-                                $this->element->getElement('add_show_rebroadcast_time_'.$i)->getMessages()
-                                );
-                        ?> 
-
-                        <?php foreach($errors as $error): ?>
-                            <li><?php echo $error; ?></li>
-                        <?php endforeach; ?>
-                    </ul>
-                <?php endif; ?>
                 <?php endfor; ?>
             </ul>
         <a class="ui-button ui-button-icon-only  ui-widget ui-state-default add_absolute_rebroadcast_day">
diff --git a/airtime_mvc/public/js/airtime/schedule/add-show.js b/airtime_mvc/public/js/airtime/schedule/add-show.js
index 2bc224686..b662ae64c 100644
--- a/airtime_mvc/public/js/airtime/schedule/add-show.js
+++ b/airtime_mvc/public/js/airtime/schedule/add-show.js
@@ -160,7 +160,7 @@ function setAddShowEvents() {
     });
 
     form.find(".add_absolute_rebroadcast_day").click(function(){
-        var li = $(this).prev().find("li:visible:last").next();
+        var li = $(this).parent().find("ul.formrow-repeat > li:visible:last").next(); 
        
         li.show();
         li = li.next();