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

airtime_mvc/application/controllers/ScheduleController.php

@@ -730,6 +730,28 @@ class ScheduleController extends Zend_Controller_Action
                     Application_Model_Schedule::createNewFormSections($this->view);
 
                     $this->view->newForm = $this->view->render('schedule/add-show-form.phtml');
+                }else{
+                    $this->view->what = $formWhat;
+                    $this->view->when = $formWhen;
+                    $this->view->repeats = $formRepeats;
+                    $this->view->who = $formWho;
+                    $this->view->style = $formStyle;
+                    $this->view->rr = $formRecord;
+                    $this->view->absoluteRebroadcast = $formAbsoluteRebroadcast;
+                    $this->view->rebroadcast = $formRebroadcast;
+                    $this->view->addNewShow = true;
+        
+                    //the form still needs to be "update" since
+                    //the validity test failed.
+                    if ($data['add_show_id'] != -1){
+                        $this->view->addNewShow = false;
+                    }
+                    if (!$startDateModified){
+                        $formWhen->getElement('add_show_start_date')->setOptions(array('disabled' => true));
+                    }
+        
+                    $this->view->form = $this->view->render('schedule/add-show-form.phtml');
+                    
                 }
             }else{
                 $userInfo = Zend_Auth::getInstance()->getStorage()->read();

airtime_mvc/application/models/Preference.php

@@ -530,7 +530,7 @@ class Application_Model_Preference
     public static function GetLatestLink(){
         $link = self::GetValue("latest_link");
         if($link == null || strlen($link) == 0) {
-            return "http://www.sourcefabric.org/en/airtime/download/";
+            return 'http://airtime.sourcefabric.org';
         } else {
             return $link;
         }

airtime_mvc/public/css/styles.css

@@ -1516,7 +1516,6 @@ div.success{
 	list-style-type:none;
 	margin:0 0 8px 0;
 	padding:0;
-	height:25px;
 	display:block;
 }
 /*

python_apps/pypo/liquidsoap_scripts/ls_lib.liq

@@ -143,7 +143,9 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de
                     url = !url_ref,
                     genre = !genre_ref,
                     name = !description_ref,
-                    user = !user_ref)
+                    user = !user_ref,
+                    on_error = on_error,
+                    on_connect = on_connect)
          if bitrate == 24 then 
                 ignore(output.shoutcast(%mp3(bitrate = 24),s))
             elsif bitrate == 32 then