Merge branch 'CC-3174' into devel

airtime_mvc/application/controllers/UsersettingsController.php

@@ -11,9 +11,9 @@ class UsersettingsController extends Zend_Controller_Action
                     ->addActionContext('get-library-datatable', 'json')
                     ->addActionContext('set-library-datatable', 'json')
                     ->addActionContext('get-timeline-datatable', 'json')
-                    ->addActionContext('set-timeline-datatable', 'json')
+                    ->addActionContext('set-timeline-datatable', 'json')
-                    ->addActionContext('register', 'json')
                     ->addActionContext('remindme', 'json')
+                    ->addActionContext('donotshowregistrationpopup', 'json')
                     ->initContext();
     }
     

airtime_mvc/application/models/Schedule.php

@@ -245,7 +245,8 @@ class Application_Model_Schedule {
         showt.background_color AS show_background_color, showt.id AS show_id,
 
         si.starts AS si_starts, si.ends AS si_ends, si.time_filled AS si_time_filled,
-        si.record AS si_record, si.rebroadcast AS si_rebroadcast, si.id AS si_id, si.last_scheduled AS si_last_scheduled,
+        si.record AS si_record, si.rebroadcast AS si_rebroadcast, si.instance_id AS parent_show,
+        si.id AS si_id, si.last_scheduled AS si_last_scheduled,
 
         sched.starts AS sched_starts, sched.ends AS sched_ends, sched.id AS sched_id,
         sched.cue_in AS cue_in, sched.cue_out AS cue_out,

airtime_mvc/application/models/ShowBuilder.php

@@ -159,6 +159,22 @@ class Application_Model_ShowBuilder {
         $showEndDT->setTimezone(new DateTimeZone($this->timezone));
         $endsEpoch = floatval($showEndDT->format("U.u"));
         
+        //is a rebroadcast show
+        if (intval($p_item["si_rebroadcast"]) === 1) {
+            $row["rebroadcast"] = true;
+            
+            $parentInstance = CcShowInstancesQuery::create()->findPk($p_item["parent_show"]);
+            $name = $parentInstance->getCcShow()->getDbName();
+            $dt = $parentInstance->getDbStarts(null);
+            $dt->setTimezone(new DateTimeZone($this->timezone));
+            $time = $dt->format("Y-m-d H:i");
+            
+            $row["rebroadcast_title"] = "Rebroadcast of {$name} from {$time}";
+        }
+        else if (intval($p_item["si_record"]) === 1) {
+            $row["record"] = true;
+        }
+        
         if ($startsEpoch < $this->epoch_now && $endsEpoch > $this->epoch_now) {
             $row["currentShow"] = true;
             $this->currentShow = true;
@@ -238,7 +254,11 @@ class Application_Model_ShowBuilder {
             $row["id"] = 0 ;
             $row["instance"] = intval($p_item["si_id"]);
         }
-              
+        
+        if (intval($p_item["si_rebroadcast"]) === 1) {
+            $row["record"] = true;
+        }
+               
         if ($this->currentShow = true) {
             $row["currentShow"] = true;
         }

airtime_mvc/public/js/airtime/showbuilder/builder.js

@@ -228,7 +228,8 @@ var AIRTIME = (function(AIRTIME){
 					//background-color to imitate calendar color.
 					r,g,b,a,
 					$nRow = $(nRow),
-					$image;
+					$image,
+					$div;
 				
 				fnPrepareSeparatorRow = function fnPrepareSeparatorRow(sRowContent, sClass, iNodeIndex) {
 					
@@ -252,7 +253,25 @@ var AIRTIME = (function(AIRTIME){
 					node.innerHTML = '';
 					cl = 'sb-header';
 					
+					if (aData.record === true) {
+						$div = $("<div/>", {
+							"class": "small-icon recording"
+						});
+						$(node).append($div);
+					}
+					else if(aData.rebroadcast === true) {
+						$div = $("<div/>", {
+							"class": "small-icon rebroadcast"
+						});
+						$(node).append($div);
+					}
+					
 					sSeparatorHTML = '<span class="show-title">'+aData.title+'</span>';
+					
+					if (aData.rebroadcast === true) {
+						sSeparatorHTML += '<span>'+aData.rebroadcast_title+'</span>';
+					}
+					
 					sSeparatorHTML += '<span class="push-right">';
 					
 					if (aData.startDate === aData.endDate) {