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

VERSION

@@ -1,2 +1,2 @@
 PRODUCT_ID=Airtime
-PRODUCT_RELEASE=2.0.0
+PRODUCT_RELEASE=2.1.0

airtime_mvc/application/controllers/ScheduleController.php

@@ -443,7 +443,10 @@ class ScheduleController extends Zend_Controller_Action
                 "Rebroadcast of show \"$originalShowName\" from "
                 .$originalDateTime->format("l, F jS")." at ".$originalDateTime->format("G:i");
         }
-		$this->view->showContent = $show->getShowListContent();
+        $this->view->showLength = $show->getShowLength();
+        $this->view->timeFilled = $show->getTimeScheduled();
+        $this->view->percentFilled = $show->getPercentScheduled();
+        $this->view->showContent = $show->getShowListContent();
         $this->view->dialog = $this->view->render('schedule/show-content-dialog.phtml');
         unset($this->view->showContent);
     }

airtime_mvc/application/forms/AddShowRepeats.php

@@ -52,6 +52,7 @@ class Application_Form_AddShowRepeats extends Zend_Form_SubForm
 		$this->addElement('checkbox', 'add_show_no_end', array(
             'label'      => 'No End?',
             'required'   => false,
+            'checked' => true,
 		));
     }
 

airtime_mvc/application/forms/GeneralPreferences.php

@@ -11,7 +11,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
 
         $defaultFade = Application_Model_Preference::GetDefaultFade();
         if($defaultFade == ""){
-            $defaultFade = '00:00:00.000000';
+            $defaultFade = '00:00:00.500000';
         }
 
         //Station name

airtime_mvc/application/models/Nowplaying.php

@@ -23,8 +23,9 @@ class Application_Model_Nowplaying
             $showEnds = $showEndDateTime->format("Y-m-d H:i:s");
             $itemStarts = $itemStartDateTime->format("Y-m-d H:i:s");
             $itemEnds = $itemEndDateTime->format("Y-m-d H:i:s");
-        
+            
-            $status = ($dbRow['show_ends'] < $dbRow['item_ends']) ? "x" : "";
+            // Allow show to exceed 1 second per CC-3183
+            $status = ($showEnds < $itemEnds) ? "x" : "";
             
             $type = "a";
             $type .= ($itemEndDateTime->getTimestamp() > $epochNow && $itemStartDateTime->getTimestamp() <= $epochNow) ? "c" : "";

airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml

@@ -15,6 +15,7 @@
 <div><span>Copyright:</span><span><?php echo ($this->md["MDATA_KEY_COPYRIGHT"]);?></span></div>
 <div><span>Isrc Number:</span><span><?php echo ($this->md["MDATA_KEY_ISRC"]);?></span></div>
 <div><span>Website:</span><span><?php echo ($this->md["MDATA_KEY_URL"]);?></span></div>
+<div><span>Language:</span><span><?php echo ($this->md["MDATA_KEY_LANGUAGE"]);?></span></div>
 
 <?php endif; ?>
 

airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml

@@ -24,4 +24,10 @@
 <?php $i=$i+1; ?>
 <?php endforeach; ?>
 </table>
+<br/>
+<div id="show_time_info">
+    <span id="show_time_filled" class="time"><?php echo $this->timeFilled; ?></span>
+    <div id="show_progressbar"></div>
+    <span id="show_length" class="time"><?php echo $this->showLength; ?></span>
+</div>
 </div>

airtime_mvc/public/js/airtime/schedule/schedule.js

@@ -219,7 +219,11 @@ function buildContentDialog(json){
         alertShowErrorAndReload();
     }
 	var dialog = $(json.dialog);
-	
+        
+	dialog.find("#show_progressbar").progressbar({
+		value: json.percentFilled
+	});
+        
 	var viewportwidth;
 	var viewportheight;