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>
+        <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">
+        <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
+Before you overwrite fullcalendar.js, note that we have changed a few lines
-of this file.
+in this file.
 
 Running a diff between the original fullcalendar.js and our modified one:
 
-$diff -u fullcalendar_original.js fullcalendar.js 
+martin@Thinkpad-T410:~/workspace/airtime/airtime_mvc/public/js/fullcalendar$ diff -u fullcalendar_orig.js fullcalendar.js 
---- fullcalendar_original.js	2011-04-09 17:13:15.000000000 -0400
+--- fullcalendar_orig.js	2011-04-09 17:13:15.000000000 -0400
-+++ fullcalendar.js	2011-08-19 11:58:49.672894583 -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);

python_apps/pypo/install/pypo-initialize.py

@@ -41,16 +41,16 @@ def get_os_codename():
         if (sts == 0):
             #lsb_release is available on this system. Let's get the os codename
             p = Popen("lsb_release -sc", shell=True, stdout=PIPE)
-            return p.communicate()[0].strip('\r\n')
+            codename = p.communicate()[0].strip('\r\n')
+ 
+            p = Popen("lsb_release -sd", shell=True, stdout=PIPE)
+            fullname = p.communicate()[0].strip('\r\n')
+            
+            return (codename, fullname)
     except Exception, e:
         pass
 
-    return "unknown"
+    return ("unknown", "unknown")
-        
-def get_current_script_dir():
-    current_script_dir = os.path.realpath(__file__)
-    index = current_script_dir.rindex('/')
-    return current_script_dir[0:index]
 
 def generate_liquidsoap_config(ss):
     data = ss['msg']
@@ -76,6 +76,7 @@ def generate_liquidsoap_config(ss):
     fh.close()
     
 PATH_INI_FILE = '/etc/airtime/pypo.cfg'
+PATH_LIQUIDSOAP_BIN = '/usr/lib/airtime/pypo/bin/liquidsoap_bin'
 
 #any debian/ubuntu codename in this et will automatically use the natty liquidsoap binary
 codenames_for_natty_binary = set(["natty", "oneiric", "precise", "squeeze"])
@@ -88,29 +89,27 @@ except Exception, e:
     sys.exit(1)
     
 try:    
-    current_script_dir = get_current_script_dir()
-    
     #select appropriate liquidsoap file for given system os/architecture
     architecture = platform.architecture()[0]
     #natty = is_natty()
         
-    codename = get_os_codename()
+    print "* Detecting OS: ...",
+    (codename, fullname) = get_os_codename()
+    print " Found %s" % fullname
     natty = codename in codenames_for_natty_binary
         
-    print "* Detecting system architecture for Liquidsoap"
-    
     if architecture == '64bit' and natty:
         print " * Installing 64-bit liquidsoap binary (Natty)"
-        shutil.copy("%s/../liquidsoap_bin/liquidsoap-natty-amd64"%current_script_dir, "%s/../liquidsoap_bin/liquidsoap"%current_script_dir)
+        shutil.copy("%s/liquidsoap-natty-amd64"%PATH_LIQUIDSOAP_BIN, "%s/liquidsoap"%PATH_LIQUIDSOAP_BIN)
     elif architecture == '32bit' and natty:
         print " * Installing 32-bit liquidsoap binary (Natty)"
-        shutil.copy("%s/../liquidsoap_bin/liquidsoap-natty-i386"%current_script_dir, "%s/../liquidsoap_bin/liquidsoap"%current_script_dir)
+        shutil.copy("%s/liquidsoap-natty-i386"%PATH_LIQUIDSOAP_BIN, "%s/liquidsoap"%PATH_LIQUIDSOAP_BIN)
     elif architecture == '64bit' and not natty:
         print " * Installing 64-bit liquidsoap binary"
-        shutil.copy("%s/../liquidsoap_bin/liquidsoap-amd64"%current_script_dir, "%s/../liquidsoap_bin/liquidsoap"%current_script_dir)
+        shutil.copy("%s/liquidsoap-amd64"%PATH_LIQUIDSOAP_BIN, "%s/liquidsoap"%PATH_LIQUIDSOAP_BIN)
     elif architecture == '32bit' and not natty:
         print " * Installing 32-bit liquidsoap binary"
-        shutil.copy("%s/../liquidsoap_bin/liquidsoap-i386"%current_script_dir, "%s/../liquidsoap_bin/liquidsoap"%current_script_dir)
+        shutil.copy("%s/liquidsoap-i386"%PATH_LIQUIDSOAP_BIN, "%s/liquidsoap"%PATH_LIQUIDSOAP_BIN)
     else:
         print "Unknown system architecture."
         sys.exit(1)