Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x

airtime_mvc/application/models/Show.php

@@ -180,13 +180,18 @@ SQL;
             return "Shows can have a max length of 24 hours.";
         }
         
+        $utc = new DateTimeZone("UTC");
+        
+        $nowDateTime = new DateTime("now", $utc);
+
         $showInstances = CcShowInstancesQuery::create()
             ->filterByDbShowId($this->_showId)
             ->find($con);
 
-        /* Check if the show being resized and any of its repeats * overlap
+        /* Check two things:
-            with other scheduled shows */
+           1. If the show being resized and any of its repeats end in the past 
-        $utc = new DateTimeZone("UTC");
+           2. If the show being resized and any of its repeats overlap
+              with other scheduled shows */
 
         foreach ($showInstances as $si) {
             $startsDateTime = new DateTime($si->getDbStarts(), new DateTimeZone("UTC"));
@@ -202,6 +207,10 @@ SQL;
             $newStartsDateTime = Application_Model_ShowInstance::addDeltas($startsDateTime, $deltaDay, $deltaMin);
             $newEndsDateTime   = Application_Model_ShowInstance::addDeltas($endsDateTime, $deltaDay, $deltaMin);
             
+            if ($newEndsDateTime->getTimestamp() < $nowDateTime->getTimestamp()) {
+                return "End date/time cannot be in the past";
+            }
+
             //convert our new starts/ends to UTC.
             $newStartsDateTime->setTimezone($utc);
             $newEndsDateTime->setTimezone($utc);

airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js

@@ -65,7 +65,7 @@ var AIRTIME = (function(AIRTIME) {
 
                         var $el = $(this), selected = mod
                                 .getChosenAudioFilesLength(), container, message, li = $("#side_playlist ul[id='spl_sortable'] li:first"), width = li
-                                .width(), height = li.height();
+                                .width(), height = 55;
 
                         // dragging an element that has an unselected
                         // checkbox.