Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

airtime_mvc/application/forms/SmartBlockCriteria.php

@@ -29,13 +29,12 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
             "mood" => "Mood",
             "name" => "Name",
             "orchestra" => "Orchestra",
-            "radio_station_name" => "Radio Station Name",
             "rating" => "Rating",
             "sample_rate" => "Sample Rate",
             "track_title" => "Title",
             "track_number" => "Track Number",
             "utime" => "Uploaded",
-            "year" => "Year"               
+            "year" => "Year"
         );
         
         $criteriaTypes = array(
@@ -60,7 +59,6 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
             "mood" => "s",
             "name" => "s",
             "orchestra" => "s",
-            "radio_station_name" => "s",
             "rating" => "n",
             "sample_rate" => "n",
             "track_title" => "s",
@@ -210,7 +208,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
                 /* This is where the additional modifier rows get defined
                  * The additional row count starts at 0 and gets appended
                  * to the parent field name
-                 */      
+                 */
                 } else if (count($storedCrit["crit"][$criteriaKeys[$i]]) > 1) {
                     $n = $j - 1;
                     $criteria = new Zend_Form_Element_Select("sp_criteria_field_".$i."_".$n);
@@ -251,7 +249,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
                     $this->addElement($criteriaExtra);
                 }
                         
-            }//for            
+            }//for
             
         }//for
         

airtime_mvc/application/models/Block.php

@@ -76,7 +76,6 @@ class Application_Model_Block
             "mood" => "DbMood",
             "name" => "DbName",
             "orchestra" => "DbOrchestra",
-            "radio_station_name" => "DbRadioStationName",
             "rating" => "DbRating",
             "sample_rate" => "DbSampleRate",
             "track_title" => "DbTrackTitle",
@@ -1211,6 +1210,7 @@ EOT;
     
         $insertList = array();
         $totalTime = 0;
+        $totalItems = 0;
     
         // this moves the pointer to the first element in the collection
         $files->getFirst();
@@ -1220,7 +1220,9 @@ EOT;
             $length = Application_Common_DateHelper::calculateLengthInSeconds($iterator->current()->getDbLength());
             $insertList[$id] = $length;
             $totalTime += $length;
-            if ( !is_null($limit['items']) && $limit['items'] == count($insertList)) {
+            $totalItems++;
+            
+            if ((!is_null($limit['items']) && $limit['items'] == count($insertList)) || $totalItems > 500) {
                 break;
             }
     
@@ -1252,7 +1254,6 @@ EOT;
                 "mood" => "Mood",
                 "name" => "Name",
                 "orchestra" => "Orchestra",
-                "radio_station_name" => "Radio Station Name",
                 "rating" => "Rating",
                 "sample_rate" => "Sample Rate",
                 "track_title" => "Title",

airtime_mvc/application/views/scripts/playlist/update.phtml

@@ -10,7 +10,7 @@ if ($item['type'] == 2) {
 }
 ?>
     <li class="ui-state-default" id="spl_<?php echo $item["id"] ?>" unqid="<?php echo $item["id"]; ?>">
-        <div class="list-item-container"> 
+        <div class="list-item-container">
         
             <?php if ($item['type'] == 0 && $item['exists']):?>
             <div class="big_play" audioFile="<?php echo $item["id"]; ?>">
@@ -39,11 +39,11 @@ if ($item['type'] == 2) {
                 <span class="spl_title"><?php echo $item['track_title'] ?></span>
             </div>
             <div class="text-row">
-                <span class="spl_artist"><?php echo $item['creator'] ?></span>     
+                <span class="spl_artist"><?php echo $item['creator'] ?></span>
                 <span class="spl_offset"><?php echo $item["offset"]?></span>
             </div>
             <?php //create the crossfade icon.
-                if ($i < count($items) -1):
+                if (($i < count($items) -1) && !($items[$i]['type'] == 2 && $items[$i+1]['type'])):
             ?>
             <div id="fade_<?php echo $i ?>" class="spl_fade_control ui-state-default"></div>
             <?php endif; ?>
@@ -62,7 +62,7 @@ if ($item['type'] == 2) {
 
         <?php //create a fade editor box
               //(fadeout of current position + fade in of next position)
-            if($i < count($items) -1):
+            if(($i < count($items) -1) && !($items[$i]['type'] == 2 && $items[$i+1]['type'])):
         ?>
         <div id="crossfade_<?php echo $i ?>-<?php echo $i+1 ?>" class="crossfade clearfix" style="display: none">
             <?php echo $this->partial('playlist/set-fade.phtml', array(

airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js

@@ -590,7 +590,6 @@ var criteriaTypes = {
     "mood" : "s",
     "name" : "s",
     "orchestra" : "s",
-    "radio_station_name" : "s",
     "rating" : "n",
     "sample_rate" : "n",
     "track_title" : "s",