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

airtime_mvc/application/forms/StreamSettingSubForm.php

@@ -158,7 +158,7 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm{
         $liquidsopa_error_msg = '<div class="stream-status status-info"><h3>Getting information from the server...</h3></div>';
         
         $this->setDecorators(array(
-            array('ViewScript', array('viewScript' => 'form/stream-setting-form.phtml', "stream_number"=>$stream_number, "liquidsoap_error_msg"=>$liquidsopa_error_msg))
+            array('ViewScript', array('viewScript' => 'form/stream-setting-form.phtml', "stream_number"=>$stream_number, "enabled"=>$enable->getValue(), "liquidsoap_error_msg"=>$liquidsopa_error_msg))
         ));
     }
 

airtime_mvc/application/views/scripts/form/stream-setting-form.phtml

@@ -1,8 +1,8 @@
         <?php 
         $s_name = "s".$this->stream_number;
         ?>
-        <h3 class="collapsible-header <?php echo $this->stream_number != '1'?"close":""?>"><span class="arrow-icon"></span>Stream <?php echo $this->stream_number?></h3>
-        <div class="stream-setting-content" <?php echo $this->stream_number != '1'?'style="display: none;':''?> id="<?=$s_name?>-config">
+        <h3 class="collapsible-header <?php echo $this->stream_number == '1'?"close":""?>"><span class="arrow-icon"></span>Stream <?php echo $this->stream_number?></h3>
+        <div class="stream-setting-content" <?php echo $this->enabled == 0?'style="display: none;':''?> id="<?=$s_name?>-config">
         <fieldset class="padded">
             <dl class="zend_form clearfix">
             <dd id="<?=$s_name?>Liquidsoap-error-msg-element" class="liquidsoap_status">

airtime_mvc/public/js/fullcalendar/AIRTIME_DEV_README

@@ -1,11 +1,28 @@
-Before you overwrite fullcalendar.js, note that we have changed one line
-of this file.
+Before you overwrite fullcalendar.js, note that we have changed a few lines
+in this file.
 
 Running a diff between the original fullcalendar.js and our modified one:
 
-$diff -u fullcalendar_original.js fullcalendar.js 
---- fullcalendar_original.js	2011-04-09 17:13:15.000000000 -0400
-+++ fullcalendar.js	2011-08-19 11:58:49.672894583 -0400
+martin@Thinkpad-T410:~/workspace/airtime/airtime_mvc/public/js/fullcalendar$ diff -u fullcalendar_orig.js fullcalendar.js 
+--- fullcalendar_orig.js	2011-04-09 17:13:15.000000000 -0400
++++ fullcalendar.js	2011-11-18 17:03:57.000000000 -0500
+@@ -1,6 +1,6 @@
+ /**
+  * @preserve
+- * FullCalendar v1.5.1
++ * FullCalendar v1.5.1-CUSTOM (Changes by Martin Konecny -added primitive support for timezones)
+  * http://arshaw.com/fullcalendar/
+  *
+  * Use fullcalendar.css for basic styling.
+@@ -227,7 +227,7 @@
+ 	var absoluteViewElement;
+ 	var resizeUID = 0;
+ 	var ignoreWindowResize = 0;
+-	var date = new Date();
++	var date = adjustDateToServerDate(new Date(), options["serverTimezoneOffset"]);
+ 	var events = [];
+ 	var _dragElement;
+ 	
 @@ -2275,7 +2275,7 @@
  	function updateCells(firstTime) {
  		var dowDirty = firstTime || rowCnt == 1; // could the cells' day-of-weeks need updating?
@@ -15,7 +32,22 @@ $diff -u fullcalendar_original.js fullcalendar.js
  		var cell;
  		var date;
  		var row;
-
+@@ -3108,7 +3108,7 @@
+ 		var headCell;
+ 		var bodyCell;
+ 		var date;
+-		var today = clearTime(new Date());
++		var today = clearTime(adjustDateToServerDate(new Date(), opt("serverTimezoneOffset")));
+ 		for (i=0; i<colCnt; i++) {
+ 			date = colDate(i);
+ 			headCell = dayHeadCells.eq(i);
+@@ -5205,4 +5205,4 @@
+ 	
+ }
+ 
+-})(jQuery);
+\ No newline at end of file
++})(jQuery);
 
 
 adjustDateToServerDate() function is defined in "js/airtime/schedule/full-calendar-functions.js"

airtime_mvc/public/js/fullcalendar/fullcalendar.js

@@ -1,6 +1,6 @@
 /**
  * @preserve
- * FullCalendar v1.5.1
+ * FullCalendar v1.5.1-CUSTOM (Changes by Martin Konecny -added primitive support for timezones)
  * http://arshaw.com/fullcalendar/
  *
  * Use fullcalendar.css for basic styling.
@@ -227,7 +227,7 @@ function Calendar(element, options, eventSources) {
 	var absoluteViewElement;
 	var resizeUID = 0;
 	var ignoreWindowResize = 0;
-	var date = new Date();
+	var date = adjustDateToServerDate(new Date(), options["serverTimezoneOffset"]);
 	var events = [];
 	var _dragElement;
 	
@@ -3108,7 +3108,7 @@ function AgendaView(element, calendar, viewName) {
 		var headCell;
 		var bodyCell;
 		var date;
-		var today = clearTime(new Date());
+		var today = clearTime(adjustDateToServerDate(new Date(), opt("serverTimezoneOffset")));
 		for (i=0; i<colCnt; i++) {
 			date = colDate(i);
 			headCell = dayHeadCells.eq(i);
@@ -5205,4 +5205,4 @@ function HorizontalPositionCache(getElement) {
 	
 }
 
-})(jQuery);
+})(jQuery);